diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 12c9446b402b7617804bd0dac823aedc1746bbd4..5f49b9e8c2579c2d3f0fe52063bd7874ad038ae9 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -39,13 +39,14 @@ module OneM2M_Functions {
 			map(self:acPort, system:acPort);
 			
 			activate(a_default());
-			vc_a_cse := activate(a_cse_cf01());
+			vc_aeSimu := activate(a_cse_cf01());
 				
 			// Initialize AE2
 			if(p_auxiliaryAe2Required) {
 				vc_auxiliaryAe2Up := p_auxiliaryAe2Required;
 				vc_ae2 := AeSimu.create("AE2") alive;
-				f_setProtocolBinding(PX_PROTOCOL_BINDING_AE2);
+				vc_ae2.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE2));
+				vc_ae2.done;
 				vc_ae2.start(f_cf01UpAe2());
 				vc_ae2.done;
 			}
@@ -81,7 +82,8 @@ module OneM2M_Functions {
 			vc_config := e_cf02;
 			vc_testSystemRole := e_ae;	
 			vc_cse1 := CseSimu.create("CSE1") alive;
-			f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+			vc_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+			vc_cse1.done;
 				
 			// Map
 			map(self:mcaPort, system:mcaPort);
@@ -90,7 +92,7 @@ module OneM2M_Functions {
 				map(self:utPort, system:utPort);
 			}
 			activate(a_default());
-			vc_a_cse := activate(a_cse_cf02_ae1());
+			vc_aeSimu := activate(a_cse_cf02_ae1());
 			vc_cse1.start(f_cf02UpCse1());
 			vc_cse1.done;
 				
@@ -134,7 +136,8 @@ module OneM2M_Functions {
 			vc_testSystemRole := e_cse;	
 			vc_cseType := p_cseType;
 			vc_ae1 := AeSimu.create("AE1") alive;
-			f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+			vc_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+			vc_ae1.done;
 			
 			//Initialization of local CSEBase
 			v_cSEBaseResource := f_generateLocalResource(-, -1, int5);
@@ -145,7 +148,7 @@ module OneM2M_Functions {
 			map(self:mccPortIn, system:mccPortIn);
 			map(self:acPort, system:acPort);
 			activate(a_default());
-			vc_a_cse := activate(a_cse_cf02_cse1());
+			vc_cseSimu := activate(a_cse_cf02_cse1());
 			vc_ae1.start(f_cf02UpAe1());
 			vc_ae1.done;
 				
@@ -195,7 +198,7 @@ module OneM2M_Functions {
 				map(self:utPort, system:utPort);
 			}
 			activate(a_default());
-			vc_a_ae := activate(a_ae_cf03());
+			vc_cseSimu := activate(a_cse_cf03());
 		
 			// Connect
 					
@@ -222,7 +225,7 @@ module OneM2M_Functions {
 			map(self:mccPortIn, system:mccPortIn);
 			map(self:acPort, system:acPort);
 			activate(a_default());
-			vc_a_cse := activate(a_cse_cf04());
+			vc_cseSimu := activate(a_cse_cf04());
 
 			// Connect
 			
@@ -387,6 +390,50 @@ module OneM2M_Functions {
 			return v_resourceIndex;
 
 		}
+		
+		/**
+		 * @desc Getting last local resourceIndex saved in the vc_localResourcesList
+		 * @param p_tester Given component
+		 */
+		function f_getLatestLocalResourceIndex(in CseSimu p_component) runs on Tester return integer {
+			var integer v_resourceIndex;
+
+			f_connectInfoPort(p_component);
+
+			p_component.start(f_sendLatestLocalResourceIndex());
+			alt {
+				[]infoPort.receive(mw_resourceIndex) -> value v_resourceIndex{
+				}
+			}
+
+			p_component.done;
+			f_disconnectInfoPort(p_component);
+
+			return v_resourceIndex;
+
+		}
+		
+		/**
+		 * @desc Getting the address of the last local resource saved in the vc_localResourcesList
+		 * @param p_tester Given component
+		 */
+		function f_getLatestLocalResourceAddress(in CseSimu p_component, AddressingMethod p_addressingMethod := PX_ADDRESSING_METHOD, PrimitiveScope p_primitiveScope := PX_PRIMITIVE_SCOPE) runs on Tester return XSD.ID {
+			var XSD.ID v_localResourceAddress;
+
+			f_connectInfoPort(p_component);
+
+			p_component.start(f_sendLatestLocalResourceAddress(p_addressingMethod, p_primitiveScope));
+			alt {
+				[]infoPort.receive(mw_resourceAddress) -> value v_localResourceAddress{
+				}
+			}
+
+			p_component.done;
+			f_disconnectInfoPort(p_component);
+
+			return v_localResourceAddress;
+
+		}
 							
 		/**
 		 * @desc Getting primitiveContent retrieved in an AeSimu component
@@ -434,6 +481,31 @@ module OneM2M_Functions {
 				
 		}
 		
+		/**
+		 * @desc Getting the latest resource from an AeSimu component
+		 * @param p_tester AeSimu component
+		 * @param p_resourceIndex Index of resource to be retrieved
+		 */
+		function f_getLatestResource(in Tester p_component) runs on Tester return integer {
+			var MyResource v_resource;
+			var integer v_resourceIndex := -1;
+		
+			f_connectInfoPort(p_component);
+
+			p_component.start(f_sendLatestResource());
+			alt {
+				[]infoPort.receive(mw_resource) -> value v_resource {
+					v_resourceIndex := f_setResource(v_resource.resource, v_resource.resourceType, v_resource.parentIndex, false);
+				}
+			}
+
+			p_component.done;
+			f_disconnectInfoPort(p_component);
+			
+			return v_resourceIndex;
+			
+		}
+		
 		/**
 		 * @desc Getting a specific resource from an AeSimu component
 		 * @param p_tester AeSimu component
@@ -486,6 +558,24 @@ module OneM2M_Functions {
 		
 		} 
 		
+		/**
+		 * @desc Sending the address of the last resource saved in the vc_resourcesList
+		 */	
+		function f_sendLatestLocalResourceAddress(AddressingMethod p_addressingMethod := PX_ADDRESSING_METHOD, PrimitiveScope p_primitiveScope := PX_PRIMITIVE_SCOPE) runs on CseSimu {
+
+			infoPort.send(f_getLocalResourceAddress(lengthof(vc_localResourcesList)-1, p_addressingMethod, p_primitiveScope));
+		
+		} 
+		
+		/**
+		 * @desc Sending of last local resourceIndex saved in the vc_localResourcesList
+		 */	
+		function f_sendLatestLocalResourceIndex() runs on CseSimu {
+
+			infoPort.send(lengthof(vc_localResourcesList)-1);
+		
+		} 
+		
 		/**
 		 * @desc Sending of last primitiveContent retrieved (vc_primitiveContentRetrievedResource) through InfoPort
 		 */	
@@ -528,6 +618,14 @@ module OneM2M_Functions {
 			} else {
 				infoPort.send(vc_resourcesList[p_resourceIndex]);
 			}
+		}
+			
+		/**
+		 * @desc Sending of the latest resource through InfoPort
+		 */	
+		function f_sendLatestResource() runs on Tester {
+
+			infoPort.send(vc_resourcesList[lengthof(vc_resourcesList)-1]);
 				
 		} 	
 	
@@ -840,7 +938,10 @@ module OneM2M_Functions {
 				var integer i;
 				var XSD.ID v_resourceAddress;
 				var RequestPrimitive v_request;
-	
+				var boolean v_deregistrationPerformed := false;
+				var template UtTriggerPrimitive v_utRequest := m_utDelete;
+				var universal charstring v_action := __SCOPE__ & ": Please, perform deregistration by sending a valid DELETE Request for remoteCSE to ";
+					
 				if (PX_RUN_POSTAMBLE) {
 		
 					if(vc_config == e_cf02CseSimuMaster) {
@@ -851,13 +952,14 @@ module OneM2M_Functions {
 		
 					for(i := lengthof(vc_resourcesIndexToBeDeleted) -1; i >=0; i := i - 1) {
 			
-						if(ischosen(vc_resourcesList[vc_resourcesIndexToBeDeleted[i]].resource.remoteCSE) and PX_MN_CSE) {
+						if(ischosen(vc_resourcesList[vc_resourcesIndexToBeDeleted[i]].resource.remoteCSE)) {
 							v_resourceAddress := f_getResourceAddress(vc_resourcesIndexToBeDeleted[i], e_nonHierarchical, e_spRelative);
+							v_deregistrationPerformed := true;
 						} else {
 							v_resourceAddress := f_getResourceAddress(vc_resourcesIndexToBeDeleted[i]);
 						} 
 			
-						v_request := valueof(m_delete(v_resourceAddress, f_getOriginator(vc_resourcesIndexToBeDeleted[i],false)));
+						v_request := valueof(m_delete(v_resourceAddress, f_getOriginator(vc_resourcesIndexToBeDeleted[i], vc_testSystemRole)));
 
 						mccPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 			
@@ -875,8 +977,68 @@ module OneM2M_Functions {
 								log(__SCOPE__&" INFO: No answer while deleting resource " & v_request.to_);
 							}	
 						}	
-			
 					}
+					
+					if(not(v_deregistrationPerformed)) {
+						if(vc_localRemoteCseIndex != -1) {
+							//Deregistration by Registrar (Test System)
+							mccPort.send(f_getMsgOutPrimitive(m_request(m_retrieveChildReferences(f_getResourceAddress(), f_getOriginator(vc_remoteCseIndex), {int16}))));
+							tc_ac.start;
+							alt {
+								[] mccPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
+									tc_ac.stop;
+									log(__SCOPE__&":INFO: Resource retrieved successfuly");
+									v_resourceAddress := vc_response.primitive.responsePrimitive.primitiveContent.cSEBase.choice.childResource_list[0].base;
+									v_request := valueof(m_delete(v_resourceAddress, PX_CSE1_ID));
+
+									mccPort.send(f_getMsgOutPrimitive(m_request(v_request)));
+
+									tc_ac.start;
+									alt {
+										[] mccPort.receive(mw_response(mw_responsePrimitiveOK)) {
+											tc_ac.stop;
+											log(__SCOPE__&" INFO: Resource " & v_request.to_ & " deleted");
+											v_deregistrationPerformed := true;
+										}
+										[] mccPort.receive(mw_response(mw_responsePrimitiveKO)) {
+											tc_ac.stop;
+											log(__SCOPE__&" INFO: Error while deleting resource " & v_request.to_);
+										}
+										[] tc_ac.timeout {
+											log(__SCOPE__&" INFO: No answer while deleting resource " & v_request.to_);
+										}	
+									}		
+								}
+								[] mccPort.receive(mw_response(mw_responsePrimitiveKO)) -> value vc_response {
+									tc_ac.stop;
+									log(__SCOPE__&":INFO: Error while retrieving resource");
+								}
+								[] tc_ac.timeout {
+									log(__SCOPE__&":INFO: No answer while retrieving resource");
+								}
+							}
+							
+							if(not(v_deregistrationPerformed)) {
+								//Deregistration by Registree (IUT)
+								//Send trigger message for deregistration
+								v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(vc_localRemoteCseIndex);
+								f_sendUtPrimitive(v_utRequest, v_action & f_getLocalResourceAddress(vc_localRemoteCseIndex));	
+								
+								tc_ac.start;
+								alt {
+									[] mccPortIn.receive(mw_request(mw_delete(f_getLocalResourceAddress(vc_localRemoteCseIndex)))) -> value vc_request {
+										tc_ac.stop;
+										f_processDeleteRequestPrimitive(vc_request.primitive.requestPrimitive);
+										mccPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
+										log(__SCOPE__&": INFO: Deregistration performed successfully");
+									}
+									[] tc_ac.timeout {
+										log(__SCOPE__&": INFO: No deregistration performed");
+									}
+								}
+							}
+						}
+					}					
 				}
 			
 			}			
@@ -934,6 +1096,38 @@ module OneM2M_Functions {
 		
 			}
 			
+			/**
+				 * @desc Message exchange for the creation of a resource
+				 * @param p_resourceType Resource type of the resource to be created
+				 * @param p_requestPrimitive UPDATE request primitive to be used
+				 * @param p_resourceIndex Internal resource index which indicates the resource to be updated	 
+				 * @verdict 
+				 */
+				function f_cse_createResourceHandler(template RequestPrimitive p_request := mw_create) runs on CseSimu return integer{
+					
+					var integer v_localResourceIndex;
+					
+					//Activate defaults when running on a PTC
+					f_cse_activateDefaults_cse1();	
+				
+					tc_ac.start;
+					alt {
+						[] mccPortIn.receive(mw_request(p_request)) -> value vc_request {
+							tc_ac.stop;
+							v_localResourceIndex := f_processCreateRequestPrimitive(vc_request.primitive.requestPrimitive);
+							mccPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
+						}
+						[] tc_ac.timeout {
+							setverdict(inconc, __SCOPE__&":INFO: No creation for resource received");
+						}
+					}	
+				
+					f_checkCseSimuStatus();
+					
+					return v_localResourceIndex;
+				
+				}// end f_cse_createResourceHandler
+			
 			/**
 			 * @desc Creation of a local resource
 			 * @param p_resourceType Resource type of the resource to be created
@@ -973,7 +1167,7 @@ module OneM2M_Functions {
 						}
 						v_response.from_ := PX_CSE1_ID;
 						v_response.to_ := vc_request.primitive.requestPrimitive.from_;
-						mccPortIn.send(m_response(v_response));					
+						mccPortIn.send(f_getMsgOutPrimitive(m_response(v_response)));					
 					}
     					
 					[] tc_ac.timeout {
@@ -1096,15 +1290,15 @@ module OneM2M_Functions {
 			 * @verdict 
 			 */
 			function f_cse_updateResource(in ResourceType p_resourceType, integer p_resourceIndex, template RequestPrimitive p_request, template (omit) AttributeAux_list p_nullFields := omit) runs on AeSimu {
-				
+
 				var RequestPrimitive v_request;
 				
 				//Activate defaults when running on a PTC
 				f_cse_activateDefaults_ae();	
 				
 				v_request := f_getUpdateRequestPrimitive(p_resourceType, p_resourceIndex, p_request);
-					
-				mcaPort.send(m_request(v_request, p_nullFields));
+				
+				mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(v_request), p_nullFields)));
 				tc_ac.start;
 				alt {
 					[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
@@ -1128,6 +1322,41 @@ module OneM2M_Functions {
 				
 			}// end f_cse_updateResource
 			
+			/**
+			 * @desc Message exchange for the update of a resource
+			 * @param p_resourceIndex Internal resource index which indicates the resource to be updated	 
+			 * @param p_requestPrimitive UPDATE request primitive to be used
+			 * @verdict 
+			 */
+			function f_cse_updateResourceHandler(integer p_resourceIndex, template RequestPrimitive p_request := mw_update) runs on CseSimu {
+				
+				var integer v_targetResourceIndex := -1;
+				
+				//Activate defaults when running on a PTC
+				f_cse_activateDefaults_cse1();	
+				
+				tc_ac.start;
+				alt {
+					[] mccPortIn.receive(mw_request(p_request)) -> value vc_request {
+						tc_ac.stop;
+						
+						v_targetResourceIndex := f_processUpdateRequestPrimitive(vc_request.primitive.requestPrimitive);
+						if(v_targetResourceIndex == p_resourceIndex) {
+							setverdict(pass, __SCOPE__&":INFO: Resource updated successfuly");
+						} else {
+							setverdict(inconc, __SCOPE__&":INFO: Unexpected resource update");
+						}
+						mccPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
+					}
+					[] tc_ac.timeout {
+						setverdict(inconc, __SCOPE__&":INFO: No answer while updating resource");
+					}
+				}	
+				
+				f_checkCseSimuStatus();
+				
+			}// end f_cse_updateResourceHandler			
+			
 			/**
 			 * @desc Message exchange for the retrieval of a resource
 			 * @param p_resourceIndex Resource index of the resource to be retrieved
@@ -1158,6 +1387,40 @@ module OneM2M_Functions {
 				
 			}// end f_cse_retrieveResource
 			
+			/**
+			 * @desc Message exchange for the retrieve of a resource
+			 * @param p_resourceIndex Internal resource index which indicates the expected resource to be retrieved	 
+			 * @param p_requestPrimitive RETRIEVE request primitive to be used
+			 * @verdict 
+			 */
+			function f_cse_retrieveResourceHandler(integer p_resourceIndex, template RequestPrimitive p_request := mw_retrieve(?)) runs on CseSimu {
+				
+				var integer v_targetResourceIndex := -1;
+				
+				//Activate defaults when running on a PTC
+				f_cse_activateDefaults_cse1();	
+				
+				tc_ac.start;
+				alt {
+					[] mccPortIn.receive(mw_request(p_request)) -> value vc_request {
+						tc_ac.stop;
+						v_targetResourceIndex := f_processRetrieveRequestPrimitive(vc_request.primitive.requestPrimitive);
+						if(v_targetResourceIndex == p_resourceIndex) {
+							setverdict(pass, __SCOPE__&":INFO: Resource retrieved successfuly");
+						} else {
+							setverdict(inconc, __SCOPE__&":INFO: Unexpected resource retrieval");
+						}
+						mccPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
+					}
+					[] tc_ac.timeout {
+						setverdict(inconc, __SCOPE__&":INFO: No answer while retrieving resource");
+					}
+				}	
+				
+				f_checkCseSimuStatus();
+				
+			}// end f_cse_retrieveResourceHandler	
+			
 			/**
 			 * @desc Message exchange for the deletion of a resource
 			 * @param p_index Resource index of the resource to be deleted
@@ -1195,6 +1458,70 @@ module OneM2M_Functions {
 				f_checkAeSimuStatus();
 				
 			}// end f_cse_deleteResource
+
+			/**
+			 * @desc Message exchange for the delete of a resource
+			 * @param p_resourceIndex Internal resource index which indicates the expected resource to be deleted	 
+			 * @param p_requestPrimitive DELETE request primitive to be used
+			 * @verdict 
+			 */
+			function f_cse_deleteResourceHandler(integer p_resourceIndex, template RequestPrimitive p_request := mw_delete) runs on CseSimu {
+				
+				var integer v_targetResourceIndex := -1;
+				
+				//Activate defaults when running on a PTC
+				f_cse_activateDefaults_cse1();	
+				
+				tc_ac.start;
+				alt {
+					[] mccPortIn.receive(mw_request(p_request)) -> value vc_request {
+						tc_ac.stop;
+						v_targetResourceIndex := f_processDeleteRequestPrimitive(vc_request.primitive.requestPrimitive);
+						if(v_targetResourceIndex == p_resourceIndex) {
+							setverdict(pass, __SCOPE__&":INFO: Resource deleted successfuly");
+						} else {
+							setverdict(inconc, __SCOPE__&":INFO: Unexpected resource retrieval");
+						}
+						mccPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
+					}
+					[] tc_ac.timeout {
+						setverdict(inconc, __SCOPE__&":INFO: No answer while retrieving resource");
+					}
+				}	
+				
+				f_checkCseSimuStatus();
+				
+			}// end f_cse_deleteResourceHandler
+						
+			/**
+			 * @desc Message exchange for any operation on a resource
+			 * @param p_requestPrimitive Request primitive to be sent
+			 * @return PrimitiveContent parameter of the operation response
+			 * @verdict 
+			 */
+			function f_cse_operationResource(template RequestPrimitive p_requestPrimitive) runs on AeSimu return PrimitiveContent{
+
+				mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
+				tc_ac.start;
+				alt {
+					[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
+						tc_ac.stop;
+						setverdict(pass, __SCOPE__&":INFO: Success operation on resource");
+					}
+					[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value vc_response {
+						tc_ac.stop;
+						setverdict(inconc, __SCOPE__&":INFO: Error on the operation on resource");
+					}
+					[] tc_ac.timeout {
+						setverdict(inconc, __SCOPE__&":INFO: No answer while operation on resource");
+					}
+				}	
+				
+				f_checkAeSimuStatus();
+				
+				return vc_response.primitive.responsePrimitive.primitiveContent;
+				
+			}// end f_cse_operationResource
 			
 			/**
 			 * @desc Check that a resource is present in the IUT (resourceId is known) by using RETRIEVE operation
@@ -1441,7 +1768,7 @@ module OneM2M_Functions {
 			
 				v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, p_parentIndex);
 		
-				mcaPort.send(m_request(v_request));
+				mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 					
 			}
 			
@@ -1453,14 +1780,13 @@ module OneM2M_Functions {
 			 * @return Internal resource index of the created resource
 			 * @verdict 
 			 */
-			function f_cse_sendUpdateRequestPrimitive(in ResourceType p_resourceType, template RequestPrimitive p_requestUpdatePrimitive := m_update, integer p_parentIndex := -1) runs on AeSimu {
+			function f_cse_sendUpdateRequestPrimitive(in ResourceType p_resourceType, template RequestPrimitive p_requestUpdatePrimitive := m_update, integer p_targetIndex := -1) runs on AeSimu {
 
 				var RequestPrimitive v_request;
-				var integer v_resourceIndex := -1;
 				
-				v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_requestUpdatePrimitive);
+				v_request := f_getUpdateRequestPrimitive(p_resourceType, p_targetIndex, p_requestUpdatePrimitive);
 
-				mcaPort.send(m_request(v_request));
+				mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 		
 			}
 			
@@ -1570,7 +1896,7 @@ module OneM2M_Functions {
 							setverdict(pass, __SCOPE__ & ":INFO: Notification received");
 							
 							//Send response in any case
-							v_responsePrimitive := valueof(m_responseNotification(int2001, omit));
+							v_responsePrimitive := valueof(m_responseNotification(int2000, omit));
 							v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
 							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 							tc_ac.start;
@@ -1609,7 +1935,7 @@ module OneM2M_Functions {
 								setverdict(fail, __SCOPE__ & ":ERROR: Notification received but the content doesn't match");
 							}
 							//Send response in any case
-							v_responsePrimitive := valueof(m_responseNotification(int2001, omit));
+							v_responsePrimitive := valueof(m_responseNotification(int2000, omit));
 							v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
 							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 						}
@@ -1641,21 +1967,24 @@ module OneM2M_Functions {
 						[] mcaPortIn.receive(mw_request(mw_notifyResponsePrimitive(p_responsePrimitive))) -> value vc_request {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__ & ":INFO: Notification received with the expected content");
-							v_responsePrimitive := valueof(m_responseNotification(int2001, omit));
+							v_responsePrimitive := valueof(m_responseNotification(int2000, omit));
 							v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
-							mcaPortIn.send(m_response(v_responsePrimitive));
 						}
 						[] mcaPortIn.receive(mw_request(mw_notifyResponsePrimitive(?))) -> value vc_request {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__ & ":ERROR: Notification received but the content doesn't match");
-							v_responsePrimitive := valueof(m_responseNotification(int2001, omit));
+							v_responsePrimitive := valueof(m_responseNotification(int2000, omit));
 							v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
-							mcaPortIn.send(m_response(v_responsePrimitive));
 						}
 						[] tc_ac.timeout {
 							setverdict(fail, __SCOPE__ & ":ERROR: No notification received");
 						}
 					}
+					
+					if(isvalue(v_responsePrimitive)) {
+						mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+					}
+					
     	
 				} //end f_cse_notifyProcedure_representationHandler
 	    		
@@ -1688,7 +2017,7 @@ module OneM2M_Functions {
 								setverdict(fail, __SCOPE__ & ": Number of Notification in Aggregatednotification isn't right");
 							}
 							//Send response in any case
-							v_responsePrimitive := valueof(m_responseNotification(int2001, omit));
+							v_responsePrimitive := valueof(m_responseNotification(int2000, omit));
 							v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
 							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 						}
@@ -1701,7 +2030,7 @@ module OneM2M_Functions {
 								setverdict(fail, __SCOPE__ & ":ERROR: Notification received but the content doesn't match");
 							}
 							//Send response in any case
-							v_responsePrimitive := valueof(m_responseNotification(int2001, omit));
+							v_responsePrimitive := valueof(m_responseNotification(int2000, omit));
 							v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
 							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 							v_notificationsReceived := v_notificationsReceived + 1;
@@ -1736,7 +2065,7 @@ module OneM2M_Functions {
 					alt {
 						[] mcaPortIn.receive(mw_request(mw_notifyNotification(p_notification))) -> value vc_request {
 							tc_ac.stop;
-							v_responsePrimitive := valueof(m_responseNotification(int2001, omit));
+							v_responsePrimitive := valueof(m_responseNotification(int2000, omit));
 							v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
 							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 							if(not(match(vc_request.primitive.requestPrimitive.primitiveContent.notification.subscriptionDeletion, true))) {
@@ -1784,16 +2113,15 @@ module OneM2M_Functions {
 				 */
 				 function f_cse_notifyProcedure_notify(template RequestPrimitive p_requestPrimitive) runs on CseSimu {
 					// Local variables
-					var RequestPrimitive v_request;
 					var ResponsePrimitive v_responsePrimitive;
 					var integer v_resourceIndex := -1;
 				
-					v_request.from_ := PX_CSE1_ID;
+					p_requestPrimitive.from_ := PX_CSE1_ID;
 					
-					mccPort.send(m_request(v_request));
+					mccPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
 					tc_ac.start;
 					alt {
-						[] mccPort.receive(mw_response(mw_responsePrimitive(int2000, mw_primitiveContentNotification(mw_contentNotification_any)))) -> value vc_response {
+						[] mccPort.receive(mw_response(mw_responseNotify(int2000))) -> value vc_response {
 							tc_ac.stop;
 						}
 						[] mccPort.receive(mw_response(mw_responsePrimitiveKO)) {
@@ -1831,8 +2159,8 @@ module OneM2M_Functions {
 							v_matchResult := match(p_requestPrimitive.primitiveContent.notification.notificationEvent.representation.resource.aE, p_primitiveContent.aE);
 							log("Expected primitiveContent");
 						}
-						else if(isvalue(p_requestPrimitive.primitiveContent.notification.notificationEvent.representation.responsePrimitive.primitiveContent.aE)) {
-							v_matchResult :=match(p_requestPrimitive.primitiveContent.notification.notificationEvent.representation.responsePrimitive.primitiveContent.aE, p_primitiveContent.aE);
+						else if(isvalue(p_requestPrimitive.primitiveContent.responsePrimitive.primitiveContent.aE)) {
+							v_matchResult :=match(p_requestPrimitive.primitiveContent.responsePrimitive.primitiveContent.aE, p_primitiveContent.aE);
 						}
 						else if (isvalue(p_requestPrimitive.primitiveContent.aggregatedNotification.notification_list)) {
 							v_matchResult := true;
@@ -1842,11 +2170,6 @@ module OneM2M_Functions {
 									if(not (match(p_requestPrimitive.primitiveContent.aggregatedNotification.notification_list[i].notificationEvent.representation.resource.aE, p_primitiveContent.aE))){
 										v_matchResult := false;
 									}
-								}
-								else if(isvalue(p_requestPrimitive.primitiveContent.aggregatedNotification.notification_list[i].notificationEvent.representation.responsePrimitive.primitiveContent.aE)) {
-									if(not (match(p_requestPrimitive.primitiveContent.aggregatedNotification.notification_list[i].notificationEvent.representation.responsePrimitive.primitiveContent.aE, p_primitiveContent.aE))){
-										v_matchResult := false;
-									}
 								}						
 							}
 							if (i == 0){
@@ -1860,8 +2183,8 @@ module OneM2M_Functions {
 						if(isvalue(p_requestPrimitive.primitiveContent.notification.notificationEvent.representation.resource.container)) {
 							v_matchResult := match(p_requestPrimitive.primitiveContent.notification.notificationEvent.representation.resource.container, p_primitiveContent.container)
 						}
-						else if(isvalue(p_requestPrimitive.primitiveContent.notification.notificationEvent.representation.responsePrimitive.primitiveContent.container)) {
-							v_matchResult := match(p_requestPrimitive.primitiveContent.notification.notificationEvent.representation.responsePrimitive.primitiveContent.container, p_primitiveContent.container)
+						else if(isvalue(p_requestPrimitive.primitiveContent.responsePrimitive.primitiveContent.container)) {
+							v_matchResult := match(p_requestPrimitive.primitiveContent.responsePrimitive.primitiveContent.container, p_primitiveContent.container)
 						}
 					}
 					
@@ -1869,8 +2192,8 @@ module OneM2M_Functions {
 						if(isvalue(p_requestPrimitive.primitiveContent.notification.notificationEvent.representation.resource.timeSeries)) {
 							v_matchResult := match(p_requestPrimitive.primitiveContent.notification.notificationEvent.representation.resource.timeSeries, p_primitiveContent.timeSeries)
 						}
-						else if(isvalue(p_requestPrimitive.primitiveContent.notification.notificationEvent.representation.responsePrimitive.primitiveContent.timeSeries)) {
-							v_matchResult := match(p_requestPrimitive.primitiveContent.notification.notificationEvent.representation.responsePrimitive.primitiveContent.timeSeries, p_primitiveContent.timeSeries)
+						else if(isvalue(p_requestPrimitive.primitiveContent.responsePrimitive.primitiveContent.timeSeries)) {
+							v_matchResult := match(p_requestPrimitive.primitiveContent.responsePrimitive.primitiveContent.timeSeries, p_primitiveContent.timeSeries)
 						}
 					}
     	
@@ -1884,12 +2207,12 @@ module OneM2M_Functions {
 				
 				/**
 				 * @desc Handling of announcement of resources
-				 * @param p_from Expected originator of the request primitive
-				 * @param p_to Expected receiver of the request primitive
+				 * @param p_requestPrimitive Expected announcement primitive
+				 * @param p_responseStatusCode Response Status code to be sent as response
+				 * @param p_expectedResourceIndex Expected target parent resource of the announcemnet
 				 * @verdict 
 				 */
-				 //TODO To finalize this function
-				function f_cse_announcementProcedure_createHandler(template RequestPrimitive p_requestprimitive := ?, in ResponseStatusCode p_responseStatusCode := int2001, template(omit) integer p_expectedResourceIndex := omit) runs on CseSimu {
+				function f_cse_announcementProcedure_createHandler(template RequestPrimitive p_requestprimitive := ?, in ResponseStatusCode p_responseStatusCode := int2001, template(omit) integer p_expectedResourceIndex := omit) runs on CseSimu return integer{
 					// Local variables
 					var MsgIn v_request;
 					var integer v_parentIndex := vc_localRemoteCseIndex;
@@ -1904,39 +2227,53 @@ module OneM2M_Functions {
 					alt {
 						[] mccPortIn.receive(mw_request(p_requestprimitive)) -> value v_request {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__ & ":INFO: Announcement received");
-							//TODO Save resource and generate required attributes
-							v_announcedResource:= f_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, v_parentIndex,v_request.primitive.requestPrimitive.resourceType);
-							v_announcedResourceIndex := f_setLocalResource(v_announcedResource, v_request.primitive.requestPrimitive.resourceType, v_parentIndex);
-							
-							if(isvalue(p_expectedResourceIndex)){
-								if(p_expectedResourceIndex == f_getResourceIndex(v_request.primitive.requestPrimitive.to_)){
-									setverdict(pass, __SCOPE__ & ":INFO: Announcement Parent Resource Address matched");
-									v_responsePrimitive := valueof(m_responsePrimitive(p_responseStatusCode,v_request.primitive.requestPrimitive.requestIdentifier));
-									v_responsePrimitive.primitiveContent := vc_localResourcesList[p_expectedResourceIndex].resource;
-								} else {
-									setverdict(fail, __SCOPE__ & ":ERROR: Announcement Parent Resource Address not matched");
-									v_responsePrimitive := valueof(m_responsePrimitive(int4000,v_request.primitive.requestPrimitive.requestIdentifier));
-									v_responsePrimitive.primitiveContent := omit;
-								}	
+							setverdict(pass, __SCOPE__ & ":INFO: Expected Announcement received");
+							v_parentIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
+							if(v_parentIndex == -1) {
+								log(__SCOPE__&": ERROR: Target resource not found");
+								v_responsePrimitive := valueof(m_responsePrimitive(int4004,v_request.primitive.requestPrimitive.requestIdentifier));
+	
 							} else {
-								v_responsePrimitive := valueof(m_responsePrimitive(p_responseStatusCode,v_request.primitive.requestPrimitive.requestIdentifier));
-								if(p_responseStatusCode == int2001) {
-									v_responsePrimitive.primitiveContent := vc_localResourcesList[v_announcedResourceIndex].resource;
+								//Save resource and generate required attributes
+								v_announcedResource:= f_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, v_parentIndex,v_request.primitive.requestPrimitive.resourceType);
+								v_announcedResourceIndex := f_setLocalResource(v_announcedResource, v_request.primitive.requestPrimitive.resourceType, v_parentIndex);
+								
+								if(isvalue(p_expectedResourceIndex)){
+									if(valueof(p_expectedResourceIndex) == v_parentIndex){
+										setverdict(pass, __SCOPE__ & ":INFO: Announcement Parent Resource Address matched");
+										v_responsePrimitive := valueof(m_responsePrimitive(p_responseStatusCode,v_request.primitive.requestPrimitive.requestIdentifier));
+										v_responsePrimitive.primitiveContent := vc_localResourcesList[v_announcedResourceIndex].resource;
+									} else {
+										setverdict(fail, __SCOPE__ & ":ERROR: Announcement Parent Resource Address not matched");
+										v_responsePrimitive := valueof(m_responsePrimitive(int4000,v_request.primitive.requestPrimitive.requestIdentifier));
+										v_responsePrimitive.primitiveContent := omit;
+									}	
 								} else {
-									v_responsePrimitive.primitiveContent := omit;
+									v_responsePrimitive := valueof(m_responsePrimitive(p_responseStatusCode,v_request.primitive.requestPrimitive.requestIdentifier));
+									if(p_responseStatusCode == int2001) {
+										v_responsePrimitive.primitiveContent := vc_localResourcesList[v_announcedResourceIndex].resource;
+									} else {
+										v_responsePrimitive.primitiveContent := omit;
+									}
 								}
 							}
 							v_responsePrimitive.from_ := PX_CSE1_ID;
 							v_responsePrimitive.to_ := v_request.primitive.requestPrimitive.from_;
 							mccPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));			
 						}
+						[] mccPortIn.receive(mw_request(?)) -> value v_request {
+							setverdict(fail, __SCOPE__ & ":ERROR:  Request received with unexpected parameters");
+							v_responsePrimitive := valueof(m_responsePrimitive(int4000,v_request.primitive.requestPrimitive.requestIdentifier));
+							mccPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+						}
 						[] tc_ac.timeout {
 							setverdict(fail, __SCOPE__ & ":ERROR:  No announcement received");
 						}
 					}
 				
 					f_checkCseSimuStatus();
+					
+					return v_announcedResourceIndex;
 	
 				} //end f_cse_announcementProcedure_createHandler
 			
@@ -2155,7 +2492,7 @@ module OneM2M_Functions {
     			
 				var MsgIn v_response;
 				var RequestPrimitive v_request;
-				var PrimitiveContent v_remoteCSEResource;
+				var PrimitiveContent v_localRemoteCSEResource;
 				
 				//Activate defaults when running on a PTC
 				f_cse_activateDefaults_cse1();
@@ -2170,8 +2507,8 @@ module OneM2M_Functions {
 						setverdict(pass, __SCOPE__&":INFO: Resource type remoteCSE created successfuly");
 						f_checkAttributesToBeSaved(int16, v_request, v_response.primitive.responsePrimitive);
 						vc_remoteCseIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int16, -1);
-						v_remoteCSEResource := f_generateLocalResource(v_response.primitive.responsePrimitive.primitiveContent, vc_cSEBaseIndex, int16);
-						vc_localRemoteCseIndex := f_setLocalResource(v_remoteCSEResource, int16, vc_cSEBaseIndex);
+						v_localRemoteCSEResource := f_generateLocalResource(valueof(m_primitiveContentRemoteCSE(m_contentLocalRemoteCSEResource)), vc_cSEBaseIndex, int16);
+						vc_localRemoteCseIndex := f_setLocalResource(v_localRemoteCSEResource, int16, vc_cSEBaseIndex);
 					}
 					[] mccPort.receive(mw_response(mw_responsePrimitiveKO)) {
 						tc_ac.stop;
@@ -2201,15 +2538,12 @@ module OneM2M_Functions {
     			
 				var MsgIn v_request;
 				var ResponsePrimitive v_response;
-				var PrimitiveContent v_remoteCSEResource;
+				var PrimitiveContent v_localRemoteCSEResource;
 				var integer v_resourceIndex := -1;
 				var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
 				var charstring v_action := "Please, send a CSE registration request";
-				var integer v_parentIndex := vc_localRemoteCseIndex;
 				var ResponsePrimitive v_responsePrimitive;
-				var PrimitiveContent v_announcedResource;
 				var boolean v_remoteCSERegistered:=false;
-				var integer v_ResourceIndex := -1;
 				
 				//Activate defaults when running on a PTC
 				f_cse_activateDefaults_cse1();			
@@ -2219,11 +2553,11 @@ module OneM2M_Functions {
 
 				tc_ac.start;
 				alt {
-					[] mccPortIn.receive(mw_request(p_requestPrimitive)) -> value v_request {
+					[not v_remoteCSERegistered] mccPortIn.receive(mw_request(p_requestPrimitive)) -> value v_request {
 						tc_ac.stop;
 						setverdict(pass, __SCOPE__&":INFO: Resource type remoteCSE created successfuly");
-						v_remoteCSEResource := f_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, vc_cSEBaseIndex, int16);//TODO Get index from v_request.primitive.requestPrimitive.to_
-						vc_localRemoteCseIndex := f_setLocalResource(v_remoteCSEResource, int16, vc_cSEBaseIndex);
+						v_localRemoteCSEResource := f_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, vc_cSEBaseIndex, int16);//TODO Get index from v_request.primitive.requestPrimitive.to_
+						vc_localRemoteCseIndex := f_setLocalResource(v_localRemoteCSEResource, int16, vc_cSEBaseIndex);
 						
 						v_response := valueof(m_responsePrimitive(int2001,v_request.primitive.requestPrimitive.requestIdentifier));
 						v_response.from_ := PX_CSE1_ID;
@@ -2231,10 +2565,10 @@ module OneM2M_Functions {
 						v_response.primitiveContent.remoteCSE := vc_localResourcesList[vc_localRemoteCseIndex].resource.remoteCSE;
 						mccPortIn.send(f_getMsgOutPrimitive(m_response(v_response)));
 						
-						vc_remoteCseIndex := f_setResource(valueof(m_primitiveContentRemoteCSE(m_contentMyRemoteCSEResource)), int16, -1);
+						vc_remoteCseIndex := f_setResource(valueof(m_primitiveContentRemoteCSE(m_contentMyRemoteCSEResource)), int16, -1, false);
 						v_resourceIndex := vc_remoteCseIndex;
 						v_remoteCSERegistered:=true;
-						tc_ac.start;
+						tc_ac.start(10.0);
 						repeat;
 					}
 					[] tc_ac.timeout {
@@ -2285,6 +2619,26 @@ module OneM2M_Functions {
 				f_checkCseSimuStatus();
 				    		
 			}
+
+			/**
+			 * @desc   Creation  and save a local resource (Test System simulating a CSE)
+			 * @param  p_resource          Resource to be created
+			 * @param  p_parentIndex       Parent resource index of resource to be saved
+			 * @param  p_resourceType      Type of the resource to be created
+			 * @return Index of internal created resource
+			 */
+			function f_generateAndSetLocalResource(in template(omit) PrimitiveContent p_resource := omit, in integer p_parentIndex, in ResourceType p_resourceType) runs on CseSimu return Integer {
+
+				var PrimitiveContent v_localResource;
+				var integer v_localResourceIndex;
+				
+				v_localResource := f_generateLocalResource(p_resource, p_parentIndex, p_resourceType);
+				
+				v_localResourceIndex := f_setLocalResource(v_localResource, p_resourceType, p_parentIndex);
+				
+				return v_localResourceIndex;
+				
+			}//End of function		
 			
 			/**
 			 * @desc   Creation of a local resource (Test System simulating a CSE)
@@ -2302,7 +2656,7 @@ module OneM2M_Functions {
 				if(p_resourceType == int5) {	//CSEBase
 					v_myResource.cSEBase.resourceName := PX_CSE1_NAME;
 					v_myResource.cSEBase.resourceType := p_resourceType;
-					v_myResource.cSEBase.resourceID := f_resourceIdCleaner(PX_CSE1_ID);
+					v_myResource.cSEBase.resourceID := f_resourceIdCleaner(PX_CSE1_RESOURCE_ID);
 					v_myResource.cSEBase.parentID := "";//Following TS-0001, it must be NULL. Set to a value for Codec to set it to null
 					v_myResource.cSEBase.creationTime := fx_generateTimestamp();
 					v_myResource.cSEBase.creationTime := "20171231T012345";
@@ -2349,7 +2703,7 @@ module OneM2M_Functions {
 						
 						v_myResource.aEAnnc.resourceName := "aEAnnc" & int2str(v_resourceIndex);
 						v_myResource.aEAnnc.resourceType := p_resourceType;
-						v_myResource.aEAnnc.resourceID := f_resourceIdCleaner(v_myResource.aEAnnc.aE_ID);
+						v_myResource.aEAnnc.resourceID := "aeA" & int2str(v_resourceIndex);
 						v_myResource.aEAnnc.parentID := f_getResourceId(vc_localResourcesList[p_parentIndex].resource);
 						v_myResource.aEAnnc.creationTime := fx_generateTimestamp();
 						v_myResource.aEAnnc.lastModifiedTime := v_myResource.aEAnnc.creationTime;
@@ -2360,7 +2714,7 @@ module OneM2M_Functions {
 						
 						v_myResource.accessControlPolicyAnnc.resourceName := "accessControlPolicyAnnc" & int2str(v_resourceIndex);
 						v_myResource.accessControlPolicyAnnc.resourceType := p_resourceType;
-						v_myResource.accessControlPolicyAnnc.resourceID := f_resourceIdCleaner(v_myResource.accessControlPolicyAnnc.resourceID);
+						v_myResource.accessControlPolicyAnnc.resourceID := "acpA" & int2str(v_resourceIndex);
 						v_myResource.accessControlPolicyAnnc.parentID := f_getResourceId(vc_localResourcesList[p_parentIndex].resource);
 						v_myResource.accessControlPolicyAnnc.creationTime := fx_generateTimestamp();
 						v_myResource.accessControlPolicyAnnc.lastModifiedTime := v_myResource.accessControlPolicyAnnc.creationTime;	
@@ -2371,7 +2725,7 @@ module OneM2M_Functions {
 						
 						v_myResource.containerAnnc.resourceName := "containerAnnc" & int2str(v_resourceIndex);
 						v_myResource.containerAnnc.resourceType := p_resourceType;
-						v_myResource.containerAnnc.resourceID := f_resourceIdCleaner(v_myResource.containerAnnc.resourceID);
+						v_myResource.containerAnnc.resourceID := "cntA" & int2str(v_resourceIndex);
 						v_myResource.containerAnnc.parentID := f_getResourceId(vc_localResourcesList[p_parentIndex].resource);
 						v_myResource.containerAnnc.creationTime := fx_generateTimestamp();
 						v_myResource.containerAnnc.lastModifiedTime := v_myResource.containerAnnc.creationTime;
@@ -2382,18 +2736,18 @@ module OneM2M_Functions {
 						
 						v_myResource.groupAnnc.resourceName := "groupAnnc" & int2str(v_resourceIndex);
 						v_myResource.groupAnnc.resourceType := p_resourceType;
-						v_myResource.groupAnnc.resourceID := f_resourceIdCleaner(v_myResource.groupAnnc.resourceID);
+						v_myResource.groupAnnc.resourceID := "grpA" & int2str(v_resourceIndex);
 						v_myResource.groupAnnc.parentID := f_getResourceId(vc_localResourcesList[p_parentIndex].resource);
 						v_myResource.groupAnnc.creationTime := fx_generateTimestamp();
 						v_myResource.groupAnnc.lastModifiedTime := v_myResource.groupAnnc.creationTime;
 					}
-				} else if (p_resourceType == int10014 and ispresent (p_resource)) { //ContentInstance Annc
+				} else if (p_resourceType == int10004 and ispresent (p_resource)) { //ContentInstance Annc
 					if(ischosen(p_resource.contentInstanceAnnc)) {
 						v_myResource.contentInstanceAnnc := valueof(p_resource.contentInstanceAnnc);
 						
 						v_myResource.contentInstanceAnnc.resourceName := "contentInstanceAnnc" & int2str(v_resourceIndex);
 						v_myResource.contentInstanceAnnc.resourceType := p_resourceType;
-						v_myResource.contentInstanceAnnc.resourceID := f_resourceIdCleaner(v_myResource.contentInstanceAnnc.resourceID);
+						v_myResource.contentInstanceAnnc.resourceID := "cinA" & int2str(v_resourceIndex);
 						v_myResource.contentInstanceAnnc.parentID := f_getResourceId(vc_localResourcesList[p_parentIndex].resource);
 						v_myResource.contentInstanceAnnc.creationTime := fx_generateTimestamp();
 						v_myResource.contentInstanceAnnc.lastModifiedTime := v_myResource.contentInstanceAnnc.creationTime;
@@ -2407,7 +2761,7 @@ module OneM2M_Functions {
 						}
 						
 						v_myResource.accessControlPolicy.resourceType := p_resourceType;
-						v_myResource.accessControlPolicy.resourceID := "accessControlPolicy" & int2str(v_resourceIndex);
+						v_myResource.accessControlPolicy.resourceID := "acp" & int2str(v_resourceIndex);
 						v_myResource.accessControlPolicy.parentID := f_getResourceId(vc_localResourcesList[p_parentIndex].resource);
 						v_myResource.accessControlPolicy.creationTime := fx_generateTimestamp();
 						if(not(ispresent(p_resource.accessControlPolicy.expirationTime))) {
@@ -2430,7 +2784,7 @@ module OneM2M_Functions {
 						if(not(ispresent(p_resource.aE.expirationTime))) {
 							v_myResource.aE.expirationTime := "20301231T012345";
 						}
-						v_myResource.aE.resourceID := "ae" & int2str(v_resourceIndex);
+						v_myResource.aE.resourceID := "Cae" & int2str(v_resourceIndex);
 						v_myResource.aE.aE_ID := v_myResource.aE.resourceID;
 						if(not(ispresent(p_resource.aE.resourceName))) {
 							v_myResource.aE.resourceName := "ae" & int2str(v_resourceIndex);
@@ -2451,7 +2805,7 @@ module OneM2M_Functions {
 						}
 						v_myResource.container.resourceID := "cnt" & int2str(v_resourceIndex);
 						if(not(ispresent(p_resource.container.resourceName))) {
-							v_myResource.container.resourceName := "cnt" & int2str(v_resourceIndex);
+							v_myResource.container.resourceName := "container" & int2str(v_resourceIndex);
 						}
 						v_myResource.container.stateTag := 0;
 						v_myResource.container.currentNrOfInstances := 0;
@@ -2463,7 +2817,7 @@ module OneM2M_Functions {
 						v_myResource.contentInstance := valueof(p_resource.contentInstance);
 						v_myResource.contentInstance.resourceID := "cin" & int2str(v_resourceIndex);
 						if(not(ispresent(p_resource.contentInstance.resourceName))) {
-							v_myResource.contentInstance.resourceName := "cin" & int2str(v_resourceIndex);
+							v_myResource.contentInstance.resourceName := "contentInstance" & int2str(v_resourceIndex);
 						}
 						v_myResource.contentInstance.resourceType := p_resourceType;
       					v_myResource.contentInstance.parentID := f_getResourceId(vc_localResourcesList[p_parentIndex].resource);
@@ -2474,7 +2828,7 @@ module OneM2M_Functions {
 						}
 						v_myResource.contentInstance.stateTag := 0;
 						v_myResource.contentInstance.contentSize := lengthof(v_myResource.contentInstance.content);
-						v_myResource.contentInstance.content := p_resource.contentInstance.content;
+						v_myResource.contentInstance.content := valueof(p_resource.contentInstance.content);
 					}
 										
 				} else if(p_resourceType == int23 and ispresent(p_resource)) { //Subscription
@@ -2482,7 +2836,7 @@ module OneM2M_Functions {
 						v_myResource.subscription := valueof(p_resource.subscription);
 						v_myResource.subscription.resourceID := "sub" & int2str(v_resourceIndex);
 						if(not(ispresent(p_resource.subscription.resourceName))) {
-							v_myResource.subscription.resourceName := "sub" & int2str(v_resourceIndex);
+							v_myResource.subscription.resourceName := "subscription" & int2str(v_resourceIndex);
 						}
 						v_myResource.subscription.resourceType := p_resourceType;
 						v_myResource.subscription.parentID := f_getResourceId(vc_localResourcesList[p_parentIndex].resource);
@@ -2497,7 +2851,7 @@ module OneM2M_Functions {
 						v_myResource.pollingChannel := valueof(p_resource.pollingChannel);
 						v_myResource.pollingChannel.resourceID := "pch" & int2str(v_resourceIndex);
 						if(not(ispresent(p_resource.pollingChannel.resourceName))) {
-							v_myResource.pollingChannel.resourceName := "pch" & int2str(v_resourceIndex);
+							v_myResource.pollingChannel.resourceName := "pollingChannel" & int2str(v_resourceIndex);
 						}
 						v_myResource.pollingChannel.resourceType := p_resourceType;
 						v_myResource.pollingChannel.parentID := f_getResourceId(vc_localResourcesList[p_parentIndex].resource);
@@ -2532,7 +2886,7 @@ module OneM2M_Functions {
 						vc_localResourcesList[p_localResourceIndex].resource.remoteCSE.labels := p_resource.remoteCSE.labels;
 					}
 					if(ispresent(p_resource.remoteCSE.announceTo)) {
-						vc_localResourcesList[p_localResourceIndex].resource.remoteCSE.announceTo := p_resource.remoteCSE.announceTo;
+						vc_localResourcesList[p_localResourceIndex].resource.remoteCSE.announceTo := {p_resource.remoteCSE.announceTo[0] & "/" & vc_localResourcesList[vc_localRemoteCseIndex].resource.remoteCSE.resourceID & "Annc"};
 					}
 					if(ispresent(p_resource.remoteCSE.announcedAttribute)) {
 						vc_localResourcesList[p_localResourceIndex].resource.remoteCSE.announcedAttribute := p_resource.remoteCSE.announcedAttribute;
@@ -2674,6 +3028,55 @@ module OneM2M_Functions {
 					}
 				}
 			  } //End of function	
+			
+			/**
+			 * @desc Creation of a resource using CseSimu
+			 * @param p_resourceType Resource type of the resource to be created
+			 * @param p_requestPrimitive CREATE request primitive for the resource to be created
+			 * @param p_parentIndex Internal resource index which indicates the parent of the resource to be created
+			 * @return Internal resource index of the created resource
+			 * @verdict 
+			 */
+			function f_cse_createResource_cseSimu(in ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive := m_create, integer p_parentIndex := -1) runs on CseSimu return integer {
+
+				var RequestPrimitive v_request;
+				var integer v_resourceIndex := -1;
+
+				//Activate defaults when running on a PTC
+				f_cse_activateDefaults_cse1();		
+					
+				v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, p_parentIndex);
+
+				mccPort.send(f_getMsgOutPrimitive(m_request(v_request)));
+				tc_ac.start;
+				alt {
+					[] mccPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
+						tc_ac.stop;
+						setverdict(pass, __SCOPE__&":INFO: Resource type " & int2str(enum2int(p_resourceType)) & " created successfuly");
+						f_checkAttributesToBeSaved(p_resourceType, v_request, vc_response.primitive.responsePrimitive);
+						v_resourceIndex := f_setResource(vc_response.primitive.responsePrimitive.primitiveContent, p_resourceType, p_parentIndex);
+						if(p_resourceType == int16) {	//remoteCSE
+							vc_remoteCseIndex := v_resourceIndex;
+						}
+					}
+					[] mccPort.receive(mw_response(mw_responsePrimitiveKO)) {
+						tc_ac.stop;
+						setverdict(inconc, __SCOPE__&":INFO: Error while creating resource type " & int2str(enum2int(p_resourceType)));
+					}
+					[] mccPort.receive {
+						tc_ac.stop;
+						setverdict(inconc, __SCOPE__&":INFO: Unexpected message received");
+					}
+					[] tc_ac.timeout {
+						setverdict(inconc, __SCOPE__&":INFO: No answer while creating resource type " & int2str(enum2int(p_resourceType)));
+					}
+				}	
+	
+				f_checkCseSimuStatus();
+	
+				return v_resourceIndex;
+
+			}
 
 			/**
 			 * @desc   Send response to the IUT (Test System simulating a CSE)
@@ -2760,12 +3163,40 @@ module OneM2M_Functions {
 					log(__SCOPE__&": WARNING: Unexpected Notification for Subscription Verification message received");
 					repeat;
 				}
-			 }			
+			 }	
 			 
-			/**
-			  * @desc	Cse altstep for config 02 on CSE1 (AE1 as master)
+			 /**
+			  * @desc	Cse altstep for config 02
 			  */
+			 altstep a_cse_cf02_ae1() runs on AeSimu {
+				[] a_cse_aeSimu();
+			 }		
+			 
+			 /**
+			 * @desc	Cse altstep for config 02
+			 */
 			 altstep a_cse_cf02_cse1() runs on CseSimu {
+			   [] a_cse_cseSimu();
+			 }	
+						 
+			 /**
+			 * @desc	Cse altstep for config 03
+			 */
+			 altstep a_cse_cf03() runs on CseSimu {
+			   [] a_ae_cseSimu();
+			 }	
+			
+			/**
+			  * @desc	Cse altstep for config 04
+			  */
+			 altstep a_cse_cf04() runs on CseSimu {
+			 	[] a_cse_cseSimu();
+			 }		
+ 
+			/**
+			  * @desc	Altstep for CseSimu
+			  */
+			 altstep a_cse_cseSimu() runs on CseSimu {
 			
 				var PrimitiveContent v_localResource;
 				var integer v_localResourceIndex := -1;
@@ -2777,21 +3208,9 @@ module OneM2M_Functions {
 					log(__SCOPE__&": WARNING: Unexpected CREATE message received");
 					tc_ac.stop;
 					
-					v_parentResourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
-					if(v_parentResourceIndex == -1) {
-						log(__SCOPE__&": ERROR: Target resource not found");
-						v_response := valueof(m_responsePrimitive(int4004,v_request.primitive.requestPrimitive.requestIdentifier));
-						
-					} else {
-						v_localResource := f_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, v_parentResourceIndex, v_request.primitive.requestPrimitive.resourceType);
-						v_localResourceIndex := f_setLocalResource(v_localResource, v_request.primitive.requestPrimitive.resourceType, v_parentResourceIndex);
+					v_localResourceIndex := f_processCreateRequestPrimitive(v_request.primitive.requestPrimitive);
 	
-						v_response := valueof(m_responsePrimitive(int2001,v_request.primitive.requestPrimitive.requestIdentifier));
-						v_response.primitiveContent := vc_localResourcesList[v_localResourceIndex].resource;
-					}
-					v_response.from_ := PX_CSE1_ID;
-					v_response.to_ := v_request.primitive.requestPrimitive.from_;
-					mccPortIn.send(f_getMsgOutPrimitive(m_response(v_response)));
+					mccPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
 					tc_ac.start(10.0);
 					repeat;
 				}
@@ -2799,25 +3218,11 @@ module OneM2M_Functions {
 					tc_ac.stop;
 					log(__SCOPE__&": WARNING: Unexpected RETRIEVE message received");
 					
-					v_localResourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
-					if(v_localResourceIndex == -1)
-					{ 
-						log(__SCOPE__&": ERROR: Resource Index not valid");
-						v_response := valueof(m_responsePrimitive(int4004,v_request.primitive.requestPrimitive.requestIdentifier));
-						v_response.from_ := PX_CSE1_ID;
-						v_response.to_ := v_request.primitive.requestPrimitive.from_;
-						mccPortIn.send(f_getMsgOutPrimitive(m_response(v_response)));
+					f_processRetrieveRequestPrimitive(v_request.primitive.requestPrimitive);
+					if(ischosen(vc_response.primitive.responsePrimitive.primitiveContent.cSEBase)) {
+						mccPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive, {{"parentID", omit}}))); 
 					} else {
-						v_response := valueof(m_responsePrimitive(int2000,v_request.primitive.requestPrimitive.requestIdentifier));
-						v_response.from_ := PX_CSE1_ID;
-						v_response.to_ := v_request.primitive.requestPrimitive.from_;
-						v_response.primitiveContent := vc_localResourcesList[v_localResourceIndex].resource;
-						if(ischosen(vc_localResourcesList[v_localResourceIndex].resource.cSEBase)) {
-							mccPortIn.send(f_getMsgOutPrimitive(m_response(v_response, {{"parentID", omit}}))); 
-						} else {
-							mccPortIn.send(f_getMsgOutPrimitive(m_response(v_response)));
-						}
-						
+						mccPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
 					}
 					tc_ac.start(10.0);
 					repeat;
@@ -2826,22 +3231,28 @@ module OneM2M_Functions {
 					tc_ac.stop;
 					log(__SCOPE__&": WARNING: Unexpected UPDATE message received");
 
-					v_localResourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
-					if(v_localResourceIndex == -1)
-					{ 
-						log(__SCOPE__&": ERROR: Resource Index not valid");
-						v_response := valueof(m_responsePrimitive(int4004,v_request.primitive.requestPrimitive.requestIdentifier));
-						v_response.from_ := PX_CSE1_ID;
-						v_response.to_ := v_request.primitive.requestPrimitive.from_;
-						mccPortIn.send(f_getMsgOutPrimitive(m_response(v_response)));
-					} else {
-						v_response := valueof(m_responsePrimitive(int2004,v_request.primitive.requestPrimitive.requestIdentifier));
-						v_response.from_ := PX_CSE1_ID;
-						v_response.to_ := v_request.primitive.requestPrimitive.from_;
-						f_updateLocalResource(v_localResourceIndex, v_request.primitive.requestPrimitive.primitiveContent);
-						v_response.primitiveContent := vc_localResourcesList[v_localResourceIndex].resource;
-						mccPortIn.send(f_getMsgOutPrimitive(m_response(v_response)));
-					}
+					f_processUpdateRequestPrimitive(v_request.primitive.requestPrimitive);
+					mccPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
+					tc_ac.start(10.0);
+					repeat;
+				}
+				[] mccPortIn.receive(mw_request(mw_delete())) -> value v_request {
+					tc_ac.stop;
+					log(__SCOPE__&": WARNING: Unexpected DELETE message received");
+
+					f_processDeleteRequestPrimitive(v_request.primitive.requestPrimitive);
+					mccPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
+					tc_ac.start(10.0);
+					repeat;
+				}
+				[] mccPortIn.receive(mw_request(mw_notify)) -> value v_request {
+					tc_ac.stop;
+					log(__SCOPE__&": WARNING: Unexpected NOTIFY message received");
+
+					//Send response in any case
+					v_response := valueof(m_responseNotification(int2000, omit));
+					v_response.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
+					mccPortIn.send(f_getMsgOutPrimitive(m_response(v_response)));
 					tc_ac.start(10.0);
 					repeat;
 				}
@@ -2856,27 +3267,61 @@ module OneM2M_Functions {
 			 }
 			 
 			/**
-			  * @desc	Cse altstep for config 02 on AE1 (CSE1 as master)
+			  * @desc	Altstep for AeSimu
 			  */
-			 altstep a_cse_cf02_ae1() runs on AeSimu 
-			 {
+			 altstep a_cse_aeSimu() runs on AeSimu {
+				var MsgIn v_request;
+				var ResponsePrimitive v_response;
+				
+			 	[] mcaPortIn.receive(mw_request(mw_notify)) -> value v_request {
+					tc_ac.stop;
+					log(__SCOPE__&": WARNING: Unexpected NOTIFY message received");
+
+					//Send response in any case
+					v_response := valueof(m_responseNotification(int2000, omit));
+					v_response.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
+					mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_response)));
+					tc_ac.start(10.0);
+					repeat;
+				}
+			 	[] mcaPortIn.receive {
+					log(__SCOPE__&": WARNING: Unexpected message received");
+					repeat;
+				}
 				[] mcaPort.receive {
 					log(__SCOPE__&": WARNING: Unexpected message received");
 					repeat;
 				}
-			 }
-			 			 
+			 }	
+
 			/**
-			  * @desc	Cse altstep for config 04
+			  * @desc	Altstep for AeSimu
 			  */
-			 altstep a_cse_cf04() runs on CseSimu {
+			 altstep a_ae_cseSimu() runs on CseSimu {
+				var MsgIn v_request;
+				var ResponsePrimitive v_response;
+				
+				[] mcaPortIn.receive(mw_request(mw_notify)) -> value v_request {
+					tc_ac.stop;
+					log(__SCOPE__&": WARNING: Unexpected NOTIFY message received");
 
-				[] mccPort.receive {
+					//Send response in any case
+					v_response := valueof(m_responseNotification(int2000, omit));
+					v_response.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
+					mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_response)));
+					tc_ac.start(10.0);
+					repeat;
+				}
+				[] mcaPortIn.receive {
 					log(__SCOPE__&": WARNING: Unexpected message received");
 					repeat;
 				}
-			 }		
-
+				[] mcaPort.receive {
+					log(__SCOPE__&": WARNING: Unexpected message received");
+					repeat;
+				}
+			 }
+			 
 		}//end group altstepFunctions
 		
 		function f_cse_activateDefaults_cse1() runs on CseSimu {
@@ -3007,6 +3452,49 @@ module OneM2M_Functions {
 		
 		group helpingFunctions {
 
+			function f_ae_createPollingChannel(template UtTriggerPrimitive p_utRequest := m_utCreateAe) runs on CseSimu return integer {
+				var MsgIn v_request;
+				var PrimitiveContent v_modifiedResource;
+				var integer v_resourceIndex, v_parentIndex;
+				var RequestPrimitive v_rp;
+				var charstring v_action := "Please, create a Polling Channel resource on the Tester";
+	
+				if(not(ispresent(p_utRequest.requestPrimitive.primitiveContent))) {
+					p_utRequest.requestPrimitive.primitiveContent.pollingChannel := m_contentCreatePollingChannel;
+				}
+
+				f_sendUtPrimitive(p_utRequest, v_action);
+	
+				tc_ac.start;
+				alt {    				
+					[] mcaPortIn.receive(mw_request(mw_createPollingChannel(?,?))) -> value v_request {
+						tc_ac.stop;
+			
+						v_rp := v_request.primitive.requestPrimitive;		
+						v_parentIndex := f_getResourceIndex(v_rp.to_);
+						v_modifiedResource := f_generateLocalResource(v_rp.primitiveContent, v_parentIndex, v_rp.resourceType);
+						v_resourceIndex := f_setLocalResource(v_modifiedResource, int2, v_parentIndex);
+						if(v_resourceIndex != -1) {
+							mcaPortIn.send(f_getMsgOutPrimitive(m_response(m_responsePrimitive_content(int2001, v_rp.requestIdentifier, v_modifiedResource))));
+							setverdict(pass, __SCOPE__&":INFO: Polling Channel created successfuly");
+						}
+						else {
+							mcaPortIn.send(f_getMsgOutPrimitive(m_response(m_responsePrimitive(int5000, v_request.primitive.requestPrimitive.requestIdentifier))));
+							setverdict(inconc, __SCOPE__&":INFO: Polling Channel creation failed");
+						}					
+					}
+			
+					[] tc_ac.timeout {
+						setverdict(inconc, __SCOPE__&":INFO: Polling Channel create request not received");
+						stop;
+					}	     				   	
+				}    
+	
+				f_checkCseSimuStatus();	
+	
+				return v_resourceIndex;	
+			} //end function f_ae_createPollingChannel
+
 		} // end helpingFunctions
 		
 		group altstepFunctions {
@@ -3094,21 +3582,25 @@ module OneM2M_Functions {
 				if(p_resourceType == int16) {
 					p_request.from_ := PX_CSE1_ID;
 				} else {	
-					if(vc_testSystemRole == e_ae) {			
-						p_request.from_ := f_getOriginator(p_parentIndex);
-					} else {//vc_testSystemRole == e_cse
-						p_request.from_ := f_getOriginator(p_parentIndex, false);
-					}
+					p_request.from_ := f_getOriginator(p_parentIndex, vc_testSystemRole);
 				}
 			}
-			
-			p_request.to_ := f_getResourceAddress(p_parentIndex);
+			//Only set To parameter if it has not been set yet 
+			if(valueof(p_request.to_) == "NotInitialized") {
+				p_request.to_ := f_getResourceAddress(p_parentIndex);
+			}
 
 			if (p_resourceType == int1) {//AccessControlPolicy
 				
-			} 
-			
-			if (p_resourceType == int9) {//group
+			} else if (p_resourceType == int2) {//AE
+				if(ispresent(p_request.primitiveContent.aE.pointOfAccess)) {
+					p_request.primitiveContent.aE.requestReachability := true;
+				}
+			} else if (p_resourceType == int16) {//remoteCSE
+				if(ispresent(p_request.primitiveContent.remoteCSE.pointOfAccess)) {
+					p_request.primitiveContent.remoteCSE.requestReachability := true;
+				}
+			} else if (p_resourceType == int9) {//group
 				if(match(valueof(p_request.primitiveContent.group_.memberIDs), v_defaultListOfURIs )){
 					if ((p_parentIndex == -1) and (isbound(vc_aeAuxIndex))){
 						p_request.primitiveContent.group_.memberIDs := {f_getResourceId(vc_resourcesList[vc_aeAuxIndex].resource)};
@@ -3116,9 +3608,7 @@ module OneM2M_Functions {
 						p_request.primitiveContent.group_.memberIDs := {f_getResourceId(vc_resourcesList[p_parentIndex].resource)};
 					}
 				}
-			}
-			
-			if(p_resourceType == int3){//container
+			} else if(p_resourceType == int3){//container
 				//when a container is created by hosting cse for storing location information, the container is seen as a location container
 				if(PX_IS_LOC_CONTAINER){
 					p_request.primitiveContent.container.locationID := f_getResourceId(vc_resourcesList[p_parentIndex].resource);//resourceID of the locationPolicy
@@ -3128,18 +3618,12 @@ module OneM2M_Functions {
 						p_request.primitiveContent.container.accessControlPolicyIDs := {f_getResourceId(vc_resourcesList[vc_acpAuxIndex].resource)};
 					}	
 				}  
-			}
-			
-			if (p_resourceType == int15) {//pollingChannel
+			} else if (p_resourceType == int15) {//pollingChannel
 				if(ischosen(vc_resourcesList[p_parentIndex].resource.aE)) {	
 					p_request.from_ := vc_resourcesList[p_parentIndex].resource.aE.aE_ID;
 				}
-			} 
-			
-			if (p_resourceType == int18) {//schedule
-			} 
-
-			if (p_resourceType == int23) {//subscription
+			} else if (p_resourceType == int18) {//schedule
+			} else if (p_resourceType == int23) {//subscription
 				//notificationURI
 				if(match(valueof(p_request.primitiveContent.subscription.notificationURI), v_defaultListOfURIs )){
 					p_request.primitiveContent.subscription.notificationURI := {f_getResourceAddress(p_parentIndex)};
@@ -3156,8 +3640,7 @@ module OneM2M_Functions {
 						p_request.primitiveContent.subscription.accessControlPolicyIDs := {f_getResourceId(vc_resourcesList[vc_acpAuxIndex].resource)};
 					}	
 				}  
-			}
-			if (p_resourceType == int4) {//contentInstance
+			} else if (p_resourceType == int4) {//contentInstance
 				//creator attribute
 				if(ispresent(p_request.primitiveContent.contentInstance.creator)) {
 					p_request.primitiveContent.contentInstance.creator := f_getCreator(p_parentIndex);
@@ -3225,7 +3708,10 @@ module OneM2M_Functions {
 			if(p_resourceType != int10002) {
 				p_request.from_ := f_getOriginator(p_resourceIndex);
 			
-				p_request.to_ := f_getResourceAddress(p_resourceIndex);
+				//Only set To parameter if it has not been set yet
+				if(valueof(p_request.to_) == "NotInitialized") {
+					p_request.to_ := f_getResourceAddress(p_resourceIndex);
+				}
 			} else {
 				p_request.from_ := PX_CSE1_ID & "/" & f_getResourceId(vc_resourcesList[p_resourceIndex].resource); 
 				
@@ -3272,6 +3758,9 @@ module OneM2M_Functions {
 			if(ischosen(p_contentResource.container)) {
 				return f_resourceIdCleaner(p_contentResource.container.resourceID);
 			}
+			if(ischosen(p_contentResource.containerAnnc)) {
+				return f_resourceIdCleaner(p_contentResource.containerAnnc.resourceID);
+			}
 			if(ischosen(p_contentResource.contentInstance)) {
 				return f_resourceIdCleaner(p_contentResource.contentInstance.resourceID);
 			}
@@ -3387,16 +3876,16 @@ module OneM2M_Functions {
 		/**
 		 * @desc Resolution of the originator field (from) for a given resource
 		 * @param p_targetResourceIndex Internal resource index of the given resource
-		 * @param p_testSystemRole True if TS acting as an AE, False if TS acting as a CSE
+		 * @param p_testSystemRole TS acting as an AE or a CSE
 		 * @return Originator for a given resource
 		 * @verdict 
 		 */
-		function f_getOriginator(integer  p_targetResourceIndex := -1, boolean p_testSystemRole := true) runs on Tester return XSD.AnyURI {
+		function f_getOriginator(integer  p_targetResourceIndex := -1, TestSystemRole p_testSystemRole := e_ae) runs on Tester return XSD.AnyURI {
 				
 			if(p_targetResourceIndex == -1) {
-				if(p_testSystemRole) {
+				if(p_testSystemRole == e_ae) {
 					return PX_SUPER_AE_ID;
-				} else {
+				} else if (p_testSystemRole == e_cse) {
 					return PX_SUPER_CSE_ID;
 				}
 			}	
@@ -3500,10 +3989,10 @@ module OneM2M_Functions {
     		
 			} else {
 				
-				log("Non Hierarchical method: " & v_cleanedURI);
 				for(i:=0; i < lengthof(vc_localResourcesList); i := i+1){
 					if(v_cleanedURI == f_getResourceId(vc_localResourcesList[i].resource)){
 						v_resourceIndex := i;
+						log("Non Hierarchical method: " & v_cleanedURI);
 						break;
 					} 
 				}
@@ -3512,6 +4001,10 @@ module OneM2M_Functions {
 			//Try CSEBase
 			if(v_resourceIndex == -1) {
 				if(v_cleanedURI == f_getResourceName(vc_localResourcesList[vc_cSEBaseIndex].resource)) {
+					log("Hierarchical method: " & v_cleanedURI);
+					v_resourceIndex := vc_cSEBaseIndex;
+				} else if (v_cleanedURI == f_getResourceId(vc_localResourcesList[vc_cSEBaseIndex].resource)) {
+					log("Non Hierarchical method: " & v_cleanedURI);
 					v_resourceIndex := vc_cSEBaseIndex;
 				}
 			}
@@ -3743,11 +4236,84 @@ module OneM2M_Functions {
 			else if (ischosen(p_requestPrimitive.primitiveContent.statsConfig)){
 				p_requestPrimitive.primitiveContent.statsConfig.accessControlPolicyIDs := p_accessControlPolicyIDs;
 			} else {
-				log( __SCOPE__, ":INFO: Resource not having acpi attribute. Not possible to set acpi")
+				log( __SCOPE__ & ":INFO: Resource not having acpi attribute. Not possible to set acpi")
 			}
 			return valueof(p_requestPrimitive);					
 		}
 		
+		/**
+		 * @desc Set parentID into the resource
+		 * @param p_resource Resource to be modified
+		 * @param p_parentID ParentID to be set
+		 * @return 
+		 * @verdict 
+		 */
+		function f_setParentID(PrimitiveContent p_resource, XSD.ID p_parentID) runs on Tester return PrimitiveContent {
+	
+			if (ischosen(p_resource.aE)){
+				p_resource.aE.parentID := p_parentID;
+			}
+			else if (ischosen(p_resource.accessControlPolicy)){
+				p_resource.accessControlPolicy.parentID := p_parentID;
+			}
+			else if (ischosen(p_resource.accessControlPolicyAnnc)){
+				p_resource.accessControlPolicyAnnc.parentID := p_parentID;
+			}
+			else if (ischosen(p_resource.container)){
+				p_resource.container.parentID := p_parentID;
+			}
+			else if (ischosen(p_resource.containerAnnc)){
+				p_resource.containerAnnc.parentID := p_parentID;
+			}
+			else if (ischosen(p_resource.group_)){
+				p_resource.group_.parentID := p_parentID;
+			}
+			else if (ischosen(p_resource.groupAnnc)){
+				p_resource.groupAnnc.parentID := p_parentID;
+			}
+			else if (ischosen(p_resource.serviceSubscribedAppRule)){
+				p_resource.serviceSubscribedAppRule.parentID := p_parentID;
+			}
+			else if (ischosen(p_resource.subscription)){
+				p_resource.subscription.parentID := p_parentID;
+			}
+			else if (ischosen(p_resource.locationPolicy)){
+				p_resource.locationPolicy.parentID := p_parentID;
+			}
+			else if (ischosen(p_resource.delivery)){
+				p_resource.delivery.parentID := p_parentID;
+			}
+			else if (ischosen(p_resource.mgmtCmd)){
+				p_resource.mgmtCmd.parentID := p_parentID;
+			}	
+			else if (ischosen(p_resource.node)){
+				p_resource.node.parentID := p_parentID;
+			}	
+			else if (ischosen(p_resource.remoteCSE)){
+				p_resource.remoteCSE.parentID := p_parentID;
+			}
+			else if (ischosen(p_resource.remoteCSE)){
+				p_resource.remoteCSE.parentID := p_parentID;
+			}
+			else if (ischosen(p_resource.request)){
+				p_resource.request.parentID := p_parentID;
+			}
+			else if (ischosen(p_resource.statsCollect)){
+				p_resource.statsCollect.parentID := p_parentID;
+			}
+			else if (ischosen(p_resource.statsConfig)){
+				p_resource.statsConfig.parentID := p_parentID;
+			}
+			else if (ischosen(p_resource.timeSeries)){
+				p_resource.timeSeries.parentID := p_parentID;
+			}
+			else if (ischosen(p_resource.timeSeriesAnnc)){
+				p_resource.timeSeriesAnnc.parentID := p_parentID;
+			} else {
+				log( __SCOPE__, ":INFO: Resource not having acpi attribute. Not possible to set acpi")
+			}
+			return valueof(p_resource);					
+		}
 		/**
 		 * @desc Retrieve AE_ID for a given AE resource
 		 * @param p_targetResourceIndex Internal resource index of the given resource
@@ -3781,9 +4347,9 @@ module OneM2M_Functions {
 		} // end f_getAnnouncedResourceType
 		
 		/**
-		 * @desc   Proccessing of the request primitive
+		 * @desc   Proccessing of the CREATE request primitive
 		 * @param  p_request          Request primitive to be processed
-		 * @return p_response 		Response primitive to be sent back
+		 * @return Local resource index
 		 */
 		function f_processCreateRequestPrimitive(in RequestPrimitive p_request) runs on CseSimu return integer {			
 			var integer v_parentIndex := -1;
@@ -3808,7 +4374,77 @@ module OneM2M_Functions {
 				
 			return v_localResourceIndex;
 		}
+		
+		/**
+		 * @desc   Proccessing of the UPDATE request primitive
+		 * @param  p_request          Request primitive to be processed
+		 */
+		function f_processUpdateRequestPrimitive(in RequestPrimitive p_request) runs on CseSimu return integer {			
+			var integer v_targetLocalResourceIndex := -1;
+				
+			v_targetLocalResourceIndex := f_getResourceIndex(p_request.to_);
+			if(v_targetLocalResourceIndex == -1) {
+				setverdict(inconc,__SCOPE__&": ERROR: Target resource not found");
+				vc_response.primitive.responsePrimitive := valueof(m_responsePrimitive(int4004,p_request.requestIdentifier));
+		
+			} else {
+				setverdict(pass, __SCOPE__&":INFO: Resource updated successfuly");
+				f_updateLocalResource(v_targetLocalResourceIndex, p_request.primitiveContent);
+				vc_response.primitive.responsePrimitive := valueof(m_responsePrimitive(int2004,p_request.requestIdentifier));
+				vc_response.primitive.responsePrimitive.primitiveContent := vc_localResourcesList[v_targetLocalResourceIndex].resource;
+			}
+			vc_response.primitive.responsePrimitive.from_ := PX_CSE1_ID;
+			vc_response.primitive.responsePrimitive.to_ := p_request.from_;
+			
+			return v_targetLocalResourceIndex;
+		
+		}
+	
+		/**
+		 * @desc   Proccessing of the RETRIEVE request primitive
+		 * @param  p_request          Request primitive to be processed
+		 */
+		function f_processRetrieveRequestPrimitive(in RequestPrimitive p_request) runs on CseSimu return integer {			
+			var integer v_targetLocalResourceIndex := -1;
+				
+			v_targetLocalResourceIndex := f_getResourceIndex(p_request.to_);
+			if(v_targetLocalResourceIndex == -1) {
+				setverdict(inconc,__SCOPE__&": ERROR: Target resource not found");
+				vc_response.primitive.responsePrimitive := valueof(m_responsePrimitive(int4004,p_request.requestIdentifier));
+		
+			} else {
+				setverdict(pass, __SCOPE__&":INFO: Resource retrieved successfuly");
+				vc_response.primitive.responsePrimitive := valueof(m_responsePrimitive(int2000,p_request.requestIdentifier));
+				vc_response.primitive.responsePrimitive.primitiveContent := vc_localResourcesList[v_targetLocalResourceIndex].resource;
+			}
+			vc_response.primitive.responsePrimitive.from_ := PX_CSE1_ID;
+			vc_response.primitive.responsePrimitive.to_ := p_request.from_;
+		
+			return v_targetLocalResourceIndex;
+		}
     				
+		/**
+		 * @desc   Proccessing of the DELETE request primitive
+		 * @param  p_request          Request primitive to be processed
+		 */
+		function f_processDeleteRequestPrimitive(in RequestPrimitive p_request) runs on CseSimu return integer {			
+			var integer v_targetLocalResourceIndex := -1;
+				
+			v_targetLocalResourceIndex := f_getResourceIndex(p_request.to_);
+			if(v_targetLocalResourceIndex == -1) {
+				setverdict(inconc,__SCOPE__&": ERROR: Target resource not found");
+				vc_response.primitive.responsePrimitive := valueof(m_responsePrimitive(int4004,p_request.requestIdentifier));
+		
+			} else {
+				setverdict(pass, __SCOPE__&":INFO: Resource deleted successfuly");
+				vc_response.primitive.responsePrimitive := valueof(m_responsePrimitive(int2002,p_request.requestIdentifier));
+			}
+			vc_response.primitive.responsePrimitive.from_ := PX_CSE1_ID;
+			vc_response.primitive.responsePrimitive.to_ := p_request.from_;
+		
+			return v_targetLocalResourceIndex;
+		}
+
 	}//end group getSetFunctions
 	
 	group CheckingFunctions {
@@ -3938,13 +4574,13 @@ module OneM2M_Functions {
 		 * @param data Corresponding information for the correct execution of the given action
 		 * @verdict 
 		 */
-		function f_aeSimu_checkComponentDoneAndGetVerdict(AeSimu p_ae) runs on AeSimu {
+		function f_aeSimu_checkComponentDoneAndGetVerdict(Tester p_component) runs on AeSimu {
 			
 			var verdicttype v_verdict := none;
 
 			tc_ac.start(15.0);
 			alt {
-				[] p_ae.done -> value v_verdict {
+				[] p_component.done -> value v_verdict {
 					tc_ac.stop;
 				}
 				[] tc_ac.timeout {
@@ -3983,13 +4619,13 @@ module OneM2M_Functions {
 		 * @param data Corresponding information for the correct execution of the given action
 		 * @verdict 
 		 */
-		function f_cseSimu_checkComponentDoneAndGetVerdict(AeSimu p_ae) runs on CseSimu {
+		function f_cseSimu_checkComponentDoneAndGetVerdict(Tester p_component) runs on CseSimu {
 			
 			var verdicttype v_verdict := none;
 
 			tc_ac.start(15.0);
 			alt {
-				[] p_ae.done -> value v_verdict {
+				[] p_component.done -> value v_verdict {
 					tc_ac.stop;
 				}
 				[] tc_ac.timeout {
@@ -4050,9 +4686,9 @@ module OneM2M_Functions {
 		* @param MsgOut MsgOut primitive
 		 */
 
-		function f_getMsgOutPrimitive(MsgOut p_msgOut) runs on Tester return MsgOut {
+		function f_getMsgOutPrimitive(template MsgOut p_msgOut) runs on Tester return MsgOut {
 			p_msgOut.protocolBinding := vc_protocolBinding;
-			return p_msgOut; 
+			return valueof(p_msgOut); 
 		}
 		
 		function f_sendUtPrimitive(template UtTriggerPrimitive p_utRequest, in universal charstring p_action) runs on Tester {
@@ -4068,30 +4704,30 @@ module OneM2M_Functions {
 				alt{
 					[] utPort.receive(mw_utResponseOK) {
 						tc_wait.stop;
-						setverdict(pass, __SCOPE__, " : Triggering message is successfully received!");
+						setverdict(pass, __SCOPE__ & " : Triggering message is successfully received!");
 					}
 					[] utPort.receive(mw_utResponseKO) {
 						tc_wait.stop;
-						setverdict(inconc, __SCOPE__, " : Error while receiving Triggering message!");
+						setverdict(inconc, __SCOPE__ & " : Error while receiving Triggering message!");
 					}
 					[] tc_wait.timeout{
-						setverdict(inconc, __SCOPE__, " : Timeout due to no response received from requested SUT!");
+						setverdict(inconc, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 					}
 				}
 				
 				activate(a_default());
 				if(vc_config == e_cf01) {
-					vc_a_cse := activate(a_cse_cf01());
+					vc_aeSimu := activate(a_cse_cf01());
 				} else if ((vc_config == e_cf02) or (vc_config == e_cf02CseSimuMaster)) {
 					if(vc_testSystemRole == e_ae) {
-						vc_a_cse := activate(a_cse_cf02_ae1());
+						vc_aeSimu := activate(a_cse_cf02_ae1());
 					} else if (vc_testSystemRole == e_cse) {
-						vc_a_cse := activate(a_cse_cf02_cse1());
+						vc_cseSimu := activate(a_cse_cf02_cse1());
 					}
 				} else if (vc_config == e_cf03) {
-					vc_a_ae := activate(a_ae_cf03());
+					vc_cseSimu := activate(a_ae_cf03());
 				} else if (vc_config == e_cf04) {
-					vc_a_cse := activate(a_cse_cf04());
+					vc_cseSimu := activate(a_cse_cf04());
 				}
 			}else{
 				
@@ -4511,6 +5147,23 @@ module OneM2M_Functions {
 			}
 			return v_month;
 			
+		} // end f_getMonth
+		
+		/**
+		 * @desc Retrieve Time from a given timestamp
+		 * @param p_timestamp Given timestamp
+		 * @return Time
+		 */
+		function f_getTime(charstring p_timestamp) runs on Tester return integer {
+			
+			var charstring v_time := "";
+			var integer i;
+			
+			for(i := 9; i <= 14; i := i+1){
+					v_time := v_time & p_timestamp[i];
+			}
+			return str2int(v_time);
+			
 		} // end f_getYear
 		
 		/**
diff --git a/LibOneM2M/OneM2M_Pixits.ttcn b/LibOneM2M/OneM2M_Pixits.ttcn
index fa83245b0fffa9711a69aff76fb275c7f3c5d04e..2832df7cf6462189391a1d6bd5e06dd82c7f4ad3 100644
--- a/LibOneM2M/OneM2M_Pixits.ttcn
+++ b/LibOneM2M/OneM2M_Pixits.ttcn
@@ -217,7 +217,7 @@ module OneM2M_Pixits {
 			/**
 			 * @desc Resources to be deleted by TC_DELETE_RESOURCES 
 			 */			
-			modulepar XSD.IDREFS PX_RESOURCES_TO_BE_DELETED := {"MyAe"};
+			modulepar XSD.IDREFS PX_RESOURCES_TO_BE_DELETED := { "MyAe", "MyAccessControlPolicyResource", "SubscriptionVerificationAcp", "MyAcp", "MyRemoteCSEResource" };
 	
 			/**
 			 * @desc To enable run postamble (for debugging) 
diff --git a/LibOneM2M/OneM2M_Ports.ttcn b/LibOneM2M/OneM2M_Ports.ttcn
index e6b5192faa639894668ff615344f81e26b3676cc..fbfdbc6024dc35bbb7ffe700a6855d824231f4db 100644
--- a/LibOneM2M/OneM2M_Ports.ttcn
+++ b/LibOneM2M/OneM2M_Ports.ttcn
@@ -14,6 +14,7 @@
 module OneM2M_Ports {
 	
 	import from OneM2M_Types all;
+	import from XSD all;
 	/* ***************************************
 	 * 		oneM2M Ports 
 	 * ***************************************
@@ -47,9 +48,9 @@ module OneM2M_Ports {
 	 */
 	type port InfoPort message {
 		in
-			RequestPrimitive, ResponsePrimitive, PrimitiveContent, MyResource, integer;
+			RequestPrimitive, ResponsePrimitive, PrimitiveContent, MyResource, integer, XSD.ID;
 		out
-			RequestPrimitive, ResponsePrimitive, PrimitiveContent, MyResource, integer;
+			RequestPrimitive, ResponsePrimitive, PrimitiveContent, MyResource, integer, XSD.ID;
 	}
 
 
diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index 7ad69077d6848170d8ddf19cb22e103d685d850f..d58fc36efe61fa0c2fe7e03a0b7322e31693900d 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -16,9 +16,8 @@ module OneM2M_Templates {
 	import from XSD all;
 	import from OneM2M_Types all;
 	import from OneM2M_TypesAndValues all;
-	//import from OneM2M_AdditionalTypes all;
 	import from OneM2M_Pixits all;
-	import from OneM2M_Functions all;
+    import from OneM2M_Functions all;
 
 		
 	/**
@@ -129,6 +128,39 @@ module OneM2M_Templates {
 				vendorInformation := omit
 			};
         	
+			/**
+			 * @desc RETRIEVE request primitive for child references
+			 * @param p_targetResourceAddress Target resource address
+			 * @param p_originator Originator (from)
+			 */
+			template (value) RequestPrimitive m_retrieveChildReferences(XSD.ID p_targetResourceAddress, in XSD.ID p_originator, template (omit) ResourceTypeList p_resourceTypeList := omit) modifies m_retrieve := {
+				resultContent := int6, 
+				filterCriteria := {
+					createdBefore := omit,
+					createdAfter := omit,
+					modifiedSince := omit,
+					unmodifiedSince := omit,
+					stateTagSmaller := omit,
+					stateTagBigger := omit,
+					expireBefore := omit,
+					expireAfter := omit,
+					labels := omit,
+					resourceType := p_resourceTypeList,
+					sizeAbove := omit,
+					sizeBelow := omit,
+					contentType_list := {},
+					attribute_list := {},
+					filterUsage := omit,
+					limit := omit,
+					semanticsFilter_list := {},
+					filterOperation := omit,
+					contentFilterSyntax := omit,
+					contentFilterQuery := omit,
+					level := omit,
+					offset := omit
+				}
+			};
+			
 			/**
 			 * @desc Base Receive RETRIEVE request primitive
 			 * @param p_targetResourceAddress Target resource address
@@ -586,7 +618,15 @@ module OneM2M_Templates {
 			   requestIdentifier := "m_updateRemoteCSEBase",
         	   primitiveContent := {remoteCSE := m_contentUpdateRemoteCSE}
         	}
-        	
+
+			/**
+			 * @desc Reception template for update remoteCSE resource
+			 */
+			template RequestPrimitive mw_updateRemoteCSE(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_update := {
+				resourceType := int16,
+				primitiveContent:= {remoteCSE := ?}
+			};
+			       	
 			template (value) RequestPrimitive m_updateAEAnncBase modifies m_update:= {
 				requestIdentifier := testcasename() & "-m_updateAEAnnc",
 				resourceType := int10002,
@@ -755,12 +795,19 @@ module OneM2M_Templates {
 			};
 			
 			/**
-			 * @desc Reception template for CREATE AEAnnc
+			 * @desc Reception template for CREATE AEAnnc for registration when AE-ID-Stem starts with S
 			 */
-			template RequestPrimitive mw_createAEAnnc(template XSD.ID p_from := ?, template XSD.ID p_to := ?, template AcpType p_accessControlPolicyIds := ?, template XSD.AnyURI p_link := ?) modifies mw_create := {				
+			template RequestPrimitive mw_createAEAnnc_s_ae_id(template XSD.ID p_from := ?, template XSD.ID p_to := ?, template AcpType p_accessControlPolicyIds := ?, template XSD.AnyURI p_link := ?) modifies mw_create := {				
 				primitiveContent := {aEAnnc := mw_contentCreateAEAnnc({"Credential-ID:None"}, p_accessControlPolicyIds)}
 			};
 
+			/**
+			 * @desc Reception template for CREATE AEAnnc as announced resource
+			 */
+			template RequestPrimitive mw_createAEAnnc(template XSD.ID p_from := ?, template XSD.ID p_to := ?, template AcpType p_accessControlPolicyIds := ?, template XSD.AnyURI p_link := ?) modifies mw_create := {				
+				primitiveContent := {aEAnnc := mw_contentCreateAEAnnc(-, p_accessControlPolicyIds)}
+			};
+			
 			template (value) RequestPrimitive m_createAe(XSD.ID p_appId, template (omit) AcpType p_accessControlPolicyIds := omit,template (omit) XSD.ID p_from := omit, template (omit) ResourceName p_resourceName :=  c_aeAuxName, in template (omit) PoaList p_poaList := omit) modifies m_create := {
 				from_ := p_from,//PX_AE_ID_STEM,//TODO We should use omit, "s", or "c"
 				requestIdentifier := testcasename() & "-m_createAe",
@@ -791,6 +838,15 @@ module OneM2M_Templates {
 				resourceType := int1,
 				primitiveContent := {accessControlPolicy := m_contentCreateAcp ()}
 			};
+			
+			/**
+			 * @desc Base CREATE request primitive for AccessControlPolicyAnnc resource
+			 */
+			template (value) RequestPrimitive m_createAcpAnncBase modifies m_create := {
+				requestIdentifier := testcasename() & "-m_createAcpAnnc",
+				resourceType := int10001,
+				primitiveContent := {accessControlPolicyAnnc := m_contentCreateAcpAnnc ()}
+			};
 				
         	template (value) RequestPrimitive m_createAcp(XSD.ID p_parentResourceAddress, in template (omit)  XSD.String p_name := c_defaultAccessControlPolicyResourceName, in template (value) ListOfURIs p_acor := PX_ACOR, in template (value) AccessControlOperations p_allowedOperations := int63) modifies m_create := {
         		to_ := p_parentResourceAddress,
@@ -851,6 +907,15 @@ module OneM2M_Templates {
 				resourceType := int3,
 				primitiveContent := {container := m_contentCreateContainer}
 			};
+			
+			/**
+			 * @desc Base CREATE request primitive for ContainerAnnc resource
+			 */
+			template (value) RequestPrimitive m_createContainerAnncBase modifies m_create := {
+				requestIdentifier := testcasename() & "-m_createContainerAnnc",
+				resourceType := int10003,
+				primitiveContent := {containerAnnc := m_contentCreateContainerAnnc}
+			};
 			       	
 			/**
 			 * @desc Base CREATE request primitive for Container resource using Container_update_invalid
@@ -870,6 +935,13 @@ module OneM2M_Templates {
 				primitiveContent := {remoteCSE := m_contentCreateRemoteCSE(p_resourceName, p_accessControlPolicyIds,p_cSEBase, p_cSE_ID)}
 			};
 			
+			/**
+			 * @desc CREATE request primitive for remoteCSE resource with poa
+			 */
+			template (value) RequestPrimitive m_createRemoteCSE_poa(template (omit) AcpType p_accessControlPolicyIds := omit, template (omit) ResourceName p_resourceName :=  c_defaultRemoteCSEResourceName, in template (omit) XSD.AnyURI p_cSEBase := PX_CSE1_ID, in template (omit) XSD.ID p_cSE_ID := PX_CSE1_ID, in PoaList p_poaList) modifies m_createRemoteCSEBase := {
+				primitiveContent := {remoteCSE := m_contentCreateRemoteCSE_poa(p_resourceName, p_accessControlPolicyIds,p_cSEBase, p_cSE_ID, p_poaList)}
+			};
+			
 			/**
 			 * @desc Reception template for CREATE RemoteCSE
 			 */
@@ -960,7 +1032,7 @@ module OneM2M_Templates {
 			 * @desc Reception template for CREATE ContentInstanceAnnc
 			 */
 			template RequestPrimitive mw_createContentInstanceAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int10014,
+				resourceType := int10004,
 				primitiveContent := {contentInstanceAnnc := ?}
 			};  
 			
@@ -998,6 +1070,15 @@ module OneM2M_Templates {
 				resourceType := int9,
 				primitiveContent := {group_ := m_contentCreateGroup (1, {"NotInitialized"}, omit, omit)}	//TODO: p_resourceId
 			};
+			
+			/**
+			 * @desc Base CREATE request primitive for GroupAnnc resource
+			 */
+			template (value) RequestPrimitive m_createGroupAnncBase modifies m_create := {
+				requestIdentifier := testcasename() & "-m_createGroupAnnc",
+				resourceType := int10009,
+				primitiveContent := {groupAnnc := m_contentCreateGroupAnnc (1, {"NotInitialized"}, omit, omit)}	//TODO: p_resourceId
+			};
         	
         	template (value) RequestPrimitive m_createGroup(in template (value) XSD.NonNegativeInteger p_maxNrOfMembers,
 															in template (value) ListOfURIs p_memberIds := {"NotInitialized"},
@@ -1286,6 +1367,15 @@ module OneM2M_Templates {
 				resourceType := int29,
 				primitiveContent := {timeSeries := m_contentCreateTimeSeries ()}
 			};
+			
+			/**
+			 * @desc Base CREATE request primitive for timeSeriesAnnc resource
+			 */
+			template (value) RequestPrimitive m_createTimeSeriesAnncBase modifies m_create := {
+				requestIdentifier := testcasename() & "-m_createTimeSeriesAnnc",
+				resourceType := int10029,
+				primitiveContent := {timeSeriesAnnc := m_contentCreateTimeSeriesAnnc()}
+			};
         	
 			template (value) RequestPrimitive m_createTimeSeries(in template (omit)  XSD.String p_name := c_defaultTimeSeriesResourceName,
 																 in XSD.Boolean p_missingDataDetect := true,
@@ -1446,6 +1536,21 @@ module OneM2M_Templates {
 				vendorInformation := omit
 			};
 			
+			/**
+			 * @desc Base NOTIFY request primitive
+			 */
+			template RequestPrimitive m_notifyNotification(XSD.ID p_resourceAddress, Notification p_notification) modifies m_notify := {
+				primitiveContent := {notification := p_notification},
+				requestExpirationTimestamp := {alt_1 := 10000}//Needed for polling
+			};
+			
+			/**
+			 * @desc Base NOTIFY request primitive carrying a responsePrimitive
+			 */
+			template RequestPrimitive m_notifyResponsePrimitive(XSD.ID p_resourceAddress, ResponsePrimitive p_responsePrimitive) modifies m_notify := {
+				primitiveContent := {responsePrimitive := p_responsePrimitive}
+			};
+			
 			/**
 			 * @desc Base NOTIFY Aggregated request primitive
 			 */
@@ -1557,6 +1662,10 @@ module OneM2M_Templates {
 		template PrimitiveContent m_primitiveContentRemoteCSE(template RemoteCSE_optional p_remoteCSE) := {
 			remoteCSE := p_remoteCSE
 		}
+		
+		template PrimitiveContent m_primitiveContentResponsePrimitive(template ResponsePrimitive p_responsePrimitive) := {
+			responsePrimitive := p_responsePrimitive
+		}		
 				
 		template PrimitiveContent mw_primitiveContent := ?;
 		
@@ -1589,7 +1698,7 @@ module OneM2M_Templates {
 			pointOfAccess := omit, //{"http://127.0.0.1:1400/monitor"},//O //{"http://192.168.1.92:18080/notifications/AE"}, // TODO: Check this => AE PoA
 			ontologyRef := omit,//O
 			nodeLink := p_nodeLink,//NP
-			requestReachability := true,//M
+			requestReachability := false,//M
 			contentSerialization := omit,//O
 			e2eSecInfo := omit, //O TODO Check whether it is optional or mandatory for create operation
 			supportedReleaseVersions := {"2a"}, //M
@@ -1603,7 +1712,7 @@ module OneM2M_Templates {
 		 * @param p_appId App ID
 		 * @param p_nodeLink Node link
 		 */
-		template AEAnnc_optional mw_contentCreateAEAnnc (in template  Labels p_labels := ?, in template AcpType p_accessControlPolicyIds := ?, template XSD.AnyURI p_link := ?) := {
+		template AEAnnc_optional mw_contentCreateAEAnnc (in template  Labels p_labels := *, in template AcpType p_accessControlPolicyIds := ?, template XSD.AnyURI p_link := ?) := {
     		resourceName := omit,//NA M
     		resourceType := omit,//NA M
     		resourceID := omit,//NA M
@@ -1623,8 +1732,8 @@ module OneM2M_Templates {
 			nodeLink := *,//OA
 			requestReachability := *,//OA
 			contentSerialization := *,//OA
-			e2eSecInfo := ?, //MA
-			supportedReleaseVersions := ?, //MA
+			e2eSecInfo := *, //MA
+			supportedReleaseVersions := *, //MA//TODO It should be mandatory for AEAnnc
 			choice := omit//NA
 		};	
 		
@@ -1635,7 +1744,7 @@ module OneM2M_Templates {
 		 * @param p_appId App ID
 		 * @param p_nodeLink Node link
 		 */
-		template RemoteCSEAnnc_optional mw_contentCreateRemoteCSEAnnc (in template  Labels p_labels := ?, in template AcpType p_accessControlPolicyIds := ?, template XSD.AnyURI p_link := ?) := {
+		template RemoteCSEAnnc_optional mw_contentCreateRemoteCSEAnnc (in template  Labels p_labels := *, in template AcpType p_accessControlPolicyIds := ?, template XSD.AnyURI p_link := ?) := {
 			resourceName := omit,//NA M
 			resourceType := omit,//NA M
 			resourceID := omit,//NA M
@@ -1683,7 +1792,7 @@ module OneM2M_Templates {
     		pointOfAccess := p_poaList, //O {"http://127.0.0.1:1400/monitor"},//{"http://192.168.1.92:18080/notifications/AE"}, // TODO: Check this => AE PoA
     		ontologyRef := omit,//O
     		nodeLink := omit,//NP
-    		requestReachability := true,//M
+    		requestReachability := false,//M
     		contentSerialization := omit,//O
 			e2eSecInfo := omit, //O
 			supportedReleaseVersions := {"2a"}, //M
@@ -1716,11 +1825,36 @@ module OneM2M_Templates {
 			choice := omit //NP
 		};
 		
+		/**
+		 * @desc Base primitiveContent for CREATE operation for AccessControlPolicyAnnc resource
+		 * @param p_name Resource name
+		 * @param p_acor Allowed originators
+		 * @param p_allowedOperations Allowed operations
+		 */
+		template (value) AccessControlPolicyAnnc_optional m_contentCreateAcpAnnc (in template (omit) XSD.String p_name := c_defaultAccessControlPolicyAnncResourceName, in template (value) ListOfURIs p_acor := PX_ACOR, in template (value) AccessControlOperations p_allowedOperations := int63 ) := {
+			resourceName := p_name,//O
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			labels := omit,//O
+			expirationTime := omit,//O
+			link := omit,//M TODO Put the right value
+			privileges := {
+				accessControlRule_list := {valueof(m_createAcr(p_acor, p_allowedOperations))}
+			},//M
+			selfPrivileges := {
+				accessControlRule_list := {valueof(m_createAcr({"all"}, int63))}
+			},//M
+			choice := omit //NP
+		};
+		
 		/**
 		 * @desc Base reception template of primitiveContent for CREATE operation for AccessControlPolicyAnnc resource
 		 * @param p_labels Labels
 		 */
-		template AccessControlPolicyAnnc_optional mw_contentCreateAcpAnnc (in template Labels p_labels := ?) := {
+		template AccessControlPolicyAnnc_optional mw_contentCreateAcpAnnc (in template Labels p_labels := *) := {
 			resourceName := omit,//NA M
 			resourceType := omit,//NA M
 			resourceID := omit,//NA M
@@ -1862,6 +1996,43 @@ module OneM2M_Templates {
 			choice := omit//NP
     	};  
     	
+		/**
+		 * @desc Base primitiveContent for CREATE operation for GroupAnnc resource
+		 * @param p_maxNrOfMembers Max number of members
+		 * @param p_memberIds Member IDs
+		 * @param p_accessControlPolicyIds ACP IDs for the GroupAnnc
+		 * @param p_name Resource name
+		 */
+		template (value) GroupAnnc_optional m_contentCreateGroupAnnc (	in template (value) XSD.PositiveInteger p_maxNrOfMembers,
+																in template (value) ListOfURIs p_memberIds,
+																in template (omit) AcpType p_accessControlPolicyIds,
+																in template (omit) MemberType p_memberType := omit,
+																in template (omit) ConsistencyStrategy p_consistencyStrategy := omit,
+																in template (omit) ListOfURIs p_membersAccessControlPolicyIDs := omit,
+																in template (omit) XSD.String p_name := c_defaultGroupAnncResourceName) := {	
+			resourceName := p_name,//O
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			labels := omit,//O
+			accessControlPolicyIDs := p_accessControlPolicyIds,//O
+			expirationTime := omit,//O
+			link := omit,//M TODO Put the right value
+			dynamicAuthorizationConsultationIDs := omit, //O
+			memberType := p_memberType,//O
+			currentNrOfMembers := omit,//NP
+			maxNrOfMembers := p_maxNrOfMembers,//M
+			memberIDs := p_memberIds,//M
+			membersAccessControlPolicyIDs := p_membersAccessControlPolicyIDs,//O
+			memberTypeValidated := omit,//NP
+			consistencyStrategy := p_consistencyStrategy,//O
+			groupName := omit,//O
+			semanticSupportIndicator := omit,//O
+			choice := omit//NP
+		};  
+    	
 		  /**
 		  * @desc Base reception template of primitiveContent for CREATE operation for GroupAnnc resource
 		  */
@@ -1872,7 +2043,7 @@ module OneM2M_Templates {
 			  parentID := omit,//NA M
 			  creationTime := omit,//NA M
 			  lastModifiedTime := omit,//NA M
-			  labels := ?,//MA
+			  labels := *,//MA
 			  accessControlPolicyIDs := ?,//MA
 			  expirationTime := ?,//MA M
 			  link := ?,
@@ -1949,7 +2120,7 @@ module OneM2M_Templates {
 			parentID := omit,//NA M
 			creationTime := omit,//NA M
 			lastModifiedTime := omit,//NA M
-			labels := ?,//MA
+			labels := *,//MA
 			accessControlPolicyIDs := ?,//MA
 			expirationTime := ?,//MA M
 			link := ?,
@@ -2049,7 +2220,7 @@ module OneM2M_Templates {
 			parentID := omit,//NA M
 			creationTime := omit,//NA M
 			lastModifiedTime := omit,//NA M
-			labels := ?,//MA
+			labels := *,//MA
 			expirationTime := ?,//MA M
 			link := ?,
 			scheduleElement := * //OA
@@ -2208,7 +2379,7 @@ module OneM2M_Templates {
 			parentID := omit,//NA M
 			creationTime := omit,//NA M
 			lastModifiedTime := omit,//NA M
-			labels := ?,//MA
+			labels := *,//MA
 			expirationTime := omit,//O NA
 			link := omit, //O NA
 			stateTag := *,// OA
@@ -2249,6 +2420,34 @@ module OneM2M_Templates {
 			choice := omit//NP
     	};
     	
+		/**
+		 * @desc Base primitiveContent for CREATE operation for ContainerAnnc resource
+		 * @param p_name Resource name
+		 */
+		template (value) ContainerAnnc_optional m_contentCreateContainerAnnc (in template (omit) XSD.String p_name := c_defaultContainerAnncResourceName):= {
+			resourceName := p_name,//O
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			labels := omit,//O
+			accessControlPolicyIDs := omit,//O
+			expirationTime := omit,//O
+			link := omit,//M TODO Put the right value
+			dynamicAuthorizationConsultationIDs := omit, //O
+			stateTag := omit,//NP
+			maxNrOfInstances := omit,//O
+			maxByteSize := omit,//O
+			maxInstanceAge := omit,//O
+			currentNrOfInstances := omit,//NP
+			currentByteSize := omit,//NP
+			locationID := omit,//O
+			ontologyRef := omit,//O
+			disableRetrieval := omit, //O
+			choice := omit//NP
+		};
+    	
 		/**
 		 * @desc Base primitiveContent for invalid CREATE operation for Container resource (using Container_update_invalid)
 		 * @param p_name Resource name
@@ -2303,7 +2502,7 @@ module OneM2M_Templates {
 			cSE_ID := valueof(p_cSE_ID),//M
 			m2M_Ext_ID := omit,//O
 			trigger_Recipient_ID := omit,//O
-			requestReachability := true,//M
+			requestReachability := false,//M
 			nodeLink := omit,//O
 			triggerReferenceNumber := omit,//O
 			e2eSecInfo := omit,//O
@@ -2311,6 +2510,37 @@ module OneM2M_Templates {
 			choice := omit//O
 		};
     	
+		/**
+		 * @desc PrimitiveContent for CREATE operation for RemoteCSE resource with poa
+		 * @param p_name Resource name
+		 */
+		template (value) RemoteCSE_optional m_contentCreateRemoteCSE_poa (in template (omit) XSD.String p_name := c_defaultRemoteCSEResourceName, in template (omit) AcpType p_accessControlPolicyIds, in template (omit) XSD.AnyURI p_cSEBase := PX_CSE1_ID, in template (omit) XSD.ID p_cSE_ID := PX_CSE1_ID, in PoaList p_poaList):= {
+			resourceName := p_name,//O
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			labels := omit,//O
+			accessControlPolicyIDs := p_accessControlPolicyIds,//O
+			expirationTime := omit,//O
+			dynamicAuthorizationConsultationIDs := omit,
+			announceTo := omit,//O
+			announcedAttribute := omit,//O
+			cseType := omit,//O
+			pointOfAccess := p_poaList,//O
+			cSEBase := valueof(p_cSEBase),//M
+			cSE_ID := valueof(p_cSE_ID),//M
+			m2M_Ext_ID := omit,//O
+			trigger_Recipient_ID := omit,//O
+			requestReachability := true,//M
+			nodeLink := omit,//O
+			triggerReferenceNumber := omit,//O
+			e2eSecInfo := omit,//O
+			supportedReleaseVersions := {"2a"}, //M
+			choice := omit//O
+		};
+		
 		/**
 		* @desc Base reception template of primitiveContent for CREATE operation for ContainerAnnc resource
 		*/
@@ -2321,7 +2551,7 @@ module OneM2M_Templates {
 			parentID := omit,//NA M
 			creationTime := omit,//NA M
 			lastModifiedTime := omit,//NA M
-			labels := ?,//MA M
+			labels := *,//MA M
 			accessControlPolicyIDs := ?,//MA
 			expirationTime := ?,//MA M
 			link := ?, //M
@@ -2395,7 +2625,7 @@ module OneM2M_Templates {
 		  parentID := omit,//NA M
 		  creationTime := omit,//NA M
 		  lastModifiedTime := omit,//NA M
-		  labels := ?,//MA
+		  labels := *,//MA
 		  accessControlPolicyIDs := ?,//MA
 		  expirationTime := ?,//MA M
 		  link := ?,
@@ -2569,7 +2799,7 @@ module OneM2M_Templates {
 		};
 		
 		/**
-		 * @desc Base primitiveContent for CREATE operation for timeSeries resource
+		 * @desc Base primitiveContent for CREATE operation for timeSeries resource 
 		 * @param p_name Resource name
 		 */
 		template (value) TimeSeries_optional m_contentCreateTimeSeries (in template (omit) XSD.String p_name := c_defaultTimeSeriesResourceName):= {
@@ -2602,6 +2832,37 @@ module OneM2M_Templates {
 			choice := omit//NP
 		};
 		
+		/**
+		 * @desc Base primitiveContent for CREATE operation for timeSeriesAnnc resource 
+		 * @param p_name Resource name
+		 */
+		template (value) TimeSeriesAnnc_optional m_contentCreateTimeSeriesAnnc (in template (omit) XSD.String p_name := c_defaultTimeSeriesAnncResourceName):= {			
+			resourceName := p_name,//O
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			labels := omit,//O
+			accessControlPolicyIDs := omit,//O
+			expirationTime := omit,//O
+			link := omit,//M TODO Put the right value
+			dynamicAuthorizationConsultationIDs := omit, //O
+			stateTag := omit,//NP
+			maxNrOfInstances := omit,//O
+			maxByteSize := omit,//O
+			maxInstanceAge := omit,//O
+			currentNrOfInstances := omit,//NP
+			currentByteSize := omit,//NP
+			periodicInterval := omit,//O
+			missingDataDetect := omit,//O
+			missingDataList := omit,//NP
+			missingDataCurrentNr := omit,//NP
+			missingDataDetectTimer := omit,//O
+			ontologyRef := omit,//O
+			choice := omit//NP
+		};
+		
 		/**
 		 * @desc Base primitiveContent for CREATE operation for TimeSeriesAnnc resource
 		 * @param p_primitiveContent Content for the TimeSeriesAnnc
@@ -2613,7 +2874,7 @@ module OneM2M_Templates {
 			parentID := omit,//NA M
 			creationTime := omit,//NA M
 			lastModifiedTime := omit,//NA M
-			labels := ?,//MA
+			labels := *,//MA
 			accessControlPolicyIDs := ?,//MA
 			expirationTime := ?,//MA M
 			link := omit, //O NA
@@ -2644,7 +2905,7 @@ module OneM2M_Templates {
 			parentID := omit,//NA M
 			creationTime := omit,//NA M
 			lastModifiedTime := omit,//NA M
-			labels := ?,//MA
+			labels := *,//MA
 			expirationTime := omit,//NA M
 			link := omit, //O NA
 			dataGenerationTime := *,//M OA
@@ -2668,6 +2929,7 @@ module OneM2M_Templates {
 			missingDataMaxNr := p_missingDataMaxNr,//O
 			missingDataDetectTimer := p_missingDataDetectTimer//O
 		}
+		
 		/**
 		 * @desc Base primitiveContent for invalid CREATE operation for timeSeries resource (using Container_update_invalid)
 		 * @param p_name Resource name
@@ -3667,6 +3929,16 @@ module OneM2M_Templates {
 			requestReachability := true//M
 		};
 		
+		template RemoteCSE_optional m_contentLocalRemoteCSEResource modifies m_contentRemoteCSE_allOmit := {
+			resourceName := PX_CSE_NAME,//M
+			resourceType := int16,//M
+			resourceID := PX_CSE_RESOURCE_ID,//M
+			pointOfAccess := {PX_SUT_ADDRESS},//O
+			cSEBase := PX_CSE_ID & "/" & PX_CSE_NAME,//M
+			cSE_ID := PX_CSE_ID,//M
+			requestReachability := true//M
+		};
+		
 		template RemoteCSE_optional mw_contentRemoteCSEBase := {
 			resourceName := ?,//M
 			resourceType := ?,//M
@@ -4201,6 +4473,11 @@ module OneM2M_Templates {
 			iPEDiscoveryRequest := omit
 		};
 		
+		template Notification m_contentNotification_subscriptionVerification modifies m_contentNotification_allOmit:= {
+			verificationRequest := true,
+			creator := "C-AE-ID"
+		};
+		
 		template Notification mw_contentNotification_any := {
 			notificationEvent := *,
 			verificationRequest := *,
@@ -4808,12 +5085,28 @@ module OneM2M_Templates {
 			vendorInformation := omit
 		};
 		
-		
+		template ResponsePrimitive mw_responseNotify(ResponseStatusCode p_statusCode) := {
+			responseStatusCode := p_statusCode,
+			requestIdentifier := ?,
+			primitiveContent := omit,
+			to_ := *,
+			from_ := *,
+			originatingTimestamp := *,
+			resultExpirationTimestamp := *,
+			eventCategory := *,
+			contentStatus := *,
+			contentOffset := *,
+			assignedTokenIdentifiers := *,
+			tokenRequestInformation := *,
+			releaseVersionIndicator := ?,
+			vendorInformation := *
+		};
     	
 		group InfoPortTemplates {
 		
 			template MyResource mw_resource := ?;	
 			template integer mw_resourceIndex := ?;	
+			template XSD.ID mw_resourceAddress := ?;
 		
 		}//end group InfoPortTemplates
     	
@@ -4930,9 +5223,9 @@ module OneM2M_Templates {
 			forcedFields := omit
 		};
 		
-		template (value) UtTriggerPrimitive m_utRetrievePollingChannel(XSD.ID p_targetResourceAddress) modifies m_utRetrieve := {
+		template (value) UtTriggerPrimitive m_utRetrievePollingChannelUri(XSD.ID p_targetResourceAddress) modifies m_utRetrieve := {
 			requestPrimitive := {
-				requestIdentifier := testcasename() & "-m_utRetrievePollingChannel" & f_rnd(1, 1000000),
+				requestIdentifier := testcasename() & "-m_utRetrievePollingChannelUri" & f_rnd(1, 1000000),
 				resourceType := int15,
 				primitiveContent := {pollingChannel := m_contentRetrievePollingChannel}
 			}
diff --git a/LibOneM2M/OneM2M_TestSystem.ttcn b/LibOneM2M/OneM2M_TestSystem.ttcn
index a5b1777ea193fb9b5c69cf7dda95e0ea5ee003fe..d0fc01784fc74161bdd31087c257f9f399126d2d 100644
--- a/LibOneM2M/OneM2M_TestSystem.ttcn
+++ b/LibOneM2M/OneM2M_TestSystem.ttcn
@@ -41,8 +41,8 @@ module OneM2M_TestSystem {
 		var AccessControlPolicy_optional vc_acpAux;
 		var MsgIn vc_request;
 		var MsgIn vc_response;
-		var default vc_a_ae := null;
-		var default vc_a_cse := null;
+		var default vc_aeSimu := null;
+		var default vc_cseSimu := null;
 	};
 	
 	type component AeSimu extends Tester {
diff --git a/LibOneM2M/OneM2M_Types.ttcn b/LibOneM2M/OneM2M_Types.ttcn
index 330f82eb9b4e9200528e431ba571f2d769060166..b2d6d5c40e372a525bdad25bfcc72f7301710eef 100644
--- a/LibOneM2M/OneM2M_Types.ttcn
+++ b/LibOneM2M/OneM2M_Types.ttcn
@@ -5128,7 +5128,6 @@ with {
 //FIXME To replace Representation type by this
 type union Representation {
 	Resource_2 resource, 
-	ResponsePrimitive responsePrimitive, 
 	XSD.AnyURI uRI
 }
 with {
diff --git a/LibOneM2M/OneM2M_TypesAndValues.ttcn b/LibOneM2M/OneM2M_TypesAndValues.ttcn
index 0514eeae980e84104014a062d99777a6a292d4b3..61d58b175414a718c262451a7d9f1f393ce7e605 100644
--- a/LibOneM2M/OneM2M_TypesAndValues.ttcn
+++ b/LibOneM2M/OneM2M_TypesAndValues.ttcn
@@ -18,12 +18,15 @@ module OneM2M_TypesAndValues {
 	/* Constants */	
 	const XSD.String c_defaultResourceName := "MyResource";
 	const XSD.String c_defaultGroupResourceName := "MyGroupResource";
+	const XSD.String c_defaultGroupAnncResourceName := "MyGroupAnncResource";
 	const XSD.String c_defaultAccessControlPolicyResourceName := "MyAccessControlPolicyResource";
+	const XSD.String c_defaultAccessControlPolicyAnncResourceName := "MyAccessControlPolicyAnncResource";
 	const XSD.String c_defaultScheduleResourceName := "MyScheduleResource";
 	const XSD.String c_defaultPollingChannelResourceName := "MyPollingChannelResource";
 	const XSD.String c_defaultSubscriptionResourceName := "MySubscriptionResource";
 	const XSD.String c_defaultContentInstanceResourceName := "MyContentInstanceResource";
 	const XSD.String c_defaultContainerResourceName := "MyContainerResource";
+	const XSD.String c_defaultContainerAnncResourceName := "MyContainerAnncResource";
 	const XSD.String c_defaultDeliveryResourceName := "MyDeliveryResource";
 	const XSD.String c_defaultRemoteCSEResourceName := "MyRemoteCSEResource";
 	const XSD.String c_defaultMgmtObjResourceName := "MyMgmtObjResource";
@@ -38,6 +41,7 @@ module OneM2M_TypesAndValues {
 	const XSD.String c_defaultm2mServiceSubscriptionProfileResourceName := "Mym2mServiceSubscriptionProfileResource";
 	const XSD.String c_defaultServiceSubscribedAppRuleResourceName := "MyServiceSubscribedAppRuleResource";
 	const XSD.String c_defaultTimeSeriesResourceName := "MyTimeSeriesResource";
+	const XSD.String c_defaultTimeSeriesAnncResourceName := "MyTimeSeriesAnncResource";
 	const XSD.String c_defaultTimeSeriesInstanceResourceName := "MyTimeSeriesInstanceResource";
 	const XSD.ID c_aeAuxName := "MyAe";
 	const XSD.String c_defaultAE2Name := "MyAe2";
diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index 413b91709820ebaaffba7b1d8b988e2bce9ab4f8..c6144cca5fd2e02477a0507f182200e98b1b2621 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -31,17 +31,13 @@ module OneM2M_PermutationFunctions {
 						
 					function f_AE_GEN_CRE_001(PrimitiveScope p_primitiveScope) runs on CseSimu {
 						
-						var ResponsePrimitive v_responsePrimitive;
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
-						var UtTriggerAckPrimitive v_trigger_response;
-						var integer v_parentIndex := -1;
 						var integer v_resourceIndex := -1;
 						var MsgIn v_request;
-						var PrimitiveContent v_resource;
-						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for container containing To set to " & f_getLocalResourceAddress(0, e_nonHierarchical, p_primitiveScope);
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for container to ";
 						
 						if(not(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
-							setverdict(inconc, __SCOPE__, ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 
@@ -49,27 +45,24 @@ module OneM2M_PermutationFunctions {
 						
 						//Send Trigger Message
 						v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(-, e_nonHierarchical, p_primitiveScope);
-						f_sendUtPrimitive(v_utRequest, v_action);
+						f_sendUtPrimitive(v_utRequest, v_action & f_getLocalResourceAddress(-, e_nonHierarchical, p_primitiveScope));
 						
 						tc_ac.start;
 						alt {
 							[] mcaPortIn.receive(mw_request(mw_createContainer(-,v_utRequest.requestPrimitive.to_))) -> value v_request {
 								tc_ac.stop;
-								setverdict(pass, __SCOPE__, " : Container creation request received successfuly");
-								v_parentIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
-								v_resource := f_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, v_parentIndex, v_request.primitive.requestPrimitive.resourceType);
-								v_resourceIndex := f_setLocalResource(v_resource, v_request.primitive.requestPrimitive.resourceType, v_parentIndex);	
-								v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
-								mcaPortIn.send(f_getMsgOutPrimitive(f_getMsgOutPrimitive(m_response(v_responsePrimitive))));
+								setverdict(pass, __SCOPE__ & " : Container creation request received successfuly");
+								v_resourceIndex := f_processCreateRequestPrimitive(v_request.primitive.requestPrimitive);	
+								mcaPortIn.send(f_getMsgOutPrimitive(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))));
 							}
-							[] mcaPortIn.receive(mw_request(?)) {
+							[] mcaPortIn.receive(mw_request(mw_createContainer())) -> value v_request {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__, " : Error while creating container");
-								mcaPortIn.send(f_getMsgOutPrimitive(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))));
+								setverdict(fail, __SCOPE__ & " : Create Request with unexpected target");
+								mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 								stop;
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, __SCOPE__, " : No answer while creating resource");
+								setverdict(fail, __SCOPE__ & " : No answer while creating resource");
 								stop;
 							}
 						}
@@ -79,18 +72,14 @@ module OneM2M_PermutationFunctions {
 					}
 					function f_AE_GEN_CRE_002(PrimitiveScope p_primitiveScope) runs on CseSimu {
 						var MsgIn v_request;
-						var Integer v_parentIndex := -1;
 						var Integer v_resourceIndex := -1;
-						var ResponsePrimitive v_responsePrimitive;
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
-						var UtTriggerAckPrimitive v_trigger_response;
-						var PrimitiveContent v_resource;
-						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for container containing To set to " & f_getLocalResourceAddress(-, e_hierarchical, p_primitiveScope);
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for container to ";
 						
 						
 						//Test Control
 						if(not(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
-							setverdict(inconc, __SCOPE__, ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 	
@@ -98,28 +87,25 @@ module OneM2M_PermutationFunctions {
 	
 						//Send Trigger Message
 						v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(-, e_hierarchical, p_primitiveScope);
-						f_sendUtPrimitive(v_utRequest,v_action);
+						f_sendUtPrimitive(v_utRequest,v_action  & f_getLocalResourceAddress(-, e_hierarchical, p_primitiveScope));
 							
 	
 						tc_ac.start;
 						alt {
-							[] mcaPortIn.receive(mw_request(mw_createContainer(-,v_utRequest.requestPrimitive.to_))) -> value (v_request) {
+							[] mcaPortIn.receive(mw_request(mw_createContainer(-,v_utRequest.requestPrimitive.to_))) -> value v_request {
 								tc_ac.stop;
-								setverdict(pass, __SCOPE__, " : Container creation request received successfuly");
-								v_parentIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
-								v_resource := f_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, v_parentIndex, v_request.primitive.requestPrimitive.resourceType);
-								v_resourceIndex := f_setLocalResource(v_resource, v_request.primitive.requestPrimitive.resourceType, v_parentIndex);	
-								v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
-								mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+								setverdict(pass, __SCOPE__ & " : Container creation request received successfuly");
+								v_resourceIndex := f_processCreateRequestPrimitive(v_request.primitive.requestPrimitive);	
+								mcaPortIn.send(f_getMsgOutPrimitive(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))));
 							}
-							[] mcaPortIn.receive(mw_request(?)) {
+							[] mcaPortIn.receive(mw_request(mw_createContainer())) -> value v_request {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__, " : Error while creating container");
+								setverdict(fail, __SCOPE__ & " : Create Request with unexpected target");
 								mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 								stop;
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, __SCOPE__, " : No answer while creating resource");
+								setverdict(fail, __SCOPE__ & " : No answer while creating resource");
 								stop;
 							}
 						}
@@ -134,16 +120,14 @@ module OneM2M_PermutationFunctions {
 						
 					function f_AE_GEN_UPD_001(PrimitiveScope p_primitiveScope) runs on CseSimu {
 						var MsgIn v_request;
-						var ResponsePrimitive v_responsePrimitive;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
-						var UtTriggerAckPrimitive v_trigger_response;
 						var integer v_resourceIndex;
 						var PrimitiveContent v_localResource;
-						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for container containing To set to " & f_getLocalResourceAddress(-, e_nonHierarchical, p_primitiveScope);
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for container to ";
 						
 						
 						if(not(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
-							setverdict(inconc, __SCOPE__, ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -153,26 +137,24 @@ module OneM2M_PermutationFunctions {
 						v_localResource := f_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
 						v_resourceIndex := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
 						v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_resourceIndex, e_nonHierarchical, p_primitiveScope);
-						f_sendUtPrimitive(v_utRequest,v_action);
+						f_sendUtPrimitive(v_utRequest,v_action  & f_getLocalResourceAddress(v_resourceIndex, e_nonHierarchical, p_primitiveScope));
 						
 						tc_ac.start;
 						alt {
 							[] mcaPortIn.receive(mw_request(mw_updateContainer(-,v_utRequest.requestPrimitive.to_))) -> value v_request {
 								tc_ac.stop;
-								setverdict(pass, __SCOPE__, " : Container update request received successfuly");
-								v_resourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
-								f_updateLocalResource(v_resourceIndex, v_request.primitive.requestPrimitive.primitiveContent);
-								v_responsePrimitive := valueof(m_responsePrimitive(int2004, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
-								mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+								setverdict(pass, __SCOPE__ & " : Container update request received successfuly");
+								f_processUpdateRequestPrimitive(v_request.primitive.requestPrimitive);
+								mcaPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
 							}
-							[] mcaPortIn.receive(mw_request(?)) {
+							[] mcaPortIn.receive(mw_request(mw_updateContainer())) {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__, " : Error while updating container");
+								setverdict(fail, __SCOPE__ & " : Update Request with unexpected target");
 								mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 								stop;
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, __SCOPE__, " : No answer while updating resource");
+								setverdict(fail, __SCOPE__ & " : No answer while updating resource");
 								stop;
 							}
 						}
@@ -182,15 +164,13 @@ module OneM2M_PermutationFunctions {
 					}
 					function f_AE_GEN_UPD_002(PrimitiveScope p_primitiveScope) runs on CseSimu {
 						var MsgIn v_request;
-						var ResponsePrimitive v_responsePrimitive;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
-						var UtTriggerAckPrimitive v_trigger_response;
 						var integer v_resourceIndex := -1;
 						var PrimitiveContent v_localResource;
-						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for container containing To set to " & f_getLocalResourceAddress(-, e_hierarchical, p_primitiveScope);
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for container to ";
 						
 						if(not(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
-							setverdict(inconc, __SCOPE__, ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 	
@@ -200,26 +180,24 @@ module OneM2M_PermutationFunctions {
 						v_localResource := f_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
 						v_resourceIndex := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
 						v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_resourceIndex, e_hierarchical, p_primitiveScope);
-						f_sendUtPrimitive(v_utRequest,v_action);
+						f_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_resourceIndex, e_hierarchical, p_primitiveScope));
 								
 						tc_ac.start;
 						alt {
 							[] mcaPortIn.receive(mw_request(mw_updateContainer(-,v_utRequest.requestPrimitive.to_))) -> value (v_request) {
 								tc_ac.stop;
-								setverdict(pass, __SCOPE__, " : Container update request received successfuly");
-								v_resourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
-								f_updateLocalResource(v_resourceIndex, v_request.primitive.requestPrimitive.primitiveContent);
-								v_responsePrimitive := valueof(m_responsePrimitive(int2004, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
-								mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+								setverdict(pass, __SCOPE__ & " : Container update request received successfuly");
+								f_processUpdateRequestPrimitive(v_request.primitive.requestPrimitive);
+								mcaPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
 							}
-							[] mcaPortIn.receive(mw_request(?)) {
+							[] mcaPortIn.receive(mw_request(mw_updateContainer())) {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__, " : Error while updating container");
+								setverdict(fail, __SCOPE__ & " : Update Request with unexpected target");
 								mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 								stop;
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, __SCOPE__, " : No answer while updating resource");
+								setverdict(fail, __SCOPE__ & " : No answer while updating resource");
 								stop;
 							}
 						}
@@ -234,16 +212,13 @@ module OneM2M_PermutationFunctions {
 						
 					function f_AE_GEN_RET_001(PrimitiveScope p_primitiveScope) runs on CseSimu {
 						var MsgIn v_request;
-						var ResponsePrimitive v_responsePrimitive;
-						var template UtTriggerPrimitive v_utRequestTemplate;
-                        var UtTriggerPrimitive v_utRequest;
-						var UtTriggerAckPrimitive v_trigger_response;
-						var integer v_resourceIndex := -1;
+						var template UtTriggerPrimitive v_utRequest;
+                        var integer v_resourceIndex := -1;
 						var PrimitiveContent v_localResource;
-						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for container containing To set to " & f_getLocalResourceAddress(-, e_nonHierarchical, p_primitiveScope);
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for container to ";
 						
 						if(not(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
-							setverdict(inconc, __SCOPE__, ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 			
@@ -252,27 +227,25 @@ module OneM2M_PermutationFunctions {
 						//Send Trigger Message
 						v_localResource := f_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
 						v_resourceIndex := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
-						v_utRequestTemplate := m_utRetrieve(f_getLocalResourceAddress(v_resourceIndex, e_nonHierarchical, p_primitiveScope));
-						f_sendUtPrimitive(v_utRequestTemplate,v_action);
-                        v_utRequest := valueof(v_utRequestTemplate);
-			
+						v_utRequest := m_utRetrieve(f_getLocalResourceAddress(v_resourceIndex, e_nonHierarchical, p_primitiveScope));
+						f_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_resourceIndex, e_nonHierarchical, p_primitiveScope));
+                        
 						tc_ac.start;
 						alt {
-							[] mcaPortIn.receive(mw_request(mw_retrieve(v_utRequest.requestPrimitive.to_))) -> value (v_request) {
+							[] mcaPortIn.receive(mw_request(mw_retrieve(v_utRequest.requestPrimitive.to_))) -> value v_request {
 								tc_ac.stop;
-								setverdict(pass, __SCOPE__, " : Container retrieve request received successfuly");
-								v_resourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
-								v_responsePrimitive := valueof(m_responsePrimitive(int2000, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
-								mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+								setverdict(pass, __SCOPE__ & " : Container retrieve request received successfuly");
+								f_processRetrieveRequestPrimitive(v_request.primitive.requestPrimitive);
+								mcaPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
 							}
-							[] mcaPortIn.receive(mw_request(?)) {
+							[] mcaPortIn.receive(mw_request(mw_retrieve(?))) -> value v_request {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__, " : Error while retrieving container");
+								setverdict(fail, __SCOPE__ & " : Retrieve request with unexpected target");
 								mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 								stop;
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, __SCOPE__, " : No answer while retrieving resource");
+								setverdict(fail, __SCOPE__ & " : No answer while retrieving resource");
 								stop;
 							}
 						}
@@ -282,16 +255,13 @@ module OneM2M_PermutationFunctions {
 					}
 					function f_AE_GEN_RET_002(PrimitiveScope p_primitiveScope) runs on CseSimu {
 						var MsgIn v_request;
-						var ResponsePrimitive v_responsePrimitive;
-						var template UtTriggerPrimitive v_utRequestTemplate;
-                        var UtTriggerPrimitive v_utRequest;
-						var UtTriggerAckPrimitive v_trigger_response;
-						var integer v_resourceIndex := -1;
+						var template UtTriggerPrimitive v_utRequest;
+                        var integer v_resourceIndex := -1;
 						var PrimitiveContent v_localResource;
-						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for container containing To set to " & f_getLocalResourceAddress(-, e_hierarchical, p_primitiveScope);
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for container to ";
 						
 						if(not(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
-							setverdict(inconc, __SCOPE__, ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 
@@ -300,27 +270,25 @@ module OneM2M_PermutationFunctions {
 						//Send Trigger Message
 						v_localResource := f_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
 						v_resourceIndex := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
-						v_utRequestTemplate := m_utRetrieve(f_getLocalResourceAddress(v_resourceIndex, e_hierarchical, p_primitiveScope));
-                        v_utRequest := valueof(v_utRequestTemplate);
-						f_sendUtPrimitive(v_utRequest,v_action);
-
+						v_utRequest := m_utRetrieve(f_getLocalResourceAddress(v_resourceIndex, e_hierarchical, p_primitiveScope));
+                        f_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_resourceIndex, e_hierarchical, p_primitiveScope));
+						
 						tc_ac.start;
 						alt {
 							[] mcaPortIn.receive(mw_request(mw_retrieve(v_utRequest.requestPrimitive.to_))) -> value (v_request) {
 								tc_ac.stop;
-								setverdict(pass, __SCOPE__, " : Container retrieve request received successfuly");
-								v_resourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
-								v_responsePrimitive := valueof(m_responsePrimitive(int2000, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
-								mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+								setverdict(pass, __SCOPE__ & " : Container retrieve request received successfuly");
+								f_processRetrieveRequestPrimitive(v_request.primitive.requestPrimitive);
+								mcaPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
 							}
-							[] mcaPortIn.receive(mw_request(?)) {
+							[] mcaPortIn.receive(mw_request(mw_retrieve(?))) -> value v_request {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__, " : Error while retrieving container");
+								setverdict(fail, __SCOPE__ & " : Retrieve request with unexpected target");
 								mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 								stop;
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, __SCOPE__, " : No answer while retrieving resource");
+								setverdict(fail, __SCOPE__ & " : No answer while retrieving resource");
 								stop;
 							}
 						}
@@ -335,15 +303,13 @@ module OneM2M_PermutationFunctions {
 						
 					function f_AE_GEN_DEL_001(PrimitiveScope p_primitiveScope) runs on CseSimu {
 						var MsgIn v_request;
-						var ResponsePrimitive v_responsePrimitive;
 						var template UtTriggerPrimitive v_utRequest := m_utDelete;
-						var UtTriggerAckPrimitive v_trigger_response;
 						var integer v_auxInteger;
 						var PrimitiveContent v_localResource;
-						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid DELETE Request for container containing To set to " & f_getLocalResourceAddress(-, e_nonHierarchical, p_primitiveScope);
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid DELETE Request for container to ";
 
 						if(not(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
-							setverdict(inconc, __SCOPE__, ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 			
@@ -353,24 +319,24 @@ module OneM2M_PermutationFunctions {
 						v_localResource := f_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
 						v_auxInteger := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
 						v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_auxInteger, e_nonHierarchical, p_primitiveScope);
-						f_sendUtPrimitive(v_utRequest,v_action);
+						f_sendUtPrimitive(v_utRequest,v_action  & f_getLocalResourceAddress(v_auxInteger, e_nonHierarchical, p_primitiveScope));
 			
 						tc_ac.start;
 						alt {
-							[] mcaPortIn.receive(mw_request(mw_delete(v_utRequest.requestPrimitive.to_))) -> value (v_request) {
+							[] mcaPortIn.receive(mw_request(mw_delete(v_utRequest.requestPrimitive.to_))) -> value v_request {
 								tc_ac.stop;
-								setverdict(pass, __SCOPE__, " : Container update request received successfuly");
-								v_responsePrimitive := valueof(m_responsePrimitive(int2004, v_request.primitive.requestPrimitive.requestIdentifier, omit));
-								mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+								setverdict(pass, __SCOPE__ & " : Container delete request received successfuly");
+								f_processDeleteRequestPrimitive(v_request.primitive.requestPrimitive);
+								mcaPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
 							}
-							[] mcaPortIn.receive(mw_request(?)) {
+							[] mcaPortIn.receive(mw_request(mw_delete(?))) -> value v_request {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__, " : Error while updating container");
+								setverdict(fail, __SCOPE__ & " : Delete request with unexpected target");
 								mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 								stop;
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, __SCOPE__, " : No answer while updating resource");
+								setverdict(fail, __SCOPE__ & " : No answer while updating resource");
 								stop;
 							}
 						}
@@ -380,42 +346,41 @@ module OneM2M_PermutationFunctions {
 					}
 					function f_AE_GEN_DEL_002(PrimitiveScope p_primitiveScope) runs on CseSimu {
 						var MsgIn v_request;
-						var ResponsePrimitive v_responsePrimitive;
 						var template UtTriggerPrimitive v_utRequest := m_utDelete;
-						var UtTriggerAckPrimitive v_trigger_response;
 						var integer v_auxInteger;
 						var PrimitiveContent v_localResource;
-						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid DELETE Request for container containing To set to " & f_getLocalResourceAddress(-, e_hierarchical, p_primitiveScope);
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid DELETE Request for container to ";
 						
 						if(not(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
-							setverdict(inconc, __SCOPE__, ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 
 						f_cf03Up();
 
-						//Send Trigger Mesf_generateLocalResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
+						//Send Trigger Message
+						v_localResource := f_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
 						v_auxInteger := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
 						v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_auxInteger, e_hierarchical, p_primitiveScope);
-						f_sendUtPrimitive(v_utRequest,v_action);
+						f_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_auxInteger, e_hierarchical, p_primitiveScope));
 				
 
 						tc_ac.start;
 						alt {
-							[] mcaPortIn.receive(mw_request(mw_delete(v_utRequest.requestPrimitive.to_))) -> value (v_request) {
+							[] mcaPortIn.receive(mw_request(mw_delete(v_utRequest.requestPrimitive.to_))) -> value v_request {
 								tc_ac.stop;
-								setverdict(pass, __SCOPE__, " : Container update request received successfuly");
-								v_responsePrimitive := valueof(m_responsePrimitive(int2004, v_request.primitive.requestPrimitive.requestIdentifier, omit));
-								mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+								setverdict(pass, __SCOPE__ & " : Container delete request received successfuly");
+								f_processDeleteRequestPrimitive(v_request.primitive.requestPrimitive);
+								mcaPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
 							}
-							[] mcaPortIn.receive(mw_request(?)) {
+							[] mcaPortIn.receive(mw_request(mw_delete(?))) -> value v_request {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__, " : Error while updating container");
+								setverdict(fail, __SCOPE__ & " : Delete request with unexpected target");
 								mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 								stop;
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, __SCOPE__, " : No answer while updating resource");
+								setverdict(fail, __SCOPE__ & " : No answer while updating resource");
 								stop;
 							}
 						}
@@ -446,29 +411,26 @@ module OneM2M_PermutationFunctions {
 					   //Send Trigger Message
 					   p_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(-, -, -);
 					   p_request.to_ := p_utRequest.requestPrimitive.to_;
-					   f_sendUtPrimitive(p_utRequest,p_action);
+					   f_sendUtPrimitive(p_utRequest,p_action & f_getLocalResourceAddress(-, -, -));
 	
 					   //Test behavior
 					   tc_ac.start;
 					   alt{
 							[] mcaPortIn.receive(mw_request(p_request)) -> value v_request {
 							   tc_ac.stop;
-							   setverdict(pass, __SCOPE__, " : AE registration request is accepted!!");
-							   v_parentIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
-							   v_resource := f_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, v_parentIndex, v_request.primitive.requestPrimitive.resourceType);
-							   v_resourceIndex := f_setLocalResource(v_resource, v_request.primitive.requestPrimitive.resourceType, v_parentIndex);	
-							   v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
-	
+							   setverdict(pass, __SCOPE__ & " : AE registration request is accepted!!");
+							   v_resourceIndex := f_processCreateRequestPrimitive(v_request.primitive.requestPrimitive);	
+							
 							   //send back responsePrimitive
-								mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+							   mcaPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
 						   }
-							[] mcaPortIn.receive(mw_request(mw_createAe(*,?,m_contentCreateAe_Invalid))) -> value v_request {
+							[] mcaPortIn.receive(mw_request(mw_createAe())) -> value v_request {
 							   tc_ac.stop;
-							   setverdict(fail, __SCOPE__, " : AE registration request is rejected due to not including the optional attribute!");
+							   setverdict(fail, __SCOPE__ & " : Unexpected AE registration request");
 								mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 						   }
 						   [] tc_ac.timeout{
-							   setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
+							   setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 						   }
 	
 					   }
@@ -491,47 +453,40 @@ module OneM2M_PermutationFunctions {
 			
 					function f_AE_DMR_CRE_003(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request, in universal charstring p_action) runs on CseSimu {
 						var MsgIn v_request;
-						var integer v_parentIndex := -1;
 						var integer v_resourceIndex := -1;
-						var PrimitiveContent v_resource;
 						var PrimitiveContent v_localResource;
 						var integer v_containerIndex := -1;
-						var ResponsePrimitive v_responsePrimitive;
-	
+						
 						//Test component configuration
 						f_cf03Up();
 	
-						//send triggeringf_generateLocalResourcelocalResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
+						//send triggering
+						v_localResource := f_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
 						v_containerIndex := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
 						p_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_containerIndex, -, -);
 						p_request.to_ := p_utRequest.requestPrimitive.to_;
-						f_sendUtPrimitive(p_utRequest,p_action);
+						f_sendUtPrimitive(p_utRequest,p_action & f_getLocalResourceAddress(v_containerIndex, -, -));
 	
 						//Test behavior
 						tc_ac.start;
 						alt{
 	
 							//receive MsgIn requestPrimitive
-							[] mcaPortIn.receive(mw_request(p_request)) -> value (v_request) {
+							[] mcaPortIn.receive(mw_request(p_request)) -> value v_request {
 								tc_ac.stop;
-								setverdict(pass, __SCOPE__, " : ContentInstance creation request is accepted!!");
-								v_parentIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
-								v_resource := f_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, v_parentIndex, v_request.primitive.requestPrimitive.resourceType);
-								v_resourceIndex := f_setLocalResource(v_resource, v_request.primitive.requestPrimitive.resourceType, v_parentIndex);	
-								v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
-	
+								setverdict(pass, __SCOPE__ & " : ContentInstance creation request is accepted!!");
+								v_resourceIndex := f_processCreateRequestPrimitive(v_request.primitive.requestPrimitive);	
 								//send back responsePrimitive
-								mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+								mcaPortIn.send(f_getMsgOutPrimitive(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))));
 							}
 	
-							[] mcaPortIn.receive {
+							[] mcaPortIn.receive(mw_request(mw_create)) -> value v_request{
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__, " : ContentInstance creation request is rejected due to not including the attribute!");
+								setverdict(fail, __SCOPE__ & " : Unexpected CREATE request ");
 								mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 							}
-	
 							[] tc_ac.timeout{
-								setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
+								setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 							}
 						}
 	
@@ -540,18 +495,15 @@ module OneM2M_PermutationFunctions {
 					}
 					function f_AE_DMR_CRE_004(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request, in universal charstring p_action) runs on CseSimu {
 						var MsgIn v_request;
-						var integer v_parentIndex := -1;
 						var integer v_resourceIndex := -1;
-						var PrimitiveContent v_resource;
-						var ResponsePrimitive v_responsePrimitive;
-	
+						
 						//Test component configuration
 						f_cf03Up();
 	
 						//send triggering primitive to SUT
 						p_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(-, -, -);
 						p_request.to_ := p_utRequest.requestPrimitive.to_;
-						f_sendUtPrimitive(p_utRequest,p_action);
+						f_sendUtPrimitive(p_utRequest,p_action & f_getLocalResourceAddress(-, -, -));
 	
 						//Test behavior
 						tc_ac.start;
@@ -560,22 +512,18 @@ module OneM2M_PermutationFunctions {
 							//receive MsgIn requestPrimitive
 							[] mcaPortIn.receive(mw_request(p_request)) -> value (v_request) {
 								tc_ac.stop;
-								setverdict(pass, __SCOPE__, " : Container creation request is accepted!!");
-								v_parentIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
-								v_resource := f_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, v_parentIndex, v_request.primitive.requestPrimitive.resourceType);
-								v_resourceIndex := f_setLocalResource(v_resource, v_request.primitive.requestPrimitive.resourceType, v_parentIndex);	
-								v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
-	
+								setverdict(pass, __SCOPE__ & " : Container creation request is accepted!!");
+								v_resourceIndex := f_processCreateRequestPrimitive(v_request.primitive.requestPrimitive);	
 								//send back responsePrimitive
-								mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+								mcaPortIn.send(f_getMsgOutPrimitive(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))));
 							}
-							[] mcaPortIn.receive {
+							[] mcaPortIn.receive(mw_request(mw_create)) {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__, " : Container creation request is rejected due to not including the attribute!");
+								setverdict(fail, __SCOPE__ & " : Unexpected CREATE request ");
 								mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 							}
 							[] tc_ac.timeout{
-								setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
+								setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 							}
 						}
 	
@@ -593,16 +541,16 @@ module OneM2M_PermutationFunctions {
 					   	var MsgIn v_request;
 						var integer v_resourceIndex := -1;
 					   	var PrimitiveContent v_localResource;
-					   	var ResponsePrimitive v_responsePrimitive;
-	
+					   	
 					   	f_cf03Up();
 					   
 					   	//Preamble
 						
-					   	//Send Trf_generateLocalResourcelResource := f_ae_generateLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))), vc_cSEBaseIndex, int2);
+					   	//Send Tr
+					    v_localResource := f_generateLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))), vc_cSEBaseIndex, int2);
 						v_resourceIndex := f_setLocalResource(v_localResource, int2, vc_cSEBaseIndex);
 						p_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_resourceIndex);
-					   	f_sendUtPrimitive(p_utRequest,p_action);
+					   	f_sendUtPrimitive(p_utRequest,p_action & f_getLocalResourceAddress(v_resourceIndex));
 	
 					   //Test behavior
 					   
@@ -610,19 +558,17 @@ module OneM2M_PermutationFunctions {
 					   alt{
 							[] mcaPortIn.receive(mw_request(p_expectedUpdateRequest)) -> value v_request {
 							   tc_ac.stop;
-							   setverdict(pass, __SCOPE__, " : AE update request is accepted!");
-							   v_resourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
-							   f_updateLocalResource(v_resourceIndex, v_request.primitive.requestPrimitive.primitiveContent);
-							   v_responsePrimitive := valueof(m_responsePrimitive(int2004, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
-							   mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
-						   }
-							[] mcaPortIn.receive(mw_request(?)) -> value v_request {
+							   setverdict(pass, __SCOPE__ & " : AE update request is accepted!");
+							   f_processUpdateRequestPrimitive(v_request.primitive.requestPrimitive);
+							   mcaPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
+							}
+							[] mcaPortIn.receive(mw_request(mw_update)) -> value v_request {
 							   tc_ac.stop;
-							   setverdict(fail, __SCOPE__, " : AE update request is rejected due to not including the optional attribute!");
+							   setverdict(fail, __SCOPE__ & " : Unexpected UPDATE request");
 								mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 						   }
 						   [] tc_ac.timeout{
-							   setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
+							   setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 						   }
 	
 					   }
@@ -633,17 +579,17 @@ module OneM2M_PermutationFunctions {
 	
 					function f_AE_DMR_UPD_002(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request, in universal charstring p_action) runs on CseSimu {
 						var MsgIn v_request;
-						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_localResource;
 						var integer v_resourceIndex := -1;
 
 						//Test component configuration
 						f_cf03Up();
 
-						//send triggering f_generateLocalResourceocalResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
+						//send triggering 
+						v_localResource := f_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
 						v_resourceIndex := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
 						p_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_resourceIndex);
-						f_sendUtPrimitive(p_utRequest,p_action);
+						f_sendUtPrimitive(p_utRequest,p_action & f_getLocalResourceAddress(v_resourceIndex));
 
 						//Test behavior
 						tc_ac.start;
@@ -652,21 +598,17 @@ module OneM2M_PermutationFunctions {
 							//receive MsgIn requestPrimitive
 							[] mcaPortIn.receive(mw_request(p_request)) -> value (v_request) {
 								tc_ac.stop;
-								setverdict(pass, __SCOPE__, " : Container update request is accepted!!");
-								v_resourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
-								f_updateLocalResource(v_resourceIndex, v_request.primitive.requestPrimitive.primitiveContent);
-								v_responsePrimitive := valueof(m_responsePrimitive(int2004, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
-								mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+								setverdict(pass, __SCOPE__ & " : Container update request is accepted!!");
+								f_processUpdateRequestPrimitive(v_request.primitive.requestPrimitive);
+								mcaPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
 							}
-
-							[] mcaPortIn.receive {
+							[] mcaPortIn.receive(mw_request(mw_update)) {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__, " : Container update request is rejected due to not including the attribute!");
+								setverdict(fail, __SCOPE__ & " : Unexpected UPDATE request");
 								mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 							}
-
 							[] tc_ac.timeout{
-								setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
+								setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 							}
 						}
 
@@ -678,7 +620,7 @@ module OneM2M_PermutationFunctions {
 
 			group Retrieve {
 				
-					function f_AE_DMR_RET_001(ResourceType p_resourceType, template PrimitiveContent p_primitiveContent, in universal charstring p_action) runs on CseSimu {
+					function f_AE_DMR_RET_001(ResourceType p_resourceType, in template (omit) PrimitiveContent p_primitiveContent, in universal charstring p_action) runs on CseSimu {
 		
 						//variables
 						var template UtTriggerPrimitive v_utRequest;
@@ -686,32 +628,36 @@ module OneM2M_PermutationFunctions {
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_localResource;
 						var integer v_resourceIndex := -1;
-		
+						
 						//Test component configuration
 						f_cf03Up();
 		
-						//send triggerinf_generateLocalResource_localResource := f_ae_generateLocalResource(valueof(p_primitiveContent), vc_cSEBaseIndex, p_resourceType);
-						v_resourceIndex := f_setLocalResource(v_localResource, p_resourceType, vc_cSEBaseIndex);
+						//send triggering message
+					    if(p_resourceType != int5) {
+					    	v_localResource := f_generateLocalResource(p_primitiveContent, vc_cSEBaseIndex, p_resourceType);
+					    	v_resourceIndex := f_setLocalResource(v_localResource, p_resourceType, vc_cSEBaseIndex);
+					    } else {
+					    	v_resourceIndex := vc_cSEBaseIndex;
+					    }
 						v_utRequest := m_utRetrieve(f_getLocalResourceAddress(v_resourceIndex));
-						f_sendUtPrimitive(v_utRequest,p_action);
+						f_sendUtPrimitive(v_utRequest,p_action & f_getLocalResourceAddress(v_resourceIndex));
 						
 						//Test behavior
 						tc_ac.start;
 						alt{
 							[] mcaPortIn.receive(mw_request(mw_retrieve(f_getLocalResourceAddress(v_resourceIndex)))) -> value v_request {
 								tc_ac.stop;
-								setverdict(pass, __SCOPE__, " : retrieve resource type request is accepted!!");
-								v_resourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
+								setverdict(pass, __SCOPE__ & " : retrieve resource type request is accepted!!");
 								v_responsePrimitive := valueof(m_responsePrimitive(int2000, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
 								mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 							}
-							[] mcaPortIn.receive {
+							[] mcaPortIn.receive (mw_request(mw_retrieve(?))){
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__, " : error while retrieving resource !");
+								setverdict(fail, __SCOPE__ & " : Retrieve request for unexpected target");
 								mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 							}
 							[] tc_ac.timeout{
-								setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
+								setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 							}
 						}
 		
@@ -751,7 +697,7 @@ module OneM2M_PermutationFunctions {
 						alt{
 							[] mcaPortIn.receive(mw_request(p_request)) -> value v_request {
 								tc_ac.stop;
-								setverdict(pass, __SCOPE__, " : Subscription creation request is accepted!");
+								setverdict(pass, __SCOPE__ & " : Subscription creation request is accepted!");
 								v_parentIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
 								v_resource := f_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, v_parentIndex, v_request.primitive.requestPrimitive.resourceType);
 								v_resourceIndex := f_setLocalResource(v_resource, v_request.primitive.requestPrimitive.resourceType, v_parentIndex);	
@@ -761,11 +707,11 @@ module OneM2M_PermutationFunctions {
 							}
 							[] mcaPortIn.receive {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__, " : Subscription creation request is rejected due to not including the optional attribute!");
+								setverdict(fail, __SCOPE__ & " : Subscription creation request is rejected due to not including the optional attribute!");
 								mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 							}
 							[] tc_ac.timeout{
-								setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
+								setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 							}
 						}
 
@@ -1628,57 +1574,30 @@ module OneM2M_PermutationFunctions {
 						// Test adapter configuration
 
 						// Preamble
-						if(PICS_IN_CSE){
-							vc_remoteCseIndex := f_cse_registerRemoteCse(p_createRequestPrimitive);
-							mccPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(vc_remoteCseIndex), f_getOriginator(vc_remoteCseIndex)))));
-						    tc_ac.start;
-							alt {
-								[] mccPort.receive(mw_response(mw_responsePrimitive(int2000, p_contentResponse))) -> value v_response {
-									tc_ac.stop;
-									setverdict(pass, __SCOPE__ & ": Response OK for retrieving for attribute");
-								}
-								[] mccPort.receive(mw_response(mw_responsePrimitiveOK(p_contentResponse))) -> value v_response {
-									tc_ac.stop;
-									setverdict(fail, __SCOPE__ & ": Wrong response status code");
-								}
-								[] mccPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
-									tc_ac.stop;
-									setverdict(fail, __SCOPE__ & ": Error, resource elements provided not matching expected resource elements");
-								}
-								[] mccPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
-									tc_ac.stop;
-									setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
-								}
-								[] tc_ac.timeout {
-									setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
-								}
+						vc_remoteCseIndex := f_cse_registerRemoteCse(p_createRequestPrimitive);
+						mccPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(vc_remoteCseIndex), f_getOriginator(vc_remoteCseIndex)))));
+					    tc_ac.start;
+						alt {
+							[] mccPort.receive(mw_response(mw_responsePrimitive(int2000, p_contentResponse))) -> value v_response {
+								tc_ac.stop;
+								setverdict(pass, __SCOPE__ & ": Response OK for retrieving for attribute");
+							}
+							[] mccPort.receive(mw_response(mw_responsePrimitiveOK(p_contentResponse))) -> value v_response {
+								tc_ac.stop;
+								setverdict(fail, __SCOPE__ & ": Wrong response status code");
+							}
+							[] mccPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+								tc_ac.stop;
+								setverdict(fail, __SCOPE__ & ": Error, resource elements provided not matching expected resource elements");
+							}
+							[] mccPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+								tc_ac.stop;
+								setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
+							}
+							[] tc_ac.timeout {
+								setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
 							}
-						} else if (PICS_MN_CSE){
-							vc_remoteCseIndex := f_cse_registrationRemoteCse(p_createRequestPrimitive);
-							mccPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(vc_remoteCseIndex), f_getOriginator(vc_remoteCseIndex)))));
-							tc_ac.start;
-							alt {
-								[] mccPort.receive(mw_response(mw_responsePrimitive(int2000, p_contentResponse))) -> value v_response {
-									tc_ac.stop;
-									setverdict(pass, __SCOPE__ & ": Response OK for retrieving for attribute");
-								}
-								[] mccPort.receive(mw_response(mw_responsePrimitiveOK(p_contentResponse))) -> value v_response {
-									tc_ac.stop;
-									setverdict(fail, __SCOPE__ & ": Wrong response status code");
-								}
-								[] mccPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
-									tc_ac.stop;
-									setverdict(fail, __SCOPE__ & ": Error, resource elements provided not matching expected resource elements");
-								}
-								[] mccPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
-									tc_ac.stop;
-									setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
-								}
-								[] tc_ac.timeout {
-									setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
-								}
 							}
-						}
 						
 						//Postamble
   					    f_cse_postamble_deleteResourcesCSE();
@@ -1714,7 +1633,7 @@ module OneM2M_PermutationFunctions {
 						alt {
 							[] mccPort.receive(mw_response(mw_responsePrimitive(int2004, f_getTemplateFromPrimitiveContent(v_request.primitiveContent)))) -> value v_response {
 								tc_ac.stop;
-								setverdict(pass, __SCOPE__ & ": Accepted updation for resource type remoteCSE containing attribute ");
+								setverdict(pass, __SCOPE__ & ": Accepted update for resource type remoteCSE containing attribute ");
 							}
 							[] mccPort.receive(mw_response(mw_responsePrimitiveOK(f_getTemplateFromPrimitiveContent(v_request.primitiveContent)))) -> value v_response {
 								tc_ac.stop;
@@ -1722,11 +1641,11 @@ module OneM2M_PermutationFunctions {
 							}
 							[] mccPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Accepted updation for resource type remoteCSE without containing attribute ");
+								setverdict(fail, __SCOPE__ & ": Accepted update for resource type remoteCSE without containing attribute ");
 							}
 							[] mccPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Rejected updation of resource type remoteCSE containing attribute");
+								setverdict(fail, __SCOPE__ & ": Rejected update of resource type remoteCSE containing attribute");
 							}
 							[] tc_ac.timeout {
 								setverdict(fail, __SCOPE__ & ": No answer while updating resource type remoteCSE");
@@ -1804,94 +1723,343 @@ module OneM2M_PermutationFunctions {
 		
 		group Data_Management_and_Repository {
 						
-			group Create {
+			function f_CSE_DMR_001(template RequestPrimitive p_requestPrimitive) runs on CseSimu {
+    				
+				// Local variables
+				var integer v_aeIndex, v_remoteCseIndex, v_targetResourceIndex := -1;
+				var ResponseStatusCode v_responseStatusCode := int2000;   
+				var XSD.ID v_targetResourceAddress;
+				
+				// Test control
+
+				// Test component configuration
+				f_cf02UpCseSimuMaster();
+
+				// Test adapter configuration
+
+				// Preamble
+				
+				v_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSE_poa(-, -, -, -, {f_getAnnouncementTargetPoA()}));
+				
+				vc_ae1.start(f_cse_preamble_registerAe());				
+				vc_ae1.done;
+				
+				//Creating resource in Hosting CSE
+				v_targetResourceIndex := f_generateAndSetLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
+				
+				// Test Body
+				v_aeIndex := f_getLatestResource(vc_ae1);
+				
+				v_targetResourceAddress := f_getLocalResourceAddress(v_targetResourceIndex, PX_ADDRESSING_METHOD, e_spRelative);
+				p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);
+				p_requestPrimitive.to_ := v_targetResourceAddress;
+				
+				if(valueof(p_requestPrimitive.operation) == int1) {
+					v_responseStatusCode := int2001;
+				} else if(valueof(p_requestPrimitive.operation) == int2) {
+					v_responseStatusCode := int2000;
+				} else if(valueof(p_requestPrimitive.operation) == int3) {
+					v_responseStatusCode := int2004;
+				} else if(valueof(p_requestPrimitive.operation) == int4) {
+					v_responseStatusCode := int2002;
+				}
+				vc_ae1.start(f_cse_operationResource(p_requestPrimitive));
+				
+				tc_ac.start;
+				alt {
+					[v_responseStatusCode == int2001] mccPortIn.receive(mw_request(mw_create(-, v_targetResourceAddress))) -> value vc_request {
+						tc_ac.stop;
+						setverdict(pass, __SCOPE__ & ": Request primitive retargeted successfully");
+						f_processCreateRequestPrimitive(vc_request.primitive.requestPrimitive);
+						mccPortIn.send(m_response(vc_response.primitive.responsePrimitive));
+					}
+					[v_responseStatusCode == int2000] mccPortIn.receive(mw_request(mw_retrieve(v_targetResourceAddress))) -> value vc_request {
+						tc_ac.stop;
+						setverdict(pass, __SCOPE__ & ": Request primitive retargeted successfully");
+						f_processRetrieveRequestPrimitive(vc_request.primitive.requestPrimitive);
+						mccPortIn.send(m_response(vc_response.primitive.responsePrimitive));
+					}
+					[v_responseStatusCode == int2004] mccPortIn.receive(mw_request(mw_update(-, v_targetResourceAddress))) -> value vc_request {
+						tc_ac.stop;
+						setverdict(pass, __SCOPE__ & ": Request primitive retargeted successfully");
+						f_processUpdateRequestPrimitive(vc_request.primitive.requestPrimitive);
+						mccPortIn.send(m_response(vc_response.primitive.responsePrimitive));
+					}
+					[v_responseStatusCode == int2002] mccPortIn.receive(mw_request(mw_delete(v_targetResourceAddress))) -> value vc_request {
+						tc_ac.stop;
+						setverdict(pass, __SCOPE__ & ": Request primitive retargeted successfully");
+						f_processDeleteRequestPrimitive(vc_request.primitive.requestPrimitive);
+						mccPortIn.send(m_response(vc_response.primitive.responsePrimitive));
+					}
+					[] mccPortIn.receive(mw_request(?)) -> value vc_request {
+						tc_ac.stop;
+						setverdict(fail, __SCOPE__ & ": Wrong request received");
+						mccPortIn.send(m_response(m_responsePrimitive(int4000, vc_request.primitive.requestPrimitive.requestIdentifier)));
+					}
+					[] tc_ac.timeout {
+						setverdict(fail, __SCOPE__ & ": No answer while retargeting request");
+					}
+				}	
+				
+				f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
+
+				// Postamble
+				f_cse_postamble_deleteResourcesCSE();
+
+				// Tear down
+				f_cf02DownCseSimuMaster();
 				
-					function f_CSE_DMR_CRE_001(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, in template (omit) RequestPrimitive p_parentRequestPrimitive := omit) runs on AeSimu return ResponsePrimitive {
+			}//end f_CSE_DMR_001
+
+			function f_CSE_DMR_002(template RequestPrimitive p_requestPrimitive) runs on AeSimu {
+    				
+				// Local variables
+				var integer v_aeIndex, v_cseBaseIndex, v_targetResourceIndex := -1;
+				var ResponseStatusCode v_responseStatusCode := int2000;   
+				var XSD.ID v_targetResourceAddress;
+				
+				// Test control
+
+				// Test component configuration
+				f_cf02Up();
+
+				// Test adapter configuration
+
+				// Preamble
+				
+				v_cseBaseIndex := f_getLatestLocalResourceIndex(vc_cse1);
+
+				vc_cse1.start(f_cse_registerRemoteCse(m_createRemoteCSE_poa(-, -, -, -, {f_getAnnouncementTargetPoA()})));
+				f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
+				
+				v_aeIndex := f_cse_preamble_registerAe();				
+				
+				//Creating resource in Hosting CSE
+				vc_cse1.start(f_generateAndSetLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), v_cseBaseIndex, int3));
+				vc_cse1.done;
+				
+				// Test Body
+
+				v_targetResourceAddress := f_getLatestLocalResourceAddress(vc_cse1, PX_ADDRESSING_METHOD, e_spRelative);
+				p_requestPrimitive.to_ := v_targetResourceAddress;
+				p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);
+				
+				v_targetResourceIndex := f_getLatestLocalResourceIndex(vc_cse1);
+				
+				if(valueof(p_requestPrimitive.operation) == int1) {
+					v_responseStatusCode := int2001;
+					vc_cse1.start(f_cse_createResourceHandler(mw_create(-, v_targetResourceAddress )));
+				} else if(valueof(p_requestPrimitive.operation) == int2) {
+					v_responseStatusCode := int2000;
+					vc_cse1.start(f_cse_retrieveResourceHandler(v_targetResourceIndex));
+				} else if(valueof(p_requestPrimitive.operation) == int3) {
+					v_responseStatusCode := int2004;
+					vc_cse1.start(f_cse_updateResourceHandler(v_targetResourceIndex));
+				} else if(valueof(p_requestPrimitive.operation) == int4) {
+					v_responseStatusCode := int2002;
+					vc_cse1.start(f_cse_deleteResourceHandler(v_targetResourceIndex));
+				}
+
+				mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
+				tc_ac.start;
+				alt {
+					[] mcaPort.receive(mw_response(mw_responsePrimitive(v_responseStatusCode))) -> value vc_response {
+						tc_ac.stop;
+						setverdict(pass, __SCOPE__ & ": Request primitieve retargeted successfully");
+					}
+					[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
+						tc_ac.stop;
+						setverdict(fail, __SCOPE__ & ": Wrong response status code");
+						}
+					[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value vc_response {
+						tc_ac.stop;
+						setverdict(fail, __SCOPE__ & ": Error while retargeting request");
+					}
+					[] tc_ac.timeout {
+						setverdict(fail, __SCOPE__ & ": No answer while retargeting request");
+					}
+				}	
+				
+				f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
+
+				// Postamble
+				f_cse_postamble_deleteResources();
+
+				// Tear down
+				f_cf02Down();
+				
+			}//end f_CSE_DMR_002
+
+			group Create {	
+				
+				function f_CSE_DMR_CRE_001(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, in template (omit) RequestPrimitive p_parentRequestPrimitive := omit) runs on AeSimu return ResponsePrimitive {
+				
+					// Local variables
+					var MsgIn v_response;
+					var RequestPrimitive v_request;
+					var integer v_parentIndex := -1;
+					var integer v_resourceIndex := -1;
+					var integer v_ae2Index := -1;
+					var integer v_acpAuxIndex := -1;
+					var PoaList v_poaList := {"http://" & PX_AE2_ADDRESS & "/"};
+										   
+					// Test control
+				
+					// Test component configuration
+					f_cf01Up(true);
+					
+					// Test adapter configuration
+				
+					// Preamble
+					
+					if(ispresent(p_parentRequestPrimitive)) {
+						if(match(int23, p_parentRequestPrimitive.resourceType)){
+							vc_ae2.start(f_cse_preamble_createAcpAux("SubscriptionVerificationAcp", int63));
+							f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
+							
+							vc_ae2.start(f_cse_createResource_withAcpAux(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, c_defaultAE2Name, v_poaList), -1)); // AE2 is registred
+							f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
+							
+							v_ae2Index := f_getResource(vc_ae2);
+							p_parentRequestPrimitive.primitiveContent.subscription.notificationURI := {f_getResourceAddress(v_ae2Index)};
+							vc_ae2.start(f_cse_notifyProcedure_subscriptionVerificationHandler());
+						}
+						if(ischosen(p_parentRequestPrimitive.primitiveContent.group_)){
+						
+							f_cse_preamble_registerAe();
+						
+						}
+						v_parentIndex := f_cse_createResource(valueof(p_parentRequestPrimitive.resourceType), p_parentRequestPrimitive, v_parentIndex);
+						
+						
+						
+					} else {//Resource under CSEBase
+					
+						if(p_resourceType != int1) {
+												
+							v_acpAuxIndex := f_cse_createAccessControlPolicyAux(-, -, -);
+											
+							p_requestPrimitive := f_setAcpId(p_requestPrimitive, {vc_resourcesList[v_acpAuxIndex].resource.accessControlPolicy.resourceID});
+						}
+						
+						if(ischosen(p_requestPrimitive.primitiveContent.group_)){
+						
+							f_cse_preamble_registerAe();
+						
+						}
+											
+					}															
+									
+					// Test Body
+					
+					if(match(int23, p_requestPrimitive.resourceType)){
+						vc_ae2.start(f_cse_preamble_createAcpAux("SubscriptionVerificationAcp", int63));
+						f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
+						vc_ae2.start(f_cse_createResource_withAcpAux(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, c_defaultAE2Name, v_poaList), -1)); // AE2 is registred
+						f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
+						v_ae2Index := f_getResource(vc_ae2);
+						p_requestPrimitive.primitiveContent.subscription.notificationURI := {f_getResourceAddress(v_ae2Index)}; 
+						vc_ae2.start(f_cse_notifyProcedure_subscriptionVerificationHandler());
+					}
+					
+					v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_parentIndex);
+					
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
+					tc_ac.start;
+					alt {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value vc_response {
+							tc_ac.stop;
+							setverdict(pass, __SCOPE__ & ": Resource type " & int2str(enum2int(p_resourceType)) & " created successfully");
+							f_checkAttributesToBeSaved(p_resourceType, v_request, vc_response.primitive.responsePrimitive);
+							v_resourceIndex := f_setResource(vc_response.primitive.responsePrimitive.primitiveContent, p_resourceType, v_parentIndex);
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Wrong response status code");
+							}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value vc_response {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Error while creating resource type " & int2str(enum2int(p_resourceType)));
+						}
+						[] tc_ac.timeout {
+							setverdict(fail, __SCOPE__ & ": No answer while creating resource type " & int2str(enum2int(p_resourceType)));
+						}
+					}	
+					
+					f_checkAeSimuStatus();
+								
+					//Check to see if the resource is present or not
+					if (f_isResourcePresent(v_resourceIndex)){
+						setverdict(pass, __SCOPE__ & ":INFO: Resource created");
+					} else {
+						setverdict(fail, __SCOPE__ & ":ERROR: Resource not created");
+					}
+								
+					// Postamble
+					f_cse_postamble_deleteResources();
+					
+					// Tear down
+					f_cf01Down();
+					
+					return vc_response.primitive.responsePrimitive;
+					    				
+				}//end f_CSE_DMR_CRE_001
+					
+					function f_CSE_DMR_CRE_001_cseSimu(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, ResourceType p_parentResourceType := int2, in template (omit) RequestPrimitive p_parentRequestPrimitive := omit) runs on CseSimu{
     				
 						// Local variables
 						var MsgIn v_response;
 						var RequestPrimitive v_request;
 						var integer v_parentIndex := -1;
 						var integer v_resourceIndex := -1;
-						var integer v_ae2Index := -1;
+						var integer v_ae1Index := -1;
 						var integer v_acpAuxIndex := -1;
-						var PoaList v_poaList := {"http://" & PX_AE2_ADDRESS & "/"};
-    										   
+						var PoaList v_poaList := {"http://" & PX_AE1_ADDRESS & "/"};
+										   
 						// Test control
-    				
+				
 						// Test component configuration
-						f_cf01Up(true);
-						
+						f_cf02UpCseSimuMaster();
+					
 						// Test adapter configuration
-    				
+				
 						// Preamble
-    					
-						if(ispresent(p_parentRequestPrimitive)) {
-							if(match(int23, p_parentRequestPrimitive.resourceType)){
-								vc_ae2.start(f_cse_preamble_createAcpAux("SubscriptionVerificationAcp", int63));
-								f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
-								
-								vc_ae2.start(f_cse_createResource_withAcpAux(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, c_defaultAE2Name, v_poaList), -1)); // AE2 is registred
-								f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
-								
-								v_ae2Index := f_getResource(vc_ae2);
-								p_parentRequestPrimitive.primitiveContent.subscription.notificationURI := {f_getResourceAddress(v_ae2Index)};
-								vc_ae2.start(f_cse_notifyProcedure_subscriptionVerificationHandler());
-							}
-							if(ischosen(p_parentRequestPrimitive.primitiveContent.group_)){
-							
-								f_cse_preamble_registerAe();
-							
-							}
-							v_parentIndex := f_cse_createResource(valueof(p_parentRequestPrimitive.resourceType), p_parentRequestPrimitive, v_parentIndex);
-							
-							
-							
-						} else {//Resource under CSEBase
+						vc_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSEBase);
 						
-							if(p_resourceType != int1) {
-													
-								v_acpAuxIndex := f_cse_createAccessControlPolicyAux(-, -, -);
-												
-								p_requestPrimitive := f_setAcpId(p_requestPrimitive, {vc_resourcesList[v_acpAuxIndex].resource.accessControlPolicy.resourceID});
-							}
-							
-							if(ischosen(p_requestPrimitive.primitiveContent.group_)){
-							
-								f_cse_preamble_registerAe();
-							
-							}
-												
-						}															
-    									
-						// Test Body
-    					
-						if(match(int23, p_requestPrimitive.resourceType)){
-							vc_ae2.start(f_cse_preamble_createAcpAux("SubscriptionVerificationAcp", int63));
-							f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
-							vc_ae2.start(f_cse_createResource_withAcpAux(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, c_defaultAE2Name, v_poaList), -1)); // AE2 is registred
-							f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
-							v_ae2Index := f_getResource(vc_ae2);
-							p_requestPrimitive.primitiveContent.subscription.notificationURI := {f_getResourceAddress(v_ae2Index)}; 
-							vc_ae2.start(f_cse_notifyProcedure_subscriptionVerificationHandler());
+						if(match(int23, p_resourceType)){
+							vc_ae1.start(f_cse_preamble_createAcpAux("SubscriptionVerificationAcp", int63));
+							f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
+							vc_ae1.start(f_cse_createResource_withAcpAux(int2, m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM, "MyAe", v_poaList), -1)); // AE1 is registered
+							f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
+							v_ae1Index := f_getResource(vc_ae1);
+							p_requestPrimitive.primitiveContent.subscription.notificationURI := {f_getResourceAddress(v_ae1Index)}; 
+							vc_ae1.start(f_cse_notifyProcedure_subscriptionVerificationHandler());
 						}
-    					
-						v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_parentIndex);
 						
-						mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
+						if (not ispresent(p_parentRequestPrimitive)){	//Create the resource directly under RemoteCSE
+							v_parentIndex := vc_remoteCseIndex;
+						}else{	//Create the resource under parentResource
+							v_parentIndex := f_cse_createResource_cseSimu(p_parentResourceType, p_parentRequestPrimitive, vc_remoteCseIndex); 	
+						}
+						
+						// Test Body
+					
+						v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_parentIndex);
+					
+						mccPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 						tc_ac.start;
 						alt {
-							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value vc_response {
+							[] mccPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value vc_response {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__ & ": Resource type " & int2str(enum2int(p_resourceType)) & " created successfully");
 								f_checkAttributesToBeSaved(p_resourceType, v_request, vc_response.primitive.responsePrimitive);
 								v_resourceIndex := f_setResource(vc_response.primitive.responsePrimitive.primitiveContent, p_resourceType, v_parentIndex);
 							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
+							[] mccPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__ & ": Wrong response status code");
 								}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value vc_response {
+							[] mccPort.receive(mw_response(mw_responsePrimitiveKO)) -> value vc_response {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__ & ": Error while creating resource type " & int2str(enum2int(p_resourceType)));
 							}
@@ -1899,101 +2067,23 @@ module OneM2M_PermutationFunctions {
 								setverdict(fail, __SCOPE__ & ": No answer while creating resource type " & int2str(enum2int(p_resourceType)));
 							}
 						}	
-    					
-						f_checkAeSimuStatus();
-    								
+					
+						f_checkCseSimuStatus();
+								
 						//Check to see if the resource is present or not
-						if (f_isResourcePresent(v_resourceIndex)){
+						if (f_cse_isResourcePresent(v_resourceIndex)){
 							setverdict(pass, __SCOPE__ & ":INFO: Resource created");
 						} else {
 							setverdict(fail, __SCOPE__ & ":ERROR: Resource not created");
 						}
-    								
+								
 						// Postamble
-						f_cse_postamble_deleteResources();
-						
-						// Tear down
-						f_cf01Down();
-						
-						return vc_response.primitive.responsePrimitive;
-    					    				
-					}//end f_CSE_DMR_CRE_001
+						f_cse_postamble_deleteResourcesCSE();
 					
-					function f_CSE_DMR_CRE_001_cseSimu(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on CseSimu return ResponsePrimitive {
-    				
-							// Local variables
-							var MsgIn v_response;
-							var RequestPrimitive v_request;
-							var integer v_parentIndex := -1;
-							var integer v_resourceIndex := -1;
-							var integer v_ae1Index := -1;
-							var integer v_acpAuxIndex := -1;
-							var PoaList v_poaList := {"http://" & PX_AE1_ADDRESS & "/"};
-    										   
-							// Test control
-    				
-							// Test component configuration
-							f_cf02UpCseSimuMaster();
-						
-							// Test adapter configuration
-    				
-							// Preamble
-							vc_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSEBase);
-							
-    						if(match(int23, p_resourceType)){
-    							vc_ae1.start(f_cse_preamble_createAcpAux("SubscriptionVerificationAcp", int63));
-								f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
-								vc_ae1.start(f_cse_createResource_withAcpAux(int2, m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM, "MyAe", v_poaList), -1)); // AE1 is registered
-								f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
-								v_ae1Index := f_getResource(vc_ae1);
-								p_requestPrimitive.primitiveContent.subscription.notificationURI := {f_getResourceAddress(v_ae1Index)}; 
-								vc_ae1.start(f_cse_notifyProcedure_subscriptionVerificationHandler());
-							}
-							
-							// Test Body
-    					
-							v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, vc_remoteCseIndex);
-						
-							mccPort.send(f_getMsgOutPrimitive(m_request(v_request)));
-							tc_ac.start;
-							alt {
-								[] mccPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value vc_response {
-									tc_ac.stop;
-									setverdict(pass, __SCOPE__ & ": Resource type " & int2str(enum2int(p_resourceType)) & " created successfully");
-									f_checkAttributesToBeSaved(p_resourceType, v_request, vc_response.primitive.responsePrimitive);
-									v_resourceIndex := f_setResource(vc_response.primitive.responsePrimitive.primitiveContent, p_resourceType, vc_remoteCseIndex);
-								}
-								[] mccPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
-									tc_ac.stop;
-									setverdict(fail, __SCOPE__ & ": Wrong response status code");
-									}
-								[] mccPort.receive(mw_response(mw_responsePrimitiveKO)) -> value vc_response {
-									tc_ac.stop;
-									setverdict(fail, __SCOPE__ & ": Error while creating resource type " & int2str(enum2int(p_resourceType)));
-								}
-								[] tc_ac.timeout {
-									setverdict(fail, __SCOPE__ & ": No answer while creating resource type " & int2str(enum2int(p_resourceType)));
-								}
-							}	
-    					
-							f_checkCseSimuStatus();
-    								
-							//Check to see if the resource is present or not
-							if (f_cse_isResourcePresent(v_resourceIndex)){
-								setverdict(pass, __SCOPE__ & ":INFO: Resource created");
-							} else {
-								setverdict(fail, __SCOPE__ & ":ERROR: Resource not created");
-							}
-    								
-							// Postamble
-							f_cse_postamble_deleteResourcesCSE();
-						
-							// Tear down
-							f_cf02DownCseSimuMaster();
-						
-							return vc_response.primitive.responsePrimitive;
-    					    				
-						}//end f_CSE_DMR_CRE_001_cseSimu
+						// Tear down
+						f_cf02DownCseSimuMaster();
+					    				
+					}//end f_CSE_DMR_CRE_001_cseSimu
     									
 					function f_CSE_DMR_CRE_002(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on AeSimu return ResponsePrimitive{//system CseSystem { MRO system keyword not supported on functions in Titan
 				
@@ -2332,7 +2422,7 @@ module OneM2M_PermutationFunctions {
 						// Test Body
 						v_request := f_getCreateRequestPrimitive(p_resourceTypeChild, p_requestPrimitiveChild2, v_parentIndex);	////Child2
 
-						mcaPort.send(m_request(v_request));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
@@ -2394,7 +2484,7 @@ module OneM2M_PermutationFunctions {
 	
 						v_request := f_getCreateRequestPrimitive(p_resourceTypeChild, p_requestPrimitiveChild2, v_parentIndex);	//Child2
 	
-						mcaPort.send(m_request(v_request));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
@@ -2543,7 +2633,7 @@ module OneM2M_PermutationFunctions {
 						// Test Body
 						v_request := f_getCreateRequestPrimitive(p_resourceTypeChild, p_requestPrimitiveChild, v_parentIndex);
 	
-						mcaPort.send(m_request(v_request));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int5207))) -> value v_response {
@@ -2780,47 +2870,111 @@ module OneM2M_PermutationFunctions {
 						// Preamble
 						v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
 						
-						f_cse_preamble_subscriptionVerification(v_ae2Index, p_requestPrimitive, p_resourceType);
-											
+						f_cse_preamble_subscriptionVerification(v_ae2Index, p_requestPrimitive, p_resourceType);
+											
+						// Test Body
+						v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_aeIndex);
+						v_request.resultContent := int3;//Attributes + Hierarchichal Address
+						
+						mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
+						tc_ac.start;
+						alt {
+							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001, p_contentResponse))) -> value v_response {
+								tc_ac.stop;
+								if(f_isHierarchical(v_response.primitive.responsePrimitive.primitiveContent.resource.uRI)) {
+									setverdict(pass, __SCOPE__ & ": Response returning correctly the hierarchical address of the created resource and resource representation");
+								} else {
+									setverdict(fail, __SCOPE__ & ": Response returning the address of the created resource with wrong format");							
+								}
+							}
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(p_contentResponse))) -> value v_response {
+								tc_ac.stop;
+								setverdict(fail, __SCOPE__ & ": Wrong response status code");
+							}
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+								tc_ac.stop;
+								setverdict(fail, __SCOPE__ & ": Wrong content provided with RC set to 3");
+							}
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
+								tc_ac.stop;
+								setverdict(fail, __SCOPE__ & ": Error while creating resource");
+							}
+							[] tc_ac.timeout {
+								setverdict(fail, __SCOPE__ & ": No answer while creating resource");
+							}
+						}	
+    								
+						// Postamble
+						f_cse_postamble_deleteResources();
+					
+						// Tear down
+						f_cf01Down();
+    				
+					}//end f_CSE_DMR_CRE_017
+					
+					function f_CSE_DMR_CRE_019(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on CseSimu{
+	    				
+						// Local variables
+						var MsgIn v_response;
+						var RequestPrimitive v_request;
+						var integer v_parentIndex := -1;
+						var integer v_resourceIndex := -1;
+						var integer v_aEAnncIndex := -1;
+						   
+						// Test control
+	
+						// Test component configuration
+						f_cf04Up();
+	
+						// Test adapter configuration
+	
+						// Preamble
+						vc_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSEBase);
+						
+						v_aEAnncIndex := f_cse_createResource_cseSimu(int10002, m_createAEAnnc(omit, omit, omit, PX_CSE1_ID), vc_remoteCseIndex); //AEAnnnc under RemoteCSE
+		
 						// Test Body
-						v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_aeIndex);
-						v_request.resultContent := int3;//Attributes + Hierarchichal Address
-						
-						mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
+	
+						v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_aEAnncIndex);
+	
+						mccPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 						tc_ac.start;
 						alt {
-							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001, p_contentResponse))) -> value v_response {
+							[] mccPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value vc_response {
 								tc_ac.stop;
-								if(f_isHierarchical(v_response.primitive.responsePrimitive.primitiveContent.resource.uRI)) {
-									setverdict(pass, __SCOPE__ & ": Response returning correctly the hierarchical address of the created resource and resource representation");
-								} else {
-									setverdict(fail, __SCOPE__ & ": Response returning the address of the created resource with wrong format");							
-								}
+								setverdict(pass, __SCOPE__ & ": Resource type " & int2str(enum2int(p_resourceType)) & " created successfully");
+								f_checkAttributesToBeSaved(p_resourceType, v_request, vc_response.primitive.responsePrimitive);
+								v_resourceIndex := f_setResource(vc_response.primitive.responsePrimitive.primitiveContent, p_resourceType, v_aEAnncIndex);
 							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(p_contentResponse))) -> value v_response {
+							[] mccPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__ & ": Wrong response status code");
-							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
-								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Wrong content provided with RC set to 3");
-							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
+								}
+							[] mccPort.receive(mw_response(mw_responsePrimitiveKO)) -> value vc_response {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Error while creating resource");
+								setverdict(fail, __SCOPE__ & ": Error while creating resource type " & int2str(enum2int(p_resourceType)));
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, __SCOPE__ & ": No answer while creating resource");
+								setverdict(fail, __SCOPE__ & ": No answer while creating resource type " & int2str(enum2int(p_resourceType)));
 							}
 						}	
-    								
+	
+						f_checkCseSimuStatus();
+				
+						//Check to see if the resource is present or not
+						if (f_cse_isResourcePresent(v_resourceIndex)){
+							setverdict(pass, __SCOPE__ & ":INFO: Resource created");
+						} else {
+							setverdict(fail, __SCOPE__ & ":ERROR: Resource not created");
+						}
+				
 						// Postamble
-						f_cse_postamble_deleteResources();
-					
+						f_cse_postamble_deleteResourcesCSE();
+	
 						// Tear down
-						f_cf01Down();
-    				
-					}//end f_CSE_DMR_CRE_017
+						f_cf04Down();
+	    				
+					}//end f_CSE_DMR_CRE_019
     				
 					function f_CSE_DMR_CRE_020(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template (present) RequestPrimitive p_requestAnnc) runs on AeSimu {
     				
@@ -2882,7 +3036,7 @@ module OneM2M_PermutationFunctions {
 						// Preamble
 						
 						if (PX_MN_CSE) {
-							vc_cse1.start(f_cse_registrationRemoteCse(m_createRemoteCSEBase));
+							vc_cse1.start(f_cse_registrationRemoteCse(mw_createRemoteCSEBase));
 						}else if (PX_IN_CSE) {
 							vc_cse1.start(f_cse_registerRemoteCse(m_createRemoteCSEBase));
 						}	
@@ -3184,8 +3338,8 @@ module OneM2M_PermutationFunctions {
 						v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex); 				
     									
 						// Test Body
-						mcaPort.send(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex) ,
-																						{"pi", "ct"}, f_getOriginator(v_resourceIndex))));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex) ,
+																						{"pi", "ct"}, f_getOriginator(v_resourceIndex)))));
 
 						tc_ac.start;
 						alt {
@@ -3241,13 +3395,14 @@ module OneM2M_PermutationFunctions {
 						v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex); 				
     									
 						// Test Body
-						mcaPort.send(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex),
-																						{"lbl"}, f_getOriginator(v_resourceIndex))));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex),
+																						{"lbl"}, f_getOriginator(v_resourceIndex)))));
 
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))) -> value v_response {
 								tc_ac.stop;
+								setverdict(pass, __SCOPE__ & ": Non-existing attribute not found");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 								tc_ac.stop;
@@ -3270,7 +3425,7 @@ module OneM2M_PermutationFunctions {
     				
 					}//end f_CSE_DMR_RET_007
     				
-					function f_CSE_DMR_RET_008(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on AeSimu {
+					function f_CSE_DMR_RET_008(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, AttributeList_1 p_attributeList) runs on AeSimu {
     				
 						// Local variables
 						var MsgIn v_response;
@@ -3293,13 +3448,14 @@ module OneM2M_PermutationFunctions {
 						v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex); 				
     									
 						// Test Body
-						mcaPort.send(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex),
-																						{"lbl", "at"}, f_getOriginator(v_resourceIndex))));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex),
+																						p_attributeList, f_getOriginator(v_resourceIndex)))));
 
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))) -> value v_response {
 								tc_ac.stop;
+								setverdict(pass, __SCOPE__ & ": Non-existing attribute not found");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 								tc_ac.stop;
@@ -3709,8 +3865,8 @@ module OneM2M_PermutationFunctions {
 							v_resourceIndex := f_getRemoteCseResource(vc_cse1);
 						}
 						
-						mcaPort.send(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex) ,
-																						{"pi", "ct"}, f_getOriginator(v_aeIndex))));//from AE ID
+						mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex) ,
+																						{"pi", "ct"}, f_getOriginator(v_aeIndex)))));//from AE ID
 
 						tc_ac.start;
 						alt {
@@ -3791,8 +3947,8 @@ module OneM2M_PermutationFunctions {
 							v_resourceIndex := f_getRemoteCseResource(vc_cse1);
 						}
 						
-						mcaPort.send(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex),
-																						{"lbl"}, f_getOriginator(v_aeIndex))));//from AE ID
+						mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex),
+																						{"lbl"}, f_getOriginator(v_aeIndex)))));//from AE ID
 
 						tc_ac.start;
 						alt {
@@ -3869,8 +4025,8 @@ module OneM2M_PermutationFunctions {
 							v_resourceIndex := f_getRemoteCseResource(vc_cse1);
 						}
 						
-						mcaPort.send(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex),
-																						{"lbl", "at"}, f_getOriginator(v_aeIndex))));//from AE ID
+						mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex),
+																						{"lbl", "at"}, f_getOriginator(v_aeIndex)))));//from AE ID
 
 						tc_ac.start;
 						alt {
@@ -4793,7 +4949,7 @@ module OneM2M_PermutationFunctions {
 						
 						f_cse_updateResource(p_resourceType, v_resourceIndex, p_updateRequestPrimitive);
 					
-						mcaPort.send(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)))));
 					
 						tc_ac.start;
 						alt {
@@ -4844,7 +5000,7 @@ module OneM2M_PermutationFunctions {
 						//Test Body
 						v_request := f_getUpdateRequestPrimitive(p_resourceTypeChild, v_childIndex, p_updateRequestPrimitive);
 
-						mcaPort.send(m_request(v_request));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) -> value v_response {
@@ -4986,18 +5142,18 @@ module OneM2M_PermutationFunctions {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value vc_response {
 								tc_ac.stop;
-								setverdict(pass, __SCOPE__, ": Attribute of resource type " & int2str(enum2int(p_resourceType)) & " updated successfully");
+								setverdict(pass, __SCOPE__ & ": Attribute of resource type " & int2str(enum2int(p_resourceType)) & " updated successfully");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__, ": Wrong response status code");
+								setverdict(fail, __SCOPE__ & ": Wrong response status code");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value vc_response {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__, ": Error while updating optional attribute");
+								setverdict(fail, __SCOPE__ & ": Error while updating optional attribute");
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, __SCOPE__, ": No answer while updating resource type " & int2str(enum2int(p_resourceType)));
+								setverdict(fail, __SCOPE__ & ": No answer while updating resource type " & int2str(enum2int(p_resourceType)));
 							}
 						}
 					  
@@ -5006,113 +5162,247 @@ module OneM2M_PermutationFunctions {
 						//Postamble
 						f_cse_postamble_deleteResources();
 
-						// Tear down
-						if (p_resourceType!=int16){	//ResourceType != RemoteCSE
-							f_cf01Down();
-						} else {
-							f_cf02Down();
-						}
-					  
-					} // end function f_CSE_DMR_UPD_015
-			  		
-					function f_CSE_DMR_UPD_016(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive) runs on AeSimu {
-						 //Local variables
-						 var MsgIn v_response;
-						 var RequestPrimitive v_request;
-						 var ResponsePrimitive v_responsePrimitive;
-						 var integer v_aeIndex := -1;
-						 var integer v_resourceIndex := -1;
-						 var integer v_ae2Index := -1;
-						 var integer v_acpAuxIndex := -1;
-							   
-						 // Test control
+						// Tear down
+						if (p_resourceType!=int16){	//ResourceType != RemoteCSE
+							f_cf01Down();
+						} else {
+							f_cf02Down();
+						}
+					  
+					} // end function f_CSE_DMR_UPD_015
+			  		
+					function f_CSE_DMR_UPD_016(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive) runs on AeSimu {
+						 //Local variables
+						 var MsgIn v_response;
+						 var RequestPrimitive v_request;
+						 var ResponsePrimitive v_responsePrimitive;
+						 var integer v_aeIndex := -1;
+						 var integer v_resourceIndex := -1;
+						 var integer v_ae2Index := -1;
+						 var integer v_acpAuxIndex := -1;
+							   
+						 // Test control
+
+						 // Test component configuration
+						if (p_resourceType!=int16){	//ResourceType != RemoteCSE
+							f_cf01Up(true);
+						} else {
+							f_cf02Up();
+						}
+
+						 // Test adapter configuration
+
+						 // Preamble
+						if(p_resourceType != int2) {
+						 	v_aeIndex := f_cse_preamble_registerAe(-, {f_getAnnouncementTargetPoA("HTTP", PX_AE1_ADDRESS, "")});//c_CRUDNDi);
+						}
+						
+						if(p_resourceType != int1) {
+							
+							v_acpAuxIndex := f_cse_createAccessControlPolicyAux(-, -, -);
+						
+							p_createRequestPrimitive := f_setAcpId(p_createRequestPrimitive, {vc_resourcesList[v_acpAuxIndex].resource.accessControlPolicy.resourceID});
+						}
+												 
+						if (p_resourceType!=int16){	//ResourceType != RemoteCSE
+							
+							f_cse_preamble_subscriptionVerification(v_ae2Index, p_createRequestPrimitive, p_resourceType);
+
+						 	v_resourceIndex := f_cse_createResource(p_resourceType, p_createRequestPrimitive);//under the CSEBase resource
+							if(vc_ae2.running) {
+						 		vc_ae2.stop;
+						 	}
+						} else {	//ResourceType = RemoteCSE
+							vc_cse1.start(f_cse_registerRemoteCse(p_createRequestPrimitive));
+							vc_cse1.done;
+							
+							v_resourceIndex := f_getRemoteCseResource(vc_cse1);	
+						}
+											 
+						//Test Body
+						v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive);
+						
+						if((p_resourceType == int23) and (ispresent(v_request.primitiveContent.subscription.notificationURI))) {	//Subscription
+							v_request.primitiveContent.subscription.notificationURI := {f_getResourceAddress(v_aeIndex)};							
+						}
+						
+						mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
+						
+						tc_ac.start;
+						alt {
+							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value vc_response {
+								tc_ac.stop;
+								setverdict(pass, __SCOPE__ & ": Attribute of resource type " & int2str(enum2int(p_resourceType)) & " updated successfully");
+							}
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
+								tc_ac.stop;
+								setverdict(fail, __SCOPE__ & ": Wrong response status code");
+							}
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value vc_response {
+								tc_ac.stop;
+								setverdict(fail, __SCOPE__ & ": Error while updating mandatory attribute");
+							}
+							[] mcaPortIn.receive(mw_request(mw_notifyNotification(mw_contentNotificationVerification))) -> value vc_request {
+								tc_ac.stop;
+								setverdict(pass, __SCOPE__ & ":INFO: Notification for Subscription verification received");
+								v_responsePrimitive := valueof(m_responseNotification(int2000, omit));
+								v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
+								mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+								tc_ac.start;
+								repeat;
+							}
+							[] tc_ac.timeout {
+								setverdict(fail, __SCOPE__ & ": No answer while updating resource type " & int2str(enum2int(p_resourceType)));
+							}
+						}
+						
+						vc_primitiveContentRetrievedResource := f_cse_retrieveResource(v_resourceIndex);
+						
+						//Postamble
+						f_cse_postamble_deleteResources();
+						
+						// Tear down
+						if (p_resourceType!=int16){	//ResourceType != RemoteCSE
+							f_cf01Down();
+						} else {
+							f_cf02Down();
+						}
+						
+					} //end function f_CSE_DMR_UPD_016
+					
+				function f_CSE_DMR_UPD_017(ResourceType p_resourceType, template RequestPrimitive p_requestCreatePrimitive, template RequestPrimitive p_createRequestAnnc, template RequestPrimitive p_requestUpdatePrimitive) runs on CseSimu {
+					// Local variables
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+					var MsgIn v_request;
+					var RequestPrimitive v_requestUpdatePrimitive;
+					var integer v_parentIndex := -1;
+					var integer v_aeIndex := -1;
+					var integer v_resourceIndex;
+					var integer v_aEAnncIndex := -1;
+					var integer v_latestResourceIndex;
+					var ResponsePrimitive v_responsePrimitive;
+					var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
+					v_create.primitiveContent.aE.announceTo := {PX_CSE1_ID};
+		   
+					//Test control
+		
+					// Test component configuration
+					f_cf02UpCseSimuMaster();
+		
+					// Test adapter configuration
+					// Register the CSE
+					f_cse_registerRemoteCse(m_createRemoteCSEBase);	
+		
+					//Preamble
+		
+					v_ae1.start(f_cse_createResource(int2,v_create));					
+					f_cse_announcementProcedure_createHandler(mw_createAEAnnc(-, -, -));		
+					v_ae1.done;
+		
+					v_ae1.start(f_cse_createResource(p_resourceType, p_requestCreatePrimitive, vc_aeAuxIndex));
+					v_ae1.done;					
+			
+					v_latestResourceIndex := f_getLatestResourceIndex(v_ae1);
+		
+					// Test Body
+					v_ae1.start(f_cse_updateResource(p_resourceType, v_latestResourceIndex, p_requestUpdatePrimitive));
+		
+					tc_ac.start;
+					alt {
+						[] mccPortIn.receive(mw_request(p_createRequestAnnc)) -> value v_request {
+							tc_ac.stop;
+							setverdict(pass, __SCOPE__ & ":INFO: CREATE REQUEST received");
+					
+							if(match(v_request.primitive.requestPrimitive.to_, f_getLocalResourceAddress(lengthof(vc_localResourcesList)-1, e_hierarchical, e_spRelative)) or 
+							match(v_request.primitive.requestPrimitive.to_, f_getLocalResourceAddress(lengthof(vc_localResourcesList)-1, e_nonHierarchical, e_spRelative))) {
+								setverdict(pass, __SCOPE__ & ":matching ANNC_PARENT_RESOURCE_ADDRESS");     
+							} else {
+								setverdict(fail, __SCOPE__ & ":mis-matching ANNC_PARENT_RESOURCE_ADDRESS");
+							}
+								
+						}
+						[] tc_ac.timeout {
+							setverdict(fail, __SCOPE__ & ":ERROR:  No CREATE REQUEST received");
+						}
+					}
+					v_ae1.done;
+		
+					// Postamble
+					f_cse_postamble_deleteResourcesCSE();
+		
+					// Tear down
+					f_cf02DownCseSimuMaster();
+	
+				}//end f_CSE_DMR_UPD_017
+					
+				function f_CSE_DMR_UPD_018(ResourceType p_resourceType, template RequestPrimitive p_requestCreatePrimitive, template RequestPrimitive p_createRequestAnnc, template RequestPrimitive p_requestUpdatePrimitive, template RequestPrimitive p_updateRequestAnnc) runs on CseSimu {
+					// Local variables
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+					var MsgIn v_request;
+					var RequestPrimitive v_requestUpdatePrimitive;
+					var integer v_parentIndex := -1;
+					var integer v_aeIndex := -1;
+					var integer v_resourceIndex;
+					var integer v_aEAnncIndex := -1;
+					var integer v_latestResourceIndex;
+					var ResponsePrimitive v_responsePrimitive;
+					var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
+
+					v_create.primitiveContent.aE.announceTo := {PX_CSE1_ID};
+   
+					//Test control
+
+					// Test component configuration
+					f_cf02UpCseSimuMaster();
+
+					// Test adapter configuration
+					// Register the CSE
+					f_cse_registerRemoteCse(m_createRemoteCSEBase);	
+
+					//Preamble
+
+					v_ae1.start(f_cse_createResource(int2,v_create));					
+					f_cse_announcementProcedure_createHandler(mw_createAEAnnc(-, -, -));		
+					v_ae1.done;
+
+					v_ae1.start(f_cse_createResource(p_resourceType, p_requestCreatePrimitive, vc_aeAuxIndex));
+					f_cse_announcementProcedure_createHandler(p_createRequestAnnc);	
+					v_ae1.done;					
+
+					v_latestResourceIndex := f_getLatestResourceIndex(v_ae1);
+					p_updateRequestAnnc.to_ := f_getLocalResourceAddress(lengthof(vc_localResourcesList)-1);
 
-						 // Test component configuration
-						if (p_resourceType!=int16){	//ResourceType != RemoteCSE
-							f_cf01Up(true);
-						} else {
-							f_cf02Up();
-						}
+					// Test Body
+					v_ae1.start(f_cse_updateResource(p_resourceType, v_latestResourceIndex, p_requestUpdatePrimitive));
 
-						 // Test adapter configuration
+					tc_ac.start;
+					alt {
+						[] mccPortIn.receive(mw_request(p_updateRequestAnnc)) -> value v_request {
+							tc_ac.stop;
+							setverdict(pass, __SCOPE__ & ":INFO: Announcement received");
 
-						 // Preamble
-						if(p_resourceType != int2) {
-						 	v_aeIndex := f_cse_preamble_registerAe(-, {f_getAnnouncementTargetPoA("HTTP", PX_AE1_ADDRESS, "")});//c_CRUDNDi);
+							v_responsePrimitive := valueof(m_responsePrimitive(int2004,v_request.primitive.requestPrimitive.requestIdentifier));
+							v_responsePrimitive.from_ := PX_CSE1_ID;
+							v_responsePrimitive.to_ := v_request.primitive.requestPrimitive.from_;
+							mccPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));			
 						}
-						
-						if(p_resourceType != int1) {
-							
-							v_acpAuxIndex := f_cse_createAccessControlPolicyAux(-, -, -);
-						
-							p_createRequestPrimitive := f_setAcpId(p_createRequestPrimitive, {vc_resourcesList[v_acpAuxIndex].resource.accessControlPolicy.resourceID});
+						[] tc_ac.timeout {
+							setverdict(fail, __SCOPE__ & ":ERROR:  No announcement received");
 						}
-												 
-						if (p_resourceType!=int16){	//ResourceType != RemoteCSE
-							
-							f_cse_preamble_subscriptionVerification(v_ae2Index, p_createRequestPrimitive, p_resourceType);
+					}
+					v_ae1.done;
 
-						 	v_resourceIndex := f_cse_createResource(p_resourceType, p_createRequestPrimitive);//under the CSEBase resource
-							if(vc_ae2.running) {
-						 		vc_ae2.stop;
-						 	}
-						} else {	//ResourceType = RemoteCSE
-							vc_cse1.start(f_cse_registerRemoteCse(p_createRequestPrimitive));
-							vc_cse1.done;
-							
-							v_resourceIndex := f_getRemoteCseResource(vc_cse1);	
-						}
-											 
-						//Test Body
-						v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive);
-						
-						if((p_resourceType == int23) and (ispresent(v_request.primitiveContent.subscription.notificationURI))) {	//Subscription
-							v_request.primitiveContent.subscription.notificationURI := {f_getResourceAddress(v_aeIndex)};							
-						}
-						
-						mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
-						
-						tc_ac.start;
-						alt {
-							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value vc_response {
-								tc_ac.stop;
-								setverdict(pass, __SCOPE__, ": Attribute of resource type " & int2str(enum2int(p_resourceType)) & " updated successfully");
-							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
-								tc_ac.stop;
-								setverdict(fail, __SCOPE__, ": Wrong response status code");
-							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value vc_response {
-								tc_ac.stop;
-								setverdict(fail, __SCOPE__, ": Error while updating mandatory attribute");
-							}
-							[] mcaPortIn.receive(mw_request(mw_notifyNotification(mw_contentNotificationVerification))) -> value vc_request {
-								tc_ac.stop;
-								setverdict(pass, __SCOPE__ & ":INFO: Notification for Subscription verification received");
-								v_responsePrimitive := valueof(m_responseNotification(int2000, omit));
-								v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
-								mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
-								tc_ac.start;
-								repeat;
-							}
-							[] tc_ac.timeout {
-								setverdict(fail, __SCOPE__, ": No answer while updating resource type " & int2str(enum2int(p_resourceType)));
-							}
-						}
-						
-						vc_primitiveContentRetrievedResource := f_cse_retrieveResource(v_resourceIndex);
-						
-						//Postamble
-						f_cse_postamble_deleteResources();
-						
-						// Tear down
-						if (p_resourceType!=int16){	//ResourceType != RemoteCSE
-							f_cf01Down();
-						} else {
-							f_cf02Down();
-						}
-						
-					} //end function f_CSE_DMR_UPD_016
+					// Postamble
+					f_cse_postamble_deleteResourcesCSE();
+
+					// Tear down
+					f_cf02DownCseSimuMaster();
+
+				}//end f_CSE_DMR_UPD_018
 			  	
 			}//end group Update
 			
@@ -5366,7 +5656,7 @@ module OneM2M_PermutationFunctions {
 						v_childResourceIndex := f_cse_createResource(p_resourceTypeChild, p_requestPrimitiveChild, v_resourceIndex); 
 				
 						// Test Body
-						mcaPort.send(m_request(m_delete(f_getResourceAddress(v_childResourceIndex), f_getOriginator(v_childResourceIndex))));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(m_delete(f_getResourceAddress(v_childResourceIndex), f_getOriginator(v_childResourceIndex)))));
 					
 						tc_ac.start;
 						alt {
@@ -5546,12 +5836,12 @@ module OneM2M_PermutationFunctions {
 								setverdict(pass, __SCOPE__ & ": creation successfull by using fanOutPoint in group resource");
 	                
 								if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list)){
-									setverdict(fail, __SCOPE__, ": Error, aggregatedResponse attribute not provided");
+									setverdict(fail, __SCOPE__ & ": Error, aggregatedResponse attribute not provided");
 								}
 								else {
 									for(i:=0; i<lengthof(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list); i := i+1){
 										if(not match(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list[i], mw_responsePrimitiveOK)){
-											setverdict(fail, __SCOPE__, ": Error, one responsePrimitve of aggregatedResponse_list is not successful");
+											setverdict(fail, __SCOPE__ & ": Error, one responsePrimitve of aggregatedResponse_list is not successful");
 										}
 									}
 								}                       
@@ -5690,12 +5980,12 @@ module OneM2M_PermutationFunctions {
 								setverdict(pass, __SCOPE__ & ": creation successfull by using fanOutPoint in group resource");
 	    
 								if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list)){
-									setverdict(fail, __SCOPE__, ": Error, aggregatedResponse attribute not provided");
+									setverdict(fail, __SCOPE__ & ": Error, aggregatedResponse attribute not provided");
 								}
 								else {
 									for(i:=0; i<lengthof(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list); i := i+1){
 										if(not match(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list[i], mw_responsePrimitiveOK)){
-											setverdict(fail, __SCOPE__, ": Error, one responsePrimitve of aggregatedResponse_list is not successful");
+											setverdict(fail, __SCOPE__ & ": Error, one responsePrimitve of aggregatedResponse_list is not successful");
 										}
 									}
 								}                       
@@ -5830,16 +6120,16 @@ module OneM2M_PermutationFunctions {
 								setverdict(pass, __SCOPE__ & ": creation successfull by using fanOutPoint in group resource");
 	                            
 								if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list)){
-									setverdict(fail, __SCOPE__, ": Error, aggregatedResponse attribute not provided");
+									setverdict(fail, __SCOPE__ & ": Error, aggregatedResponse attribute not provided");
 								}
 								else{
 									if(lengthof(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list) != c_numberOfResponsePrimitive){
-										setverdict(fail, __SCOPE__, ": Error, length of aggregatedResponse is not valid");
+										setverdict(fail, __SCOPE__ & ": Error, length of aggregatedResponse is not valid");
 									}
 									else{
 										for(i:=0; i<c_numberOfResponsePrimitive; i:=i+1){
 											if(not match(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list[i].primitiveContent, p_contentResponse)){
-												setverdict(fail, __SCOPE__, ": Error, aggregatedResponse doesn't match with template expected");
+												setverdict(fail, __SCOPE__ & ": Error, aggregatedResponse doesn't match with template expected");
 											}
 										}
 									}
@@ -5917,16 +6207,16 @@ module OneM2M_PermutationFunctions {
 								setverdict(pass, __SCOPE__ & ": creation successfull by using fanOutPoint in group resource");
 	                
 								if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list)){
-									setverdict(fail, __SCOPE__, ": Error, aggregatedResponse attribute not provided");
+									setverdict(fail, __SCOPE__ & ": Error, aggregatedResponse attribute not provided");
 								}
 								else{
 									if(lengthof(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list) != c_numberOfResponsePrimitive){
-										setverdict(fail, __SCOPE__, ": Error, length of aggregatedResponse is not valid");
+										setverdict(fail, __SCOPE__ & ": Error, length of aggregatedResponse is not valid");
 									}
 									else{
 										for(i:=0; i<c_numberOfResponsePrimitive; i:=i+1){
 											if(not match(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list[i].primitiveContent, v_contentResponse)){
-												setverdict(fail, __SCOPE__, ": Error, aggregatedResponse doesn't match with template expected");
+												setverdict(fail, __SCOPE__ & ": Error, aggregatedResponse doesn't match with template expected");
 											}
 										}
 									}
@@ -6050,7 +6340,7 @@ module OneM2M_PermutationFunctions {
 					v_request := f_getCreateRequestPrimitive(int23, v_createSubscriptionRequest, v_childResourceIndex);//Subscription under child
 	
 					// Test Body
-					mcaPort.send(m_request(v_request));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int5203))) -> value v_response {
@@ -6900,26 +7190,30 @@ module OneM2M_PermutationFunctions {
 					// Test adapter configuration
 			
 					//Register the CSE
-					vc_cse1.start(f_cse_registerRemoteCse(m_createRemoteCSEBase));
+					vc_cse1.start(f_cse_registerRemoteCse(m_createRemoteCSE_poa(-, -, -, -, {f_getAnnouncementTargetPoA()})));
 					vc_cse1.done;
 					
+					f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
+					
 					//Preamble
 					vc_cse1.start(f_cse_announcementProcedure_createHandler(mw_createAEAnnc(-, -, -)));
 					v_aeIndex := f_cse_createResource(int2,v_create);
 					vc_cse1.done;
 					
+					f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
+					
 					// Test Body
 					if (ispresent (p_requestUpdatePrimitive)) {
 						v_resourceIndex := f_cse_createResource(p_resourceType,p_requestCreatePrimitive);
  				      	v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_requestUpdatePrimitive);
 					  	v_responsePrimitive.responseStatusCode := int2004;
 					} else {
-					  	v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestCreatePrimitive, v_parentIndex);
+					  	v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestCreatePrimitive, v_aeIndex);
 					  	v_responsePrimitive.responseStatusCode := int2001;
 					}
 					
 					//Retrieve the parent resource index
-					v_AEAnncResourceIndex := f_getLatestResourceIndex(vc_cse1);
+					v_AEAnncResourceIndex := f_getLatestLocalResourceIndex(vc_cse1);
 					vc_cse1.start(f_cse_announcementProcedure_createHandler(p_createRequestAnnc, -, v_AEAnncResourceIndex));	
 					mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 
@@ -6927,16 +7221,18 @@ module OneM2M_PermutationFunctions {
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(v_responsePrimitive.responseStatusCode))) -> value v_response {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__, ": Operation for resource " & int2str(enum2int(p_resourceType)) & " performed successfully");	
+							setverdict(pass, __SCOPE__ & ": Operation for resource " & int2str(enum2int(p_resourceType)) & " performed successfully");	
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__, ": Wrong response status code");
+							setverdict(fail, __SCOPE__ & ": Wrong response status code");
 						}
 						[] tc_ac.timeout {
-							setverdict(fail, __SCOPE__, ": No answer while updating resource type " & int2str(enum2int(p_resourceType)));
+							setverdict(fail, __SCOPE__ & ": No answer while updating resource type " & int2str(enum2int(p_resourceType)));
 						}
 					}
+					
+					f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
 										
 					// Postamble
 					f_cse_postamble_deleteResources();
@@ -6957,21 +7253,23 @@ module OneM2M_PermutationFunctions {
 				  var integer v_resourceIndex;
 				  var ResponsePrimitive v_responsePrimitive;
 				  var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
-				  v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
+				  v_create.primitiveContent.aE.announceTo := {PX_CSE1_ID};
 				  //Test control
 
 				  //Test component configuration
 				  f_cf02Up();
 
 				  //Register the CSE
-				  vc_cse1.start(f_cse_registerRemoteCse(m_createRemoteCSEBase));	
-				  vc_cse1.done;
+				  vc_cse1.start(f_cse_registerRemoteCse(m_createRemoteCSE_poa(-, -, -, -, {f_getAnnouncementTargetPoA()})));
+				  
+				  f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
 
 				  //Preamble
 				  vc_cse1.start(f_cse_announcementProcedure_createHandler(mw_createAEAnnc(-, -, -)));
 				  v_aeIndex := f_cse_createResource(int2,v_create);
-				  vc_cse1.done;
-
+				  
+				  f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
+				  
 				  vc_cse1.start(f_cse_announcementProcedure_createHandler(p_createRequestAnnc));	
 				  f_cse_createResource(p_resourceType, p_requestCreatePrimitive, v_aeIndex);
 				  vc_cse1.done;
@@ -6983,36 +7281,89 @@ module OneM2M_PermutationFunctions {
 				  f_cf02Down();
 				} //end f_CSE_ANNC_CRE_001
 				
-				function f_CSE_ANNC_CRE_002(ResourceType p_resourceType, template RequestPrimitive p_createRequestAnnc, in template RequestPrimitive p_requestUpdatePrimitive := omit) runs on CseSimu {
+				function f_CSE_ANNC_CRE_002(ResourceType p_resourceType, template RequestPrimitive p_createRequest, in template RequestPrimitive p_updateRequest := omit, in template RequestPrimitive p_createRequestAnnc) runs on CseSimu {
 					// Local variables
-					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 					var MsgIn v_response;
-					var RequestPrimitive v_request;
-					var integer v_parentIndex := -1;
+					var MsgIn v_request;
+					var PrimitiveContent v_announcedResource;
 					var integer v_aeIndex := -1;
 					var integer v_resourceIndex;
+					var integer v_localResourceIndex := -1;
 					var integer v_remoteCSEAnncIndex := -1;
 					var ResponsePrimitive v_responsePrimitive;
-					var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
-					//TODO var template RequestPrimitive v_remoteCSEAnnc := mw_createAccessControlPolicyAnnc;
-   
+					
 					// Test control
 
 					// Test component configuration
 					f_cf02UpCseSimuMaster();
 
 					// Test adapter configuration
-	
+
+					//Register the CSE
+				  	f_cse_registrationRemoteCse(mw_createRemoteCSEBase);
+				  
 					//Preamble
-					v_ae1.start(f_cse_createResource(int2,v_create));
-					v_ae1.done;
+					vc_ae1.start(f_cse_preamble_registerAe());
+					f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
+					
+					v_aeIndex := f_getLatestResourceIndex(vc_ae1);
+					
+					vc_ae1.start(f_cse_createResource(p_resourceType, p_createRequest, v_aeIndex));
+					f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
+					
+					v_resourceIndex := f_getLatestResourceIndex(vc_ae1);
 	
 					// Test Body
-					v_ae1.start(f_cse_sendUpdateRequestPrimitive(p_resourceType, p_requestUpdatePrimitive));
-					v_ae1.done;
+					vc_ae1.start(f_cse_sendUpdateRequestPrimitive(p_resourceType, p_updateRequest, v_resourceIndex));
+					vc_ae1.done;
+					
+					tc_ac.start;
+					alt {
+						[] mccPortIn.receive(mw_request(mw_updateRemoteCSE(PX_CSE_ID))) -> value v_request {
+							tc_ac.stop;
+							setverdict(pass, __SCOPE__ & ":INFO: RemoteCSE UPDATE received");
+							
+							v_localResourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
+							if(v_localResourceIndex == -1)
+							{ 
+								log(__SCOPE__&": ERROR: Resource Index not valid, target not found");
+								v_responsePrimitive := valueof(m_responsePrimitive(int4004,v_request.primitive.requestPrimitive.requestIdentifier));
+							} else {
+								v_responsePrimitive := valueof(m_responsePrimitive(int2004,v_request.primitive.requestPrimitive.requestIdentifier));
+								f_updateLocalResource(v_localResourceIndex, v_request.primitive.requestPrimitive.primitiveContent);
+								v_responsePrimitive.primitiveContent := vc_localResourcesList[v_localResourceIndex].resource;
+							}
+							v_responsePrimitive.from_ := PX_CSE1_ID;
+							v_responsePrimitive.to_ := v_request.primitive.requestPrimitive.from_;
+							mccPortIn.send(f_getMsgOutPrimitive(m_response(valueof(v_responsePrimitive))));
+						}
+						[] tc_ac.timeout {
+							setverdict(fail, __SCOPE__ & ":ERROR:  No announcement received");
+						}
+					}
+					
+					f_checkCseSimuStatus();
+					
+					tc_ac.start;
+					alt {
+						[] mccPortIn.receive(mw_request(p_createRequestAnnc)) -> value v_request {
+							tc_ac.stop;
+							setverdict(pass, __SCOPE__ & ":INFO: Resource Announced CREATE received");
+		
+							//Simulate that resourceAnnc is created on CSE2
+							v_announcedResource:= f_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, -1,v_request.primitive.requestPrimitive.resourceType);
+							//Set parentID correctly to remoteCSEAnnc-ID
+							v_announcedResource := f_setParentID(v_announcedResource, f_resourceIdCleaner(vc_localResourcesList[v_localResourceIndex].resource.remoteCSE.announceTo[0]));
+					
+							v_responsePrimitive := valueof(m_responsePrimitive(int2001,v_request.primitive.requestPrimitive.requestIdentifier));
+							v_responsePrimitive.primitiveContent := v_announcedResource;
+							mccPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+						}
+						[] tc_ac.timeout {
+							setverdict(fail, __SCOPE__ & ":ERROR:  No announcement received");
+						}
+					}
 					
-					f_cse_announcementProcedure_createHandler(p_createRequestAnnc);
-						
 					// Postamble
 					f_cse_postamble_deleteResourcesCSE();
 
@@ -7029,9 +7380,9 @@ module OneM2M_PermutationFunctions {
 					var integer v_parentIndex := -1;
 					var integer v_aeIndex := -1;
 					var integer v_resourceIndex;
-					var integer v_CntAnncResourceIndex;
-					var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
-					v_create.primitiveContent.container.announceTo := {PX_CSE1_ID};
+					var integer v_containerAnncResourceIndex;
+					var template RequestPrimitive v_createContainer := m_createContainerBase;
+					v_createContainer.primitiveContent.container.announceTo := {PX_CSE1_ID};
 					
    
 					// Test control
@@ -7042,20 +7393,22 @@ module OneM2M_PermutationFunctions {
 					// Test adapter configuration
 
 					//Register the CSE
-					vc_cse1.start(f_cse_registerRemoteCse(m_createRemoteCSEBase));	
-					vc_cse1.done;
+					vc_cse1.start(f_cse_registerRemoteCse(m_createRemoteCSE_poa(-, -, -, -, {f_getAnnouncementTargetPoA()})));
+				  
+				  	f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
 	
 					//Preamble
+					v_aeIndex := f_cse_preamble_registerAe();
 					vc_cse1.start(f_cse_announcementProcedure_createHandler(mw_createContainerAnncBase(-, -)));
-					v_aeIndex := f_cse_createResource(int2,v_create);
-					vc_cse1.done;
+					v_resourceIndex := f_cse_createResource(int3,v_createContainer, v_aeIndex);
+					f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
 	
 					// Test Body
-					//Retrieve the parent resource index
-					v_CntAnncResourceIndex := f_getLatestResourceIndex(vc_cse1);
-					v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestCreatePrimitive, v_parentIndex);
-					vc_cse1.start(f_cse_announcementProcedure_createHandler(p_createRequestAnnc,int4000, v_CntAnncResourceIndex));	
-					mcaPort.send(m_request(v_request));
+					//Retrieve the parent resource index where contentInstanceAnnc must be created
+					v_containerAnncResourceIndex := f_getLatestLocalResourceIndex(vc_cse1);
+					v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestCreatePrimitive, v_resourceIndex);
+					vc_cse1.start(f_cse_announcementProcedure_createHandler(p_createRequestAnnc,int4000, v_containerAnncResourceIndex));	
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 
 					tc_ac.start;
 					alt {
@@ -7063,7 +7416,9 @@ module OneM2M_PermutationFunctions {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__, ": Resource " & int2str(enum2int(p_resourceType)) & " created successfully");
 							if(ispresent(v_response.primitive.responsePrimitive.primitiveContent.contentInstance.announceTo)) {
-								setverdict(fail, __SCOPE__, ": Resource " & int2str(enum2int(p_resourceType)) & " contains the attribute announceTo");
+								if(lengthof(v_response.primitive.responsePrimitive.primitiveContent.contentInstance.announceTo) != 0) {
+									setverdict(fail, __SCOPE__, ": Resource " & int2str(enum2int(p_resourceType)) & " contains the attribute announceTo");
+								}
 							}
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
@@ -7087,53 +7442,37 @@ module OneM2M_PermutationFunctions {
 				
 				function f_CSE_ANNC_CRE_004_CseSimu(ResourceType p_resourceType, template RequestPrimitive p_createRequestAnnc, in template RequestPrimitive p_requestCreatePrimitive := omit) runs on CseSimu {
 					// Local variables
-					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 					var MsgIn v_request;
-					var integer v_parentIndex := -1;
 					var integer v_aeIndex := -1;
 					var integer v_resourceIndex;
 					var integer v_aEAnncIndex := -1;
 					var ResponsePrimitive v_responsePrimitive;
 					var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
-					v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
+					
+					v_create.primitiveContent.aE.announceTo := {PX_CSE1_ID};
    
 					// Test control
 
 					// Test component configuration
 					f_cf02UpCseSimuMaster();
-
+					
 					// Test adapter configuration
 					// Register the CSE
-					f_cse_registerRemoteCse(m_createRemoteCSEBase);	
+					f_cse_registerRemoteCse(m_createRemoteCSE_poa(-, -, -, -, {f_getAnnouncementTargetPoA()}));
 					
 					//Preamble
-					v_ae1.start(f_cse_createResource(int2,v_create));
-					f_cse_announcementProcedure_createHandler(mw_createAEAnnc(-, -, -));
-					v_ae1.done;
+					vc_ae1.start(f_cse_createResource(int2,v_create));
+					v_aEAnncIndex := f_cse_announcementProcedure_createHandler(mw_createAEAnnc(-, -, -));
+					f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
+					
+					v_aeIndex := f_getLatestResourceIndex(vc_ae1);
 					
 					// Test Body
-					v_ae1.start(f_cse_sendCreateRequestPrimitive(p_resourceType,p_requestCreatePrimitive, v_parentIndex));
+					vc_ae1.start(f_cse_createResource(p_resourceType,p_requestCreatePrimitive, v_aeIndex));
 					
-					tc_ac.start;
-					alt {
-						[] mccPortIn.receive(mw_request(p_createRequestAnnc)) -> value v_request {
-							tc_ac.stop;
-							setverdict(pass, __SCOPE__ & ":INFO: CREATE REQUEST received");
-							
-							if(match(v_request.primitive.requestPrimitive.to_, f_getLocalResourceAddress(v_aEAnncIndex, e_hierarchical, e_spRelative)) or 
-							match(v_request.primitive.requestPrimitive.to_, f_getLocalResourceAddress(v_aEAnncIndex, e_nonHierarchical, e_spRelative))) {
-								setverdict(pass, __SCOPE__ & ":matching ANNC_PARENT_RESOURCE_ADDRESS");     
-							} else {
-								setverdict(fail, __SCOPE__ & ":mis-matching ANNC_PARENT_RESOURCE_ADDRESS");
-							}
-										
-						}
-						[] tc_ac.timeout {
-							setverdict(fail, __SCOPE__ & ":ERROR:  No CREATE REQUEST received");
-						}
-					}
+					f_cse_announcementProcedure_createHandler(p_createRequestAnnc, -, v_aEAnncIndex);					
 					
-					v_ae1.done;
+					vc_ae1.done;
 
 					// Postamble
 					f_cse_postamble_deleteResourcesCSE();
@@ -7145,16 +7484,16 @@ module OneM2M_PermutationFunctions {
 				
 				function f_CSE_ANNC_CRE_005_CseSimu(ResourceType p_resourceType, template RequestPrimitive p_createRequestAnnc, in template RequestPrimitive p_requestCreatePrimitive := omit) runs on CseSimu {
 					// Local variables
-					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 					var MsgIn v_request;
 					var integer v_parentIndex := -1;
 					var integer v_aeIndex := -1;
-					var integer v_resourceIndex;
+					var integer v_resourceAnncIndex := -1;
 					var integer v_aEAnncIndex := -1;
 					var ResponsePrimitive v_responsePrimitive;
+					var PrimitiveContent v_announcedResource;
 					var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
-					v_create.primitiveContent.container.announceTo := {PX_CSE1_ID};
-   
+					var template RequestPrimitive v_createContainer := m_createContainerBase;
+					
 					// Test control
 
 					// Test component configuration
@@ -7162,36 +7501,71 @@ module OneM2M_PermutationFunctions {
 
 					// Test adapter configuration
 					// Register the CSE
-					f_cse_registerRemoteCse(m_createRemoteCSEBase);	
-	
+					vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSEBase);
+				  
+					f_checkCseSimuStatus();
+					
 					//Preamble
-					v_ae1.start(f_cse_createResource(int2,v_create));
-					f_cse_announcementProcedure_createHandler(mw_createRemoteCSEAnnc(-, -, -));
-					v_ae1.done;
-	
+					vc_ae1.start(f_cse_createResource(int2,v_create));
+					f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
+					
+					v_aeIndex := f_getLatestResourceIndex(vc_ae1);
+					
+					v_createContainer.primitiveContent.container.announceTo := {"/CSE2_ID"};
+					v_createContainer.primitiveContent.container.resourceName := "TriggerAnnounceIUT";
+					vc_ae1.start(f_cse_createResource(int3,v_createContainer, v_aeIndex));
+					
+					//IUT shall announce itself by updating announceTo attribute of its remoteCSE on its registrar (CSE1)
+					f_cse_updateResourceHandler(vc_localRemoteCseIndex, mw_updateRemoteCSE);				
+					
+					tc_ac.start;
+					alt {
+						[] mccPortIn.receive(mw_request(mw_createContainerAnncBase(PX_CSE_ID, vc_localResourcesList[vc_localRemoteCseIndex].resource.remoteCSE.announceTo[0] ))) -> value v_request {
+							tc_ac.stop;
+							setverdict(pass, __SCOPE__ & ":INFO: Resource Announced CREATE received");
+							
+							//Simulate that resourceAnnc is created on CSE2
+							v_announcedResource:= f_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, -1,v_request.primitive.requestPrimitive.resourceType);
+							//Set parentID correctly to remoteCSEAnnc-ID
+							v_announcedResource := f_setParentID(v_announcedResource, f_resourceIdCleaner(vc_localResourcesList[vc_localRemoteCseIndex].resource.remoteCSE.announceTo[0]));
+										
+							v_responsePrimitive := valueof(m_responsePrimitive(int2001,v_request.primitive.requestPrimitive.requestIdentifier));
+							v_responsePrimitive.primitiveContent := v_announcedResource;
+							mccPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+						}
+						[] tc_ac.timeout {
+							setverdict(fail, __SCOPE__ & ":ERROR:  No announcement received");
+						}
+					}
+					
+					f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
+					
 					// Test Body
-					v_ae1.start(f_cse_sendCreateRequestPrimitive(p_resourceType,p_requestCreatePrimitive, v_parentIndex));
-	
+					vc_ae1.start(f_cse_createResource(p_resourceType,p_requestCreatePrimitive, v_aeIndex));
+					
+					//IUT shall then create the announced resource on its remoteCSEAnnc as indicated in the announceTo attribute returned by its registrar (CSE1)
+					p_createRequestAnnc.to_ := vc_localResourcesList[vc_localRemoteCseIndex].resource.remoteCSE.announceTo[0];
 					tc_ac.start;
 					alt {
 						[] mccPortIn.receive(mw_request(p_createRequestAnnc)) -> value v_request {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__ & ":INFO: CREATE REQUEST received");
-			
-							if(match(v_request.primitive.requestPrimitive.to_, f_getLocalResourceAddress(v_aEAnncIndex, e_hierarchical, e_spRelative)) or 
-							match(v_request.primitive.requestPrimitive.to_, f_getLocalResourceAddress(v_aEAnncIndex, e_nonHierarchical, e_spRelative))) {
-								setverdict(pass, __SCOPE__ & ":matching ANNC_PARENT_RESOURCE_ADDRESS");     
-							} else {
-								setverdict(fail, __SCOPE__ & ":mis-matching ANNC_PARENT_RESOURCE_ADDRESS");
-							}
-						
+							setverdict(pass, __SCOPE__ & ":INFO: Resource Announced CREATE received");
+				
+							//Simulate that resourceAnnc is created on CSE2
+							v_announcedResource:= f_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, -1,v_request.primitive.requestPrimitive.resourceType);
+							//Set parentID correctly to remoteCSEAnnc-ID
+							v_announcedResource := f_setParentID(v_announcedResource, f_resourceIdCleaner(vc_localResourcesList[vc_localRemoteCseIndex].resource.remoteCSE.announceTo[0]));
+							
+							v_responsePrimitive := valueof(m_responsePrimitive(int2001,v_request.primitive.requestPrimitive.requestIdentifier));
+							v_responsePrimitive.primitiveContent := v_announcedResource;
+							mccPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 						}
 						[] tc_ac.timeout {
-							setverdict(fail, __SCOPE__ & ":ERROR:  No CREATE REQUEST received");
+							setverdict(fail, __SCOPE__ & ":ERROR:  No announcement received");
 						}
 					}
 					
-					v_ae1.done;
+					vc_ae1.done;
 
 					// Postamble
 					f_cse_postamble_deleteResourcesCSE();
@@ -7203,7 +7577,6 @@ module OneM2M_PermutationFunctions {
 				
 				function f_CSE_ANNC_CRE_006_CseSimu(ResourceType p_resourceType, template RequestPrimitive p_createRequestAnnc, in template RequestPrimitive p_requestCreatePrimitive := omit) runs on CseSimu {
 					// Local variables
-					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 					var MsgIn v_request;
 					var integer v_parentIndex := -1;
 					var integer v_aeIndex := -1;
@@ -7211,44 +7584,28 @@ module OneM2M_PermutationFunctions {
 					var integer v_aEAnncIndex := -1;
 					var ResponsePrimitive v_responsePrimitive;
 					var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
-					v_create.primitiveContent.container.announceTo := {PX_CSE1_ID};
-   
+					
 					// Test control
 
 					// Test component configuration
 					f_cf02UpCseSimuMaster();
 
 					// Test adapter configuration
-					// Register the CSE
-					f_cse_registerRemoteCse(m_createRemoteCSEBase);	
-
+					// Register the CSE
+					vc_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSE_poa(-, -, -, -, {f_getAnnouncementTargetPoA()}));
+					
 					//Preamble
-					v_ae1.start(f_cse_createResource(int2,v_create));
-					v_ae1.done;
+					vc_ae1.start(f_cse_createResource(int2,v_create));
+					f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
+					
+					v_aeIndex := f_getLatestResourceIndex(vc_ae1);
 
 					// Test Body
-					v_ae1.start(f_cse_sendCreateRequestPrimitive(p_resourceType,p_requestCreatePrimitive, v_parentIndex));
-
-					tc_ac.start;
-					alt {
-						[] mccPortIn.receive(mw_request(p_createRequestAnnc)) -> value v_request {
-							tc_ac.stop;
-							setverdict(pass, __SCOPE__ & ":INFO: CREATE REQUEST received");
+					vc_ae1.start(f_cse_createResource(p_resourceType,p_requestCreatePrimitive, v_aeIndex));
 
-							if(match(v_request.primitive.requestPrimitive.to_, f_getLocalResourceAddress(v_aEAnncIndex, e_hierarchical, e_spRelative)) or 
-							match(v_request.primitive.requestPrimitive.to_, f_getLocalResourceAddress(v_aEAnncIndex, e_nonHierarchical, e_spRelative))) {
-								setverdict(pass, __SCOPE__ & ":matching ANNC_PARENT_RESOURCE_ADDRESS");     
-							} else {
-								setverdict(fail, __SCOPE__ & ":mis-matching ANNC_PARENT_RESOURCE_ADDRESS");
-							}
-		
-						}
-						[] tc_ac.timeout {
-							setverdict(fail, __SCOPE__ & ":ERROR:  No CREATE REQUEST received");
-						}
-					}
-					
-					v_ae1.done;
+					f_cse_announcementProcedure_createHandler(p_createRequestAnnc, -, vc_localRemoteCseIndex);
+										
+					vc_ae1.done;
 
 					// Postamble
 					f_cse_postamble_deleteResourcesCSE();
@@ -7260,62 +7617,91 @@ module OneM2M_PermutationFunctions {
 				
 				function f_CSE_ANNC_CRE_007_CseSimu(ResourceType p_resourceType, template RequestPrimitive p_createRequestAnnc, in template RequestPrimitive p_requestCreatePrimitive := omit) runs on CseSimu {
 					// Local variables
-					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 					var MsgIn v_request;
 					var integer v_parentIndex := -1;
 					var integer v_aeIndex := -1;
 					var integer v_resourceIndex;
 					var integer v_aEAnncIndex := -1;
 					var ResponsePrimitive v_responsePrimitive;
+					var PrimitiveContent v_announcedResource;
 					var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
-					v_create.primitiveContent.container.announceTo := {PX_CSE1_ID};
-   
+					var template RequestPrimitive v_createContainer := m_createContainerBase;
+					
 					// Test control
-
 					// Test component configuration
-					f_cf02UpCseSimuMaster();	
-					
-					v_ae1.start(f_cse_createResource(int2,v_create));
-					v_ae1.done;
+					f_cf02UpCseSimuMaster();
 
-					// Test Body
-					v_ae1.start(f_cse_sendCreateRequestPrimitive(p_resourceType,p_requestCreatePrimitive, v_parentIndex));
+					// Test adapter configuration
+					// Register the CSE
+					vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSEBase);
+				  
+					f_checkCseSimuStatus();
+					
+					//Preamble
+					vc_ae1.start(f_cse_createResource(int2,v_create));
+					f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
+					
+					v_aeIndex := f_getLatestResourceIndex(vc_ae1);
+					
+					v_createContainer.primitiveContent.container.announceTo := {"/CSE2_ID"};
+					v_createContainer.primitiveContent.container.resourceName := "TriggerAnnounceIUT";
+					vc_ae1.start(f_cse_createResource(int3,v_createContainer, v_aeIndex));
+					
+					//IUT shall announce itself by updating announceTo attribute of its remoteCSE on its registrar (CSE1)
+					f_cse_updateResourceHandler(vc_localRemoteCseIndex, mw_updateRemoteCSE);				
 					
 					tc_ac.start;
 					alt {
-						[] mccPortIn.receive(mw_request(mw_createRemoteCSEAnnc(-, -, -))) -> value v_request {
+						[] mccPortIn.receive(mw_request(mw_createContainerAnncBase(PX_CSE_ID, vc_localResourcesList[vc_localRemoteCseIndex].resource.remoteCSE.announceTo[0] ))) -> value v_request {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__ & ":INFO: CREATE REQUEST for remoteCSEAnnc received");
+							setverdict(pass, __SCOPE__ & ":INFO: Resource Announced CREATE received");
+							
+							//Simulate that resourceAnnc is created on CSE2
+							v_announcedResource:= f_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, -1,v_request.primitive.requestPrimitive.resourceType);
+							//Set parentID correctly to remoteCSEAnnc-ID
+							v_announcedResource := f_setParentID(v_announcedResource, f_resourceIdCleaner(vc_localResourcesList[vc_localRemoteCseIndex].resource.remoteCSE.announceTo[0]));
+										
+							v_responsePrimitive := valueof(m_responsePrimitive(int2001,v_request.primitive.requestPrimitive.requestIdentifier));
+							v_responsePrimitive.primitiveContent := v_announcedResource;
+							mccPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 						}
 						[] tc_ac.timeout {
-							setverdict(fail, __SCOPE__ & ":ERROR:  No CREATE REQUEST received");
+							setverdict(fail, __SCOPE__ & ":ERROR:  No announcement received");
 						}
 					}
-
+					
+					f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
+					
+					// Test Body
+					vc_ae1.start(f_cse_createResource(p_resourceType,p_requestCreatePrimitive, v_aeIndex));
+					
+					//IUT shall then create the announced resource on its remoteCSEAnnc as indicated in the announceTo attribute returned by its registrar (CSE1)
+					p_createRequestAnnc.to_ := vc_localResourcesList[vc_localRemoteCseIndex].resource.remoteCSE.announceTo[0];
 					tc_ac.start;
 					alt {
 						[] mccPortIn.receive(mw_request(p_createRequestAnnc)) -> value v_request {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__ & ":INFO: CREATE REQUEST received");
-
-							if(match(v_request.primitive.requestPrimitive.to_, f_getLocalResourceAddress(v_aEAnncIndex, e_hierarchical, e_spRelative)) or 
-							match(v_request.primitive.requestPrimitive.to_, f_getLocalResourceAddress(v_aEAnncIndex, e_nonHierarchical, e_spRelative))) {
-								setverdict(pass, __SCOPE__ & ":matching ANNC_PARENT_RESOURCE_ADDRESS");     
-							} else {
-								setverdict(fail, __SCOPE__ & ":mis-matching ANNC_PARENT_RESOURCE_ADDRESS");
-							}
-
+							setverdict(pass, __SCOPE__ & ":INFO: Resource Announced CREATE received");
+				
+							//Simulate that resourceAnnc is created on CSE2
+							v_announcedResource:= f_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, -1,v_request.primitive.requestPrimitive.resourceType);
+							//Set parentID correctly to remoteCSEAnnc-ID
+							v_announcedResource := f_setParentID(v_announcedResource, f_resourceIdCleaner(vc_localResourcesList[vc_localRemoteCseIndex].resource.remoteCSE.announceTo[0]));
+							
+							v_responsePrimitive := valueof(m_responsePrimitive(int2001,v_request.primitive.requestPrimitive.requestIdentifier));
+							v_responsePrimitive.primitiveContent := v_announcedResource;
+							mccPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 						}
 						[] tc_ac.timeout {
-							setverdict(fail, __SCOPE__ & ":ERROR:  No CREATE REQUEST received");
+							setverdict(fail, __SCOPE__ & ":ERROR:  No announcement received");
 						}
 					}
 					
-					v_ae1.done;
+					vc_ae1.done;
 
 					// Postamble
 					f_cse_postamble_deleteResourcesCSE();
-
+										
 					// Tear down
 					f_cf02DownCseSimuMaster();
 
@@ -7323,15 +7709,12 @@ module OneM2M_PermutationFunctions {
 				
 				function f_CSE_ANNC_CRE_008_CseSimu(ResourceType p_resourceType, template RequestPrimitive p_createRequestAnnc, in template RequestPrimitive p_requestCreatePrimitive := omit) runs on CseSimu {
 					// Local variables
-					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 					var MsgIn v_request;
-					var integer v_parentIndex := -1;
 					var integer v_aeIndex := -1;
-					var integer v_resourceIndex;
 					var integer v_aEAnncIndex := -1;
 					var ResponsePrimitive v_responsePrimitive;
 					var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
-					v_create.primitiveContent.container.announceTo := {PX_CSE1_ID};
+					v_create.primitiveContent.aE.announceTo := {PX_CSE1_ID};
    
 					// Test control
 
@@ -7340,35 +7723,21 @@ module OneM2M_PermutationFunctions {
 					
 					//Test adapter configuration
 					// Register the CSE
- 					f_cse_registerRemoteCse(mw_createRemoteCSE);		
-	
-					v_ae1.start(f_cse_createResource(int2,v_create));
-					f_cse_announcementProcedure_createHandler(mw_createAEAnnc(-, -, -));
-					v_ae1.done;
+					vc_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSE_poa(-, -, -, -, {f_getAnnouncementTargetPoA()}));
+					
+					f_checkCseSimuStatus();
+					
+					vc_ae1.start(f_cse_createResource(int2,v_create));
+					v_aEAnncIndex := f_cse_announcementProcedure_createHandler(mw_createAEAnnc(-, -, -));
+					f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
+					
+					v_aeIndex := f_getLatestResourceIndex(vc_ae1);
 
 					// Test Body
-					v_ae1.start(f_cse_sendCreateRequestPrimitive(p_resourceType,p_requestCreatePrimitive, v_parentIndex));
-	
-					tc_ac.start;
-					alt {
-						[] mccPortIn.receive(mw_request(p_createRequestAnnc)) -> value v_request {
-							tc_ac.stop;
-							setverdict(pass, __SCOPE__ & ":INFO: CREATE REQUEST received");
-
-							if(match(v_request.primitive.requestPrimitive.to_, f_getLocalResourceAddress(v_aEAnncIndex, e_hierarchical, e_spRelative)) or 
-							match(v_request.primitive.requestPrimitive.to_, f_getLocalResourceAddress(v_aEAnncIndex, e_nonHierarchical, e_spRelative))) {
-								setverdict(pass, __SCOPE__ & ":matching ANNC_PARENT_RESOURCE_ADDRESS");     
-							} else {
-								setverdict(fail, __SCOPE__ & ":mis-matching ANNC_PARENT_RESOURCE_ADDRESS");
-							}
-
-						}
-						[] tc_ac.timeout {
-							setverdict(fail, __SCOPE__ & ":ERROR:  No CREATE REQUEST received");
-						}
-					}
-
-					v_ae1.done;
+					vc_ae1.start(f_cse_createResource(p_resourceType,p_requestCreatePrimitive, v_aeIndex));
+					f_cse_announcementProcedure_createHandler(p_createRequestAnnc, -, v_aEAnncIndex);
+					vc_ae1.done;
+					
 					// Postamble
 					f_cse_postamble_deleteResourcesCSE();
 
@@ -7379,7 +7748,6 @@ module OneM2M_PermutationFunctions {
 				
 				function f_CSE_ANNC_CRE_009_CseSimu(ResourceType p_resourceType, template RequestPrimitive p_createRequestAnnc, in template RequestPrimitive p_requestCreatePrimitive := omit) runs on CseSimu {
 					// Local variables
-					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 					var MsgIn v_request;
 					var integer v_parentIndex := -1;
 					var integer v_aeIndex := -1;
@@ -7387,7 +7755,7 @@ module OneM2M_PermutationFunctions {
 					var integer v_aEAnncIndex := -1;
 					var ResponsePrimitive v_responsePrimitive;
 					var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
-					v_create.primitiveContent.container.announceTo := {PX_CSE1_ID};
+					v_create.primitiveContent.aE.announceTo := {PX_CSE1_ID};
    
 					// Test control
 
@@ -7396,35 +7764,19 @@ module OneM2M_PermutationFunctions {
 	
 					//Test adapter configuration
 					// Register the CSE
-					f_cse_registerRemoteCse(mw_createRemoteCSE);		
-
-					v_ae1.start(f_cse_createResource(int2,v_create));
-					f_cse_announcementProcedure_createHandler(mw_createAEAnnc(-, -, -));
-					v_ae1.done;
+					vc_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSE_poa(-, -, -, -, {f_getAnnouncementTargetPoA()}));
+					
+					f_checkCseSimuStatus();
+					vc_ae1.start(f_cse_createResource(int2,v_create));
+					v_aEAnncIndex := f_cse_announcementProcedure_createHandler(mw_createAEAnnc(-, -, -));
+					f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
+					
+					v_aeIndex := f_getLatestResourceIndex(vc_ae1);
 
 					// Test Body
-					v_ae1.start(f_cse_sendCreateRequestPrimitive(p_resourceType,p_requestCreatePrimitive, v_parentIndex));
-
-					tc_ac.start;
-					alt {
-						[] mccPortIn.receive(mw_request(p_createRequestAnnc)) -> value v_request {
-							tc_ac.stop;
-							setverdict(pass, __SCOPE__ & ":INFO: CREATE REQUEST received");
-
-							if(match(v_request.primitive.requestPrimitive.to_, f_getLocalResourceAddress(v_aEAnncIndex, e_hierarchical, e_spRelative)) or 
-							match(v_request.primitive.requestPrimitive.to_, f_getLocalResourceAddress(v_aEAnncIndex, e_nonHierarchical, e_spRelative))) {
-								setverdict(pass, __SCOPE__ & ":matching ANNC_PARENT_RESOURCE_ADDRESS");     
-							} else {
-								setverdict(fail, __SCOPE__ & ":mis-matching ANNC_PARENT_RESOURCE_ADDRESS");
-							}
-
-						}
-						[] tc_ac.timeout {
-							setverdict(fail, __SCOPE__ & ":ERROR:  No CREATE REQUEST received");
-						}
-					}
-					
-					v_ae1.done;
+					vc_ae1.start(f_cse_createResource(p_resourceType,p_requestCreatePrimitive, v_aeIndex));
+					f_cse_announcementProcedure_createHandler(p_createRequestAnnc, -, v_aEAnncIndex);
+					vc_ae1.done;
 
 					// Postamble
 					f_cse_postamble_deleteResourcesCSE();
@@ -7477,7 +7829,7 @@ module OneM2M_PermutationFunctions {
 					v_resourceAnncIndex := f_cse_createResource(p_resourceType,p_createRequestAnnc);
 
 					// Test Body
-					mcaPort.send(m_request(m_retrieve(f_getResourceAddress(), f_getOriginator(v_resourceAnncIndex))));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(), f_getOriginator(v_resourceAnncIndex)))));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) -> value v_response {
@@ -7563,6 +7915,8 @@ module OneM2M_PermutationFunctions {
 					var integer v_latestResourceIndex;
 					var ResponsePrimitive v_responsePrimitive;
 					var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
 		
 					v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
 	   
@@ -7629,6 +7983,8 @@ module OneM2M_PermutationFunctions {
 					var integer v_latestResourceIndex;
 					var ResponsePrimitive v_responsePrimitive;
 					var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
 		
 					v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
 	   
@@ -7709,7 +8065,7 @@ module OneM2M_PermutationFunctions {
 	
 					vc_cse1.start(f_cse_announcementProcedure_deleteHandler());	
 					v_updateRequest := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_requestUpdatePrimitive);
-					mcaPort.send(m_request(v_updateRequest, p_nullFields));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_updateRequest, p_nullFields)));
 	
 					tc_ac.start;
 					alt {
@@ -7755,6 +8111,8 @@ module OneM2M_PermutationFunctions {
 					var integer v_latestResourceIndex;
 					var ResponsePrimitive v_responsePrimitive;
 					var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
 
 					v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
    
@@ -7797,6 +8155,8 @@ module OneM2M_PermutationFunctions {
 					var integer v_latestResourceIndex;
 					var ResponsePrimitive v_responsePrimitive;
 					var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
 		
 					v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
 	   
@@ -7834,7 +8194,7 @@ module OneM2M_PermutationFunctions {
 							v_responsePrimitive := valueof(m_responsePrimitive(int2004,vc_request.primitive.requestPrimitive.requestIdentifier));
 							v_responsePrimitive.from_ := PX_CSE1_ID;
 							v_responsePrimitive.to_ := vc_request.primitive.requestPrimitive.from_;
-							mccPortIn.send(m_response(v_responsePrimitive));			
+							mccPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));			
 						}
 						[] tc_ac.timeout {
 							setverdict(fail, __SCOPE__ & ":ERROR:  No announcement received");
@@ -7862,6 +8222,8 @@ module OneM2M_PermutationFunctions {
 					var integer v_latestResourceIndex;
 					var ResponsePrimitive v_responsePrimitive;
 					var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
 
 					v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
    
@@ -7921,6 +8283,8 @@ module OneM2M_PermutationFunctions {
 					var integer v_latestResourceIndex;
 					var ResponsePrimitive v_responsePrimitive;
 					var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
 
 					v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
    
@@ -7997,7 +8361,7 @@ module OneM2M_PermutationFunctions {
 
 					vc_cse1.start(f_cse_announcementProcedure_updateHandler());
 					v_updateRequest := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_requestUpdatePrimitive);
-					mcaPort.send(m_request(v_updateRequest));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_updateRequest)));
 
 					tc_ac.start;
 					alt {
@@ -8043,6 +8407,8 @@ module OneM2M_PermutationFunctions {
 					var integer v_latestResourceIndex;
 					var ResponsePrimitive v_responsePrimitive;
 					var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
 
 					v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
    
@@ -8080,7 +8446,7 @@ module OneM2M_PermutationFunctions {
 							v_responsePrimitive := valueof(m_responsePrimitive(int2004,v_request.primitive.requestPrimitive.requestIdentifier));
 							v_responsePrimitive.from_ := PX_CSE1_ID;
 							v_responsePrimitive.to_ := v_request.primitive.requestPrimitive.from_;
-							mccPortIn.send(m_response(v_responsePrimitive));			
+							mccPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));			
 						}
 						[] tc_ac.timeout {
 							setverdict(fail, __SCOPE__ & ":ERROR:  No announcement received");
@@ -8108,6 +8474,8 @@ module OneM2M_PermutationFunctions {
 					var integer v_latestResourceIndex;
 					var ResponsePrimitive v_responsePrimitive;
 					var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
 
 					v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
    
@@ -8145,7 +8513,7 @@ module OneM2M_PermutationFunctions {
 							v_responsePrimitive := valueof(m_responsePrimitive(int2004,v_request.primitive.requestPrimitive.requestIdentifier));
 							v_responsePrimitive.from_ := PX_CSE1_ID;
 							v_responsePrimitive.to_ := v_request.primitive.requestPrimitive.from_;
-							mccPortIn.send(m_response(v_responsePrimitive));			
+							mccPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));			
 						}
 						[] tc_ac.timeout {
 							setverdict(fail, __SCOPE__ & ":ERROR:  No announcement received");
@@ -8173,6 +8541,8 @@ module OneM2M_PermutationFunctions {
 					var integer v_latestResourceIndex;
 					var ResponsePrimitive v_responsePrimitive;
 					var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
 
 					v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
    
@@ -8210,7 +8580,7 @@ module OneM2M_PermutationFunctions {
 							v_responsePrimitive := valueof(m_responsePrimitive(int2004,v_request.primitive.requestPrimitive.requestIdentifier));
 							v_responsePrimitive.from_ := PX_CSE1_ID;
 							v_responsePrimitive.to_ := v_request.primitive.requestPrimitive.from_;
-							mccPortIn.send(m_response(v_responsePrimitive));			
+							mccPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));			
 						}
 						[] tc_ac.timeout {
 							setverdict(fail, __SCOPE__ & ":ERROR:  No announcement received");
@@ -8237,6 +8607,8 @@ module OneM2M_PermutationFunctions {
 					var integer v_latestResourceIndex;
 					var ResponsePrimitive v_responsePrimitive;
 					var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
 
 					v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
    
@@ -8274,7 +8646,7 @@ module OneM2M_PermutationFunctions {
 							v_responsePrimitive := valueof(m_responsePrimitive(int2004,vc_request.primitive.requestPrimitive.requestIdentifier));
 							v_responsePrimitive.from_ := PX_CSE1_ID;
 							v_responsePrimitive.to_ := vc_request.primitive.requestPrimitive.from_;
-							mccPortIn.send(m_response(v_responsePrimitive));			
+							mccPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));			
 						}
 						[] tc_ac.timeout {
 							setverdict(fail, __SCOPE__ & ":ERROR:  No announcement received");
@@ -8319,7 +8691,7 @@ module OneM2M_PermutationFunctions {
 
 					vc_cse1.start(f_cse_announcementProcedure_updateHandler());
 					v_updateRequest := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_requestUpdatePrimitive);
-					mcaPort.send(m_request(v_updateRequest, p_nullFields));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_updateRequest, p_nullFields)));
 
 					tc_ac.start;
 					alt {
@@ -8383,7 +8755,7 @@ module OneM2M_PermutationFunctions {
 					v_AEAnncResourceIndex := f_getLatestResourceIndex(vc_cse1);
 					vc_cse1.start(f_cse_announcementProcedure_createHandler(p_createRequestAnnc,int4000, v_AEAnncResourceIndex));
 					v_updateRequest := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_requestUpdatePrimitive);
-					mcaPort.send(m_request(v_updateRequest));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_updateRequest)));
 
 					tc_ac.start;
 					alt {
@@ -8449,7 +8821,7 @@ module OneM2M_PermutationFunctions {
 				  	
 					vc_cse1.start(f_cse_announcementProcedure_deleteHandler());	
 					v_request := valueof(m_delete(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
-					mcaPort.send(m_request(v_request));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 					
 					tc_ac.start;
 					alt {
@@ -8496,6 +8868,8 @@ module OneM2M_PermutationFunctions {
 					var integer v_aEAnncIndex := -1;
 					var ResponsePrimitive v_responsePrimitive;
 					var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
 					
 					v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
    
@@ -8551,6 +8925,66 @@ module OneM2M_PermutationFunctions {
 		
 		}// end group Announcement
 		
+		group PollingChannel {
+			
+			function f_CSE_PCH_005(template RequestPrimitive p_requestPrimitive) runs on AeSimu {
+		
+				//Local variables
+				var integer v_aeIndex1 := -1;
+				var integer v_aeIndex2 := -1;
+				var integer v_resourceIndex := -1;
+				var integer v_acpAuxIndex := -1;
+				var RequestPrimitive v_request;
+				var MsgIn v_response;
+				var RequestPrimitive v_requestNotify;
+
+				// Test control
+
+				// Test component configuration
+				f_cf01Up(true);
+
+				// Test adapter configuration
+
+				// Preamble
+				v_acpAuxIndex := f_cse_preamble_createAcpAux(-, int63);//c_CUDNDi)
+    
+				v_aeIndex1 := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);//c_CRDNDi);
+	
+				vc_ae2.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, {f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, PX_AE2_ID_STEM, c_defaultAE2Name, -), -1)); // AE2 is registred
+				f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
+					
+				v_aeIndex2 := f_getResource(vc_ae2);
+					
+				v_resourceIndex := f_cse_createResource(int15, m_createPollingChannelBase, v_aeIndex1);
+				
+				p_requestPrimitive.to_ := f_getResourceAddress(v_resourceIndex);
+				p_requestPrimitive.from_ := f_getOriginator(v_aeIndex2);	
+				
+				mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
+				tc_ac.start;
+				alt {
+					[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) {
+						tc_ac.stop;
+						setverdict(pass, __SCOPE__&":INFO: Originator has no privilege");
+					}
+					[] mcaPort.receive(mw_response(mw_responsePrimitive(?))) {
+						tc_ac.stop;
+						setverdict(fail, __SCOPE__&":INFO: Wrong response status code when originator has no privilege");
+					}
+					[] tc_ac.timeout {
+						setverdict(fail, __SCOPE__&":INFO: No answer while creating polling resource type");
+					}
+				}	
+
+				//Postamble
+				f_cse_postamble_deleteResources();
+		
+				// Tear down
+				f_cf01Down();
+		  	 }
+		  	 
+		  } //end group PollingChannel
+		
 		group Non_Blocking_Requests{
 
 			group Synchronous{
@@ -8586,11 +9020,11 @@ module OneM2M_PermutationFunctions {
 						p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
 					}
 					p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);					
-					p_requestPrimitive.responseType.responseTypeValue := int1;		//nonBlockingRequestSynch
+					p_requestPrimitive.responseType := {int1, omit};		//nonBlockingRequestSynch
 					
 					// Test Body
 
-					mcaPort.send(m_request(valueof(p_requestPrimitive)));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int5206))) -> value v_response {
@@ -8654,11 +9088,11 @@ module OneM2M_PermutationFunctions {
 						p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
 					}
 					p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);					
-					p_requestPrimitive.responseType.responseTypeValue := int1;		//nonBlockingRequestSynch
+					p_requestPrimitive.responseType := {int1,omit};		//nonBlockingRequestSynch
 	
 					// Test Body
 
-					mcaPort.send(m_request(valueof(p_requestPrimitive)));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int1001, v_contentResponse))) -> value v_response {
@@ -8686,7 +9120,7 @@ module OneM2M_PermutationFunctions {
 
 					//Check to see if the resource is present or not
 					if (ischosen(v_response.primitive.responsePrimitive.primitiveContent.uRI)){
-						mcaPort.send(m_request(m_retrieve(v_response.primitive.responsePrimitive.primitiveContent.uRI, f_getOriginator(v_aeIndex))));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(v_response.primitive.responsePrimitive.primitiveContent.uRI, f_getOriginator(v_aeIndex)))));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) {
@@ -8754,11 +9188,11 @@ module OneM2M_PermutationFunctions {
 						p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
 					}
 					p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);					
-					p_requestPrimitive.responseType.responseTypeValue := int1;		//nonBlockingRequestSynch
+					p_requestPrimitive.responseType := {int1, omit};		//nonBlockingRequestSynch
 
 					// Test Body
 
-					mcaPort.send(m_request(valueof(p_requestPrimitive)));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int1001, v_contentResponseUri))) -> value v_response {
@@ -8799,9 +9233,10 @@ module OneM2M_PermutationFunctions {
 							v_primitiveContent := f_getTemplateFromPrimitiveContent(p_requestPrimitive.primitiveContent);
 						}else if (p_operation == int4){	//delete
 							v_statusCode := int2002;
-							v_primitiveContent := omit;
+							v_primitiveContent.container := mw_contentContainer_rc1;
+							//v_primitiveContent := omit;
 						}
-						mcaPort.send(m_request(m_retrieve(v_requestResourceURI, f_getOriginator(v_aeIndex))));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(v_requestResourceURI, f_getOriginator(v_aeIndex)))));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, v_contentResponseRequestResource))) -> value v_response{
@@ -8809,17 +9244,30 @@ module OneM2M_PermutationFunctions {
 								v_requestStatus := v_response.primitive.responsePrimitive.primitiveContent.request.requestStatus;
 								if (v_requestStatus==int1){			//COMPLETED
 									tc_ac.stop;
-									if (match(v_response, mw_response(mw_responsePrimitive(v_statusCode,v_primitiveContent)))){
-										setverdict(pass, testcasename() & ": RequestStatus: COMPLETED and operationResult attribute correctly received");
+									if (valueof(p_requestPrimitive.requestIdentifier) ==  valueof(v_response.primitive.responsePrimitive.primitiveContent.request.operationResult.requestIdentifier) ){
+										setverdict(pass, testcasename() & ": RequestStatus: COMPLETED and requestIdentifier attribute correctly received");
+									}else{
+										setverdict(fail, testcasename() & ": RequestStatus: COMPLETED and requestIdentifier attribute not correctly received");
+									}
+									
+									if (valueof(v_statusCode) ==  valueof(v_response.primitive.responsePrimitive.primitiveContent.request.operationResult.responseStatusCode) ){
+										setverdict(pass, testcasename() & ": RequestStatus: COMPLETED and responseStatusCode attribute correctly received");
+									}else{
+										setverdict(fail, testcasename() & ": RequestStatus: COMPLETED and responseStatusCode attribute not correctly received");
+									}
+									
+									if (match(v_response.primitive.responsePrimitive.primitiveContent.request.operationResult.primitiveContent, v_primitiveContent) ){
+										setverdict(pass, testcasename() & ": RequestStatus: COMPLETED and primitiveContent template correctly received");
 									}else{
-										setverdict(fail, testcasename() & ": RequestStatus: COMPLETED and operationResult attribute not correctly received");
+										setverdict(fail, testcasename() & ": RequestStatus: COMPLETED and primitiveContent template not correctly received");
 									}
+									
 								}else if (v_requestStatus==int2){	//FAILED
 									tc_ac.stop;
 									setverdict(fail, testcasename() & ": RequestStatus: FAIL");
 								}else{								//PENDING, FORWARDING or PARTIALLY_COMPLETED
 									f_sleep(PX_TAC/5.0);
-									mcaPort.send(m_request(m_retrieve(v_requestResourceURI, f_getOriginator(v_aeIndex))));
+									mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(v_requestResourceURI, f_getOriginator(v_aeIndex)))));
 									repeat;								
 								}
 							}
@@ -8879,11 +9327,10 @@ module OneM2M_PermutationFunctions {
 						p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
 					}
 					p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);					
-					p_requestPrimitive.responseType.responseTypeValue := int2;		//nonBlockingRequestAsynch
-	
+					p_requestPrimitive.responseType := {int2,omit};		//nonBlockingRequestAsynch
 					// Test Body
 
-					mcaPort.send(m_request(valueof(p_requestPrimitive)));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int1002, omit))) -> value v_response {
@@ -8958,18 +9405,18 @@ module OneM2M_PermutationFunctions {
 						p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
 					}
 					p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);					
-					p_requestPrimitive.responseType.responseTypeValue := int2;		//nonBlockingRequestAsynch
+					p_requestPrimitive.responseType := {int2,omit};		//nonBlockingRequestAsynch
 	
 					// Test Body
 
-					mcaPort.send(m_request(valueof(p_requestPrimitive)));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
 					tc_ac.start;
 					alt {
-						[] mcaPort.receive(mw_response(mw_responsePrimitive(int1001, v_contentResponse))) -> value v_response {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int1002, v_contentResponse))) -> value v_response {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__ & ": URI attribute is set to <request> resource address");
 						}
-						[] mcaPort.receive(mw_response(mw_responsePrimitive(int1001))) -> value v_response {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int1002))) -> value v_response {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__ & ": URI attribute is not set to <request> resource address");
 						}
@@ -8990,7 +9437,7 @@ module OneM2M_PermutationFunctions {
 
 					//Check to see if the resource is present or not
 					if (ischosen(v_response.primitive.responsePrimitive.primitiveContent.uRI)){
-						mcaPort.send(m_request(m_retrieve(v_response.primitive.responsePrimitive.primitiveContent.uRI, f_getOriginator(v_aeIndex))));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(v_response.primitive.responsePrimitive.primitiveContent.uRI, f_getOriginator(v_aeIndex)))));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) {
@@ -9044,8 +9491,7 @@ module OneM2M_PermutationFunctions {
 
 					v_contentResponse.uRI := ?;
 
-					v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
-
+					v_aeIndex := f_cse_preamble_registerAe(-,  {f_getAnnouncementTargetPoA(PX_PROTOCOL_BINDING_AE1, PX_AE1_ADDRESS, "")});//c_CRUDNDi);
 					if(ispresent(p_parentRequestPrimitive)) {
 						v_resourceIndex := f_cse_createResource(valueof(p_parentRequestPrimitive.resourceType), p_parentRequestPrimitive, v_aeIndex);	
 						p_requestPrimitive.to_ := f_getResourceAddress(v_resourceIndex);
@@ -9053,17 +9499,16 @@ module OneM2M_PermutationFunctions {
 						p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
 					}
 					p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);					
-					p_requestPrimitive.responseType.responseTypeValue := int2;		//nonBlockingRequestAsynch
-					p_requestPrimitive.responseType.notificationURI := omit;		//"...no notification target list is provided"
+					p_requestPrimitive.responseType := {int2, omit};		//nonBlockingRequestAsynch and no notification target list is provided"
 
-					mcaPort.send(m_request(valueof(p_requestPrimitive)));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
 					tc_ac.start;
 					alt {
-						[] mcaPort.receive(mw_response(mw_responsePrimitive(int1001, v_contentResponse))) -> value v_response {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int1002, v_contentResponse))) -> value v_response {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__ & ": URI attribute is set to <request> resource address");
 						}
-						[] mcaPort.receive(mw_response(mw_responsePrimitive(int1001))) -> value v_response {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int1002))) -> value v_response {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__ & ": URI attribute is not set to <request> resource address");
 						}
@@ -9120,7 +9565,7 @@ module OneM2M_PermutationFunctions {
 
 					v_contentResponse.uRI := ?;
 
-					v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+					v_aeIndex := f_cse_preamble_registerAe(-,  {f_getAnnouncementTargetPoA(PX_PROTOCOL_BINDING_AE1, PX_AE1_ADDRESS, "")});//c_CRUDNDi);
 
 					if(ispresent(p_parentRequestPrimitive)) {
 						v_resourceIndex := f_cse_createResource(valueof(p_parentRequestPrimitive.resourceType), p_parentRequestPrimitive, v_aeIndex);	
@@ -9134,14 +9579,14 @@ module OneM2M_PermutationFunctions {
 
 					// Test Body
 
-					mcaPort.send(m_request(valueof(p_requestPrimitive)));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
 					tc_ac.start;
 					alt {
-						[] mcaPort.receive(mw_response(mw_responsePrimitive(int1001, v_contentResponse))) -> value v_response {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int1002, v_contentResponse))) -> value v_response {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__ & ": URI attribute is set to <request> resource address");
 						}
-						[] mcaPort.receive(mw_response(mw_responsePrimitive(int1001))) -> value v_response {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int1002))) -> value v_response {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__ & ": URI attribute is not set to <request> resource address");
 						}
@@ -9171,6 +9616,97 @@ module OneM2M_PermutationFunctions {
 					f_cf01Down();
 
 				}//end f_CSE_NBR_ASY_004
+				
+				function f_CSE_NBR_ASY_005(template RequestPrimitive p_requestPrimitive, in template (omit) RequestPrimitive p_parentRequestPrimitive := omit, in ResponseStatusCode p_responseStatusCode) runs on AeSimu{
+			
+					// Local variables
+					var MsgIn v_response;
+					var RequestPrimitive v_request;
+					var integer v_aeIndex, v_ae2Index := -1;
+					var integer v_resourceIndex := -1;
+					var integer v_acpAuxIndex := -1;
+					var template PrimitiveContent v_contentResponse;
+   
+					// Test control
+					if(not PICS_NON_BLOCKING_REQUEST_SYNCH){
+						setverdict(inconc, __SCOPE__ & ": It is required to support Non-blocking access resource in synchronous mode to run this test case");
+						stop;
+					}
+
+					// Test component configuration
+					f_cf01Up(true);
+
+					// Test adapter configuration
+
+					// Preamble
+
+					v_contentResponse.uRI := ?;
+
+					v_aeIndex := f_cse_preamble_registerAe(-,  {f_getAnnouncementTargetPoA(PX_PROTOCOL_BINDING_AE1, PX_AE1_ADDRESS, "")});//c_CRUDNDi);
+
+					f_checkAeSimuStatus();
+					
+					vc_ae2.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, c_defaultAE2Name, {f_getAnnouncementTargetPoA(PX_PROTOCOL_BINDING_AE2, PX_AE2_ADDRESS, "")}))); // AE2 is registred
+					
+					f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
+					
+					v_ae2Index := f_getResource(vc_ae2);
+					
+					if(ispresent(p_parentRequestPrimitive)) {
+						v_resourceIndex := f_cse_createResource(valueof(p_parentRequestPrimitive.resourceType), p_parentRequestPrimitive, v_aeIndex);	
+						p_requestPrimitive.to_ := f_getResourceAddress(v_resourceIndex);
+					}else{
+						p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
+					}
+					p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);					
+					p_requestPrimitive.responseType.responseTypeValue := int2;		//nonBlockingRequestAsynch
+					p_requestPrimitive.responseType.notificationURI := {f_getResourceAddress(v_aeIndex), f_getResourceAddress(v_ae2Index)};		//"...an empty notification target list is provided"
+
+					// Test Body
+
+					mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
+					tc_ac.start;
+					alt {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int1002, v_contentResponse))) -> value v_response {
+							tc_ac.stop;
+							setverdict(pass, __SCOPE__ & ": URI attribute is set to <request> resource address");
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int1002))) -> value v_response {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": URI attribute is not set to <request> resource address");
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Wrong response status code");
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Wrong response status code");
+						}
+						[] tc_ac.timeout {
+							setverdict(fail, __SCOPE__ & ": No answer while executing a Non-blocking access resource in synchronous mode operation");
+						}
+					}
+
+					f_checkAeSimuStatus();
+
+					//Check if Notification is sent or not
+					
+					
+					vc_ae2.start(f_cse_notifyProcedure_responsePrimitiveHandler(mw_responsePrimitive(p_responseStatusCode)));
+					
+					f_cse_notifyProcedure_responsePrimitiveHandler(mw_responsePrimitive(p_responseStatusCode));
+					
+					vc_ae2.done;
+
+					// Postamble
+					f_cse_postamble_deleteResources();
+
+					// Tear down
+					f_cf01Down();
+
+				}//end f_CSE_NBR_ASY_005
+				
 
 			}//end Group Asynchronous
 
diff --git a/OneM2M_Testcases_AE_Release_1.ttcn b/OneM2M_Testcases_AE_Release_1.ttcn
index de8384175d276cf3ae73e88b6198844abeef5d52..e63ec36a32670dd649172e72ca66f36764778932 100644
--- a/OneM2M_Testcases_AE_Release_1.ttcn
+++ b/OneM2M_Testcases_AE_Release_1.ttcn
@@ -39,12 +39,12 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_CRE_001_CSR() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 												
 						// Test control
 						if(not(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE)) {
-							setverdict(inconc, __SCOPE__, ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -55,12 +55,12 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_CRE_001_SPR() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 												
 						// Test control
 						if(not(PICS_PRIMITIVE_SCOPE_SP_RELATIVE)) {
-							setverdict(inconc, __SCOPE__, ": Unstructured-SP-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Unstructured-SP-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -71,12 +71,12 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_CRE_001_ABS() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						
 						// Test control
 						if(not(PICS_PRIMITIVE_SCOPE_ABSOLUTE)) {
-							setverdict(inconc, __SCOPE__, ": Unstructured-Absolute-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Unstructured-Absolute-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						v_cse1.start(f_AE_GEN_CRE_001(e_absolute));
@@ -94,11 +94,11 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_CRE_002_CSR() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						
 						if(not(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE)) {
-							setverdict(inconc, __SCOPE__, ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -109,11 +109,11 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_CRE_002_SPR() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						
 						if(not(PICS_PRIMITIVE_SCOPE_SP_RELATIVE)) {
-							setverdict(inconc, __SCOPE__, ": Structured-SP-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Structured-SP-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -124,10 +124,11 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_CRE_002_ABS() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						
 						if(not(PICS_PRIMITIVE_SCOPE_ABSOLUTE)) {
-							setverdict(inconc, __SCOPE__, ": Structured-Absolute-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Structured-Absolute-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -150,11 +151,12 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_UPD_001_CSR() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						
 						// Test control
 						if(not(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE)) {
-							setverdict(inconc, __SCOPE__, ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -165,11 +167,12 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_UPD_001_SPR() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						
 					//Test control
 					if(not(PICS_PRIMITIVE_SCOPE_SP_RELATIVE)) {
-						setverdict(inconc, __SCOPE__, ": Unstructured-SP-Relative-Resource-ID format support is required to run this test case");
+						setverdict(inconc, __SCOPE__ & ": Unstructured-SP-Relative-Resource-ID format support is required to run this test case");
 						stop;
 					}
 						
@@ -180,11 +183,12 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_UPD_001_ABS() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_ABSOLUTE)) {
-							setverdict(inconc, __SCOPE__, ": Unstructured-Absolute-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Unstructured-Absolute-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -203,11 +207,12 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_UPD_002_CSR() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE)) {
-							setverdict(inconc, __SCOPE__, ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -218,11 +223,12 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_UPD_002_SPR() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_SP_RELATIVE)) {
-							setverdict(inconc, __SCOPE__, ": Structured-SP-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Structured-SP-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -233,11 +239,12 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_UPD_002_ABS() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_ABSOLUTE)) {
-							setverdict(inconc, __SCOPE__, ": Structured-Absolute-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Structured-Absolute-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -260,11 +267,12 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_RET_001_CSR() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						
 						// Test control
 						if(not(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE)) {
-							setverdict(inconc, __SCOPE__, ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -275,11 +283,12 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_RET_001_SPR() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_SP_RELATIVE)) {
-							setverdict(inconc, __SCOPE__, ": Unstructured-SP-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Unstructured-SP-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -290,11 +299,12 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_RET_001_ABS() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_ABSOLUTE)) {
-							setverdict(inconc, __SCOPE__, ": Unstructured-Absolute-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Unstructured-Absolute-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -313,11 +323,12 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_RET_002_CSR() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE)) {
-							setverdict(inconc, __SCOPE__, ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -328,11 +339,12 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_RET_002_SPR() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_SP_RELATIVE)) {
-							setverdict(inconc, __SCOPE__, ": Structured-SP-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Structured-SP-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -343,11 +355,12 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_RET_002_ABS() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_ABSOLUTE)) {
-							setverdict(inconc, __SCOPE__, ": Structured-Absolute-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Structured-Absolute-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -370,11 +383,12 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_DEL_001_CSR() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE)) {
-							setverdict(inconc, __SCOPE__, ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -385,11 +399,12 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_DEL_001_SPR() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_SP_RELATIVE)) {
-							setverdict(inconc, __SCOPE__, ": Unstructured-SP-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Unstructured-SP-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -400,11 +415,12 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_DEL_001_ABS() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_ABSOLUTE)) {
-							setverdict(inconc, __SCOPE__, ": Unstructured-Absolute-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Unstructured-Absolute-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -423,11 +439,12 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_DEL_002_CSR() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE)) {
-							setverdict(inconc, __SCOPE__, ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -438,11 +455,12 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_DEL_002_SPR() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_SP_RELATIVE)) {
-							setverdict(inconc, __SCOPE__, ": Structured-SP-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Structured-SP-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -453,11 +471,12 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_DEL_002_ABS() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_ABSOLUTE)) {
-							setverdict(inconc, __SCOPE__, ": Structured-Absolute-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Structured-Absolute-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -482,7 +501,8 @@ module OneM2M_Testcases_AE_Release_1 {
 				testcase TC_AE_REG_CRE_001() runs on Tester system AeSystem {
 						
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+					v_cse1.done;
 					
 					v_cse1.start(f_AE_REG_CRE_001());
 					
@@ -508,29 +528,26 @@ module OneM2M_Testcases_AE_Release_1 {
 					//Send Trigger Message
 					v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(-, -, -);
 					v_requestPrimitive.to_ := v_utRequest.requestPrimitive.to_;
-					f_sendUtPrimitive(v_utRequest, v_action);
+					f_sendUtPrimitive(v_utRequest, v_action & f_getLocalResourceAddress(-, -, -));
 
 					//Test behavior
 					tc_ac.start;
 					alt{
 						[] mcaPortIn.receive(mw_request(v_requestPrimitive)) -> value v_request {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__, " : AE registration request is accepted!!");
-							v_parentIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
-							v_resource := f_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, v_parentIndex, v_request.primitive.requestPrimitive.resourceType);
-							v_resourceIndex := f_setLocalResource(v_resource, v_request.primitive.requestPrimitive.resourceType, v_parentIndex);	
-							v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
+							setverdict(pass, __SCOPE__ & " : AE registration request is accepted!!");
+							v_resourceIndex := f_processCreateRequestPrimitive(v_request.primitive.requestPrimitive);	
 							
 							//send back responsePrimitive
-							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+							mcaPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
 						}
-						[] mcaPortIn.receive(mw_request(mw_createAe(*,?,m_contentCreateAe_Invalid))) -> value v_request {
+						[] mcaPortIn.receive(mw_request(mw_createAe())) -> value v_request {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__, " : AE registration request is rejected due to not including mandatory attributes!!");
+							setverdict(fail, __SCOPE__ & " : Unexpected AE registration request");
 							mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 						}
 						[] tc_ac.timeout{
-							setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
+							setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 						}
 	
 					}
@@ -552,7 +569,8 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
 						var template RequestPrimitive v_createAe := mw_createAe;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute ResourceName";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.aE.resourceName := "UNINITIALIZED";
 						v_createAe.primitiveContent.aE.resourceName := complement("UNINITIALIZED");
 						v_cse1.start(f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action));
@@ -566,7 +584,8 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
 						var template RequestPrimitive v_createAe := mw_createAe;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute ExpirationTime";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.aE.expirationTime := "20301231T012345";
 						v_utRequest.forcedFields := {{name := "expirationTime", value_ := "UNINITIALIZED"}};
 						v_createAe.primitiveContent.aE.expirationTime := ?;//Check value other than "UNINITIALIZED", done by typing
@@ -581,7 +600,8 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
 						var template RequestPrimitive v_createAe := mw_createAe;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute Labels";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.aE.labels := {"UNINITIALIZED"};
 						v_createAe.primitiveContent.aE.labels := complement({*,"UNINITIALIZED",*});
 						v_cse1.start(f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action));
@@ -595,7 +615,8 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
 						var template RequestPrimitive v_createAe := mw_createAe;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute AppName";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.aE.appName := "UNINITIALIZED";
 						v_createAe.primitiveContent.aE.appName := complement("UNINITIALIZED");
 						v_cse1.start(f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action));
@@ -609,7 +630,8 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
 						var template RequestPrimitive v_createAe := mw_createAe;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute AppID";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.aE.app_ID := "UNINITIALIZED";
 						v_createAe.primitiveContent.aE.app_ID := complement("UNINITIALIZED");
 						v_cse1.start(f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action));
@@ -623,7 +645,8 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
 						var template RequestPrimitive v_createAe := mw_createAe;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute PointOfAccess";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.aE.pointOfAccess := {"UNINITIALIZED"};
 						v_createAe.primitiveContent.aE.pointOfAccess := complement({*,"UNINITIALIZED",*});
 						v_cse1.start(f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action));
@@ -637,7 +660,8 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
 						var template RequestPrimitive v_createAe := mw_createAe;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute OntologyRef";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.aE.ontologyRef := "UNINITIALIZED";
 						v_createAe.primitiveContent.aE.ontologyRef := complement("UNINITIALIZED");
 						v_cse1.start(f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action));
@@ -651,7 +675,8 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
 						var template RequestPrimitive v_createAe := mw_createAe;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute NodeLink";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.aE.nodeLink := "UNINITIALIZED";
 						v_createAe.primitiveContent.aE.nodeLink := complement("UNINITIALIZED");
 						v_cse1.start(f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action));
@@ -665,7 +690,8 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
 						var template RequestPrimitive v_createAe := mw_createAe;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute RequestReachability";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.aE.requestReachability := true;
 						v_utRequest.forcedFields := {{name := "requestReachability", value_ := "UNINITIALIZED"}};
 						v_createAe.primitiveContent.aE.requestReachability := ?;//Check value other than UNINITIALIZED, done by typing
@@ -680,7 +706,8 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
 						var template RequestPrimitive v_createAe := mw_createAe;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute ContentSerialization";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.aE.contentSerialization := {applicationxml};
 						v_utRequest.forcedFields := {{name := "contentSerialization", value_ := "UNINITIALIZED"}};
 						v_createAe.primitiveContent.aE.contentSerialization := ?;//Check value other than UNINITIALIZED, done by typing
@@ -701,7 +728,8 @@ module OneM2M_Testcases_AE_Release_1 {
 				testcase TC_AE_REG_DEL_001() runs on Tester system AeSystem {
 						
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 					
 					v_cse1.start(f_AE_REG_DEL_001());
 					
@@ -726,26 +754,26 @@ module OneM2M_Testcases_AE_Release_1 {
 					v_localResource := f_generateLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, -, -, omit))), vc_cSEBaseIndex, int2);
 					v_auxInteger := f_setLocalResource(v_localResource, int2, vc_cSEBaseIndex);
 					v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_auxInteger, -, -);
-					f_sendUtPrimitive(v_utRequest,v_action);
+					f_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_auxInteger, -, -));
 	
 					//Test behavior
 					tc_ac.start;
 					alt{
 						[] mcaPortIn.receive(mw_request(mw_delete(v_utRequest.requestPrimitive.to_))) -> value v_request {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__, " : AE deregistration request is accepted!");
+							setverdict(pass, __SCOPE__ & " : AE deregistration request is accepted!");
 							v_responsePrimitive := valueof(m_responsePrimitive(int2002, v_request.primitive.requestPrimitive.requestIdentifier, omit));
 	
 							//send back responsePrimitive
 							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 						}
-						[] mcaPortIn.receive {
+						[] mcaPortIn.receive (mw_request(mw_delete(?)))  {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__, " : Error while AE deregistration");
+							setverdict(fail, __SCOPE__ & " : Unexpected DELETE request");
 							mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 						}
 						[] tc_ac.timeout{
-							setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
+							setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 						}
 	
 					}
@@ -768,7 +796,8 @@ module OneM2M_Testcases_AE_Release_1 {
 				testcase TC_AE_DMR_CRE_001() runs on Tester system AeSystem {
 						
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 					
 					v_cse1.start(f_AE_DMR_CRE_001());
 					
@@ -780,41 +809,34 @@ module OneM2M_Testcases_AE_Release_1 {
 					//variables
 					var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
 					var MsgIn v_request;
-					var integer v_parentIndex := -1;
 					var integer v_resourceIndex := -1;
-					var PrimitiveContent v_resource;
 					var template RequestPrimitive v_requestPrimitive := mw_createContainer;
-					var ResponsePrimitive v_responsePrimitive;
-					var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for container";
+					var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for container to ";
 					
 					f_cf03Up();
 	
 					//send triggering primitive to SUT
 					v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(-, -, -);
 					v_requestPrimitive.to_ := v_utRequest.requestPrimitive.to_;
-					f_sendUtPrimitive(v_utRequest,v_action);
+					f_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(-, -, -));
 					
 					//Test behavior
 					tc_ac.start;
 					alt{
 						[] mcaPortIn.receive(mw_request(v_requestPrimitive)) -> value v_request {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__, " : Container creation request is accepted!");
-							v_parentIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
-							v_resource := f_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, v_parentIndex, v_request.primitive.requestPrimitive.resourceType);
-							v_resourceIndex := f_setLocalResource(v_resource, v_request.primitive.requestPrimitive.resourceType, v_parentIndex);	
-							v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
-							
+							setverdict(pass, __SCOPE__ & " : Container creation request is accepted!");
+							v_resourceIndex := f_processCreateRequestPrimitive(v_request.primitive.requestPrimitive);	
 							//send back responsePrimitive
-							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+							mcaPortIn.send(f_getMsgOutPrimitive(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))));
 						}
-						[] mcaPortIn.receive {
+						[] mcaPortIn.receive(mw_request(mw_create)) -> value v_request{
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__, " : Container creation request is rejected due to not including mandatory attributes!!");
+							setverdict(fail, __SCOPE__ & " : Unexpected CREATE request ");
 							mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 						}
 						[] tc_ac.timeout{
-							setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
+							setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 						}
 					}
 	
@@ -828,7 +850,8 @@ module OneM2M_Testcases_AE_Release_1 {
 				testcase TC_AE_DMR_CRE_002() runs on Tester system AeSystem {
 						
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 					
 					v_cse1.start(f_AE_DMR_CRE_002());
 					
@@ -839,14 +862,11 @@ module OneM2M_Testcases_AE_Release_1 {
 	
 					var template UtTriggerPrimitive v_utRequest := m_utCreateContentInstance;
 					var MsgIn v_request;
-					var integer v_parentIndex := -1;
 					var integer v_resourceIndex := -1;
-					var PrimitiveContent v_resource;
 					var PrimitiveContent v_localResource;
 					var integer v_containerIndex := -1;
 					var template RequestPrimitive v_requestPrimitive := mw_createContentInstance;
-					var ResponsePrimitive v_responsePrimitive;
-					var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance";
+					var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance to ";
 	
 					//Test component configuration
 					f_cf03Up();
@@ -856,7 +876,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					v_containerIndex := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
 					v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_containerIndex, -, -);
 					v_requestPrimitive.to_ := v_utRequest.requestPrimitive.to_;
-					f_sendUtPrimitive(v_utRequest,v_action);
+					f_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_containerIndex, -, -));
 	
 					//Test behavior
 					tc_ac.start;
@@ -865,23 +885,18 @@ module OneM2M_Testcases_AE_Release_1 {
 						//receive MsgIn requestPrimitive
 						[] mcaPortIn.receive(mw_request(v_requestPrimitive)) -> value v_request {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__, " : ContentInstance creation request is accepted!!");
-							v_parentIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
-							v_resource := f_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, v_parentIndex, v_request.primitive.requestPrimitive.resourceType);
-							v_resourceIndex := f_setLocalResource(v_resource, v_request.primitive.requestPrimitive.resourceType, v_parentIndex);	
-							v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
-	
+							setverdict(pass, __SCOPE__ & " : ContentInstance creation request is accepted!!");
+							v_resourceIndex := f_processCreateRequestPrimitive(v_request.primitive.requestPrimitive);	
 							//send back responsePrimitive
-							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+							mcaPortIn.send(f_getMsgOutPrimitive(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))));
 						}
-						[] mcaPortIn.receive {
+						[] mcaPortIn.receive(mw_request(mw_create)) -> value v_request {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__, " : ContentInstance creation request is rejected due to not including mandatory attributes!!");
+							setverdict(fail, __SCOPE__ & " : Unexpected CREATE request ");
 							mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 						}
-	
 						[] tc_ac.timeout{
-							setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
+							setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 						}
 					}
 					
@@ -900,8 +915,9 @@ module OneM2M_Testcases_AE_Release_1 {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContentInstance;
 						var template RequestPrimitive v_request := mw_createContentInstance;
-						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute ContentInfo";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute ContentInfo to ";
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.contentInstance.contentInfo := "UNINITIALIZED";
 						v_request.primitiveContent.contentInstance.contentInfo := complement("UNINITIALIZED");
 						v_cse1.start(f_AE_DMR_CRE_003(v_utRequest,v_request,v_action));
@@ -913,8 +929,9 @@ module OneM2M_Testcases_AE_Release_1 {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContentInstance;
 						var template RequestPrimitive v_request := mw_createContentInstance;
-						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute ResourceName";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute ResourceName to ";
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.contentInstance.resourceName := "UNINITIALIZED";
 						v_request.primitiveContent.contentInstance.resourceName := complement("UNINITIALIZED");
 						v_cse1.start(f_AE_DMR_CRE_003(v_utRequest,v_request,v_action));
@@ -926,8 +943,9 @@ module OneM2M_Testcases_AE_Release_1 {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContentInstance;
 						var template RequestPrimitive v_request := mw_createContentInstance;
-						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute ExpirationTime";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute ExpirationTime to";
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.contentInstance.expirationTime := "20301231T012345";
 						v_utRequest.forcedFields := {{name := "expirationTime", value_ := "UNINITIALIZED"}};
 						v_request.primitiveContent.contentInstance.expirationTime := ?;//Check value other than "UNINITIALIZED", done by typing
@@ -940,8 +958,9 @@ module OneM2M_Testcases_AE_Release_1 {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContentInstance;
 						var template RequestPrimitive v_request := mw_createContentInstance;
-						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute Labels";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute Labels to ";
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.contentInstance.labels := {"UNINITIALIZED"};
 						v_request.primitiveContent.contentInstance.labels := complement({*,"UNINITIALIZED",*});
 						v_cse1.start(f_AE_DMR_CRE_003(v_utRequest,v_request,v_action));
@@ -953,8 +972,9 @@ module OneM2M_Testcases_AE_Release_1 {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContentInstance;
 						var template RequestPrimitive v_request := mw_createContentInstance;
-						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute Creator";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute Creator to ";
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.contentInstance.creator := "UNINITIALIZED";
 						v_request.primitiveContent.contentInstance.creator := complement("UNINITIALIZED");
 						v_cse1.start(f_AE_DMR_CRE_003(v_utRequest,v_request,v_action));
@@ -976,8 +996,9 @@ module OneM2M_Testcases_AE_Release_1 {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
 						var template RequestPrimitive v_request := mw_createContainer;
-						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute AccessControlPolicyIDs";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute AccessControlPolicyIDs to";
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.container.accessControlPolicyIDs := {"UNINITIALIZED"};
 						v_request.primitiveContent.container.accessControlPolicyIDs := complement({*,"UNINITIALIZED",*});
 						v_cse1.start(f_AE_DMR_CRE_004(v_utRequest,v_request,v_action));
@@ -989,8 +1010,9 @@ module OneM2M_Testcases_AE_Release_1 {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
 						var template RequestPrimitive v_request := mw_createContainer;
-						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute MaxNrOfInstances";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute MaxNrOfInstances to ";
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.container.maxNrOfInstances := 1;
 						v_utRequest.forcedFields := {{name := "maxNrOfInstances", value_ := "UNINITIALIZED"}};
 						v_request.primitiveContent.container.maxNrOfInstances := ?;//Check value other than "UNINITIALIZED", done by typing
@@ -1003,8 +1025,9 @@ module OneM2M_Testcases_AE_Release_1 {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
 						var template RequestPrimitive v_request := mw_createContainer;
-						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute MaxByteSize";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute MaxByteSize to ";
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.container.maxByteSize := 1;
 						v_utRequest.forcedFields := {{name := "maxByteSize", value_ := "UNINITIALIZED"}};
 						v_request.primitiveContent.container.maxByteSize := ?;//Check value other than "UNINITIALIZED", done by typing
@@ -1017,8 +1040,9 @@ module OneM2M_Testcases_AE_Release_1 {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
 						var template RequestPrimitive v_request := mw_createContainer;
-						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute MaxInstanceAge";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute MaxInstanceAge to ";
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.container.maxInstanceAge := 1;
 						v_utRequest.forcedFields := {{name := "maxInstanceAge", value_ := "UNINITIALIZED"}};
 						v_request.primitiveContent.container.maxInstanceAge := ?;//Check value other than "UNINITIALIZED", done by typing
@@ -1031,8 +1055,9 @@ module OneM2M_Testcases_AE_Release_1 {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
 						var template RequestPrimitive v_request := mw_createContainer;
-						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute OntologyRef";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute OntologyRef to ";
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.container.ontologyRef := "UNINITIALIZED";
 						v_request.primitiveContent.container.ontologyRef := complement("UNINITIALIZED");
 						v_cse1.start(f_AE_DMR_CRE_004(v_utRequest,v_request,v_action));
@@ -1044,8 +1069,9 @@ module OneM2M_Testcases_AE_Release_1 {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
 						var template RequestPrimitive v_request := mw_createContainer;
-						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute ResourceName";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute ResourceName to ";
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.container.resourceName := "UNINITIALIZED";
 						v_request.primitiveContent.container.resourceName := complement("UNINITIALIZED");
 						v_cse1.start(f_AE_DMR_CRE_004(v_utRequest,v_request,v_action));
@@ -1057,8 +1083,9 @@ module OneM2M_Testcases_AE_Release_1 {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
 						var template RequestPrimitive v_request := mw_createContainer;
-						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute ExpirationTime";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute ExpirationTime to ";
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.container.expirationTime := "20301231T012345";
 						v_utRequest.forcedFields := {{name := "expirationTime", value_ := "UNINITIALIZED"}};
 						v_request.primitiveContent.container.expirationTime := ?;//Check value other than "UNINITIALIZED", done by typing
@@ -1071,8 +1098,9 @@ module OneM2M_Testcases_AE_Release_1 {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
 						var template RequestPrimitive v_request := mw_createContainer;
-						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute Labels";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute Labels to ";
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.container.labels := {"UNINITIALIZED"};
 						v_request.primitiveContent.container.labels := complement({*,"UNINITIALIZED",*});
 						v_cse1.start(f_AE_DMR_CRE_004(v_utRequest,v_request,v_action));
@@ -1084,8 +1112,9 @@ module OneM2M_Testcases_AE_Release_1 {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
 						var template RequestPrimitive v_request := mw_createContainer;
-						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute Creator";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute Creator to ";
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.container.creator := "UNINITIALIZED";
 						v_request.primitiveContent.container.creator := complement("UNINITIALIZED");
 						v_cse1.start(f_AE_DMR_CRE_004(v_utRequest,v_request,v_action));
@@ -1109,10 +1138,11 @@ module OneM2M_Testcases_AE_Release_1 {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						
 						var template RequestPrimitive v_expectedUpdateRequestAe;
-						var universal charstring v_action := "Please, send a valid UPDATE Request for AE updating attribute expirationTime";
+						var universal charstring v_action := "Please, send a valid UPDATE Request for AE updating attribute expirationTime to ";
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateAe;
 						
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.aE.expirationTime := "20301231T012345";
 						
 						v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentAeUpdateRequest;
@@ -1127,9 +1157,10 @@ module OneM2M_Testcases_AE_Release_1 {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template RequestPrimitive v_expectedUpdateRequestAe;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateAe;
-						var universal charstring v_action := "Please, send a valid UPDATE Request for AE updating attribute labels";
+						var universal charstring v_action := "Please, send a valid UPDATE Request for AE updating attribute labels to ";
 						
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.aE.labels := {"UNINITIALIZED"};
 						
 						v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentAeUpdateRequest;
@@ -1146,9 +1177,10 @@ module OneM2M_Testcases_AE_Release_1 {
 						
 						var template RequestPrimitive v_expectedUpdateRequestAe;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateAe;
-						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute appName";
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute appName to ";
 						
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.aE.appName := "UNINITIALIZED";
 
 						v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentAeUpdateRequest;
@@ -1164,9 +1196,10 @@ module OneM2M_Testcases_AE_Release_1 {
 						
 						var template RequestPrimitive v_expectedUpdateRequestAe;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateAe;
-						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute pointOfAccess";
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute pointOfAccess to ";
 						
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.aE.pointOfAccess := {"UNINITIALIZED"};
 
 						v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentAeUpdateRequest;
@@ -1182,8 +1215,9 @@ module OneM2M_Testcases_AE_Release_1 {
 						
 						var template RequestPrimitive v_expectedUpdateRequestAe;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateAe;
-						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute ontologyRef";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute ontologyRef to ";
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.aE.ontologyRef := "UNINITIALIZED";
 
 						v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentAeUpdateRequest;
@@ -1199,8 +1233,9 @@ module OneM2M_Testcases_AE_Release_1 {
 						
 						var template RequestPrimitive v_expectedUpdateRequestAe;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateAe;
-						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute nodeLink";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute nodeLink to ";
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.aE.nodeLink := "UNINITIALIZED";
 
 						v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentAeUpdateRequest;
@@ -1215,8 +1250,9 @@ module OneM2M_Testcases_AE_Release_1 {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template RequestPrimitive v_expectedUpdateRequestAe;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateAe;
-						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute requestReachability";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute requestReachability to ";
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.aE.requestReachability := true;
 						v_utRequest.forcedFields := {{name := "requestReachability", value_ := "UNINITIALIZED"}};
 						
@@ -1232,8 +1268,9 @@ module OneM2M_Testcases_AE_Release_1 {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template RequestPrimitive v_expectedUpdateRequestAe;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateAe;
-						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute contentSerialization";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute contentSerialization to ";
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.aE.contentSerialization := {applicationxml};
 						v_utRequest.forcedFields := {{name := "contentSerialization", value_ := "UNINITIALIZED"}};
 						
@@ -1257,8 +1294,9 @@ module OneM2M_Testcases_AE_Release_1 {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template RequestPrimitive v_request := mw_updateContainer;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
-						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute expirationTime";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute expirationTime to ";
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.container.expirationTime := "20301231T012345";
 						v_request.primitiveContent.container.expirationTime := ?;
 						v_cse1.start(f_AE_DMR_UPD_002(v_utRequest,v_request,v_action));
@@ -1270,8 +1308,9 @@ module OneM2M_Testcases_AE_Release_1 {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template RequestPrimitive v_request := mw_updateContainer;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
-						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute labels";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute labels to ";
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.container.labels := {"UNINITIALIZED"};
 						v_request.primitiveContent.container.labels := complement({*,"UNINITIALIZED",*});
 						v_cse1.start(f_AE_DMR_UPD_002(v_utRequest,v_request,v_action));
@@ -1283,8 +1322,9 @@ module OneM2M_Testcases_AE_Release_1 {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template RequestPrimitive v_request := mw_updateContainer;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
-						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute maxNrOfInstances";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute maxNrOfInstances to ";
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.container.maxNrOfInstances := 1;
 						v_utRequest.forcedFields := {{name := "maxNrOfInstances", value_ := "UNINITIALIZED"}};
 						v_request.primitiveContent.container.maxNrOfInstances := ?;//Check value other than "UNINITIALIZED", done by typing
@@ -1297,8 +1337,9 @@ module OneM2M_Testcases_AE_Release_1 {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template RequestPrimitive v_request := mw_updateContainer;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
-						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute maxByteSize";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute maxByteSize to ";
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.container.maxByteSize := 1;
 						v_utRequest.forcedFields := {{name := "maxByteSize", value_ := "UNINITIALIZED"}};
 						v_request.primitiveContent.container.maxByteSize := ?;//Check value other than "UNINITIALIZED", done by typing
@@ -1311,8 +1352,9 @@ module OneM2M_Testcases_AE_Release_1 {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template RequestPrimitive v_request := mw_updateContainer;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
-						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute maxInstanceAge";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute maxInstanceAge to ";
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
                         v_utRequest.requestPrimitive.primitiveContent.container.maxInstanceAge := 1;
 						v_utRequest.forcedFields := {{name := "maxInstanceAge", value_ := "UNINITIALIZED"}};
 						v_request.primitiveContent.container.maxInstanceAge := ?;//Check value other than "UNINITIALIZED", done by typing
@@ -1335,8 +1377,9 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_DMR_RET_001_CB() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for CSEBase";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for CSEBase to ";
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_cse1.start(f_AE_DMR_RET_001(int5, m_primitiveContentCSEBase(m_contentCreateCSEBase),v_action));
 						v_cse1.done;
 					}
@@ -1344,8 +1387,9 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_DMR_RET_001_AE() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for AE";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for AE to ";
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_cse1.start(f_AE_DMR_RET_001(int2, m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit)),v_action));
 						v_cse1.done;
 					}
@@ -1353,8 +1397,9 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_DMR_RET_001_CNT() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for Container";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for Container to ";
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_cse1.start(f_AE_DMR_RET_001(int3, m_primitiveContentContainer(m_contentCreateContainer()),v_action));
 						v_cse1.done;
 					}
@@ -1368,7 +1413,8 @@ module OneM2M_Testcases_AE_Release_1 {
 				testcase TC_AE_DMR_RET_002() runs on Tester system AeSystem {
 						
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 					
 					v_cse1.start(f_AE_DMR_RET_002());
 					
@@ -1377,41 +1423,43 @@ module OneM2M_Testcases_AE_Release_1 {
 
 				function f_AE_DMR_RET_002() runs on CseSimu {
 	
-					var integer v_resourceIndex := -1;
+					var integer v_resourceIndex, v_containerResourceIndex := -1;
 					var PrimitiveContent v_localResource;
 	
 					//variables
 					var template UtTriggerPrimitive v_utRequest := m_utRetrieve("NotInitialized");
 					var MsgIn v_request;
 					var ResponsePrimitive v_responsePrimitive;
-					var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for retrieving the 'oldest' attribute from Container";
+					var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for retrieving the 'oldest' child resource of Container at ";
 	
 					//Test component configuration
 					f_cf03Up();
 	
 					//send triggering primitive to SUT
 					v_localResource := f_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
-					v_resourceIndex := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
-					v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_resourceIndex) & "/" & c_resourceShortNameOldest;
-					f_sendUtPrimitive(v_utRequest,v_action);
+					v_containerResourceIndex := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
+					v_localResource := f_generateLocalResource(valueof(m_primitiveContentContentInstance(m_contentCreateContentInstance)), vc_cSEBaseIndex, int4);
+					v_resourceIndex := f_setLocalResource(v_localResource, int4, v_containerResourceIndex);
+					
+					v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_containerResourceIndex) & "/" & c_resourceShortNameOldest;
+					f_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_containerResourceIndex));
 	
 					//Test behavior
 					tc_ac.start;
 					alt{
 						[] mcaPortIn.receive(mw_request(mw_retrieve(v_utRequest.requestPrimitive.to_ ))) -> value v_request {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__, " : retrieve attribute oldest request is accepted!");
-							v_resourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
+							setverdict(pass, __SCOPE__ & " : retrieve attribute oldest request is accepted!");
 							v_responsePrimitive := valueof(m_responsePrimitive(int2000, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
 							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 						}
-						[] mcaPortIn.receive {
+						[] mcaPortIn.receive(mw_request(mw_retrieve(?))) -> value v_request {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__, " : error while retrieving attribute !");
+							setverdict(fail, __SCOPE__ & " : Retrieve Request for unexpected target");
 							mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 						}
 						[] tc_ac.timeout{
-							setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
+							setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 						}
 					}
 	
@@ -1426,7 +1474,8 @@ module OneM2M_Testcases_AE_Release_1 {
 				testcase TC_AE_DMR_RET_003() runs on Tester system AeSystem {
 						
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 					
 					v_cse1.start(f_AE_DMR_RET_003());
 					
@@ -1435,41 +1484,44 @@ module OneM2M_Testcases_AE_Release_1 {
 
 				function f_AE_DMR_RET_003() runs on CseSimu {
 	
-					var integer v_resourceIndex := -1;
+					var integer v_resourceIndex, v_containerResourceIndex := -1;
 					var PrimitiveContent v_localResource;
 	
 					//variables
 					var template UtTriggerPrimitive v_utRequest := m_utRetrieve("NotInitialized");
 					var MsgIn v_request;
 					var ResponsePrimitive v_responsePrimitive;
-					var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for retrieving the 'latest' attribute from Container";
+					var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for retrieving the 'latest' attribute from Container at ";
 	
 					//Test component configuration
 					f_cf03Up();
 	
 					//send triggering primitive to SUT
 					v_localResource := f_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
-					v_resourceIndex := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
-					v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_resourceIndex) & "/" & c_resourceShortNameLatest;
-					f_sendUtPrimitive(v_utRequest,v_action);
+					v_containerResourceIndex := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
+					v_localResource := f_generateLocalResource(valueof(m_primitiveContentContentInstance(m_contentCreateContentInstance)), vc_cSEBaseIndex, int4);
+					v_resourceIndex := f_setLocalResource(v_localResource, int4, v_containerResourceIndex);
+					
+					v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_containerResourceIndex) & "/" & c_resourceShortNameLatest;
+					f_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_containerResourceIndex));
+	
 	
 					//Test behavior
 					tc_ac.start;
 					alt{
 						[] mcaPortIn.receive(mw_request(mw_retrieve(v_utRequest.requestPrimitive.to_))) -> value v_request {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__, " : retrieve attribute latest request is accepted!!");
-							v_resourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
+							setverdict(pass, __SCOPE__ & " : retrieve attribute latest request is accepted!!");
 							v_responsePrimitive := valueof(m_responsePrimitive(int2000, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
 							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 						}
-						[] mcaPortIn.receive {
+						[] mcaPortIn.receive(mw_request(mw_retrieve(?))) -> value v_request {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__, " : error while retrieving attribute !");
+							setverdict(fail, __SCOPE__ & " : Retrieve Request for unexpected target");
 							mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 						}
 						[] tc_ac.timeout{
-							setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
+							setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 						}
 					}
 	
@@ -1484,7 +1536,8 @@ module OneM2M_Testcases_AE_Release_1 {
 				testcase TC_AE_DMR_RET_004() runs on Tester system AeSystem {
 						
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 					
 					v_cse1.start(f_AE_DMR_RET_004());
 					
@@ -1500,7 +1553,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					var template UtTriggerPrimitive v_utRequest := m_utRetrieve("NotInitialized");
 					var MsgIn v_request;
 					var ResponsePrimitive v_responsePrimitive;
-					var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for retrieving the Container";
+					var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for retrieving the Container to ";
 
 					//Test component configuration
 					f_cf03Up();
@@ -1509,25 +1562,24 @@ module OneM2M_Testcases_AE_Release_1 {
 					v_localResource := f_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
 					v_resourceIndex := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
 					v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_resourceIndex);
-					f_sendUtPrimitive(v_utRequest,v_action);
+					f_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_resourceIndex));
 	
 					//Test behavior
 					tc_ac.start;
 					alt{
 						[] mcaPortIn.receive(mw_request(mw_retrieve(v_utRequest.requestPrimitive.to_))) -> value v_request {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__, " : retrieve resource type request is accepted!!");
-							v_resourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
+							setverdict(pass, __SCOPE__ & " : retrieve resource type request is accepted!!");
 							v_responsePrimitive := valueof(m_responsePrimitive(int2000, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
 							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 						}
-						[] mcaPortIn.receive {
+						[] mcaPortIn.receive(mw_request(mw_retrieve(?))) -> value v_request {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__, " : error while retrieving resource !");
+							setverdict(fail, __SCOPE__ & " : Retrieve Request for unexpected target");
 							mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 						}
 						[] tc_ac.timeout{
-							setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
+							setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 						}
 					}
 
@@ -1542,7 +1594,8 @@ module OneM2M_Testcases_AE_Release_1 {
 				testcase TC_AE_DMR_RET_005 () runs on Tester system AeSystem {
 						
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 					
 					v_cse1.start(f_AE_DMR_RET_005());
 					
@@ -1558,34 +1611,35 @@ module OneM2M_Testcases_AE_Release_1 {
 					var template UtTriggerPrimitive v_utRequest := m_utRetrieve("NotInitialized");
 					var MsgIn v_request;
 					var ResponsePrimitive v_responsePrimitive;
-					var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for retrieving the contentInstance";
+					var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for retrieving the contentInstance to ";
 
 					//Test component configuration
 					f_cf03Up();
 
 					//send triggering primitive to SUT
-					v_localResource := f_generateLocalResource(valueof(m_primitiveContentContentInstance(m_contentCreateContentInstance)), vc_cSEBaseIndex, int4);
-					v_resourceIndex := f_setLocalResource(v_localResource, int4, vc_cSEBaseIndex);
+					v_localResource := f_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
+					v_resourceIndex := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
+					v_localResource := f_generateLocalResource(valueof(m_primitiveContentContentInstance(m_contentCreateContentInstance)), v_resourceIndex, int4);
+					v_resourceIndex := f_setLocalResource(v_localResource, int4, v_resourceIndex);
 					v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_resourceIndex);
-					f_sendUtPrimitive(v_utRequest,v_action);
+					f_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_resourceIndex));
 
 					//Test behavior
 					tc_ac.start;
 					alt{
 						[] mcaPortIn.receive(mw_request(mw_retrieve(v_utRequest.requestPrimitive.to_))) -> value v_request {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__, " : retrieve resource type request is accepted!!");
-							v_resourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
+							setverdict(pass, __SCOPE__ & " : retrieve resource type request is accepted!!");
 							v_responsePrimitive := valueof(m_responsePrimitive(int2000, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
 							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 						}
-						[] mcaPortIn.receive {
+						[] mcaPortIn.receive(mw_request(mw_retrieve(?))) -> value v_request {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__, " : error while retrieving resource !");
+							setverdict(fail, __SCOPE__ & " : Retrieve Request for unexpected target");
 							mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 						}
 						[] tc_ac.timeout{
-							setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
+							setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 						}
 					}
 
@@ -1604,7 +1658,8 @@ module OneM2M_Testcases_AE_Release_1 {
 				testcase TC_AE_DMR_DEL_001() runs on Tester system AeSystem {
 						
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 					
 					v_cse1.start(f_AE_DMR_DEL_001());
 					
@@ -1620,7 +1675,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					var template UtTriggerPrimitive v_utRequest := m_utDelete;
 					var MsgIn v_request;
 					var ResponsePrimitive v_responsePrimitive;
-					var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid DELETE Request for deleting the 'oldest' attribute from contentInstance";
+					var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid DELETE Request for deleting the 'oldest' resource from container to ";
 
 					//Test component configuration
 					f_cf03Up();
@@ -1629,14 +1684,14 @@ module OneM2M_Testcases_AE_Release_1 {
 					v_localResource := f_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
 					v_resourceIndex := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
 					v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_resourceIndex) & "/" & c_resourceShortNameOldest;
-					f_sendUtPrimitive(v_utRequest,v_action);
+					f_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_resourceIndex));
 
 					//Test behavior
 					tc_ac.start;
 					alt{
 						[] mcaPortIn.receive(mw_request(mw_delete(v_utRequest.requestPrimitive.to_))) -> value v_request {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__, " : delete attribute oldest request is accepted!!");
+							setverdict(pass, __SCOPE__ & " : Delete oldest ContentInstance resource is accepted");
 
 							//set responseStatusCode back to SUT
 							v_responsePrimitive := valueof(m_responsePrimitive(int2002, v_request.primitive.requestPrimitive.requestIdentifier, omit));
@@ -1645,12 +1700,13 @@ module OneM2M_Testcases_AE_Release_1 {
 							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 							tc_ac.stop;
 						}
-						[] mcaPortIn.receive {
+						[] mcaPortIn.receive (mw_request(mw_delete(?))) -> value v_request {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__, " : error while deleting attribute !");
+							setverdict(fail, __SCOPE__ & " : Delete request for unexpected target");
+							mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 						}
 						[] tc_ac.timeout{
-							setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
+							setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 						}
 					}
 
@@ -1665,7 +1721,8 @@ module OneM2M_Testcases_AE_Release_1 {
 				testcase TC_AE_DMR_DEL_002() runs on Tester system AeSystem {
 						
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 					
 					v_cse1.start(f_AE_DMR_DEL_002());
 					
@@ -1681,7 +1738,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					var template UtTriggerPrimitive v_utRequest := m_utDelete;
 					var MsgIn v_request;
 					var ResponsePrimitive v_responsePrimitive;
-					var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid DELETE Request for deleting the 'latest' attribute from contentInstance";
+					var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid DELETE Request for deleting the 'latest' resource from container to ";
 
 					//Test component configuration
 					f_cf03Up();
@@ -1690,14 +1747,14 @@ module OneM2M_Testcases_AE_Release_1 {
 					v_localResource := f_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
 					v_resourceIndex := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
 					v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_resourceIndex) & "/" & c_resourceShortNameLatest;
-					f_sendUtPrimitive(v_utRequest,v_action);
+					f_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_resourceIndex));
 
 					//Test behavior
 					tc_ac.start;
 					alt{
 						[] mcaPortIn.receive(mw_request(mw_delete(v_utRequest.requestPrimitive.to_))) -> value v_request {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__, " : delete attribute latest request is accepted!!");
+							setverdict(pass, __SCOPE__ & " : delete attribute latest resource ContentInstance is accepted");
 
 							//set responseStatusCode back to SUT
 							v_responsePrimitive := valueof(m_responsePrimitive(int2002, v_request.primitive.requestPrimitive.requestIdentifier, omit));
@@ -1706,12 +1763,13 @@ module OneM2M_Testcases_AE_Release_1 {
 							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 							tc_ac.stop;
 						}
-						[] mcaPortIn.receive {
+						[] mcaPortIn.receive (mw_request(mw_delete(?))) -> value v_request {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__, " : error while deleting attribute !");
+							setverdict(fail, __SCOPE__ & " : Delete request for unexpected target");
+							mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 						}
 						[] tc_ac.timeout{
-							setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
+							setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 						}
 					}
 
@@ -1726,7 +1784,8 @@ module OneM2M_Testcases_AE_Release_1 {
 				testcase TC_AE_DMR_DEL_003() runs on Tester system AeSystem {
 						
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 					
 					v_cse1.start(f_AE_DMR_DEL_003());
 					
@@ -1742,7 +1801,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					var template UtTriggerPrimitive v_utRequest := m_utDelete;
 					var MsgIn v_request;
 					var ResponsePrimitive v_responsePrimitive;
-					var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid DELETE Request for deleting the container resource";
+					var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid DELETE Request for deleting the container resource to ";
 
 					//Test component configuration
 					f_cf03Up();
@@ -1751,14 +1810,14 @@ module OneM2M_Testcases_AE_Release_1 {
 					v_localResource := f_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
 					v_resourceIndex := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
 					v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_resourceIndex);
-					f_sendUtPrimitive(v_utRequest,v_action);
+					f_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_resourceIndex));
 
 					//Test behavior
 					tc_ac.start;
 					alt{
 						[] mcaPortIn.receive(mw_request(mw_delete(v_utRequest.requestPrimitive.to_))) -> value v_request {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__, " : delete resource type request is accepted!!");
+							setverdict(pass, __SCOPE__ & " : delete resource type request is accepted!!");
 
 							//set responseStatusCode back to SUT
 							v_responsePrimitive := valueof(m_responsePrimitive(int2002, v_request.primitive.requestPrimitive.requestIdentifier, omit));
@@ -1767,12 +1826,13 @@ module OneM2M_Testcases_AE_Release_1 {
 							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 							tc_ac.stop;
 						}
-						[] mcaPortIn.receive {
+						[] mcaPortIn.receive (mw_request(mw_delete(?))) -> value v_request {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__, " : error while deleting resource !");
+							setverdict(fail, __SCOPE__ & " : Delete request for unexpected target");
+							mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 						}
 						[] tc_ac.timeout{
-							setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
+							setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 						}
 					}
 
@@ -1787,7 +1847,8 @@ module OneM2M_Testcases_AE_Release_1 {
 				testcase TC_AE_DMR_DEL_004 () runs on Tester system AeSystem {
 						
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 					
 					v_cse1.start(f_AE_DMR_DEL_004());
 					
@@ -1796,30 +1857,32 @@ module OneM2M_Testcases_AE_Release_1 {
 
 				function f_AE_DMR_DEL_004() runs on CseSimu {
 
-					var integer v_resourceIndex := -1;
+					var integer v_resourceIndex, v_containerResourceIndex := -1;
 					var PrimitiveContent v_localResource;
 
 					//variables
 					var template UtTriggerPrimitive v_utRequest := m_utDelete;
 					var MsgIn v_request;
 					var ResponsePrimitive v_responsePrimitive;
-					var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid DELETE Request for deleting the contentInstance resource";
+					var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid DELETE Request for deleting the contentInstance resource to ";
 
 					//Test component configuration
 					f_cf03Up();
 
 					//send triggering primitive to SUT
-					v_localResource := f_generateLocalResource(valueof(m_primitiveContentContentInstance(m_contentCreateContentInstance)), vc_cSEBaseIndex, int4);
-					v_resourceIndex := f_setLocalResource(v_localResource, int4, vc_cSEBaseIndex);
+					v_localResource := f_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
+					v_containerResourceIndex := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
+					v_localResource := f_generateLocalResource(valueof(m_primitiveContentContentInstance(m_contentCreateContentInstance)), v_containerResourceIndex, int4);
+					v_resourceIndex := f_setLocalResource(v_localResource, int4, v_containerResourceIndex);
 					v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_resourceIndex);
-					f_sendUtPrimitive(v_utRequest,v_action);
+					f_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_resourceIndex));
 
 					//Test behavior
 					tc_ac.start;
 					alt{
 						[] mcaPortIn.receive(mw_request(mw_delete(v_utRequest.requestPrimitive.to_ ))) -> value v_request {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__, " : delete resource type request is accepted!!");
+							setverdict(pass, __SCOPE__ & " : delete resource type request is accepted!!");
 
 							//set responseStatusCode back to SUT
 							v_responsePrimitive := valueof(m_responsePrimitive(int2002, v_request.primitive.requestPrimitive.requestIdentifier, omit));
@@ -1828,12 +1891,13 @@ module OneM2M_Testcases_AE_Release_1 {
 							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 							tc_ac.stop;
 						}
-						[] mcaPortIn.receive {
+						[] mcaPortIn.receive (mw_request(mw_delete(?))) -> value v_request {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__, " : error while deleting resource !");
+							setverdict(fail, __SCOPE__ & " : Delete request for unexpected target");
+							mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 						}
 						[] tc_ac.timeout{
-							setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
+							setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 						}
 					}
 
@@ -1857,7 +1921,8 @@ module OneM2M_Testcases_AE_Release_1 {
 				testcase TC_AE_SUB_CRE_001() runs on Tester system AeSystem {
 						
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 					
 					v_cse1.start(f_AE_SUB_CRE_001());
 					
@@ -1886,7 +1951,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					alt{
 						[] mcaPortIn.receive(mw_request(mw_createSubscription)) -> value v_request {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__, " : Subscription creation request is accepted!");
+							setverdict(pass, __SCOPE__ & " : Subscription creation request is accepted!");
 							v_parentIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
 							v_resource := f_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, v_parentIndex, v_request.primitive.requestPrimitive.resourceType);
 							v_resourceIndex := f_setLocalResource(v_resource, v_request.primitive.requestPrimitive.resourceType, v_parentIndex);	
@@ -1897,11 +1962,11 @@ module OneM2M_Testcases_AE_Release_1 {
 						}
 						[] mcaPortIn.receive {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__, " : Subscription creation request is rejected due to not including mandatory attributes!!");
+							setverdict(fail, __SCOPE__ & " : Subscription creation request is rejected due to not including mandatory attributes!!");
 							mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 						}
 						[] tc_ac.timeout{
-							setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
+							setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 						}
 					}
 
@@ -1921,7 +1986,8 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
 						var template RequestPrimitive v_requestT := mw_createSubscription;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute accessControlPolicyIDs";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
 						v_utRequest.requestPrimitive.primitiveContent.subscription.accessControlPolicyIDs := {"UNINITIALIZED"};
 						v_requestT.primitiveContent.subscription.notificationURI := complement({*,"UNINITIALIZED",*});
@@ -1929,7 +1995,7 @@ module OneM2M_Testcases_AE_Release_1 {
 	
 						v_cse1.start(f_AE_SUB_CRE_002(v_utRequest, v_requestT, v_action));
 						
-						v_cse1.stop;
+						v_cse1.done;
 					}
 					
 					testcase TC_AE_SUB_CRE_002_ENC() runs on Tester system AeSystem {
@@ -1938,7 +2004,8 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
 						var template RequestPrimitive v_requestT := mw_createSubscription;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute createdBefore";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
 						v_utRequest.requestPrimitive.primitiveContent.subscription.eventNotificationCriteria := m_eventNotificationCriteria();
 						v_utRequest.requestPrimitive.primitiveContent.subscription.eventNotificationCriteria.createdBefore := "20301231T012345";
@@ -1948,7 +2015,7 @@ module OneM2M_Testcases_AE_Release_1 {
 	
 						v_cse1.start(f_AE_SUB_CRE_002(v_utRequest, v_requestT, v_action));
 					
-						v_cse1.stop;
+						v_cse1.done;
 					}
 					
 					testcase TC_AE_SUB_CRE_002_EXC() runs on Tester system AeSystem {
@@ -1957,7 +2024,8 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
 						var template RequestPrimitive v_requestT := mw_createSubscription;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute expirationCounter";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
 						v_utRequest.requestPrimitive.primitiveContent.subscription.expirationCounter := 1;
 						v_utRequest.forcedFields := {{name := "expirationCounter", value_ := "UNINITIALIZED"}};
@@ -1966,7 +2034,7 @@ module OneM2M_Testcases_AE_Release_1 {
 	
 						v_cse1.start(f_AE_SUB_CRE_002(v_utRequest, v_requestT, v_action));
 						
-						v_cse1.stop;
+						v_cse1.done;
 					}
 					
 					testcase TC_AE_SUB_CRE_002_NFU() runs on Tester system AeSystem {
@@ -1975,7 +2043,8 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
 						var template RequestPrimitive v_requestT := mw_createSubscription;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute notificationForwardingURI";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
 						v_utRequest.requestPrimitive.primitiveContent.subscription.notificationForwardingURI := "UNINITIALIZED";
 						v_requestT.primitiveContent.subscription.notificationURI := complement({*,"UNINITIALIZED",*});
@@ -1983,7 +2052,7 @@ module OneM2M_Testcases_AE_Release_1 {
 	
 						v_cse1.start(f_AE_SUB_CRE_002(v_utRequest, v_requestT, v_action));
 						
-						v_cse1.stop;
+						v_cse1.done;
 					}
 					
 					testcase TC_AE_SUB_CRE_002_NCT() runs on Tester system AeSystem {
@@ -1992,7 +2061,8 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
 						var template RequestPrimitive v_requestT := mw_createSubscription;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute notificationContentType";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
 						v_utRequest.requestPrimitive.primitiveContent.subscription.notificationContentType := int1;
 						v_utRequest.forcedFields := {{name := "notificationContentType", value_ := "UNINITIALIZED"}};
@@ -2001,7 +2071,7 @@ module OneM2M_Testcases_AE_Release_1 {
 	
 						v_cse1.start(f_AE_SUB_CRE_002(v_utRequest, v_requestT, v_action));
 						
-						v_cse1.stop;
+						v_cse1.done;
 					}
 					 
 					testcase TC_AE_SUB_CRE_002_NEC() runs on Tester system AeSystem {
@@ -2010,7 +2080,8 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
 						var template RequestPrimitive v_requestT := mw_createSubscription;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute notificationEventCat";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
 						v_utRequest.requestPrimitive.primitiveContent.subscription.notificationEventCat.alt_1 := 100;
 						v_utRequest.forcedFields := {{name := "alt_1", value_ := "UNINITIALIZED"}};
@@ -2019,7 +2090,7 @@ module OneM2M_Testcases_AE_Release_1 {
 	
 						v_cse1.start(f_AE_SUB_CRE_002(v_utRequest, v_requestT, v_action));
 						
-						v_cse1.stop;
+						v_cse1.done;
 					}
 					
 					testcase TC_AE_SUB_CRE_002_SU() runs on Tester system AeSystem {
@@ -2028,7 +2099,8 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
 						var template RequestPrimitive v_requestT := mw_createSubscription;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute subscriberURI";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
 						v_utRequest.requestPrimitive.primitiveContent.subscription.subscriberURI := "UNINITIALIZED";
 						v_requestT.primitiveContent.subscription.notificationURI := complement({*,"UNINITIALIZED",*});
@@ -2036,7 +2108,7 @@ module OneM2M_Testcases_AE_Release_1 {
 	
 						v_cse1.start(f_AE_SUB_CRE_002(v_utRequest, v_requestT, v_action));
 						
-						v_cse1.stop;
+						v_cse1.done;
 					}
 
 				}//End AE_SUB_CRE_002
@@ -2052,7 +2124,8 @@ module OneM2M_Testcases_AE_Release_1 {
 				testcase TC_AE_SUB_NTF_001() runs on Tester system AeSystem {
 						
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+					v_cse1.done;
 					
 					v_cse1.start(f_AE_SUB_NTF_001());
 					
@@ -2080,7 +2153,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					alt{
 						[] mcaPortIn.receive(mw_request(mw_createAe)) -> value v_request {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__, " : AE registration request is accepted!!");
+							setverdict(pass, __SCOPE__ & " : AE registration request is accepted!!");
 							v_parentIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
 							v_resource := f_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, v_parentIndex, v_request.primitive.requestPrimitive.resourceType);
 							v_resourceIndex := f_setLocalResource(v_resource, v_request.primitive.requestPrimitive.resourceType, v_parentIndex);	
@@ -2091,11 +2164,11 @@ module OneM2M_Testcases_AE_Release_1 {
 						}
 						[] mcaPortIn.receive(mw_request(mw_createAe(*,?,m_contentCreateAe_Invalid))) -> value v_request {
 							tc_ac.stop;
-							setverdict(inconc, __SCOPE__, " : AE registration request is rejected due to not including mandatory attributes!!");
+							setverdict(inconc, __SCOPE__ & " : AE registration request is rejected due to not including mandatory attributes!!");
 							mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 						}
 						[] tc_ac.timeout{
-							setverdict(inconc, __SCOPE__, " : Timeout due to no response received from requested SUT!");
+							setverdict(inconc, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 						}
 
 					}
@@ -2112,7 +2185,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					alt{
 						[] mcaPortIn.receive(mw_request(mw_createSubscription)) -> value v_request {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__, " : Subscription creation request is accepted!");
+							setverdict(pass, __SCOPE__ & " : Subscription creation request is accepted!");
 							v_parentIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
 							v_resource := f_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, v_parentIndex, v_request.primitive.requestPrimitive.resourceType);
 							v_resourceIndex := f_setLocalResource(v_resource, v_request.primitive.requestPrimitive.resourceType, v_parentIndex);	
@@ -2123,11 +2196,11 @@ module OneM2M_Testcases_AE_Release_1 {
 						}
 						[] mcaPortIn.receive {
 							tc_ac.stop;
-							setverdict(inconc, __SCOPE__, " : Subscription creation request is rejected due to not including mandatory attributes!!");
+							setverdict(inconc, __SCOPE__ & " : Subscription creation request is rejected due to not including mandatory attributes!!");
 							mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 						}
 						[] tc_ac.timeout{
-							setverdict(inconc, __SCOPE__, " : Timeout due to no response received from requested SUT!");
+							setverdict(inconc, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 						}
 					}
 					
@@ -2140,14 +2213,14 @@ module OneM2M_Testcases_AE_Release_1 {
 					alt{
 						[] mcaPortIn.receive(mw_response(mw_responsePrimitiveOK)) {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__, " : Notification response is accepted!");
+							setverdict(pass, __SCOPE__ & " : Notification response is accepted!");
 						}
 						[] mcaPortIn.receive {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__, " : Notification response is rejected due to not including mandatory attributes!");
+							setverdict(fail, __SCOPE__ & " : Notification response is rejected due to not including mandatory attributes!");
 						}
 						[] tc_ac.timeout{
-							setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
+							setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 						}
 					}
  
@@ -2162,7 +2235,8 @@ module OneM2M_Testcases_AE_Release_1 {
 				testcase TC_AE_SUB_NTF_002() runs on Tester system AeSystem {
 						
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+					v_cse1.done;
 					
 					v_cse1.start(f_AE_SUB_NTF_002());
 					
@@ -2190,7 +2264,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					alt{
 						[] mcaPortIn.receive(mw_request(mw_createAe)) -> value v_request {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__, " : AE registration request is accepted!!");
+							setverdict(pass, __SCOPE__ & " : AE registration request is accepted!!");
 							v_parentIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
 							v_resource := f_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, v_parentIndex, v_request.primitive.requestPrimitive.resourceType);
 							v_resourceIndex := f_setLocalResource(v_resource, v_request.primitive.requestPrimitive.resourceType, v_parentIndex);	
@@ -2201,11 +2275,11 @@ module OneM2M_Testcases_AE_Release_1 {
 						}
 						[] mcaPortIn.receive(mw_request(mw_createAe(*,?,m_contentCreateAe_Invalid))) -> value v_request {
 							tc_ac.stop;
-							setverdict(inconc, __SCOPE__, " : AE registration request is rejected due to not including mandatory attributes!!");
+							setverdict(inconc, __SCOPE__ & " : AE registration request is rejected due to not including mandatory attributes!!");
 							mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 						}
 						[] tc_ac.timeout{
-							setverdict(inconc, __SCOPE__, " : Timeout due to no response received from requested SUT!");
+							setverdict(inconc, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 						}
 
 					}
@@ -2222,7 +2296,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					alt{
 						[] mcaPortIn.receive(mw_request(mw_createSubscription)) -> value v_request {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__, " : Subscription creation request is accepted!");
+							setverdict(pass, __SCOPE__ & " : Subscription creation request is accepted!");
 							v_parentIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
 							v_resource := f_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, v_parentIndex, v_request.primitive.requestPrimitive.resourceType);
 							v_resourceIndex := f_setLocalResource(v_resource, v_request.primitive.requestPrimitive.resourceType, v_parentIndex);	
@@ -2233,11 +2307,11 @@ module OneM2M_Testcases_AE_Release_1 {
 						}
 						[] mcaPortIn.receive {
 							tc_ac.stop;
-							setverdict(inconc, __SCOPE__, " : Subscription creation request is rejected due to not including mandatory attributes!!");
+							setverdict(inconc, __SCOPE__ & " : Subscription creation request is rejected due to not including mandatory attributes!!");
 							mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 						}
 						[] tc_ac.timeout{
-							setverdict(inconc, __SCOPE__, " : Timeout due to no response received from requested SUT!");
+							setverdict(inconc, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 						}
 					}
 					
@@ -2250,14 +2324,14 @@ module OneM2M_Testcases_AE_Release_1 {
 					alt{
 						[] mcaPortIn.receive(mw_response(mw_responsePrimitiveOK)) {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__, " : Notification response is accepted!");
+							setverdict(pass, __SCOPE__ & " : Notification response is accepted!");
 						}
 						[] mcaPortIn.receive {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__, " : Notification response is rejected due to not including mandatory attributes!");
+							setverdict(fail, __SCOPE__ & " : Notification response is rejected due to not including mandatory attributes!");
 						}
 						[] tc_ac.timeout{
-							setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
+							setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 						}
 					}
  
@@ -2269,6 +2343,97 @@ module OneM2M_Testcases_AE_Release_1 {
 
 
 		}//end SUB subgroup
+		
+		group Polling {
+			
+			/**
+			 * @desc Check that the IUT which performs polling sends the Notify request to <pollingChannelURI> Hosting CSE after receiving response using polling channel
+			 */
+			testcase TC_AE_PCH_001() runs on Tester system AeSystem {
+			   
+				var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+				v_cse1.start(f_AE_PCH_001());
+				v_cse1.done;
+			}
+			
+			function f_AE_PCH_001() runs on CseSimu {
+			//Local variables
+			  var integer v_pollingChannelIndex := -1;
+			  var integer v_aeIndex := -1;
+			  var MsgIn v_request_req1, v_request_req3;
+			  var RequestPrimitive v_request_req2;
+			  var ResponsePrimitive v_response_rsp1;
+			  var template UtTriggerPrimitive v_utRequest1 := m_utCreateAe;
+			  var template UtTriggerPrimitive v_utRequest2 := m_utCreatePollingChannel;
+			  var template UtTriggerPrimitive v_utRequest3;
+			  var charstring v_action3 := "Please, send a Polling request (Retrieve PollingChannelURI request)";
+			  var RequestPrimitive v_requestNotify;
+   
+			  //Test control
+
+			  // Test component configuration
+			  f_cf03Up();
+
+			  // Test adapter configuration
+
+			   // Preamble
+			  v_aeIndex := f_ae_preamble_registerAe(v_utRequest1);
+   
+   			  f_checkCseSimuStatus();
+			 
+			  //Create a function to receive the Create PollingChannel and to send the response
+			  v_pollingChannelIndex := f_ae_createPollingChannel(v_utRequest2);
+			    				
+			  f_checkCseSimuStatus();
+			  
+			  //Trigger IUT for sending a polling request (req1)
+			  v_utRequest3 := valueof(m_utRetrievePollingChannelUri(f_getLocalResourceAddress(v_pollingChannelIndex) & "/" & c_resourceShortNamePollingChannelUri));
+			  f_sendUtPrimitive(v_utRequest3,v_action3);
+
+			  tc_ac.start;
+			  alt {
+				  [] mcaPortIn.receive(mw_request(mw_retrieve(f_getLocalResourceAddress(v_pollingChannelIndex) & "/" & c_resourceShortNamePollingChannelUri))) -> value v_request_req1 {
+					  tc_ac.stop;
+					  setverdict(pass, __SCOPE__&":INFO: Polling request received successfuly");
+					  v_response_rsp1 := valueof(m_responsePrimitive(int2000,v_request_req1.primitive.requestPrimitive.requestIdentifier));
+					  v_response_rsp1.from_ := PX_CSE1_ID;
+					  v_response_rsp1.to_ := v_request_req1.primitive.requestPrimitive.from_;
+					  //Put in the primitiveContent a Notify request (req2) (simulated) from another node CSE
+					  v_request_req2 := valueof(m_notify(f_getLocalResourceAddress(v_pollingChannelIndex)));
+					  v_response_rsp1.primitiveContent := { requestPrimitive := v_request_req2 };
+					  mcaPortIn.send(m_response(v_response_rsp1));
+				 }
+				 [] tc_ac.timeout {
+					 setverdict(inconc, __SCOPE__&":INFO: No request received for creating resource type Polling Channel");
+				 }
+			  }
+			  
+			  f_checkCseSimuStatus();
+
+			  tc_ac.start;
+			  alt {
+				  [] mcaPortIn.receive(mw_request(mw_notifyResponsePrimitive(?))) -> value v_request_req3 {
+					  tc_ac.stop;
+					  //Check that primitiveContent carries the response to req2 (resp2)
+					  if(v_request_req3.primitive.requestPrimitive.primitiveContent.responsePrimitive.requestIdentifier == v_request_req2.requestIdentifier) {
+						  setverdict(pass, __SCOPE__ & ": NOTIFY request received carrying response (rsp2) to the Notify request (req2)");
+					  } else {
+						  setverdict(fail, __SCOPE__ & ": NOTIFY request received not carryng the expected response (rsp2) to the Notify request (req2)");
+					  }
+				  }
+				  [] tc_ac.timeout {
+					  setverdict(fail, __SCOPE__ & ": No message while expecting NOTIFY request");
+				  }
+			   }
+
+			  //Postamble
+			  f_cse_postamble_deleteResourcesCSE();
+
+			  // Tear down
+			  f_cf03Down();
+			} 
+		
+		} //end group Polling
 
 
 	}//end group AE
diff --git a/OneM2M_Testcases_CSE_Release_1.ttcn b/OneM2M_Testcases_CSE_Release_1.ttcn
index 41bafcdd03ba886cdf5e5b0d562637275d39dde3..8e5e1acf4b94435af1dcd50d283db60176e83b45 100644
--- a/OneM2M_Testcases_CSE_Release_1.ttcn
+++ b/OneM2M_Testcases_CSE_Release_1.ttcn
@@ -30,7 +30,18 @@ module OneM2M_Testcases_CSE_Release_1 {
 	
 		group helpingTestCases {//These are not part of the test suite, just for verification purposes
 			
-			testcase TC_DELETE_RESOURCES() runs on AeSimu system CseSystem {
+			testcase TC_DELETE_RESOURCES() runs on Tester system CseSystem {
+				// Local variables
+				                        
+				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+				v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+				v_ae1.done;
+	            
+				v_ae1.start(f_DELETE_RESOURCES());
+				v_ae1.done;
+			}
+			
+			function f_DELETE_RESOURCES() runs on AeSimu system CseSystem {
 				
 				timer t_ac := 5.0;
 				var integer i; 
@@ -51,21 +62,21 @@ module OneM2M_Testcases_CSE_Release_1 {
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
 							t_ac.stop;
 							log(__SCOPE__ & ":Resource deleted");
-							setverdict(pass);
+							//setverdict(pass);
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 							t_ac.stop;
 							log(__SCOPE__ & ":Error while deleting resource");
-							setverdict(fail);
+							//setverdict(fail);
 						}
 						[] mcaPort.receive {
 							t_ac.stop;
 							log(__SCOPE__ & ":Unexpected message received");
-							setverdict(inconc);
+							//setverdict(inconc);
 						}
 						[] t_ac.timeout {
 							log(__SCOPE__ & ":No answer while deleting resource");
-							setverdict(inconc);
+							//setverdict(inconc);
 						}	
 					}	
 				}
@@ -93,7 +104,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						                        
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                         
 						v_ae1.start(f_CSE_GEN_CRE_001(e_cseRelative));
 						v_ae1.done;
@@ -103,7 +115,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 						v_ae1.start(f_CSE_GEN_CRE_001(e_spRelative));
 						v_ae1.done;
@@ -112,7 +125,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_GEN_CRE_001_ABS() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                         
 						v_ae1.start(f_CSE_GEN_CRE_001(e_absolute));
 						v_ae1.done;
@@ -130,7 +144,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						                        
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                         
 						v_ae1.start(f_CSE_GEN_CRE_002(e_cseRelative));
 						v_ae1.done;
@@ -140,7 +155,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                         
 						v_ae1.start(f_CSE_GEN_CRE_002(e_spRelative));
 						v_ae1.done;
@@ -150,7 +166,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 							
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                         
 						v_ae1.start(f_CSE_GEN_CRE_002(e_absolute));
 						v_ae1.done;
@@ -171,7 +188,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						                        
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                         
 						v_ae1.start(f_CSE_GEN_RET_001(e_cseRelative));
 						v_ae1.done;
@@ -181,7 +199,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                         
 						v_ae1.start(f_CSE_GEN_RET_001(e_spRelative));
 						v_ae1.done;
@@ -190,7 +209,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_GEN_RET_001_ABS() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                         
 						v_ae1.start(f_CSE_GEN_RET_001(e_absolute));
 						v_ae1.done;
@@ -208,7 +228,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_GEN_RET_002_CSR() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                         
 						v_ae1.start(f_CSE_GEN_RET_002(e_cseRelative));
 						v_ae1.done;
@@ -218,7 +239,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                         
 						v_ae1.start(f_CSE_GEN_RET_002(e_spRelative));
 						v_ae1.done;
@@ -228,7 +250,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 							
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                         
 						v_ae1.start(f_CSE_GEN_RET_002(e_absolute));
 						v_ae1.done;
@@ -248,7 +271,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_GEN_UPD_001_CSR() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                         
 						v_ae1.start(f_CSE_GEN_UPD_001(e_cseRelative));
 						v_ae1.done;
@@ -257,7 +281,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_GEN_UPD_001_SPR() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                         
 						v_ae1.start(f_CSE_GEN_UPD_001(e_spRelative));
 						v_ae1.done;
@@ -267,7 +292,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 							
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                         
 						v_ae1.start(f_CSE_GEN_UPD_001(e_absolute));
 						v_ae1.done;
@@ -285,7 +311,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						                        
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                         
 						v_ae1.start(f_CSE_GEN_UPD_002(e_cseRelative));
 						v_ae1.done;
@@ -295,7 +322,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                         
 						v_ae1.start(f_CSE_GEN_UPD_002(e_spRelative));
 						v_ae1.done;
@@ -305,7 +333,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 							
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                         
 						v_ae1.start(f_CSE_GEN_UPD_002(e_absolute));
 						v_ae1.done;
@@ -326,7 +355,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						                        
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                         
 						v_ae1.start(f_CSE_GEN_DEL_001(e_cseRelative));
 						v_ae1.done;
@@ -336,7 +366,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                         
 						v_ae1.start(f_CSE_GEN_DEL_001(e_spRelative));
 						v_ae1.done;
@@ -346,7 +377,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 							
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                         
 						v_ae1.start(f_CSE_GEN_DEL_001(e_absolute));
 						v_ae1.done;
@@ -364,7 +396,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						                        
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                         
 						v_ae1.start(f_CSE_GEN_DEL_002(e_cseRelative));
 						v_ae1.done;
@@ -374,7 +407,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                         
 						v_ae1.start(f_CSE_GEN_DEL_002(e_spRelative));
 						v_ae1.done;
@@ -384,7 +418,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 							
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                         
 						v_ae1.start(f_CSE_GEN_DEL_002(e_absolute));
 						v_ae1.done;
@@ -407,7 +442,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_CRE_001() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 					
 					v_ae1.start(f_CSE_REG_CRE_001());
 		  	  	
@@ -476,7 +512,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_CRE_002() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 					v_ae1.start(f_CSE_REG_CRE_002());
 			  	  	
@@ -537,7 +574,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_CRE_003() runs on Tester system CseSystem {
 					
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+					v_cse1.done;
 						
 					v_cse1.start(f_CSE_REG_CRE_003());
 			  	  	
@@ -555,9 +593,10 @@ module OneM2M_Testcases_CSE_Release_1 {
 					//Preamble
 					v_remoteCseIndex := f_cse_registrationRemoteCse();
 					vc_ae1 := AeSimu.create("AE1") alive;
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+					vc_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					vc_ae1.done;
 					vc_ae1.start(f_cse_preamble_registerAe());
-					
+					vc_ae1.done;
 				
 				}
 		  	  	
@@ -568,7 +607,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_CRE_004() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 					v_ae1.start(f_CSE_REG_CRE_004());
 			  	  	
@@ -638,11 +678,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_CRE_005() runs on Tester system CseSystem {
 					
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+					v_cse1.done;
 						
 					v_cse1.start(f_CSE_REG_CRE_005());
-			  	  	
-					v_cse1.done;
+			  	  	v_cse1.done;
 			  	  		
 				}
 					
@@ -666,7 +706,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					vc_ae1.start(f_cse_sendCreateRequestPrimitive(int2, m_createAe(PX_APP_ID, -, "S", omit)));
 					vc_ae1.done;
 					
-					v_requestPrimitive := mw_createAEAnnc(PX_CSE_ID & "/S", -, -, -);
+					v_requestPrimitive := mw_createAEAnnc_s_ae_id(PX_CSE_ID & "/S", -, -, -);
 					v_requestPrimitive.primitiveContent.aEAnnc.app_ID := PX_APP_ID;
 	    									
 					tc_ac.start;
@@ -711,7 +751,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_CRE_006() runs on Tester system CseSystem {
 					
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+					v_cse1.done;
 							
 					v_cse1.start(f_CSE_REG_CRE_006());
 				  	  	
@@ -744,7 +785,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					tc_ac.start;
 
 					alt {
-						[] mccPortIn.receive(mw_request(mw_createAEAnnc(PX_CSE_ID, f_getLocalResourceAddress(vc_cSEBaseIndex), -))) {
+						[] mccPortIn.receive(mw_request(mw_createAEAnnc_s_ae_id(PX_CSE_ID, f_getLocalResourceAddress(vc_cSEBaseIndex), -))) {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__ & ": AE creation redirected.");
 						}
@@ -768,7 +809,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_CRE_007() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 					v_ae1.start(f_CSE_REG_CRE_007());
 			  	  	
@@ -837,7 +879,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_CRE_008() runs on Tester system CseSystem {
 					
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+					v_cse1.done;
 							
 					v_cse1.start(f_CSE_REG_CRE_008());
 				  	  	
@@ -877,11 +920,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 					tc_ac.start;
 	
 					alt {
-						[] mccPortIn.receive(mw_request(mw_createAEAnnc(f_getResourceAddress(-1,e_hierarchical, e_spRelative) & "/S", "CSE_ID", -))) {
+						[] mccPortIn.receive(mw_request(mw_createAEAnnc_s_ae_id(f_getResourceAddress(-1,e_hierarchical, e_spRelative) & "/S", "CSE_ID", -))) {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__ & ": AE creation redirected.");
 						}
-						[] mccPortIn.receive(mw_request(mw_createAEAnnc(f_getResourceAddress(-1,e_hierarchical, e_absolute) & "/S", "CSE_ID", -))) {
+						[] mccPortIn.receive(mw_request(mw_createAEAnnc_s_ae_id(f_getResourceAddress(-1,e_hierarchical, e_absolute) & "/S", "CSE_ID", -))) {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__ & ": AE creation redirected.");
 						}
@@ -909,7 +952,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_CRE_009() runs on Tester system CseSystem {
 					
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+					v_cse1.done;
 							
 					v_cse1.start(f_CSE_REG_CRE_009());
 				  	  	
@@ -988,7 +1032,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_CRE_010() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 					v_ae1.start(f_CSE_REG_CRE_010());
 			  	  	
@@ -1028,7 +1073,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					//Test Body
 					f_cse_createResource(int2, m_createAe(PX_APP_ID, omit, f_getResourceId(vc_resourcesList[v_aeIndex].resource)));
 					
-					vc_cse1.start(f_cse_announcementProcedure_createHandler(mw_createAEAnnc(PX_CSE_ID, -, -, -)));
+					vc_cse1.start(f_cse_announcementProcedure_createHandler(mw_createAEAnnc_s_ae_id(PX_CSE_ID, -, -, -)));
 					vc_cse1.done;
 
 					tc_ac.start;
@@ -1071,7 +1116,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_CRE_011() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 					v_ae1.start(f_CSE_REG_CRE_011());
 			  	  	
@@ -1142,7 +1188,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_REG_CRE_012_AE_LBL() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, PX_AE1_ID_STEM);
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_create.primitiveContent.aE.labels := {"labels"};
 						v_ae1.start(f_CSE_REG_CRE_012(v_create));
 						v_ae1.done;
@@ -1151,7 +1198,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_REG_CRE_012_AE_APN() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, PX_AE1_ID_STEM);
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_create.primitiveContent.aE.appName := "AeAppName";
 						v_ae1.start(f_CSE_REG_CRE_012(v_create));
@@ -1161,7 +1209,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_REG_CRE_012_AE_POA() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, PX_AE1_ID_STEM);
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_create.primitiveContent.aE.pointOfAccess := {PX_AE1_ADDRESS};
 						v_ae1.start(f_CSE_REG_CRE_012(v_create));
 						v_ae1.done;
@@ -1180,7 +1229,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createRemoteCSEBase;	
 						const AttributeAux c_optionalAttribute := {"labels", omit};
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
                         						
 						v_createRequest.primitiveContent.remoteCSE.labels := {"MyLabel"};
 						
@@ -1194,7 +1244,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createRemoteCSEBase;	
 						const AttributeAux c_optionalAttribute := {"cseType", omit};
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 												
 						v_createRequest.primitiveContent.remoteCSE.cseType := int1;
 						
@@ -1207,7 +1258,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createRemoteCSEBase;	
 						const AttributeAux c_optionalAttribute := {"pointOfAccess", omit};
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 	
 						v_createRequest.primitiveContent.remoteCSE.pointOfAccess := {"http://" & PX_CSE1_ADDRESS & "/"};
 	
@@ -1221,7 +1273,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createRemoteCSEBase;	
 						const AttributeAux c_optionalAttribute := {"nodeLink", omit};
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 
 						v_createRequest.primitiveContent.remoteCSE.nodeLink := c_defaultNodeID;
 
@@ -1239,7 +1292,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_CRE_016() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 							
 					v_ae1.start(f_CSE_REG_CRE_016());
 				  	  	
@@ -1310,7 +1364,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template RequestPrimitive v_createRequest := m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM);
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.aE.app_ID := omit;	//Mandatory app_ID field is being set empty
 	
 						v_ae1.start(f_CSE_REG_CRE_017(v_createRequest));
@@ -1322,7 +1377,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM);
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.aE.requestReachability := omit;	//Mandatory requestReachability field is being set empty
 						
 						v_ae1.start(f_CSE_REG_CRE_017(v_createRequest));
@@ -1339,7 +1395,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_CRE_018() runs on Tester system CseSystem {
 						
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 							
 					v_cse1.start(f_CSE_REG_CRE_018());
 				  	  	
@@ -1404,7 +1461,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_CRE_019() runs on Tester system CseSystem {
 					
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+					v_cse1.done;
 							
 					v_cse1.start(f_CSE_REG_CRE_019());
 				  	  	
@@ -1466,7 +1524,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_CRE_020() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 							
 					v_ae1.start(f_CSE_REG_CRE_020());
 				  	  	
@@ -1561,7 +1620,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_CRE_021() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 							
 					v_ae1.start(f_CSE_REG_CRE_021());
 				  	  	
@@ -1622,7 +1682,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_CRE_022() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 							
 					v_ae1.start(f_CSE_REG_CRE_022());
 				  	  	
@@ -1689,7 +1750,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_CRE_023() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 							
 					v_ae1.start(f_CSE_REG_CRE_023());
 				  	  	
@@ -1750,7 +1812,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_CRE_024() runs on Tester system CseSystem {
 					
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+					v_cse1.done;
 							
 					v_cse1.start(f_CSE_REG_CRE_024());
 				  	  	
@@ -1761,7 +1824,12 @@ module OneM2M_Testcases_CSE_Release_1 {
 				function f_CSE_REG_CRE_024() runs on CseSimu {
   
 					// Local variables
-					var ResponsePrimitive v_responsePrimitive;
+					var ResponsePrimitive v_response;
+					var MsgIn v_request;
+					var PrimitiveContent v_localResource;
+					var integer v_parentResourceIndex := -1;
+					var integer v_localResourceIndex := -1;
+					var boolean v_cseRegistered := false;
 					var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
 					var universal charstring v_action :=  __SCOPE__ & ": Please, send a CSE registration request with attributes multiplicity equals to 1";
 	   
@@ -1783,22 +1851,29 @@ module OneM2M_Testcases_CSE_Release_1 {
 					// Test Body
 					tc_ac.start;
 					alt {
-						[] mccPortIn.receive(mw_request(mw_createRemoteCSEBase)) {
+						[not(v_cseRegistered)] mccPortIn.receive(mw_request(mw_createRemoteCSEBase)) -> value v_request {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__&":INFO: Resource type remoteCSE created successfuly");
-							
-							//set responseStatusCode back to SUT
-							v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
-
-							//send back responsePrimitive
-							mccPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
-						}
-						[] mccPortIn.receive {
-							tc_ac.stop;
-							setverdict(inconc, __SCOPE__&":INFO: Unexpected message received");
-						}
+							setverdict(pass, __SCOPE__&":INFO: CREATE remoteCSE request received");
+							v_parentResourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
+							if(v_parentResourceIndex == -1) {
+								log(__SCOPE__&": ERROR: Target resource not found");
+								v_response := valueof(m_responsePrimitive(int4004,v_request.primitive.requestPrimitive.requestIdentifier));
+						
+							} else {
+								v_localResource := f_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, v_parentResourceIndex, v_request.primitive.requestPrimitive.resourceType);
+								vc_localRemoteCseIndex := f_setLocalResource(v_localResource, v_request.primitive.requestPrimitive.resourceType, v_parentResourceIndex);
+	
+								v_response := valueof(m_responsePrimitive(int2001,v_request.primitive.requestPrimitive.requestIdentifier));
+								v_response.primitiveContent := vc_localResourcesList[vc_localRemoteCseIndex].resource;
+								v_cseRegistered := true;
+							}
+							v_response.from_ := PX_CSE1_ID;
+							v_response.to_ := v_request.primitive.requestPrimitive.from_;
+							mccPortIn.send(f_getMsgOutPrimitive(m_response(v_response)));				}
 						[] tc_ac.timeout {
-							setverdict(inconc, __SCOPE__&":INFO: No request received for creating resource type remoteCSE");
+							if(not(v_cseRegistered)) {
+								setverdict(fail, __SCOPE__&":INFO: No request received for creating resource type remoteCSE");
+							}
 						}
 					}	
 					// Postamble
@@ -1816,7 +1891,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_CRE_025() runs on Tester system CseSystem {
 					
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+					v_cse1.done;
 							
 					v_cse1.start(f_CSE_REG_CRE_025());
 				  	  	
@@ -1886,67 +1962,73 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
 						var template RequestPrimitive v_request := mw_createRemoteCSE;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a CSE registration request with optional attribute resourceName";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.remoteCSE.resourceName := "UNINITIALIZED";
 						v_request.primitiveContent.remoteCSE.resourceName := ?;
 						v_cse1.start(f_CSE_REG_CRE_026(v_utRequest,v_request,v_action));
 						v_cse1.done;
 					}
 					
-					testcase TC_CSE_REG_CRE_026_ET() runs on CseSimu system CseSystem {
+					testcase TC_CSE_REG_CRE_026_ET() runs on Tester system CseSystem {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
 						var template RequestPrimitive v_request := mw_createRemoteCSE;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a CSE registration request with optional attribute expirationTime";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.remoteCSE.expirationTime := "20301231T012345";
 						v_request.primitiveContent.remoteCSE.expirationTime := ?;
 						v_cse1.start(f_CSE_REG_CRE_026(v_utRequest,v_request,v_action));
 						v_cse1.done;
 					}
 					
-					testcase TC_CSE_REG_CRE_026_LBL() runs on CseSimu system CseSystem {
+					testcase TC_CSE_REG_CRE_026_LBL() runs on Tester system CseSystem {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
 						var template RequestPrimitive v_request := mw_createRemoteCSE;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a CSE registration request with optional attribute labels";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.remoteCSE.labels := {"UNINITIALIZED"};
 						v_request.primitiveContent.remoteCSE.labels := ?;
 						v_cse1.start(f_CSE_REG_CRE_026(v_utRequest,v_request,v_action));
 						v_cse1.done;
 					}
 					
-					testcase TC_CSE_REG_CRE_026_POA() runs on CseSimu system CseSystem {
+					testcase TC_CSE_REG_CRE_026_POA() runs on Tester system CseSystem {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
 						var template RequestPrimitive v_request := mw_createRemoteCSE;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a CSE registration request with optional attribute pointOfAccess";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.remoteCSE.pointOfAccess := {"UNINITIALIZED"};
 						v_request.primitiveContent.remoteCSE.pointOfAccess := ?;
 						v_cse1.start(f_CSE_REG_CRE_026(v_utRequest,v_request,v_action));
 						v_cse1.done;
 					}
 					
-					testcase TC_CSE_REG_CRE_026_NL() runs on CseSimu system CseSystem {
+					testcase TC_CSE_REG_CRE_026_NL() runs on Tester system CseSystem {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
 						var template RequestPrimitive v_request := mw_createRemoteCSE;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a CSE registration request with optional attribute nodeLink";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.remoteCSE.nodeLink := "UNINITIALIZED";
 						v_request.primitiveContent.remoteCSE.nodeLink := ?;
 						v_cse1.start(f_CSE_REG_CRE_026(v_utRequest,v_request,v_action));
 						v_cse1.done;
 					}
 					
-					testcase TC_CSE_REG_CRE_026_CST() runs on CseSimu system CseSystem {
+					testcase TC_CSE_REG_CRE_026_CST() runs on Tester system CseSystem {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
 						var template RequestPrimitive v_request := mw_createRemoteCSE;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a CSE registration request with optional attribute cseType";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.remoteCSE.cseType := int1;//TODO It should be marked as "UNITIALIZED"
 						v_request.primitiveContent.remoteCSE.cseType := ?;
 						v_cse1.start(f_CSE_REG_CRE_026(v_utRequest,v_request,v_action));
@@ -1962,7 +2044,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_CRE_027() runs on Tester system CseSystem {
 					
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 							
 					v_cse1.start(f_CSE_REG_CRE_027());
 				  	  	
@@ -2020,7 +2103,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						 var RequestPrimitive v_request;
 						 var template PrimitiveContent v_contentResponse;
 						 var Labels v_labels_1 := {"VALUE_1"};
-						 f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						 v_request := valueof(m_createRemoteCSEBase);
 						 v_request.primitiveContent.remoteCSE.cseType := int2;	//MN_CSE
 						 v_request.primitiveContent.remoteCSE.labels := v_labels_1;
@@ -2040,7 +2124,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						
 						 var RequestPrimitive v_request;
 						 var template PrimitiveContent v_contentResponse;
-						 f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						 v_request := valueof(m_createRemoteCSEBase);
 						 v_request.primitiveContent.remoteCSE.cseType := int2;	//MN_CSE
 						 v_request.primitiveContent.remoteCSE.pointOfAccess := {"http://" & PX_CSE1_ADDRESS & "/"};
@@ -2060,7 +2145,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						
 						 var RequestPrimitive v_request;
 						 var template PrimitiveContent v_contentResponse;
-						 f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						 v_request := valueof(m_createRemoteCSEBase);
 						 v_request.primitiveContent.remoteCSE.cseType := int2;	//MN_CSE
 						 v_request.primitiveContent.remoteCSE.nodeLink := c_defaultNodeID;
@@ -2087,7 +2173,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_RET_001() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 								
 					v_ae1.start(f_CSE_REG_RET_001());
 					  	  	
@@ -2159,7 +2246,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.cSEBase := mw_contentCSEBase_rc1;
 						v_contentResponse.cSEBase.cseType := ?;
 						    
@@ -2171,7 +2259,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						//Local variables
 						 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						 var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						 v_contentResponse.cSEBase := mw_contentCSEBase_rc1;
 						 v_contentResponse.cSEBase.nodeLink := ?;
 	    
@@ -2189,7 +2278,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_RET_003() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);			
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;			
 					v_ae1.start(f_CSE_REG_RET_003());
 						  	  	
 					v_ae1.done;
@@ -2262,7 +2352,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.aE.labels := v_labels_1;
 	
 						v_contentResponse.aE := mw_contentAeBase;
@@ -2278,7 +2369,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						
 						 var template RequestPrimitive v_createRequest := m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM);
 						 var template PrimitiveContent v_contentResponse;
-						 f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						 v_createRequest.primitiveContent.aE.appName := "AeAppName";
 
 						 v_contentResponse.aE := mw_contentAeBase;
@@ -2293,7 +2385,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						 var template RequestPrimitive v_createRequest := m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM);
 						 var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						 v_createRequest.primitiveContent.aE.pointOfAccess := {PX_AE1_ADDRESS};
 
 						 v_contentResponse.aE := mw_contentAeBase;
@@ -2312,7 +2405,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_RET_005() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);			
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;			
 					v_ae1.start(f_CSE_REG_RET_005());
 						  	  	
 					v_ae1.done;
@@ -2395,7 +2489,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_RET_006() runs on Tester system CseSystem {
 					
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 							
 					v_cse1.start(f_CSE_REG_RET_006());
 				  	  	
@@ -2419,62 +2514,31 @@ module OneM2M_Testcases_CSE_Release_1 {
 					 // Test adapter configuration
 	
 					 // Preamble
-					 if(PX_IN_CSE){
-					     vc_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSEBase);
-					    
-						 v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
-	 
-						 mccPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(vc_remoteCseIndex), f_getOriginator(vc_remoteCseIndex)))));
-						 tc_ac.start;
-						 alt {
-							 [] mccPort.receive(mw_response(mw_responsePrimitive(int2000, v_contentResponse))) -> value v_response {
-								 tc_ac.stop;
-								 setverdict(pass, __SCOPE__ & ": Response OK for retrieving");
-							 }
-							 [] mccPort.receive(mw_response(mw_responsePrimitiveOK(v_contentResponse))) -> value v_response {
-								 tc_ac.stop;
-								 setverdict(fail, __SCOPE__ & ": Wrong response status code");
-							 }
-							 [] mccPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
-								 tc_ac.stop;
-								 setverdict(fail, __SCOPE__ & ": Error, resource elements provided not matching expected resource elements");
-							 }
-							 [] mccPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
-								 tc_ac.stop;
-								 setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
-							 }
-							 [] tc_ac.timeout {
-								 setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
-							 }
+				     vc_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSEBase);
+				    
+					 v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
+ 
+					 mccPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(vc_remoteCseIndex), f_getOriginator(vc_remoteCseIndex)))));
+					 tc_ac.start;
+					 alt {
+						 [] mccPort.receive(mw_response(mw_responsePrimitive(int2000, v_contentResponse))) -> value v_response {
+							 tc_ac.stop;
+							 setverdict(pass, __SCOPE__ & ": Response OK for retrieving");
 						 }
-					    
-					 } else if (PX_MN_CSE) {
-						vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSEBase);
-						
-						v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
-						
-						mccPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(vc_remoteCseIndex), f_getOriginator(vc_remoteCseIndex)))));
-						tc_ac.start;
-						alt {
-							 [] mccPort.receive(mw_response(mw_responsePrimitive(int2000, v_contentResponse))) -> value v_response {
-								 tc_ac.stop;
-								 setverdict(pass, __SCOPE__ & ": Response OK for retrieving");
-							 }
-							 [] mccPort.receive(mw_response(mw_responsePrimitiveOK(v_contentResponse))) -> value v_response {
-								 tc_ac.stop;
-								 setverdict(fail, __SCOPE__ & ": Wrong response status code");
-							 }
-							 [] mccPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
-								 tc_ac.stop;
-								 setverdict(fail, __SCOPE__ & ": Error, resource elements provided not matching expected resource elements");
-							 }
-							 [] mccPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
-								 tc_ac.stop;
-								 setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
-							 }
-							 [] tc_ac.timeout {
-								 setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
-							 }
+						 [] mccPort.receive(mw_response(mw_responsePrimitiveOK(v_contentResponse))) -> value v_response {
+							 tc_ac.stop;
+							 setverdict(fail, __SCOPE__ & ": Wrong response status code");
+						 }
+						 [] mccPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+							 tc_ac.stop;
+							 setverdict(fail, __SCOPE__ & ": Error, resource elements provided not matching expected resource elements");
+						 }
+						 [] mccPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+							 tc_ac.stop;
+							 setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
+						 }
+						 [] tc_ac.timeout {
+							 setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
 						 }
 					 }
 	
@@ -2499,7 +2563,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var Labels v_labels_1 := {"VALUE_1"};
 						var template RequestPrimitive v_createRequest := m_createRemoteCSEBase;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_createRequest.primitiveContent.remoteCSE.labels := v_labels_1;
 
 						v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
@@ -2515,7 +2580,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						
 						var template RequestPrimitive v_createRequest := m_createRemoteCSEBase;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_createRequest.primitiveContent.remoteCSE.cseType := int1;
 
 						v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
@@ -2531,7 +2597,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						
 						var template RequestPrimitive v_createRequest := m_createRemoteCSEBase;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_createRequest.primitiveContent.remoteCSE.pointOfAccess := {"http://" & PX_CSE1_ADDRESS & "/"};
 
 						v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
@@ -2547,7 +2614,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						
 						var template RequestPrimitive v_createRequest := m_createRemoteCSEBase;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_createRequest.primitiveContent.remoteCSE.nodeLink := c_defaultNodeID;
 
 						v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
@@ -2566,7 +2634,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_RET_008() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 									
 					v_ae1.start(f_CSE_REG_RET_008());
 						  	  	
@@ -2646,7 +2715,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_RET_009() runs on Tester system CseSystem {
 					
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 								
 					v_cse1.start(f_CSE_REG_RET_009());
 					  	  	
@@ -2655,14 +2725,14 @@ module OneM2M_Testcases_CSE_Release_1 {
 				}
 							
 				function f_CSE_REG_RET_009() runs on CseSimu {
-					//Local variables
 					 //Local variables
-					 var MsgIn v_response;
-					 var RequestPrimitive v_request;
+					 var MsgIn v_request;
 					 var ResourceType v_resourceType := int16;	//remoteCSE
+					 var ResponsePrimitive v_response;
 					 var template PrimitiveContent v_contentResponse;
 					 var template UtTriggerPrimitive v_utRequest;
-					 var universal charstring v_action := __SCOPE__ & ": Please, send a valid RETRIEVE Request containing To set to " & PX_CSE1_ADDRESS;
+					 var integer v_localResourceIndex := -1;
+					 var universal charstring v_action := __SCOPE__ & ": Please, send a valid RETRIEVE Request for remoteCSE to ";
 	 		
 					 // Test control
 					 if(not(PICS_MN_CSE)) {
@@ -2680,17 +2750,32 @@ module OneM2M_Testcases_CSE_Release_1 {
 					 
 					 //Send Trigger Message
 					 v_utRequest := m_utRetrieve(f_getLocalResourceAddress(vc_localRemoteCseIndex));
- 				     f_sendUtPrimitive(v_utRequest, v_action);
+ 				     f_sendUtPrimitive(v_utRequest, v_action & f_getLocalResourceAddress(vc_localRemoteCseIndex));
 					 
 					 tc_ac.start;
 					 alt {
- 						[] mccPortIn.receive(mw_request(mw_retrieve(f_getResourceAddress()))) -> value v_response {
-							tc_ac.stop;
-							setverdict(pass, __SCOPE__ & ": Retrieve Request received successfully");
+ 						[] mccPortIn.receive(mw_request(mw_retrieve(?))) -> value v_request {
+							tc_ac.stop;
+							v_localResourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
+							if(v_localResourceIndex == -1)
+							{ 
+								setverdict(fail, __SCOPE__ & ": ERROR: Retrieve request target not found");
+								v_response := valueof(m_responsePrimitive(int4004,v_request.primitive.requestPrimitive.requestIdentifier));
+							} else if(v_localResourceIndex != vc_localRemoteCseIndex) { 
+								setverdict(fail, __SCOPE__ & ": ERROR: Retrieve request target not expected");
+								v_response := valueof(m_responsePrimitive(int4004,v_request.primitive.requestPrimitive.requestIdentifier));
+							} else {
+								setverdict(pass, __SCOPE__ & ": Retrieve Request received successfully");
+								v_response := valueof(m_responsePrimitive(int2000,v_request.primitive.requestPrimitive.requestIdentifier));
+								v_response.primitiveContent := vc_localResourcesList[v_localResourceIndex].resource;
+							}
+							v_response.from_ := PX_CSE1_ID;
+							v_response.to_ := v_request.primitive.requestPrimitive.from_;
+							mccPortIn.send(f_getMsgOutPrimitive(m_response(v_response)));
 						}
-						[] mccPortIn.receive {
+						[] mccPortIn.receive(mw_request(?)) {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Error Retrieve request was not received");
+							setverdict(fail, __SCOPE__ & ": ERROR: Unexpected request received");
 						}
 						[] tc_ac.timeout {
 							setverdict(fail, __SCOPE__ & ": No answer while waiting to receive Retrieve request");
@@ -2711,7 +2796,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_RET_010() runs on Tester system CseSystem {
 						
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 								
 					v_cse1.start(f_CSE_REG_RET_010());
 					  	  	
@@ -2735,15 +2821,9 @@ module OneM2M_Testcases_CSE_Release_1 {
 					 // Test adapter configuration
 	
 					 // Preamble
-                    if (PX_IN_CSE){
-                        vc_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSEBase);
-                    }
+                     vc_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSEBase);
 					 
-                    if (PX_MN_CSE){
-                        vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSEBase);   
-                    }
-					 
-					v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
+ 					 v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
 	 
 					 mccPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(vc_remoteCseIndex), f_getOriginator(vc_remoteCseIndex)))));
 					 tc_ac.start;
@@ -2787,7 +2867,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_UPD_001() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 									
 					v_ae1.start(f_CSE_REG_UPD_001());
 						  	  	
@@ -2839,7 +2920,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					// Tear down
 					f_cf01Down();
 
-				}; //end TC_CSE_REG_UPD_BI_001
+				}; //end TC_CSE_REG_UPD_001
 
 				/**
 				 * @desc Check that the IUT accepts an update request of <remoteCSE> resource with OPTIONAL_ATTRIBUTE.
@@ -2852,7 +2933,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;	
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
     						
 						v_updateRequest.primitiveContent.remoteCSE.labels := {"MyLabel"};
 	
@@ -2865,7 +2947,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;	
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
     					
 						v_updateRequest.primitiveContent.remoteCSE.pointOfAccess := {"http://" & PX_CSE1_ADDRESS & "/"};
 	
@@ -2878,7 +2961,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;	
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
     						
 						v_updateRequest.primitiveContent.remoteCSE.nodeLink := c_defaultNodeID;
 	
@@ -2900,7 +2984,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;	
 						var AttributeList c_optionalAttribute;
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 			
 						v_updateRequest.primitiveContent.remoteCSE.labels := {"MyLabel"};
 						c_optionalAttribute := {"labels"};
@@ -2915,7 +3000,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;	
 						var AttributeList c_optionalAttribute;
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 		
 						v_updateRequest.primitiveContent.remoteCSE.pointOfAccess := {"http://" & PX_CSE1_ADDRESS & "/"};
 						c_optionalAttribute := {"pointofAccess"};
@@ -2930,7 +3016,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;	
 						var AttributeList c_optionalAttribute;
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 			
 						v_updateRequest.primitiveContent.remoteCSE.nodeLink := c_defaultNodeID;
 						c_optionalAttribute := {"nodeLink"};
@@ -2945,7 +3032,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;	
 						var AttributeList c_optionalAttribute;
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 			
 						v_updateRequest.primitiveContent.remoteCSE.expirationTime := "20301231T012345";
 						c_optionalAttribute := {"expirationTime"};
@@ -2960,7 +3048,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;	
 						var AttributeList c_optionalAttribute;
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 	
 						v_updateRequest.primitiveContent.remoteCSE.requestReachability := true;
 						c_optionalAttribute := {"requestReachability"};
@@ -2983,7 +3072,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_DEL_001() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 									
 					v_ae1.start(f_CSE_REG_DEL_001());
 						  	  	
@@ -3040,7 +3130,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_DEL_002() runs on Tester system CseSystem {
 					
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 								
 					v_cse1.start(f_CSE_REG_DEL_002());
 					  	  	
@@ -3059,13 +3150,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					// Test adapter configuration
 
 					// Preamble
-                    if (PX_MN_CSE){
-					vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSE);
-                    }
-                    
-                    if (PX_IN_CSE){
-					    vc_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSEBase);
-                    }
+				    vc_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSEBase);
                     
 					// Test Body
 					v_request := valueof(m_delete(f_getResourceAddress(vc_remoteCseIndex), f_getOriginator(vc_remoteCseIndex)));
@@ -3100,8 +3185,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					}					    
 
 					// Postamble
-					f_cse_postamble_deleteResourcesCSE();
-
+					
 					// Tear down
 					f_cf04Down();
 
@@ -3114,7 +3198,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_DEL_003() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 										
 					v_ae1.start(f_CSE_REG_DEL_003());
 							  	  	
@@ -3175,7 +3260,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_DEL_004() runs on Tester system CseSystem {
 					
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 								
 					v_cse1.start(f_CSE_REG_DEL_004());
 					  	  	
@@ -3184,11 +3270,14 @@ module OneM2M_Testcases_CSE_Release_1 {
 				}
 							
 				function f_CSE_REG_DEL_004() runs on CseSimu {
-					//Local variables	
+					//Local variables
+					var MsgIn v_request;
 					var template UtTriggerPrimitive v_utRequest := m_utDelete;
 					var UtTriggerAckPrimitive v_trigger_response;
+					var ResponsePrimitive v_response;
 					var integer v_auxInteger;
-					var universal charstring v_action := __SCOPE__ & ": Please, send a valid DELETE Request containing To set to " & PX_CSE1_ADDRESS;
+					var integer v_localResourceIndex := -1;
+					var universal charstring v_action := __SCOPE__ & ": Please, send a valid DELETE Request for remoteCSE to ";
 					
 					//Test control
 					if(not(PICS_MN_CSE)) {
@@ -3205,18 +3294,31 @@ module OneM2M_Testcases_CSE_Release_1 {
 					vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSE);
 					
 					//Send Trigger Message
-					v_auxInteger := f_setResource(valueof(m_primitiveContentRemoteCSE(m_contentCreateRemoteCSE(omit,omit,-,-))), int16);
-					v_utRequest.requestPrimitive.to_ := f_getResourceAddress(v_auxInteger);
-					f_sendUtPrimitive(v_utRequest, v_action);	
+					v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(vc_localRemoteCseIndex);
+					f_sendUtPrimitive(v_utRequest, v_action & f_getLocalResourceAddress(vc_localRemoteCseIndex));	
 
 					// Test Body
 					tc_ac.start;
 					alt {
-						[] mccPortIn.receive(mw_request(mw_delete( f_getResourceAddress(vc_remoteCseIndex), PX_CSE_ID))) {
-							tc_ac.stop;
-							setverdict(pass, __SCOPE__ & ": <remoteCSE> delete request has been received");
+						[] mccPortIn.receive(mw_request(mw_delete(?, PX_CSE_ID))) -> value v_request {
+							tc_ac.stop;
+							v_localResourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
+							if(v_localResourceIndex == -1)
+							{ 
+								setverdict(fail, __SCOPE__&": ERROR: Delete request target not found");
+								v_response := valueof(m_responsePrimitive(int4004,v_request.primitive.requestPrimitive.requestIdentifier));
+							} else if(v_localResourceIndex != vc_localRemoteCseIndex) { 
+								setverdict(fail, __SCOPE__&": ERROR: Delete request target not expected");
+								v_response := valueof(m_responsePrimitive(int4004,v_request.primitive.requestPrimitive.requestIdentifier));
+							} else {
+								setverdict(pass, __SCOPE__ & ": <remoteCSE> delete request has been received");
+								v_response := valueof(m_responsePrimitive(int2002,v_request.primitive.requestPrimitive.requestIdentifier));
+							}	
+							v_response.from_ := PX_CSE1_ID;
+							v_response.to_ := v_request.primitive.requestPrimitive.from_;
+							mccPortIn.send(f_getMsgOutPrimitive(m_response(v_response)));
 						}
-						[] mccPortIn.receive {
+						[] mccPortIn.receive(mw_request(?)) {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__ & ": Error while receiving <remoteCSE> delete request");
 						}
@@ -3252,7 +3354,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_createRequest.primitiveContent.container.resourceName := omit;
 						v_ae1.start(f_CSE_DMR_CRE_001(int3, v_createRequest, -)); //Container
@@ -3260,7 +3363,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.container.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
 						}
 						
@@ -3271,7 +3374,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_createRequest.primitiveContent.container.resourceName := omit;
 						v_ae1.start(f_CSE_DMR_CRE_001(int3, v_createRequest, m_createAeAux(omit,omit)));//Container
@@ -3282,7 +3386,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							if(getverdict == pass){ 
 								v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 								if(not ispresent(v_responsePrimitive.primitiveContent.container.resourceName)){
-									setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+									setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 								}
 							}
 						
@@ -3293,7 +3397,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_createRequest.primitiveContent.container.resourceName := omit;
 
@@ -3304,7 +3409,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.container.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 					}
 						}
 
@@ -3315,7 +3420,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_createRequest.primitiveContent.group_.resourceName := omit;
 
@@ -3326,7 +3432,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.group_.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 						}
 						}
 						
@@ -3337,7 +3443,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_createRequest.primitiveContent.group_.resourceName := omit;
 
@@ -3348,7 +3455,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.group_.resourceName)){
-									setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+									setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 								}
 							}
 						
@@ -3359,7 +3466,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createAcpBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_createRequest.primitiveContent.accessControlPolicy.resourceName := omit;
 
@@ -3370,7 +3478,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.accessControlPolicy.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 						}
 						}
 						
@@ -3381,7 +3489,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createAcpBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_createRequest.primitiveContent.accessControlPolicy.resourceName := omit;
 
@@ -3392,7 +3501,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.accessControlPolicy.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
 						}
 						
@@ -3403,7 +3512,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_createRequest.primitiveContent.subscription.resourceName := omit;
 						v_ae1.start(f_CSE_DMR_CRE_001(int23, v_createRequest, -));//Subscription
@@ -3413,7 +3523,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.subscription.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
 						}
 					
@@ -3424,7 +3534,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_createRequest.primitiveContent.subscription.resourceName := omit;
 						v_ae1.start(f_CSE_DMR_CRE_001(int23, v_createRequest, m_createAeAux(omit,omit)));//Subscription
@@ -3434,7 +3545,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.subscription.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
 						}
 	
@@ -3445,7 +3556,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_createRequest.primitiveContent.subscription.resourceName := omit;
 						v_ae1.start(f_CSE_DMR_CRE_001(int23, v_createRequest, m_createContainerBase));//Subscription
@@ -3455,7 +3567,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.subscription.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
 						}
 
@@ -3466,7 +3578,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_createRequest.primitiveContent.subscription.resourceName := omit;
 						v_ae1.start(f_CSE_DMR_CRE_001(int23, v_createRequest, m_createAcpBase));//Subscription
@@ -3476,7 +3589,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.subscription.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
 						}
 					}
@@ -3486,7 +3599,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						
 						v_createRequest.primitiveContent.subscription.resourceName := omit;
 						v_cse1.start(f_CSE_DMR_CRE_001_cseSimu(int23, v_createRequest));//Subscription
@@ -3496,7 +3610,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_cse1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.subscription.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
 						}		
 					}
@@ -3506,7 +3620,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_createRequest.primitiveContent.contentInstance.resourceName := omit;
 						v_ae1.start(f_CSE_DMR_CRE_001(int4, v_createRequest, m_createContainerBase));//ContentInstance
@@ -3516,7 +3631,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.contentInstance.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
 						}
 
@@ -3535,7 +3650,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 			
 						v_ae1.start(f_CSE_DMR_CRE_002(int3, m_createContainerBase));//container
 						v_ae1.done;
@@ -3544,10 +3660,10 @@ module OneM2M_Testcases_CSE_Release_1 {
 						
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.container.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							} else {
 								if(v_responsePrimitive.primitiveContent.container.resourceName != c_defaultContainerResourceName){
-									setverdict(fail, __SCOPE__, ": Error, resourceName attribute not correct");
+									setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not correct");
 								}
 							}
 						}
@@ -3558,7 +3674,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 			
 						v_ae1.start(f_CSE_DMR_CRE_002(int9, m_createGroupBase));//group
 						v_ae1.done;
@@ -3567,10 +3684,10 @@ module OneM2M_Testcases_CSE_Release_1 {
 																		
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.group_.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							} else {
 								if(v_responsePrimitive.primitiveContent.group_.resourceName != c_defaultGroupResourceName){
-									setverdict(fail, __SCOPE__, ": Error, resourceName attribute not correct");
+									setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not correct");
 								}
 							}
 						}
@@ -3580,7 +3697,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 			
 						v_ae1.start(f_CSE_DMR_CRE_002(int1, m_createAcpBase ));//accessControlPolicy
 						v_ae1.done;
@@ -3589,10 +3707,10 @@ module OneM2M_Testcases_CSE_Release_1 {
 																		
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.accessControlPolicy.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							} else {
 								if(v_responsePrimitive.primitiveContent.accessControlPolicy.resourceName != c_defaultAccessControlPolicyResourceName){
-									setverdict(fail, __SCOPE__, ": Error, resourceName attribute not correct");
+									setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not correct");
 								}
 							}
 						}
@@ -3602,7 +3720,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 			
 						v_ae1.start(f_CSE_DMR_CRE_002(int23, m_createSubscriptionBase));//Subscription
 						v_ae1.done;
@@ -3611,10 +3730,10 @@ module OneM2M_Testcases_CSE_Release_1 {
 																		
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.subscription.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							} else {
 								if(v_responsePrimitive.primitiveContent.subscription.resourceName != c_defaultSubscriptionResourceName){
-									setverdict(fail, __SCOPE__, ": Error, resourceName attribute not correct");
+									setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not correct");
 								}
 							}
 						}
@@ -3631,7 +3750,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_CRE_003_CNT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 						v_ae1.start(f_CSE_DMR_CRE_003(int3, m_createContainerBase));//container
 						v_ae1.done;
@@ -3641,7 +3761,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 						v_ae1.start(f_CSE_DMR_CRE_003(int9, m_createGroupBase));//group
 						v_ae1.done;
@@ -3651,7 +3772,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
                         
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 						v_ae1.start(f_CSE_DMR_CRE_003(int1, m_createAcpBase));//accessControlPolicy
 						v_ae1.done;
@@ -3661,7 +3783,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
                         
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 						v_ae1.start(f_CSE_DMR_CRE_003(int23, m_createSubscriptionBase));//Subscription
 						v_ae1.done;
@@ -3679,7 +3802,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
                         
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 						v_ae1.start(f_CSE_DMR_CRE_004(int3, m_createContainerBase));//container
 						v_ae1.done;
@@ -3689,7 +3813,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 						v_ae1.start(f_CSE_DMR_CRE_004(int9, m_createGroupBase));//group
 						v_ae1.done;
@@ -3699,7 +3824,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
                         
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 						v_ae1.start(f_CSE_DMR_CRE_004(int1, m_createAcpBase));//accessControlPolicy
 						v_ae1.done;
@@ -3709,7 +3835,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
                         
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 						v_ae1.start(f_CSE_DMR_CRE_004(int23, m_createSubscriptionBase));//Subscription
 						v_ae1.done;
@@ -3728,7 +3855,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createContainerBaseInvalid;
 						var AttributeAux v_invalidAttribute;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 												
 						v_createRequest.primitiveContent.container_update_invalid.maxNrOfInstances := -1;
 						v_invalidAttribute := {name := "maxNrOfInstances", value_ := "-1"};
@@ -3742,7 +3870,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createContainerBaseInvalid;
 						var AttributeAux v_invalidAttribute;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_createRequest.primitiveContent.container_update_invalid.maxByteSize := -1;
 						v_invalidAttribute := {name := "maxByteSize", value_ := "-1"};
@@ -3757,7 +3886,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createContainerBaseInvalid;
 						var AttributeAux v_invalidAttribute;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_createRequest.primitiveContent.container_update_invalid.maxInstanceAge := -1;
 						v_invalidAttribute := {name := "maxInstanceAge", value_ := "-1"};
@@ -3780,7 +3910,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_ae1.start(f_CSE_DMR_CRE_006(int3, v_createRequest));		
 						v_ae1.done;
@@ -3789,7 +3920,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 																		
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.container.maxNrOfInstances)){
-								setverdict(fail, __SCOPE__, ": Error, maxNrOfInstances attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, maxNrOfInstances attribute not provided");
 							} 
 						}	
 					}
@@ -3799,7 +3930,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_ae1.start(f_CSE_DMR_CRE_006(int3, v_createRequest));
 						v_ae1.done;
@@ -3808,7 +3940,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 																		
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.container.maxByteSize)){
-								setverdict(fail, __SCOPE__, ": Error, maxByteSize attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, maxByteSize attribute not provided");
 							} 
 						}	
 						  
@@ -3819,7 +3951,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 												
 						v_ae1.start(f_CSE_DMR_CRE_006(int3, v_createRequest));
 						v_ae1.done;
@@ -3828,386 +3961,425 @@ module OneM2M_Testcases_CSE_Release_1 {
 																		
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.container.maxInstanceAge)){
-								setverdict(fail, __SCOPE__, ": Error, maxInstanceAge attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, maxInstanceAge attribute not provided");
 							} 
 						}	
 					}
 				
 				}// end group g_CSE_DMR_CRE_006
 				
-				group g_CSE_DMR_CRE_007 {
-					
-					/**
-					 * @desc Check that the IUT responds with error when the newly created <contentInstance> results in that the field value of attribute currentNrOfInstances exceeds the field value of maxNrOfInstances in the parent container resource.
-					 * 
-					 */
-					testcase TC_CSE_DMR_CRE_007() runs on AeSimu system CseSystem {
-						// Local variables
-						var template RequestPrimitive v_createRequestContainer := m_createContainerBase;
-						var template RequestPrimitive v_createRequestContentInstance := m_createContentInstanceBase;
-						var MsgIn v_response;
-						var RequestPrimitive v_request;
-						var integer v_aeIndex := -1;
-						var integer v_containerIndex := -1;
-						var integer v_contentInstanceIndex := -1;
-						const integer c_maxNumberOfInstances := 1;				   
-						// Test control
-				
-						// Test component configuration
-						f_cf01Up();
+				/**
+				 * @desc Check that the IUT responds with error when the newly created <contentInstance> results in that the field value of attribute currentNrOfInstances exceeds the field value of maxNrOfInstances in the parent container resource.
+				 * 
+				 */
+				testcase TC_CSE_DMR_CRE_007() runs on Tester system CseSystem {
 				
-						// Test adapter configuration
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
+								
+					v_ae1.start(f_CSE_DMR_CRE_007());
+					  	  	
+					v_ae1.done;
+					  	  		
+				}
 				
-						// Preamble
-						v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
-						
-						v_createRequestContainer.primitiveContent.container.maxNrOfInstances := c_maxNumberOfInstances;
-												
-						v_containerIndex := f_cse_createResource(int3, v_createRequestContainer, v_aeIndex);		//Container
-						
-						v_contentInstanceIndex := f_cse_createResource(int4, m_createContentInstanceBase, v_containerIndex);	//ContentInstance
+				function f_CSE_DMR_CRE_007() runs on AeSimu system CseSystem {
+					// Local variables
+					var template RequestPrimitive v_createRequestContainer := m_createContainerBase;
+					var template RequestPrimitive v_createRequestContentInstance := m_createContentInstanceBase;
+					var MsgIn v_response;
+					var RequestPrimitive v_request;
+					var integer v_aeIndex := -1;
+					var integer v_containerIndex := -1;
+					var integer v_contentInstanceIndex := -1;
+					const integer c_maxNumberOfInstances := 1;				   
+					// Test control
+			
+					// Test component configuration
+					f_cf01Up();
+			
+					// Test adapter configuration
+			
+					// Preamble
+					v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
 					
-						// Test Body
-						
-						v_createRequestContentInstance.primitiveContent.contentInstance.resourceName := c_defaultContentInstanceResourceName & "2";	//ContentInstance 2
-						v_request := f_getCreateRequestPrimitive(int4, v_createRequestContentInstance, v_containerIndex);
+					v_createRequestContainer.primitiveContent.container.maxNrOfInstances := c_maxNumberOfInstances;
+											
+					v_containerIndex := f_cse_createResource(int3, v_createRequestContainer, v_aeIndex);		//Container
 					
-						mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
-						tc_ac.start;
-						alt {
-							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
-								tc_ac.stop;
-								setverdict(pass, __SCOPE__ & ": ContentInstance created");
-							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
-								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Wrong response status code in the response");
-							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
-								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Error while creating resource type contentInstance");
-								
-							}
-							[] tc_ac.timeout {
-								setverdict(fail, __SCOPE__ & ": No answer while creating resource type contentInstance");
-							}
-						}	
-								
-						f_checkAeSimuStatus();
-    					
-						//Check to see if the resource is NOT present
-						if(f_isResourceNotPresent(v_containerIndex, c_defaultContentInstanceResourceName)){
-						  setverdict(pass, __SCOPE__ & ":INFO: Oldest contentInstance has been removed to allow the creation of the new contentInstance");
-						} else {
-						  setverdict(fail, __SCOPE__ & ":ERROR: Oldest contentInstance has not been removed to allow the creation of the new contentInstance");
-						}
-												
-						// Postamble
-						f_cse_postamble_deleteResources();
-						
-						// Tear down
-						f_cf01Down();
-					    				
-					}//end TC_CSE_DMR_CRE_007
-						
-				}// end group g_CSE_DMR_CRE_007		
+					v_contentInstanceIndex := f_cse_createResource(int4, m_createContentInstanceBase, v_containerIndex);	//ContentInstance
 				
-				group g_CSE_DMR_CRE_008 {
+					// Test Body
 					
-					/**
-					 * @desc Checks that the IUT accepts a newly created contentInstance when the currentByteSize exceeds the field value set in maxByteSize in the parent container resource by removing enough of the oldest <contentInstance> resources to allow the creation of the new <contentInstance> resource.
-					 * 
-					 */
-					testcase TC_CSE_DMR_CRE_008() runs on AeSimu system CseSystem {
-						//Local variables
-						var template RequestPrimitive v_createRequestContainer := m_createContainerBase;
-						var template RequestPrimitive v_createRequestContentInstance := m_createContentInstanceBase;
-						var MsgIn v_response;
-						var RequestPrimitive v_request;
-						var integer v_aeIndex := -1;
-						var integer v_containerIndex := -1;
-						var integer v_contentInstanceIndex := -1;
-						const integer c_maxByteSize := 10;	
-						const XSD.String c_primitiveContent1 := "Content1";
-						const XSD.String c_primitiveContent2 := "Content2";			   
-						// Test control
-	
-						// Test component configuration
-						f_cf01Up();
-	
-						// Test adapter configuration
-	
-						// Preamble
-						v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
-	
-						v_createRequestContainer.primitiveContent.container.maxByteSize := c_maxByteSize;
+					v_createRequestContentInstance.primitiveContent.contentInstance.resourceName := c_defaultContentInstanceResourceName & "2";	//ContentInstance 2
+					v_request := f_getCreateRequestPrimitive(int4, v_createRequestContentInstance, v_containerIndex);
+				
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
+					tc_ac.start;
+					alt {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
+							tc_ac.stop;
+							setverdict(pass, __SCOPE__ & ": ContentInstance created");
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Wrong response status code in the response");
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Error while creating resource type contentInstance");
 							
-						v_containerIndex := f_cse_createResource(int3, v_createRequestContainer, v_aeIndex);		//Container
-	
-						v_contentInstanceIndex := f_cse_createResource(int4, m_createContentInstance(f_getResourceAddress(v_containerIndex), c_primitiveContent1), v_containerIndex);//ContentInstance
-	
-						// Test Body
-	
-						v_createRequestContentInstance.primitiveContent.contentInstance.content := c_primitiveContent2;	//ContentInstance 2
-						v_createRequestContentInstance.primitiveContent.contentInstance.resourceName := c_defaultContentInstanceResourceName & "2";
-						v_request := f_getCreateRequestPrimitive(int4, v_createRequestContentInstance, v_containerIndex);
-	
-						mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
-						tc_ac.start;
-						alt {
-							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
-								tc_ac.stop;
-								setverdict(pass, __SCOPE__ & ": ContentInstance created");
-							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
-								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Wrong response status code in the response");
-							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
-								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Error while creating resource type contentInstance");
-			
-							}
-							[] tc_ac.timeout {
-								setverdict(fail, __SCOPE__ & ": No answer while creating resource type contentInstance");
-							}
-						}	
-			
-						f_checkAeSimuStatus();
-	
-						//Check to see if the resource is NOT present
-						if(f_isResourceNotPresent(v_containerIndex, c_defaultContentInstanceResourceName)){
-						  setverdict(pass, __SCOPE__ & ":INFO: Oldest contentInstance has been removed to allow the creation of the new contentInstance");
-						} else {
-						  setverdict(fail, __SCOPE__ & ":ERROR: Oldest contentInstance has not been removed to allow the creation of the new contentInstance");
 						}
+						[] tc_ac.timeout {
+							setverdict(fail, __SCOPE__ & ": No answer while creating resource type contentInstance");
+						}
+					}	
 							
-						// Postamble
-						f_cse_postamble_deleteResources();
-	
-						// Tear down
-						f_cf01Down();
-					    				
-					}//end TC_CSE_DMR_CRE_008
-						
-				}// end group g_CSE_DMR_CRE_008			
-
-				group g_CSE_DMR_CRE_009 {
-				
-					/**
-					 * @desc Check that the IUT increaments and then copies the field value of attribute stateTag in parent container resource when contentInstance resource is created as the direct child of the parent container
-					 * 
-					 */
-					testcase TC_CSE_DMR_CRE_009() runs on AeSimu system CseSystem {
-						// Local variables
-						var template RequestPrimitive v_createRequest := m_createContainerBase;
-						var MsgIn v_response;
-						var integer v_aeIndex := -1;
-						var integer v_containerIndex := -1;
-						var integer v_contentInstanceIndex := -1;
-						var template PrimitiveContent v_contentResponse;
-					
-						// Test control
-				
-						// Test component configuration
-						f_cf01Up();
-				
-						// Test adapter configuration
+					f_checkAeSimuStatus();
 				
-						// Preamble
-						v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
-						
-						v_containerIndex := f_cse_createResource(int3, v_createRequest, v_aeIndex);
-						
-						v_contentInstanceIndex := f_cse_createResource(int4, m_createContentInstanceBase, v_containerIndex);
+					//Check to see if the resource is NOT present
+					if(f_isResourceNotPresent(v_containerIndex, c_defaultContentInstanceResourceName)){
+					  setverdict(pass, __SCOPE__ & ":INFO: Oldest contentInstance has been removed to allow the creation of the new contentInstance");
+					} else {
+					  setverdict(fail, __SCOPE__ & ":ERROR: Oldest contentInstance has not been removed to allow the creation of the new contentInstance");
+					}
+											
+					// Postamble
+					f_cse_postamble_deleteResources();
 					
-						// Test Body
-						mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_containerIndex), f_getOriginator(v_containerIndex)))));
-						
-						v_contentResponse.container := mw_contentContainerBase;
+					// Tear down
+					f_cf01Down();
+				    				
+				}//end f_CSE_DMR_CRE_007
 						
-						tc_ac.start;
-						alt {
-							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, v_contentResponse))) -> value v_response {
-								tc_ac.stop;
-								setverdict(pass, __SCOPE__ & ": Response OK for retrieving");
-								if(v_response.primitive.responsePrimitive.primitiveContent.container.stateTag == vc_resourcesList[v_containerIndex].resource.container.stateTag + 1) {
-									setverdict(pass, __SCOPE__ & ": stateTag attribute increased after creation of contentInstance resource");
-								} else {
-									setverdict(fail, __SCOPE__ & ": stateTag attribute not incremented correctly after creation of contentInstance resource");
-								}
-							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(v_contentResponse))) -> value v_response {
-								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Wrong response status code");
-							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
-								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Error, resource elements provided not matching expected resource elements");
-							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
-								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
-							}
-							[] tc_ac.timeout {
-								setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
-							}
-						}	
+				/**
+				 * @desc Checks that the IUT accepts a newly created contentInstance when the currentByteSize exceeds the field value set in maxByteSize in the parent container resource by removing enough of the oldest <contentInstance> resources to allow the creation of the new <contentInstance> resource.
+				 * 
+				 */
+				testcase TC_CSE_DMR_CRE_008() runs on Tester system CseSystem {
+				
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
 								
-						// Postamble
-						f_cse_postamble_deleteResources();
+					v_ae1.start(f_CSE_DMR_CRE_008());
+					  	  	
+					v_ae1.done;
+					  	  		
+				}		
+				function f_CSE_DMR_CRE_008() runs on AeSimu system CseSystem {
+					//Local variables
+					var template RequestPrimitive v_createRequestContainer := m_createContainerBase;
+					var template RequestPrimitive v_createRequestContentInstance := m_createContentInstanceBase;
+					var MsgIn v_response;
+					var RequestPrimitive v_request;
+					var integer v_aeIndex := -1;
+					var integer v_containerIndex := -1;
+					var integer v_contentInstanceIndex := -1;
+					const integer c_maxByteSize := 10;	
+					const XSD.String c_primitiveContent1 := "Content1";
+					const XSD.String c_primitiveContent2 := "Content2";			   
+					// Test control
+
+					// Test component configuration
+					f_cf01Up();
+
+					// Test adapter configuration
+
+					// Preamble
+					v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+
+					v_createRequestContainer.primitiveContent.container.maxByteSize := c_maxByteSize;
 						
-						// Tear down
-						f_cf01Down();
-					    				
-					}//end TC_CSE_DMR_CRE_009
+					v_containerIndex := f_cse_createResource(int3, v_createRequestContainer, v_aeIndex);		//Container
+
+					v_contentInstanceIndex := f_cse_createResource(int4, m_createContentInstance(f_getResourceAddress(v_containerIndex), c_primitiveContent1), v_containerIndex);//ContentInstance
+
+					// Test Body
+
+					v_createRequestContentInstance.primitiveContent.contentInstance.content := c_primitiveContent2;	//ContentInstance 2
+					v_createRequestContentInstance.primitiveContent.contentInstance.resourceName := c_defaultContentInstanceResourceName & "2";
+					v_request := f_getCreateRequestPrimitive(int4, v_createRequestContentInstance, v_containerIndex);
+
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
+					tc_ac.start;
+					alt {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
+							tc_ac.stop;
+							setverdict(pass, __SCOPE__ & ": ContentInstance created");
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Wrong response status code in the response");
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Error while creating resource type contentInstance");
+		
+						}
+						[] tc_ac.timeout {
+							setverdict(fail, __SCOPE__ & ": No answer while creating resource type contentInstance");
+						}
+					}	
+		
+					f_checkAeSimuStatus();
+
+					//Check to see if the resource is NOT present
+					if(f_isResourceNotPresent(v_containerIndex, c_defaultContentInstanceResourceName)){
+					  setverdict(pass, __SCOPE__ & ":INFO: Oldest contentInstance has been removed to allow the creation of the new contentInstance");
+					} else {
+					  setverdict(fail, __SCOPE__ & ":ERROR: Oldest contentInstance has not been removed to allow the creation of the new contentInstance");
+					}
 						
-				}// end group g_CSE_DMR_CRE_009		
-				
-				group g_CSE_DMR_CRE_010 {
-					
-					/**
-					 * @desc Check that the IUT rejects the CREATE Request of a container resource named “la” as a direct child of a container resource 
-					 * 
-					 */
-					testcase TC_CSE_DMR_CRE_010() runs on AeSimu system CseSystem {
-						// Local variables
-						var template RequestPrimitive v_createRequest := m_createContainerBase;
-						var MsgIn v_response;
-						var RequestPrimitive v_request;
-						var integer v_aeIndex := -1;
-						var integer v_containerIndex := -1;
+					// Postamble
+					f_cse_postamble_deleteResources();
+
+					// Tear down
+					f_cf01Down();
+				    				
+				}//end f_CSE_DMR_CRE_008
 						
-						// Test control
+				/**
+				 * @desc Check that the IUT increaments and then copies the field value of attribute stateTag in parent container resource when contentInstance resource is created as the direct child of the parent container
+				 * 
+				 */
+				testcase TC_CSE_DMR_CRE_009() runs on Tester system CseSystem {
 				
-						// Test component configuration
-						f_cf01Up();
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
+								
+					v_ae1.start(f_CSE_DMR_CRE_009());
+					  	  	
+					v_ae1.done;
+					  	  		
+				}
 				
-						// Test adapter configuration
+				function f_CSE_DMR_CRE_009() runs on AeSimu system CseSystem {
+					// Local variables
+					var template RequestPrimitive v_createRequest := m_createContainerBase;
+					var MsgIn v_response;
+					var integer v_aeIndex := -1;
+					var integer v_containerIndex := -1;
+					var integer v_contentInstanceIndex := -1;
+					var template PrimitiveContent v_contentResponse;
 				
-						// Preamble
-						v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
-						
-						v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
+					// Test control
+			
+					// Test component configuration
+					f_cf01Up();
+			
+					// Test adapter configuration
+			
+					// Preamble
+					v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
 					
-						// Test Body
-						v_createRequest.primitiveContent.container.resourceName := c_resourceShortNameLatest;
-						
-						v_request := f_getCreateRequestPrimitive(int3, v_createRequest, v_containerIndex);
+					v_containerIndex := f_cse_createResource(int3, v_createRequest, v_aeIndex);
 					
-						mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
-						tc_ac.start;
-						alt {
-							[] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) -> value v_response {
-								tc_ac.stop;
-								setverdict(pass, __SCOPE__ & ": Not allowed to create a contentInstance resource named 'la'");
-								
-							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
-								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Rejected creation of contentInstance named 'la' with wrong ResponseStatusCode");
-							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
-								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Accepted creation of contentInstance named 'la'");
-								
-							}
-							[] tc_ac.timeout {
-								setverdict(fail, __SCOPE__ & ": No answer while creating resource type 4");
+					v_contentInstanceIndex := f_cse_createResource(int4, m_createContentInstanceBase, v_containerIndex);
+				
+					// Test Body
+					mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_containerIndex), f_getOriginator(v_containerIndex)))));
+					
+					v_contentResponse.container := mw_contentContainerBase;
+					
+					tc_ac.start;
+					alt {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, v_contentResponse))) -> value v_response {
+							tc_ac.stop;
+							setverdict(pass, __SCOPE__ & ": Response OK for retrieving");
+							if(v_response.primitive.responsePrimitive.primitiveContent.container.stateTag == vc_resourcesList[v_containerIndex].resource.container.stateTag + 1) {
+								setverdict(pass, __SCOPE__ & ": stateTag attribute increased after creation of contentInstance resource");
+							} else {
+								setverdict(fail, __SCOPE__ & ": stateTag attribute not incremented correctly after creation of contentInstance resource");
 							}
-						}	
-								
-						f_checkAeSimuStatus();
-    					
-						//Check to see if the resource is NOT present
-						if(f_isResourceNotPresent(v_containerIndex, f_getResourceName(v_request.primitiveContent))){
-						  setverdict(pass, __SCOPE__ & ":INFO: Resource not created");
-						} else {
-						  setverdict(fail, __SCOPE__ & ":ERROR: Resource created");
 						}
-								
-						// Postamble
-						f_cse_postamble_deleteResources();
-						
-						// Tear down
-						f_cf01Down();
-					    				
-					}//end TC_CSE_DMR_CRE_010
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(v_contentResponse))) -> value v_response {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Wrong response status code");
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Error, resource elements provided not matching expected resource elements");
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
+						}
+						[] tc_ac.timeout {
+							setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
+						}
+					}	
+							
+					// Postamble
+					f_cse_postamble_deleteResources();
+					
+					// Tear down
+					f_cf01Down();
+				    				
+				}//end f_CSE_DMR_CRE_009
+					
+				/**
+				 * @desc Check that the IUT rejects the CREATE Request of a container resource named “la” as a direct child of a container resource 
+				 * 
+				 */
+				testcase TC_CSE_DMR_CRE_010() runs on Tester system CseSystem {
+			
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
+							
+					v_ae1.start(f_CSE_DMR_CRE_010());
+				  	  	
+					v_ae1.done;
+				  	  		
+				}					
+				
+				function f_CSE_DMR_CRE_010() runs on AeSimu system CseSystem {
+					// Local variables
+					var template RequestPrimitive v_createRequest := m_createContainerBase;
+					var MsgIn v_response;
+					var RequestPrimitive v_request;
+					var integer v_aeIndex := -1;
+					var integer v_containerIndex := -1;
+					
+					// Test control
+			
+					// Test component configuration
+					f_cf01Up();
+			
+					// Test adapter configuration
+			
+					// Preamble
+					v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+					
+					v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
+				
+					// Test Body
+					v_createRequest.primitiveContent.container.resourceName := c_resourceShortNameLatest;
+					
+					v_request := f_getCreateRequestPrimitive(int3, v_createRequest, v_containerIndex);
+				
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
+					tc_ac.start;
+					alt {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) -> value v_response {
+							tc_ac.stop;
+							setverdict(pass, __SCOPE__ & ": Not allowed to create a contentInstance resource named 'la'");
+							
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Rejected creation of contentInstance named 'la' with wrong ResponseStatusCode");
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Accepted creation of contentInstance named 'la'");
+							
+						}
+						[] tc_ac.timeout {
+							setverdict(fail, __SCOPE__ & ": No answer while creating resource type 4");
+						}
+					}	
+							
+					f_checkAeSimuStatus();
+					
+					//Check to see if the resource is NOT present
+					if(f_isResourceNotPresent(v_containerIndex, f_getResourceName(v_request.primitiveContent))){
+					  setverdict(pass, __SCOPE__ & ":INFO: Resource not created");
+					} else {
+					  setverdict(fail, __SCOPE__ & ":ERROR: Resource created");
+					}
+							
+					// Postamble
+					f_cse_postamble_deleteResources();
+					
+					// Tear down
+					f_cf01Down();
+				    				
+				}//end f_CSE_DMR_CRE_010
 						
-				}// end group g_CSE_DMR_CRE_010	
+				/**
+				 * @desc Check that the IUT rejects the CREATE Request of a container resource named “ol” as a direct child of a container resource 
+				 * 
+				 */
+				testcase TC_CSE_DMR_CRE_011() runs on Tester system CseSystem {
+				
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
+								
+					v_ae1.start(f_CSE_DMR_CRE_011());
+					  	  	
+					v_ae1.done;
+					  	  		
+				}
 				
-				group g_CSE_DMR_CRE_011 {
+				function f_CSE_DMR_CRE_011() runs on AeSimu system CseSystem {
+					// Local variables
+					var template RequestPrimitive v_createRequest := m_createContainerBase;
+					var MsgIn v_response;
+					var RequestPrimitive v_request;
+					var integer v_aeIndex := -1;
+					var integer v_containerIndex := -1;
+					
+					// Test control
+			
+					// Test component configuration
+					f_cf01Up();
+			
+					// Test adapter configuration
+			
+					// Preamble
+					v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
 					
-					/**
-					 * @desc Check that the IUT rejects the CREATE Request of a container resource named “ol” as a direct child of a container resource 
-					 * 
-					 */
-					testcase TC_CSE_DMR_CRE_011() runs on AeSimu system CseSystem {
-						// Local variables
-						var template RequestPrimitive v_createRequest := m_createContainerBase;
-						var MsgIn v_response;
-						var RequestPrimitive v_request;
-						var integer v_aeIndex := -1;
-						var integer v_containerIndex := -1;
-						
-						// Test control
-				
-						// Test component configuration
-						f_cf01Up();
+					v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
 				
-						// Test adapter configuration
+					// Test Body
+					v_createRequest.primitiveContent.container.resourceName := c_resourceShortNameOldest;
+					
+					v_request := f_getCreateRequestPrimitive(int3, v_createRequest, v_containerIndex);
 				
-						// Preamble
-						v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
-						
-						v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
+					tc_ac.start;
+					alt {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) -> value v_response {
+							tc_ac.stop;
+							setverdict(pass, __SCOPE__ & ": Not allowed to create a contentInstance resource named 'ol'");
+							
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Rejected creation of contentInstance named 'ol' with wrong ResponseStatusCode");
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Accepted creation of contentInstance named 'ol'");
+							
+						}
+						[] tc_ac.timeout {
+							setverdict(fail, __SCOPE__ & ": No answer while creating resource type 4");
+						}
+					}	
+							
+					f_checkAeSimuStatus();
 					
-						// Test Body
-						v_createRequest.primitiveContent.container.resourceName := c_resourceShortNameOldest;
-						
-						v_request := f_getCreateRequestPrimitive(int3, v_createRequest, v_containerIndex);
+					//Check to see if the resource is NOT present
+					if(f_isResourceNotPresent(v_containerIndex, f_getResourceName(v_request.primitiveContent))){
+					  setverdict(pass, __SCOPE__ & ":INFO: Resource not created");
+					} else {
+					  setverdict(fail, __SCOPE__ & ":ERROR: Resource created");
+					}
+							
+					// Postamble
+					f_cse_postamble_deleteResources();
 					
-						mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
-						tc_ac.start;
-						alt {
-							[] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) -> value v_response {
-								tc_ac.stop;
-								setverdict(pass, __SCOPE__ & ": Not allowed to create a contentInstance resource named 'ol'");
-								
-							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
-								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Rejected creation of contentInstance named 'ol' with wrong ResponseStatusCode");
-							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
-								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Accepted creation of contentInstance named 'ol'");
-								
-							}
-							[] tc_ac.timeout {
-								setverdict(fail, __SCOPE__ & ": No answer while creating resource type 4");
-							}
-						}	
-								
-						f_checkAeSimuStatus();
-    					
-						//Check to see if the resource is NOT present
-						if(f_isResourceNotPresent(v_containerIndex, f_getResourceName(v_request.primitiveContent))){
-						  setverdict(pass, __SCOPE__ & ":INFO: Resource not created");
-						} else {
-						  setverdict(fail, __SCOPE__ & ":ERROR: Resource created");
-						}
-								
-						// Postamble
-						f_cse_postamble_deleteResources();
-						
-						// Tear down
-						f_cf01Down();
-					    				
-					}//end TC_CSE_DMR_CRE_011
+					// Tear down
+					f_cf01Down();
+				    				
+				}//end f_CSE_DMR_CRE_011
 						
-				}// end group g_CSE_DMR_CRE_011
-
 				group g_CSE_DMR_CRE_012 {
 					
 					/**
@@ -4219,7 +4391,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						const AttributeList c_optionalAttribute := {"accessControlPolicyIDs"};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.container.accessControlPolicyIDs := {"NotInitialized"};
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int3, v_createRequest, c_optionalAttribute));			
@@ -4231,7 +4404,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						const AttributeList c_optionalAttribute := {"labels"};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.container.labels := {"MyLabel"};
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int3, v_createRequest, c_optionalAttribute));
@@ -4244,7 +4418,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						const AttributeList c_optionalAttribute := {"maxNrOfInstances"};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.container.maxNrOfInstances := 0;
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int3, v_createRequest, c_optionalAttribute));
@@ -4257,7 +4432,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						const AttributeList c_optionalAttribute := {"maxByteSize"};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.container.maxByteSize := 0;
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int3, v_createRequest, c_optionalAttribute));
@@ -4270,7 +4446,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						const AttributeList c_optionalAttribute := {"maxInstanceAge"};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.container.maxInstanceAge := 0;
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int3, v_createRequest, c_optionalAttribute));
@@ -4283,7 +4460,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AttributeList v_optionalAttribute := {"creator"};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.container.creator := "NullValue";
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int3, v_createRequest, v_optionalAttribute));
@@ -4296,7 +4474,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
 						const AttributeList c_optionalAttribute := {"labels"};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.contentInstance.labels := {"MyLabel"};
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int4, v_createRequest, c_optionalAttribute));
@@ -4309,7 +4488,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
 						var AttributeList v_optionalAttribute := {"creator"};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.contentInstance.creator := "NullValue";
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int4, v_createRequest, v_optionalAttribute));
@@ -4322,7 +4502,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
 						const AttributeList c_optionalAttribute := {"contentInfo"};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.contentInstance.contentInfo := "MyContentInfo";
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int4, v_createRequest, c_optionalAttribute));
@@ -4335,7 +4516,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createAcpBase;
 						const AttributeList c_optionalAttribute := {"labels"};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.accessControlPolicy.labels := {"MyLabel"};
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int1, v_createRequest, c_optionalAttribute));
@@ -4348,7 +4530,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"accessControlPolicyIDs"};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.accessControlPolicyIDs := {"NotInitialized"};
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));			
@@ -4360,7 +4543,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"labels"};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.labels := {"MyLabel"};
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
@@ -4373,7 +4557,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var AttributeList v_optionalAttribute := {"creator"};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.creator := "NullValue";
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, v_optionalAttribute));
@@ -4383,68 +4568,76 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 				}// end group g_CSE_DMR_CRE_012	
 
-				group g_CSE_DMR_CRE_013{
-					
-					/**
-					 * @desc Check that the IUT rejects the CREATE Request of a contentInstance resource with error “NOT_ACCEPTABLE” when contentSize exceeds maxByteSize
-					 * 
-					 */
-					testcase TC_CSE_DMR_CRE_013() runs on AeSimu system CseSystem {
-						// Local variables
-						var template RequestPrimitive v_createRequest := m_createContainerBase;
-						var MsgIn v_response;
-						var RequestPrimitive v_request;
-						var integer v_aeIndex := -1;
-						var integer v_containerIndex := -1;
-						const integer c_maxByteSize := 1;				   
-						// Test control
+				/**
+				 * @desc Check that the IUT rejects the CREATE Request of a contentInstance resource with error “NOT_ACCEPTABLE” when contentSize exceeds maxByteSize
+				 * 
+				 */
+				testcase TC_CSE_DMR_CRE_013() runs on Tester system CseSystem {
+			
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
+							
+					v_ae1.start(f_CSE_DMR_CRE_013());
+				  	  	
+					v_ae1.done;
+				  	  		
+				}
+				
+				function f_CSE_DMR_CRE_013() runs on AeSimu system CseSystem {
+					// Local variables
+					var template RequestPrimitive v_createRequest := m_createContainerBase;
+					var MsgIn v_response;
+					var RequestPrimitive v_request;
+					var integer v_aeIndex := -1;
+					var integer v_containerIndex := -1;
+					const integer c_maxByteSize := 1;				   
+					// Test control
 
-						// Test component configuration
-						f_cf01Up();
+					// Test component configuration
+					f_cf01Up();
 
-						// Test adapter configuration
+					// Test adapter configuration
 
-						// Preamble
-						v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
-		
-						v_createRequest.primitiveContent.container.maxByteSize := c_maxByteSize;
-								
-						v_containerIndex := f_cse_createResource(int3, v_createRequest, v_aeIndex);
-	
-						// Test Body
-						v_request := f_getCreateRequestPrimitive(int4, m_createContentInstanceBase, v_containerIndex);
+					// Preamble
+					v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
 	
-						mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
-						tc_ac.start;
-						alt {
-							[] mcaPort.receive(mw_response(mw_responsePrimitive(int5207))) -> value v_response {
-								tc_ac.stop;
-								setverdict(pass, __SCOPE__ & ": Maximum byte size exceeded");
-							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
-								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Bad responseStatusCode in response");
-							}
-			
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
-								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Accepted creation of contentInstance exceding maximum byte size");
-							}
-							[] tc_ac.timeout {
-								setverdict(fail, __SCOPE__ & ": No answer while creating resource type 4");
-							}
-						}	
-				
-						// Postamble
-						f_cse_postamble_deleteResources();
+					v_createRequest.primitiveContent.container.maxByteSize := c_maxByteSize;
+							
+					v_containerIndex := f_cse_createResource(int3, v_createRequest, v_aeIndex);
+
+					// Test Body
+					v_request := f_getCreateRequestPrimitive(int4, m_createContentInstanceBase, v_containerIndex);
+
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
+					tc_ac.start;
+					alt {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int5207))) -> value v_response {
+							tc_ac.stop;
+							setverdict(pass, __SCOPE__ & ": Maximum byte size exceeded");
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Bad responseStatusCode in response");
+						}
 		
-						// Tear down
-						f_cf01Down();
-	    				
-					}//end TC_CSE_DMR_CRE_013
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Accepted creation of contentInstance exceding maximum byte size");
+						}
+						[] tc_ac.timeout {
+							setverdict(fail, __SCOPE__ & ": No answer while creating resource type 4");
+						}
+					}	
+			
+					// Postamble
+					f_cse_postamble_deleteResources();
+	
+					// Tear down
+					f_cf01Down();
+    				
+				}//end f_CSE_DMR_CRE_013
 		
-				}// end group g_CSE_DMR_CRE_013	
-				
 				group g_CSE_DMR_CRE_014 {
 				
 					/**
@@ -4458,7 +4651,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						const integer c_maxByteSize := 512;	
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_parentResourceRequest.primitiveContent.container.maxByteSize := c_maxByteSize;
 						
 						v_ae1.start(f_CSE_DMR_CRE_014(int3, v_parentResourceRequest, int4, v_childResourceRequest));		
@@ -4484,7 +4678,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var ResponsePrimitive v_responsePrimitive;
 						var template PrimitiveContent v_contentResponse;
 						v_contentResponse.container := mw_contentContainer_rc1;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1); 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done; 
 						v_ae1.start(f_CSE_DMR_RET_001(int3, m_createContainerBase, v_contentResponse));//Container
 						v_ae1.done;
 						
@@ -4495,7 +4690,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var ResponsePrimitive v_responsePrimitive;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.group_ := mw_contentGroup_rc1;
                         
 						v_ae1.start(f_CSE_DMR_RET_001(int9, m_createGroupBase, v_contentResponse));//Group
@@ -4508,7 +4704,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var ResponsePrimitive v_responsePrimitive;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.accessControlPolicy := mw_contentAcp_rc1;
 							
 						v_ae1.start(f_CSE_DMR_RET_001(int1, m_createAcpBase, v_contentResponse));//AccessControlPolicy
@@ -4524,7 +4721,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template PrimitiveContent v_contentResponse;
 					
 						v_contentResponse.subscription := mw_contentSubscription_rc1;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_DMR_RET_001(int23, m_createSubscriptionBase, v_contentResponse));//Subscription
 						v_ae1.done;
 					
@@ -4536,7 +4734,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						
 						var ResponsePrimitive v_responsePrimitive;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.contentInstance := mw_contentContentInstance_rc1;
 	
 						v_ae1.start(f_CSE_DMR_RET_001(int4, m_createContentInstanceBase, v_contentResponse));//ContentInstance
@@ -4556,7 +4755,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_RET_003_CNT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                         
 						v_ae1.start(f_CSE_DMR_RET_003(int3, m_createContainerBase));//Container
 						v_ae1.done;
@@ -4565,7 +4765,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_RET_003_GRP() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_ae1.start(f_CSE_DMR_RET_003(int9, m_createGroupBase));//Group
 						v_ae1.done;
@@ -4576,7 +4777,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template RequestPrimitive v_requestPrimitive := m_createAcpBase;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_requestPrimitive.primitiveContent.accessControlPolicy.selfPrivileges.accessControlRule_list[0].accessControlOperations := int61;
 						
 						v_ae1.start(f_CSE_DMR_RET_003(int1, v_requestPrimitive));//AccessControlPolicy
@@ -4586,7 +4788,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_RET_003_SUB() runs on Tester system CseSystem {
 							// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 	
 						v_ae1.start(f_CSE_DMR_RET_003(int23, m_createSubscriptionBase));//Subscription
 						v_ae1.done;
@@ -4594,145 +4797,161 @@ module OneM2M_Testcases_CSE_Release_1 {
 				
 				} // end g_CSE_DMR_RET_003
 
-				group g_CSE_DMR_RET_010{
-
-					/**
-					 * @desc Check that the IUT accepts the RETRIEVE Request of the oldest contentInstance target to a <container> resource
-					 * 
-					 */
-					testcase TC_CSE_DMR_RET_010() runs on AeSimu system CseSystem {
-						// Local variables
-						var integer v_aeIndex := -1;
-						var integer v_containerIndex := -1;
-						var integer v_contentInstanceIndex1 := -1; 
-						var integer v_contentInstanceIndex2 := -1;
-						var template PrimitiveContent v_contentResponse;                        
-						    										   
-						// Test control
-    				
-						// Test component configuration
-						f_cf01Up();
-    				
-						// Test adapter configuration
-    				
-						// Preamble
-						v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
-						
-						v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex); 	
-						
-						v_contentInstanceIndex1 := f_cse_createResource(int4, m_createContentInstance_noResourceName, v_containerIndex);
-						
-						v_contentInstanceIndex2 := f_cse_createResource(int4, m_createContentInstance_noResourceName, v_containerIndex);  
-						
-						v_contentResponse.contentInstance := mw_contentContentInstanceBase;
-						v_contentResponse.contentInstance.resourceName := vc_resourcesList[v_contentInstanceIndex1].resource.contentInstance.resourceName;
-    									
-						// Test Body
-						mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameOldest, f_getOriginator(v_containerIndex)))));
-
-						tc_ac.start;
-						alt {
-							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, v_contentResponse))) {
-								tc_ac.stop;
-								setverdict(pass, __SCOPE__ & ": resourceName attribute of <oldest> resource retrieved successfully");
-							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(v_contentResponse))){
-								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Wrong response status code");
-							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)){
-								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute of <oldest> resource value not expected");
-							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)){
-								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Error while retrieving <oldest> resource");
-							}
-							[] tc_ac.timeout {
-								setverdict(fail, __SCOPE__ & ": No answer while retrieving <oldest> resource");
-							}
-						}	
-    								
-						// Postamble
-						f_cse_postamble_deleteResources();
-						
-						// Tear down
-						f_cf01Down();
-
-					}//end TC_CSE_DMR_RET_010
+				/**
+				 * @desc Check that the IUT accepts the RETRIEVE Request of the oldest contentInstance target to a <container> resource
+				 * 
+				 */
+				testcase TC_CSE_DMR_RET_010() runs on Tester system CseSystem {
+			
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
+							
+					v_ae1.start(f_CSE_DMR_RET_010());
+				  	  	
+					v_ae1.done;
+				  	  		
+				}
+				
+				function f_CSE_DMR_RET_010() runs on AeSimu system CseSystem {
+					// Local variables
+					var integer v_aeIndex := -1;
+					var integer v_containerIndex := -1;
+					var integer v_contentInstanceIndex1 := -1; 
+					var integer v_contentInstanceIndex2 := -1;
+					var template PrimitiveContent v_contentResponse;                        
+					    										   
+					// Test control
+				
+					// Test component configuration
+					f_cf01Up();
+				
+					// Test adapter configuration
+				
+					// Preamble
+					v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+					
+					v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex); 	
+					
+					v_contentInstanceIndex1 := f_cse_createResource(int4, m_createContentInstance_noResourceName, v_containerIndex);
+					
+					v_contentInstanceIndex2 := f_cse_createResource(int4, m_createContentInstance_noResourceName, v_containerIndex);  
+					
+					v_contentResponse.contentInstance := mw_contentContentInstanceBase;
+					v_contentResponse.contentInstance.resourceName := vc_resourcesList[v_contentInstanceIndex1].resource.contentInstance.resourceName;
+									
+					// Test Body
+					mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameOldest, f_getOriginator(v_containerIndex)))));
 
-				} // end group g_CSE_DMR_RET_010
+					tc_ac.start;
+					alt {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, v_contentResponse))) {
+							tc_ac.stop;
+							setverdict(pass, __SCOPE__ & ": resourceName attribute of <oldest> resource retrieved successfully");
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(v_contentResponse))){
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Wrong response status code");
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)){
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Error, resourceName attribute of <oldest> resource value not expected");
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)){
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Error while retrieving <oldest> resource");
+						}
+						[] tc_ac.timeout {
+							setverdict(fail, __SCOPE__ & ": No answer while retrieving <oldest> resource");
+						}
+					}	
 								
-				group g_CSE_DMR_RET_012{
+					// Postamble
+					f_cse_postamble_deleteResources();
+					
+					// Tear down
+					f_cf01Down();
 
-					/**
-					 * @desc Check that the IUT accepts the RETRIEVE Request of the latest contentInstance target to a <container> resource7
-					 * 
-					 */
-					testcase TC_CSE_DMR_RET_012() runs on AeSimu system CseSystem {
-						// Local variables
-						var integer v_aeIndex := -1;
-						var integer v_containerIndex := -1;
-						var integer v_contentInstanceIndex1 := -1; 
-						var integer v_contentInstanceIndex2 := -1;
-						var template PrimitiveContent v_contentResponse;                        
-						// Test control
-    				
-						// Test component configuration
-						f_cf01Up();
-    				
-						// Test adapter configuration
-    				
-						// Preamble
-						v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
-						
-						v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex); 	
-						
-						v_contentInstanceIndex1 := f_cse_createResource(int4, m_createContentInstance_noResourceName, v_containerIndex);
-						
-						f_sleep(1.0);
-						
-						v_contentInstanceIndex2 := f_cse_createResource(int4, m_createContentInstance_noResourceName, v_containerIndex);  
-						
-						v_contentResponse.contentInstance := mw_contentContentInstanceBase;
-						v_contentResponse.contentInstance.resourceName := vc_resourcesList[v_contentInstanceIndex2].resource.contentInstance.resourceName;
-						 
-    					
-						// Test Body
-						mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameLatest, f_getOriginator(v_containerIndex)))));
+				}//end f_CSE_DMR_RET_010
 
-						tc_ac.start;
-						alt {
-							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, v_contentResponse))){
-								tc_ac.stop;
-								setverdict(pass, __SCOPE__ & ": resourceName attribute of <latest> resource retrieved successfully");
-							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(v_contentResponse))){
-								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Wrong response status code");
-							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)){
-								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Error, retrieved contentInstance with incorrect attributes");
-							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)){
-								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Error while retrieving <latest> resource");
-							}
-							[] tc_ac.timeout {
-								setverdict(fail, __SCOPE__ & ": No answer while retrieving <latest> resource");
-							}
-						}	
-    								
-						// Postamble
-						f_cse_postamble_deleteResources();
-						
-						// Tear down
-						f_cf01Down();
+				/**
+				 * @desc Check that the IUT accepts the RETRIEVE Request of the latest contentInstance target to a <container> resource7
+				 * 
+				 */
+				testcase TC_CSE_DMR_RET_012() runs on Tester system CseSystem {
+			
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
+							
+					v_ae1.start(f_CSE_DMR_RET_012());
+				  	  	
+					v_ae1.done;
+				  	  		
+				}
 
-					}//end TC_CSE_DMR_RET_012
+				function f_CSE_DMR_RET_012() runs on AeSimu system CseSystem {
+					// Local variables
+					var integer v_aeIndex := -1;
+					var integer v_containerIndex := -1;
+					var integer v_contentInstanceIndex1 := -1; 
+					var integer v_contentInstanceIndex2 := -1;
+					var template PrimitiveContent v_contentResponse;                        
+					// Test control
+				
+					// Test component configuration
+					f_cf01Up();
+				
+					// Test adapter configuration
+				
+					// Preamble
+					v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+					
+					v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex); 	
+					
+					v_contentInstanceIndex1 := f_cse_createResource(int4, m_createContentInstance_noResourceName, v_containerIndex);
+					
+					f_sleep(1.0);
+					
+					v_contentInstanceIndex2 := f_cse_createResource(int4, m_createContentInstance_noResourceName, v_containerIndex);  
+					
+					v_contentResponse.contentInstance := mw_contentContentInstanceBase;
+					v_contentResponse.contentInstance.resourceName := vc_resourcesList[v_contentInstanceIndex2].resource.contentInstance.resourceName;
+					 
+					
+					// Test Body
+					mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameLatest, f_getOriginator(v_containerIndex)))));
+
+					tc_ac.start;
+					alt {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, v_contentResponse))){
+							tc_ac.stop;
+							setverdict(pass, __SCOPE__ & ": resourceName attribute of <latest> resource retrieved successfully");
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(v_contentResponse))){
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Wrong response status code");
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)){
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Error, retrieved contentInstance with incorrect attributes");
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)){
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Error while retrieving <latest> resource");
+						}
+						[] tc_ac.timeout {
+							setverdict(fail, __SCOPE__ & ": No answer while retrieving <latest> resource");
+						}
+					}	
+								
+					// Postamble
+					f_cse_postamble_deleteResources();
+					
+					// Tear down
+					f_cf01Down();
 
-				} // end group g_CSE_DMR_RET_012
+				}//end f_CSE_DMR_RET_012
 
 				group g_CSE_DMR_RET_013 {
 					
@@ -4744,7 +4963,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.accessControlPolicy := mw_contentAcp_rc1;
 							
 						v_ae1.start(f_CSE_DMR_RET_013(int1, m_createAcpBase, v_contentResponse));//AccessControlPolicy
@@ -4756,7 +4976,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.aE := mw_contentAeBase;
 							
 						v_ae1.start(f_CSE_DMR_RET_013(int2, m_createAe(PX_APP_ID,-,PX_AE1_ID_STEM), v_contentResponse));//AE
@@ -4768,7 +4989,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.container := mw_contentContainer_rc1;
 						    
 						v_ae1.start(f_CSE_DMR_RET_013(int3, m_createContainerBase, v_contentResponse));//Container
@@ -4780,7 +5002,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.group_ := mw_contentGroup_rc1;
                         
 						v_ae1.start(f_CSE_DMR_RET_013(int9, m_createGroupBase, v_contentResponse));//Group
@@ -4792,7 +5015,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
 							
 						v_ae1.start(f_CSE_DMR_RET_013(int16, m_createRemoteCSEBase, v_contentResponse));//RemoteCSE
@@ -4804,7 +5028,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.subscription := mw_contentSubscription_rc1;
 						
 						v_ae1.start(f_CSE_DMR_RET_013(int23, m_createSubscriptionBase, v_contentResponse));//Subscription
@@ -4825,7 +5050,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template RequestPrimitive v_requestPrimitive := m_createAcpBase;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_requestPrimitive.primitiveContent.accessControlPolicy.selfPrivileges.accessControlRule_list[0].accessControlOperations := int61;
 						
 						v_ae1.start(f_CSE_DMR_RET_014(int1, v_requestPrimitive));//AccessControlPolicy
@@ -4835,7 +5061,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_RET_014_AE() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 	
 						v_ae1.start(f_CSE_DMR_RET_014(int2, m_createAe(PX_APP_ID,-,PX_AE1_ID_STEM)));//AE
 						v_ae1.done;
@@ -4844,7 +5071,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_RET_014_CNT() runs on Tester system CseSystem {
 						// Local variables
  						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                         
 						v_ae1.start(f_CSE_DMR_RET_014(int3, m_createContainerBase));//Container
 						v_ae1.done;
@@ -4853,7 +5081,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_RET_014_CSR() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 		
 						v_ae1.start(f_CSE_DMR_RET_014(int16, m_createRemoteCSEBase));//RemoteCSE
 						v_ae1.done;
@@ -4863,7 +5092,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_RET_014_GRP() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_ae1.start(f_CSE_DMR_RET_014(int9, m_createGroupBase));//Group
 						v_ae1.done;
@@ -4872,7 +5102,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_RET_014_SUB() runs on AeSimu system CseSystem {
 							// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 	
 						v_ae1.start(f_CSE_DMR_RET_014(int23, m_createSubscriptionBase));//Subscription
 						v_ae1.done;
@@ -4899,7 +5130,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.container.labels := v_labels_1;
 						v_updateRequest.primitiveContent.container.labels := v_labels_2;
 						
@@ -4939,7 +5171,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.group_.labels := v_labels_1;
 						v_updateRequest.primitiveContent.group_.labels := v_labels_2;
 
@@ -4979,7 +5212,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.accessControlPolicy.labels := v_labels_1;
 						v_updateRequest.primitiveContent.accessControlPolicy.labels := v_labels_2;
 
@@ -5019,7 +5253,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.labels := v_labels_1;
 						v_updateRequest.primitiveContent.subscription.labels := v_labels_2;
 
@@ -5066,7 +5301,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.container.labels := v_labels_1;
                         
 						v_ae1.start(f_CSE_DMR_UPD_002(int3, m_createContainerBase, v_updateRequest));//Container
@@ -5103,7 +5339,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.group_.labels := v_labels_1;
 						
 						v_ae1.start(f_CSE_DMR_UPD_002(int9, m_createGroupBase, v_updateRequest));//Group
@@ -5140,7 +5377,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.accessControlPolicy.labels := v_labels_1;
 							
 						v_ae1.start(f_CSE_DMR_UPD_002(int1, m_createAcpBase,v_updateRequest));//AccessControlPolicy
@@ -5177,7 +5415,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.subscription.labels := v_labels_1;
 						
 						v_ae1.start(f_CSE_DMR_UPD_002(int23, m_createSubscriptionBase,v_updateRequest));//Subscription
@@ -5225,7 +5464,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.container.labels := v_labels_1;
 						v_updateRequest.primitiveContent.container.labels := v_labels_2;
 						
@@ -5272,7 +5512,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.group_.labels := v_labels_1;
 						v_updateRequest.primitiveContent.group_.labels := v_labels_2;
 						
@@ -5317,7 +5558,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createAcpBase;
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.accessControlPolicy.labels := v_labels_1;
 						v_updateRequest.primitiveContent.accessControlPolicy.labels := v_labels_2;
 						
@@ -5362,7 +5604,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.labels := v_labels_1;
 						v_updateRequest.primitiveContent.subscription.labels := v_labels_2;
 						
@@ -5414,7 +5657,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var ResponsePrimitive v_responsePrimitive;
 						var AttributeAux_list v_nullFields;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.container.labels := v_labels_1;//Attribute 3
 						v_updateRequest.primitiveContent.container.expirationTime := "20301231T012345";//Attribute 1
 						v_updateRequest.primitiveContent.container.maxNrOfInstances := 5;//Attribute 2
@@ -5477,7 +5721,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);					
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;					
 						v_createRequest.primitiveContent.group_.labels := v_labels_1;//Attribute 3
 						v_updateRequest.primitiveContent.group_.expirationTime := "20301231T012345";//Attribute 1
 						v_updateRequest.primitiveContent.group_.groupName:= v_groupName_1;//Attribute 2
@@ -5540,7 +5785,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.accessControlPolicy.labels := v_labels_1;//Attribute 3
 						v_createRequest.primitiveContent.accessControlPolicy.privileges.accessControlRule_list := {};//Attribute 2
 						v_updateRequest.primitiveContent.accessControlPolicy.selfPrivileges := v_selfprivileges_2; //Attribute 1
@@ -5603,7 +5849,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.accessControlPolicy.labels := v_labels_1;//Attribute 3
 						v_updateRequest.primitiveContent.accessControlPolicy.privileges := v_privileges_2; //Attribute 1
 						v_updateRequest.primitiveContent.accessControlPolicy.announceTo := {f_getAnnouncementTargetPoA()};//Attribute 2
@@ -5663,7 +5910,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.expirationCounter := 10;//Attribute 3
 						v_updateRequest.primitiveContent.subscription.expirationTime := "20301231T012345";//Attribute 1
 						v_updateRequest.primitiveContent.subscription.labels := v_labels_1;//Attribute 2
@@ -5723,7 +5971,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_DMR_UPD_005() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 					v_ae1.start(f_CSE_DMR_UPD_005());
 			  	  	
@@ -5805,7 +6054,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var Labels v_labels_1 := {"VALUE_1"};
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.container.labels := v_labels_1;
 						
 						v_ae1.start(f_CSE_DMR_UPD_006(int3, m_createContainerBase, v_updateRequest));//Container
@@ -5828,7 +6078,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var Labels v_labels_1 := {"VALUE_1"};
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.group_.labels := v_labels_1;
 						
 						v_ae1.start(f_CSE_DMR_UPD_006(int9, m_createGroupBase, v_updateRequest));//Group
@@ -5852,7 +6103,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 						var template RequestPrimitive v_requestPrimitive := m_createAcpBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_requestPrimitive.primitiveContent.accessControlPolicy.selfPrivileges.accessControlRule_list[0].accessControlOperations := int59;
 
 						v_updateRequest.primitiveContent.accessControlPolicy.labels := v_labels_1;
@@ -5877,7 +6129,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var Labels v_labels_1 := {"VALUE_1"};
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.subscription.labels := v_labels_1;
 								
 						v_ae1.start(f_CSE_DMR_UPD_006(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
@@ -5908,7 +6161,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var Timestamp v_creationTime := "21001231T012345";
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent := {container_update_invalid := m_contentUpdateContainer_invalid};
 						v_updateRequest.primitiveContent.container_update_invalid.creationTime := v_creationTime;
 						
@@ -5932,7 +6186,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var Timestamp v_creationTime := "21001231T012345";
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent := {group_update_invalid := m_contentUpdateGroup_invalid};
 						v_updateRequest.primitiveContent.group_update_invalid.creationTime := v_creationTime;
 						
@@ -5956,7 +6211,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var Timestamp v_creationTime := "21001231T012345";
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent := {aCP_update_invalid := m_contentUpdateAcp_invalid};
 						v_updateRequest.primitiveContent.aCP_update_invalid.creationTime := v_creationTime;
 								
@@ -5980,7 +6236,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var Timestamp v_creationTime := "21001231T012345";
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent := {subscription_update_invalid := m_contentUpdateSubscription_invalid};
 						v_updateRequest.primitiveContent.subscription_update_invalid.creationTime := v_creationTime;
 								
@@ -6013,7 +6270,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 						var AttributeAux_list v_nullFields;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_nullFields := {{"maxNrOfMembers", omit}};
 						
 						v_updateRequest.primitiveContent.group_.maxNrOfMembers := 1;
@@ -6039,7 +6297,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 						var AttributeAux_list v_nullFields;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_nullFields := {{"selfPrivileges", omit}};
 						
 						v_updateRequest.primitiveContent.accessControlPolicy.selfPrivileges := v_selfPrivileges;
@@ -6064,7 +6323,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var AttributeAux_list v_nullFields;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_nullFields := {{"notificationURI", omit}};
 						
 						v_updateRequest.primitiveContent.subscription.notificationURI := {"NullTarget"};
@@ -6097,7 +6357,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var XSD.PositiveInteger v_expirationCounter := 1;
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent := {container_update_invalid := m_contentUpdateContainer_invalid};
 
 						v_updateRequest.primitiveContent.container_update_invalid.expirationCounter := v_expirationCounter;
@@ -6112,7 +6373,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var XSD.PositiveInteger v_expirationCounter := 1;
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent := {group_update_invalid := m_contentUpdateGroup_invalid};
 	
 						v_updateRequest.primitiveContent.group_update_invalid.expirationCounter := v_expirationCounter;
@@ -6127,7 +6389,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var XSD.PositiveInteger v_expirationCounter := 1;
 						var template RequestPrimitive v_createRequest := m_createAcpBase;
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent := {aCP_update_invalid := m_contentUpdateAcp_invalid};
 	
 						v_updateRequest.primitiveContent.aCP_update_invalid.expirationCounter := v_expirationCounter;
@@ -6142,7 +6405,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var XSD.NonNegativeInteger v_maxNrOfInstances := 5;
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent := {subscription_update_invalid := m_contentUpdateSubscription_invalid};
 	
 						v_updateRequest.primitiveContent.subscription_update_invalid.maxNrOfInstances := v_maxNrOfInstances;
@@ -6153,305 +6417,333 @@ module OneM2M_Testcases_CSE_Release_1 {
 	
 				} // end g_CSE_DMR_UPD_009	
 				
-				group g_CSE_DMR_UPD_010{
-
-					/**
-					 * @desc Check that the stateTag attribute of a container resource is increased when an update operation has been performed on its child resource
-					 * 
-					 */
-					testcase TC_CSE_DMR_UPD_010() runs on AeSimu system CseSystem {
-						var MsgIn v_response;
-						var integer v_aeIndex := -1;
-						var integer v_containerIndex := -1;
-						var RequestPrimitive v_updateRequest := valueof(m_updateContainerBase);
-						var Labels v_labels_1:= {"VALUE_1"};
-						v_updateRequest.primitiveContent.container.labels := v_labels_1;
-				   
-						// Test control
-
-						// Test component configuration
-						f_cf01Up();
-
-						// Test adapter configuration
-
-						// Preamble
-						v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
-		
-						v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex); 
-		
-						// Test Body
-						if(ispresent(vc_resourcesList[v_containerIndex].resource.container.stateTag)) { 
-		
-							f_cse_updateResource(int3, v_containerIndex, v_updateRequest);
-
-							mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_containerIndex), f_getOriginator(v_containerIndex)))));
-
-							tc_ac.start;
-							alt {
-								[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
-									tc_ac.stop;
-									if(v_response.primitive.responsePrimitive.primitiveContent.container.stateTag == 1) { //(Create and Delete)
-										setverdict(pass, __SCOPE__ & ": The stateTag attribute is incremented");	
-									}
-									else{
-										setverdict(fail, __SCOPE__ & ": Error the stateTag attribute is not incremented");
-									}
-								}
-								[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
-									tc_ac.stop;
-									setverdict(fail, __SCOPE__ & ": Error while retrieving resource attributes");
-								}
-								[] tc_ac.timeout {
-									setverdict(fail, __SCOPE__ & ": No answer while retrieving resource attributes");
-								}
-							}	
-				
-						}//end if
-						else{
-							setverdict(fail, __SCOPE__ & ": Error the stateTag attribute is empty");
-						}
-		
-						// Postamble
-						f_cse_postamble_deleteResources();
-
-						// Tear down
-						f_cf01Down();
+				/**
+				 * @desc Check that the stateTag attribute of a container resource is increased when an update operation has been performed on its child resource
+				 * 
+				 */
+				testcase TC_CSE_DMR_UPD_010() runs on Tester system CseSystem {
 			
-					}//end TC_CSE_DMR_UPD_010
-					
-				} // end group g_CSE_DMR_UPD_010
-				
-				group g_CSE_DMR_UPD_011{
-
-					/**
-					 * @desc Check that the IUT rejects the UPDATE Request of an existing contentInstance resource with error “OPERATION_NOT_ALLOWED”
-					 * 
-					 */
-					testcase TC_CSE_DMR_UPD_011() runs on AeSimu system CseSystem {
-						// Local variables
-						var MsgIn v_response;
-						var RequestPrimitive v_request;
-						var integer v_aeIndex := -1;
-						var integer v_containerIndex := -1;
-						var integer v_contentInstanceIndex := -1; 
-						var template RequestPrimitive v_updateRequest := m_updateContentInstanceBase;
-						var Labels v_labels:= {"LABEL"};
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-						
-						v_updateRequest.primitiveContent.contentInstance.labels := v_labels;
-								   
-						// Test control
-            
-						// Test component configuration
-						f_cf01Up();
-            
-						// Test adapter configuration
-            
-						// Preamble
-						v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
-						
-						v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex); 
-						
-						v_contentInstanceIndex := f_cse_createResource(int4, m_createContentInstanceBase, v_containerIndex); 
-						
-						//Test Body
-						v_request := f_getUpdateRequestPrimitive(int4, v_contentInstanceIndex, v_updateRequest);
-	
-						mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
-						tc_ac.start;
-						alt {
-							[] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) -> value v_response {
-							   tc_ac.stop;
-							   setverdict(pass, __SCOPE__ & ": Not allowed to update a contentInstance with error OPERATION_NOT_ALLOWED");
-						   }
-						   [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
-							   tc_ac.stop;
-							   setverdict(fail, __SCOPE__ & ": Wrong response status code");
-						   }
-						   [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
-							   tc_ac.stop;
-							   setverdict(fail, __SCOPE__ & ": Accepted update of contentInstance");
-						   }
-						   [] tc_ac.timeout {
-							   setverdict(fail, __SCOPE__ & ": No answer while updating contentInstance");
-						   }
-						}	
-				
-						v_primitiveContentRetrieveResource:=f_cse_retrieveResource(v_contentInstanceIndex);
-						if(getverdict == pass){ 
-							//Check that the resource has NOT been udpated
-								if(ischosen(v_primitiveContentRetrieveResource.contentInstance)) {
-								 if(v_primitiveContentRetrieveResource.contentInstance.labels == v_labels){
-								   setverdict(fail, __SCOPE__ & ": Error: Labels attribute updated")
-							  }
-						   }
-						}
-				
-						// Postamble
-						f_cse_postamble_deleteResources();
-	
-						// Tear down
-						f_cf01Down();
-
-					}//end TC_CSE_DMR_UPD_011
-	
-				} // end group g_CSE_DMR_UPD_011
-				
-				group g_CSE_DMR_UPD_012{
-
-					/**
-					 * @desc Check that the IUT rejects the UPDATE Request of a latest resource as a direct child of a <container> resource with error “OPERATION_NOT_ALLOWED”
-					 * 
-					 */
-					testcase TC_CSE_DMR_UPD_012() runs on AeSimu system CseSystem {
-						// Local variables
-						var MsgIn v_response;
-						var RequestPrimitive v_request;
-						var integer v_aeIndex := -1;
-						var integer v_containerIndex := -1;
-						var integer v_contentInstanceIndex := -1; 
-						var template RequestPrimitive v_updateRequest := m_updateContentInstanceBase;
-						var Labels v_labels := {"LABEL"};					  	
-						var PrimitiveContent v_primitiveContentRetrieveResource;					  	
-		
-						v_updateRequest.primitiveContent.contentInstance.labels := v_labels;
-				   
-						// Test control
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
+							
+					v_ae1.start(f_CSE_DMR_UPD_010());
+				  	  	
+					v_ae1.done;
+				  	  		
+				}
+				function f_CSE_DMR_UPD_010() runs on AeSimu system CseSystem {
+					var MsgIn v_response;
+					var integer v_aeIndex := -1;
+					var integer v_containerIndex := -1;
+					var RequestPrimitive v_updateRequest := valueof(m_updateContainerBase);
+					var Labels v_labels_1:= {"VALUE_1"};
+					v_updateRequest.primitiveContent.container.labels := v_labels_1;
+			   
+					// Test control
 
-						// Test component configuration
-						f_cf01Up();
+					// Test component configuration
+					f_cf01Up();
 
-						// Test adapter configuration
+					// Test adapter configuration
 
-						// Preamble
-						v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
-		
-						v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex); 
-		
-						v_contentInstanceIndex := f_cse_createResource(int4, m_createContentInstanceBase, v_containerIndex); 
-		
-						//Test Body
-						v_request := f_getUpdateRequestPrimitive(int4, v_containerIndex, v_updateRequest);
-					  	
-						v_request.to_ := v_request.to_ & "/" & c_resourceShortNameLatest;		//<latest>
+					// Preamble
+					v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+	
+					v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex); 
+	
+					// Test Body
+					if(ispresent(vc_resourcesList[v_containerIndex].resource.container.stateTag)) { 
+	
+						f_cse_updateResource(int3, v_containerIndex, v_updateRequest);
+
+						mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_containerIndex), f_getOriginator(v_containerIndex)))));
 
-						mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 						tc_ac.start;
 						alt {
-							[] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) -> value v_response {
-								tc_ac.stop;
-								setverdict(pass, __SCOPE__ & ": Not allowed to update a latest resource with error OPERATION_NOT_ALLOWED");
-							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Wrong response status code");
+								if(v_response.primitive.responsePrimitive.primitiveContent.container.stateTag == 1) { //(Create and Delete)
+									setverdict(pass, __SCOPE__ & ": The stateTag attribute is incremented");	
+								}
+								else{
+									setverdict(fail, __SCOPE__ & ": Error the stateTag attribute is not incremented");
+								}
 							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Accepted update of a latest resource");
+								setverdict(fail, __SCOPE__ & ": Error while retrieving resource attributes");
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, __SCOPE__ & ": No answer while updating a latest resource");
+								setverdict(fail, __SCOPE__ & ": No answer while retrieving resource attributes");
 							}
 						}	
+			
+					}//end if
+					else{
+						setverdict(fail, __SCOPE__ & ": Error the stateTag attribute is empty");
+					}
+	
+					// Postamble
+					f_cse_postamble_deleteResources();
 
-						v_primitiveContentRetrieveResource:=f_cse_retrieveResource(v_contentInstanceIndex);
-						if(getverdict == pass){ 
-							//Check that the resource has NOT been udpated
-								if(ischosen(v_primitiveContentRetrieveResource.contentInstance)) {
-								 if(v_primitiveContentRetrieveResource.contentInstance.labels == v_labels){
-								   setverdict(fail, __SCOPE__ & ": Error: Labels attribute updated")
-							  }
-						   }
-						}	
+					// Tear down
+					f_cf01Down();
+		
+				}//end f_CSE_DMR_UPD_010
+					
+				/**
+				 * @desc Check that the IUT rejects the UPDATE Request of an existing contentInstance resource with error “OPERATION_NOT_ALLOWED”
+				 * 
+				 */
+				testcase TC_CSE_DMR_UPD_011() runs on Tester system CseSystem {
+			
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
+							
+					v_ae1.start(f_CSE_DMR_UPD_011());
+				  	  	
+					v_ae1.done;
+				  	  		
+				}
+				function f_CSE_DMR_UPD_011() runs on AeSimu system CseSystem {
+					// Local variables
+					var MsgIn v_response;
+					var RequestPrimitive v_request;
+					var integer v_aeIndex := -1;
+					var integer v_containerIndex := -1;
+					var integer v_contentInstanceIndex := -1; 
+					var template RequestPrimitive v_updateRequest := m_updateContentInstanceBase;
+					var Labels v_labels:= {"LABEL"};
+					var PrimitiveContent v_primitiveContentRetrieveResource;
+					
+					v_updateRequest.primitiveContent.contentInstance.labels := v_labels;
+							   
+					// Test control
+        
+					// Test component configuration
+					f_cf01Up();
+        
+					// Test adapter configuration
+        
+					// Preamble
+					v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+					
+					v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex); 
+					
+					v_contentInstanceIndex := f_cse_createResource(int4, m_createContentInstanceBase, v_containerIndex); 
+					
+					//Test Body
+					v_request := f_getUpdateRequestPrimitive(int4, v_contentInstanceIndex, v_updateRequest);
 
-						// Postamble
-						f_cse_postamble_deleteResources();
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
+					tc_ac.start;
+					alt {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) -> value v_response {
+						   tc_ac.stop;
+						   setverdict(pass, __SCOPE__ & ": Not allowed to update a contentInstance with error OPERATION_NOT_ALLOWED");
+					   }
+					   [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+						   tc_ac.stop;
+						   setverdict(fail, __SCOPE__ & ": Wrong response status code");
+					   }
+					   [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+						   tc_ac.stop;
+						   setverdict(fail, __SCOPE__ & ": Accepted update of contentInstance");
+					   }
+					   [] tc_ac.timeout {
+						   setverdict(fail, __SCOPE__ & ": No answer while updating contentInstance");
+					   }
+					}	
+			
+					v_primitiveContentRetrieveResource:=f_cse_retrieveResource(v_contentInstanceIndex);
+					if(getverdict == pass){ 
+						//Check that the resource has NOT been udpated
+							if(ischosen(v_primitiveContentRetrieveResource.contentInstance)) {
+							 if(v_primitiveContentRetrieveResource.contentInstance.labels == v_labels){
+							   setverdict(fail, __SCOPE__ & ": Error: Labels attribute updated")
+						  }
+					   }
+					}
+			
+					// Postamble
+					f_cse_postamble_deleteResources();
 
-						// Tear down
-						f_cf01Down();
+					// Tear down
+					f_cf01Down();
 
-					}//end TC_CSE_DMR_UPD_012
+				}//end f_CSE_DMR_UPD_011
+				
+				/**
+				 * @desc Check that the IUT rejects the UPDATE Request of a latest resource as a direct child of a <container> resource with error “OPERATION_NOT_ALLOWED”
+				 * 
+				 */
+				testcase TC_CSE_DMR_UPD_012() runs on Tester system CseSystem {
+			
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
+							
+					v_ae1.start(f_CSE_DMR_UPD_012());
+				  	  	
+					v_ae1.done;
+				  	  		
+				}
+				function f_CSE_DMR_UPD_012() runs on AeSimu system CseSystem {
+					// Local variables
+					var MsgIn v_response;
+					var RequestPrimitive v_request;
+					var integer v_aeIndex := -1;
+					var integer v_containerIndex := -1;
+					var integer v_contentInstanceIndex := -1; 
+					var template RequestPrimitive v_updateRequest := m_updateContentInstanceBase;
+					var Labels v_labels := {"LABEL"};					  	
+					var PrimitiveContent v_primitiveContentRetrieveResource;					  	
+	
+					v_updateRequest.primitiveContent.contentInstance.labels := v_labels;
+			   
+					// Test control
 
-				} // end group g_CSE_DMR_UPD_012
-			  	
-				group g_CSE_DMR_UPD_013{
+					// Test component configuration
+					f_cf01Up();
 
-					/**
-					 * @desc Check that the IUT rejects the UPDATE Request of an oldest resource as a direct child of a <container> resource with error “OPERATION_NOT_ALLOWED”
-					 * 
-					 */
-					testcase TC_CSE_DMR_UPD_013() runs on AeSimu system CseSystem {
-						// Local variables
-						var MsgIn v_response;
-						var RequestPrimitive v_request;
-						var integer v_aeIndex := -1;
-						var integer v_containerIndex := -1;
-						var integer v_contentInstanceIndex := -1; 
-						var template RequestPrimitive v_updateRequest := m_updateContentInstanceBase;
-						var Labels v_labels:= {"LABEL"};
-						var PrimitiveContent v_primitiveContentRetrieveResource;
+					// Test adapter configuration
+
+					// Preamble
+					v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+	
+					v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex); 
+	
+					v_contentInstanceIndex := f_cse_createResource(int4, m_createContentInstanceBase, v_containerIndex); 
+	
+					//Test Body
+					v_request := f_getUpdateRequestPrimitive(int4, v_containerIndex, v_updateRequest);
+				  	
+					v_request.to_ := v_request.to_ & "/" & c_resourceShortNameLatest;		//<latest>
+
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
+					tc_ac.start;
+					alt {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) -> value v_response {
+							tc_ac.stop;
+							setverdict(pass, __SCOPE__ & ": Not allowed to update a latest resource with error OPERATION_NOT_ALLOWED");
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Wrong response status code");
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Accepted update of a latest resource");
+						}
+						[] tc_ac.timeout {
+							setverdict(fail, __SCOPE__ & ": No answer while updating a latest resource");
+						}
+					}	
+
+					v_primitiveContentRetrieveResource:=f_cse_retrieveResource(v_contentInstanceIndex);
+					if(getverdict == pass){ 
+						//Check that the resource has NOT been udpated
+							if(ischosen(v_primitiveContentRetrieveResource.contentInstance)) {
+							 if(v_primitiveContentRetrieveResource.contentInstance.labels == v_labels){
+							   setverdict(fail, __SCOPE__ & ": Error: Labels attribute updated")
+						  }
+					   }
+					}	
+
+					// Postamble
+					f_cse_postamble_deleteResources();
+
+					// Tear down
+					f_cf01Down();
+
+				}//end f_CSE_DMR_UPD_012
+			  	
+				/**
+				 * @desc Check that the IUT rejects the UPDATE Request of an oldest resource as a direct child of a <container> resource with error “OPERATION_NOT_ALLOWED”
+				 * 
+				 */
+				testcase TC_CSE_DMR_UPD_013() runs on Tester system CseSystem {
+			
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
+							
+					v_ae1.start(f_CSE_DMR_UPD_013());
+				  	  	
+					v_ae1.done;
+				  	  		
+				}
+				function f_CSE_DMR_UPD_013() runs on AeSimu system CseSystem {
+					// Local variables
+					var MsgIn v_response;
+					var RequestPrimitive v_request;
+					var integer v_aeIndex := -1;
+					var integer v_containerIndex := -1;
+					var integer v_contentInstanceIndex := -1; 
+					var template RequestPrimitive v_updateRequest := m_updateContentInstanceBase;
+					var Labels v_labels:= {"LABEL"};
+					var PrimitiveContent v_primitiveContentRetrieveResource;
 
-						v_updateRequest.primitiveContent.contentInstance.labels := v_labels;
+					v_updateRequest.primitiveContent.contentInstance.labels := v_labels;
    
 						// Test control
 
-						// Test component configuration
-						f_cf01Up();
+					// Test component configuration
+					f_cf01Up();
 
-						// Test adapter configuration
+					// Test adapter configuration
 
-						// Preamble
-						v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+					// Preamble
+					v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
 
-						v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex); 
+					v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex); 
 
-						v_contentInstanceIndex := f_cse_createResource(int4, m_createContentInstanceBase, v_containerIndex); 
+					v_contentInstanceIndex := f_cse_createResource(int4, m_createContentInstanceBase, v_containerIndex); 
 
-						//Test Body
-						v_request := f_getUpdateRequestPrimitive(int4, v_containerIndex, v_updateRequest);
-					  	
-						v_request.to_ := v_request.to_ & "/" & c_resourceShortNameOldest;		//<oldest>
+					//Test Body
+					v_request := f_getUpdateRequestPrimitive(int4, v_containerIndex, v_updateRequest);
+				  	
+					v_request.to_ := v_request.to_ & "/" & c_resourceShortNameOldest;		//<oldest>
 
-						mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
-						tc_ac.start;
-						alt {
-							[] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) -> value v_response {
-								tc_ac.stop;
-								setverdict(pass, __SCOPE__ & ": Not allowed to update an oldest resource with error OPERATION_NOT_ALLOWED");
-							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
-								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Wrong response status code");
-							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
-								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Accepted update of an oldest resource");
-							}
-							[] tc_ac.timeout {
-								setverdict(fail, __SCOPE__ & ": No answer while updating an oldest resource");
-							}
-						}	
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
+					tc_ac.start;
+					alt {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) -> value v_response {
+							tc_ac.stop;
+							setverdict(pass, __SCOPE__ & ": Not allowed to update an oldest resource with error OPERATION_NOT_ALLOWED");
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Wrong response status code");
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Accepted update of an oldest resource");
+						}
+						[] tc_ac.timeout {
+							setverdict(fail, __SCOPE__ & ": No answer while updating an oldest resource");
+						}
+					}	
 
-						v_primitiveContentRetrieveResource:=f_cse_retrieveResource(v_contentInstanceIndex);
-						if(getverdict == pass){ 
-							//Check that the resource has NOT been udpated
-								if(ischosen(v_primitiveContentRetrieveResource.contentInstance)) {
-								 if(v_primitiveContentRetrieveResource.contentInstance.labels == v_labels){
-								   setverdict(fail, __SCOPE__ & ": Error: Labels attribute updated")
-							  }
-						   }
-						}	
-						// Postamble
-						f_cse_postamble_deleteResources();
+					v_primitiveContentRetrieveResource:=f_cse_retrieveResource(v_contentInstanceIndex);
+					if(getverdict == pass){ 
+						//Check that the resource has NOT been udpated
+							if(ischosen(v_primitiveContentRetrieveResource.contentInstance)) {
+							 if(v_primitiveContentRetrieveResource.contentInstance.labels == v_labels){
+							   setverdict(fail, __SCOPE__ & ": Error: Labels attribute updated")
+						  }
+					   }
+					}	
+					// Postamble
+					f_cse_postamble_deleteResources();
 
-						// Tear down
-						f_cf01Down();
+					// Tear down
+					f_cf01Down();
 
-					}//end TC_CSE_DMR_UPD_013
+				}//end f_CSE_DMR_UPD_013
 
-				} // end group g_CSE_DMR_UPD_013
-			  	
 				group g_CSE_DMR_UPD_014 {
 					
 					testcase TC_CSE_DMR_UPD_014_ACP_LBL() runs on Tester system CseSystem {
@@ -6463,7 +6755,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createAcpBase;
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 						var ResponsePrimitive v_responsePrimitive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.accessControlPolicy.labels := v_labels_1;
 						v_updateRequest.primitiveContent.accessControlPolicy.labels := v_labels_2;
 
@@ -6494,7 +6787,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.container.accessControlPolicyIDs := v_accessControlPolicyIDs_1;
 						v_updateRequest.primitiveContent.container.accessControlPolicyIDs := v_accessControlPolicyIDs_2;
 
@@ -6524,7 +6818,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 		
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.container.labels := v_labels_1;
 						v_updateRequest.primitiveContent.container.labels := v_labels_2;
 		
@@ -6554,7 +6849,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 	
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.container.maxByteSize := v_maxByteSize_1;
 						v_updateRequest.primitiveContent.container.maxByteSize := v_maxByteSize_2;
 	
@@ -6584,7 +6880,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.container.maxInstanceAge := v_maxInstanceAge_1;
 						v_updateRequest.primitiveContent.container.maxInstanceAge := v_maxInstanceAge_2;
 
@@ -6614,7 +6911,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 	
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.container.maxNrOfInstances := v_maxNrOfInstances_1;
 						v_updateRequest.primitiveContent.container.maxNrOfInstances := v_maxNrOfInstances_2;
 	
@@ -6643,7 +6941,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.accessControlPolicyIDs := v_accessControlPolicyIDs_1;
 						v_updateRequest.primitiveContent.subscription.accessControlPolicyIDs := v_accessControlPolicyIDs_2;
 
@@ -6673,7 +6972,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.labels := v_labels_1;
 						v_updateRequest.primitiveContent.subscription.labels := v_labels_2;
 
@@ -6709,7 +7009,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					   	var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;
 					   	var ResponsePrimitive v_responsePrimitive;
 					   	var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 					   v_updateRequest.primitiveContent.remoteCSE.labels := v_labels;
 	
 					   v_ae1.start(f_CSE_DMR_UPD_015(int16, m_createRemoteCSEBase, v_updateRequest));//Remote CSE
@@ -6722,7 +7023,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						   if(ispresent(v_responsePrimitive.primitiveContent)) {
 							   if(ischosen(v_responsePrimitive.primitiveContent.remoteCSE)) {
 								   if(v_responsePrimitive.primitiveContent.remoteCSE.labels != v_labels){
-									   setverdict(fail, __SCOPE__, ": Error: Labels attribute not updated correctly")
+									   setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
 								   }
 							   }
 						   }
@@ -6743,7 +7044,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					   var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;
 					   var ResponsePrimitive v_responsePrimitive;
 					   var PrimitiveContent v_primitiveContentRetrieveResource;
-					   f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+					   v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 					   v_updateRequest.primitiveContent.remoteCSE.pointOfAccess := v_poaList;
 
 					   v_ae1.start(f_CSE_DMR_UPD_015(int16, m_createRemoteCSEBase, v_updateRequest));//Remote CSE
@@ -6756,7 +7058,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						  if(ispresent(v_responsePrimitive.primitiveContent)) {
 							  if(ischosen(v_responsePrimitive.primitiveContent.remoteCSE)) {
 								  if(v_responsePrimitive.primitiveContent.remoteCSE.pointOfAccess != v_poaList){
-									  setverdict(fail, __SCOPE__, ": Error: Point of access attribute not updated correctly")
+									  setverdict(fail, __SCOPE__ & ": Error: Point of access attribute not updated correctly")
 								  }
 							  }
 						  }
@@ -6777,7 +7079,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					   	var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;
 					   	var ResponsePrimitive v_responsePrimitive;
 					   	var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 					   v_updateRequest.primitiveContent.remoteCSE.nodeLink := v_nodeLink;
 
 					   v_ae1.start(f_CSE_DMR_UPD_015(int16, m_createRemoteCSEBase, v_updateRequest));//Remote CSE
@@ -6790,7 +7093,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						 if(ispresent(v_responsePrimitive.primitiveContent)) {
 							 if(ischosen(v_responsePrimitive.primitiveContent.remoteCSE)) {
 								 if(v_responsePrimitive.primitiveContent.remoteCSE.nodeLink != v_nodeLink){
-									 setverdict(fail, __SCOPE__, ": Error: Node link attribute not updated correctly")
+									 setverdict(fail, __SCOPE__ & ": Error: Node link attribute not updated correctly")
 								 }
 							 }
 						 }
@@ -6811,7 +7114,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateAeBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.aE.labels := v_labels;
 						
 						v_ae1.start(f_CSE_DMR_UPD_015(int2, m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM), v_updateRequest));//AE
@@ -6824,7 +7128,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.aE)) {
 									 if(v_responsePrimitive.primitiveContent.aE.labels != v_labels){
-										 setverdict(fail, __SCOPE__, ": Error: Labels attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -6845,7 +7149,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var RequestPrimitive v_updateRequestPrimitive;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_DMR_UPD_015(int2, m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM), v_updateRequest, true));//AE
 						v_ae1.done;
 						
@@ -6857,8 +7162,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 							 //Check attribute 1
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.aE)) {
-									 if(v_responsePrimitive.primitiveContent.aE.accessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.node.accessControlPolicyIDs)){
-										 setverdict(fail, __SCOPE__, ": Error: Access control policy IDs attribute not updated correctly")
+									 if(v_responsePrimitive.primitiveContent.aE.accessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.aE.accessControlPolicyIDs)){
+										 setverdict(fail, __SCOPE__ & ": Error: Access control policy IDs attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -6866,7 +7171,7 @@ module OneM2M_Testcases_CSE_Release_1 {
  
 							 //Check that the resource has been udpated correctly
 							  if(ischosen(v_primitiveContentRetrieveResource.aE)) {
-							   if(v_primitiveContentRetrieveResource.aE.accessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.node.accessControlPolicyIDs)){
+							   if(v_primitiveContentRetrieveResource.aE.accessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.aE.accessControlPolicyIDs)){
 								setverdict(fail, __SCOPE__ & ": Error: Access control policy IDs attribute not updated correctly")
 							  }
 							}
@@ -6879,7 +7184,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateAeBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.aE.appName := v_appName;
 						v_ae1.start(f_CSE_DMR_UPD_015(int2, m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM), v_updateRequest));//AE
 						v_ae1.done;
@@ -6891,7 +7197,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.aE)) {
 									 if(v_responsePrimitive.primitiveContent.aE.appName != v_appName){
-										 setverdict(fail, __SCOPE__, ": Error: AppName attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: AppName attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -6912,7 +7218,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateAeBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.aE.pointOfAccess := v_poaList;
 						v_ae1.start(f_CSE_DMR_UPD_015(int2, m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM), v_updateRequest));//AE
 						v_ae1.done;
@@ -6924,7 +7231,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.aE)) {
 									 if(v_responsePrimitive.primitiveContent.aE.pointOfAccess != v_poaList){
-										 setverdict(fail, __SCOPE__, ": Error: Point of Access attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Point of Access attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -6945,7 +7252,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.container.labels := v_labels;
 						
 						v_ae1.start(f_CSE_DMR_UPD_015(int3, m_createContainerBase, v_updateRequest));//Container
@@ -6958,7 +7266,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.container)) {
 									 if(v_responsePrimitive.primitiveContent.container.labels != v_labels){
-										 setverdict(fail, __SCOPE__, ": Error: Labels attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -6979,7 +7287,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var RequestPrimitive v_updateRequestPrimitive;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_DMR_UPD_015(int3, m_createContainerBase, v_updateRequest, true));//Container
 						v_ae1.done;
 						
@@ -6991,8 +7300,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 							 //Check attribute 1
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.container)) {
-									 if(v_responsePrimitive.primitiveContent.container.accessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.node.accessControlPolicyIDs)){
-										 setverdict(fail, __SCOPE__, ": Error: Access Control Policy IDs attribute not updated correctly")
+									 if(v_responsePrimitive.primitiveContent.container.accessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.container.accessControlPolicyIDs)){
+										 setverdict(fail, __SCOPE__ & ": Error: Access Control Policy IDs attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -7000,7 +7309,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 	 
 							  //Check that the resource has been udpated correctly
 							  if(ischosen(v_primitiveContentRetrieveResource.container)) {
-							   if(v_primitiveContentRetrieveResource.container.accessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.node.accessControlPolicyIDs)){
+							   if(v_primitiveContentRetrieveResource.container.accessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.container.accessControlPolicyIDs)){
 								setverdict(fail, __SCOPE__ & ": Error: Access Control Policy IDs attribute not updated correctly")
 							  }
 							}
@@ -7013,7 +7322,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.container.maxNrOfInstances := v_maxNrOfInstances;
 						
 						v_ae1.start(f_CSE_DMR_UPD_015(int3, m_createContainerBase, v_updateRequest));//Container
@@ -7026,7 +7336,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.container)) {
 									 if(v_responsePrimitive.primitiveContent.container.maxNrOfInstances != v_maxNrOfInstances){
-										 setverdict(fail, __SCOPE__, ": Error: Maximum number of instances attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Maximum number of instances attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -7047,7 +7357,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.container.maxByteSize := v_maxByteSize;
 						
 						v_ae1.start(f_CSE_DMR_UPD_015(int3, m_createContainerBase, v_updateRequest));//Container
@@ -7060,7 +7371,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.container)) {
 									 if(v_responsePrimitive.primitiveContent.container.maxByteSize != v_maxByteSize){
-										 setverdict(fail, __SCOPE__, ": Error: Maximum Byte size attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Maximum Byte size attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -7081,7 +7392,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.container.maxInstanceAge := v_maxInstanceAge;
 						
 						v_ae1.start(f_CSE_DMR_UPD_015(int3, m_createContainerBase, v_updateRequest));//Container
@@ -7094,7 +7406,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.container)) {
 									 if(v_responsePrimitive.primitiveContent.container.maxInstanceAge != v_maxInstanceAge){
-										 setverdict(fail, __SCOPE__, ": Error: Maximum Instance age attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Maximum Instance age attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -7115,7 +7427,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.accessControlPolicy.labels := v_labels;
 						
 						v_ae1.start(f_CSE_DMR_UPD_015(int1, m_createAcpBase, v_updateRequest));//AccessControlPolicy
@@ -7128,7 +7441,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.accessControlPolicy)) {
 									 if(v_responsePrimitive.primitiveContent.accessControlPolicy.labels != v_labels){
-										 setverdict(fail, __SCOPE__, ": Error: Labels attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -7149,7 +7462,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var RequestPrimitive v_updateRequestPrimitive;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest, true));//Subscription
 						v_ae1.done;
 						
@@ -7161,8 +7475,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 							  //Check attribute 1
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
-									 if(v_responsePrimitive.primitiveContent.subscription.accessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.node.accessControlPolicyIDs)){
-										 setverdict(fail, __SCOPE__, ": Error: Access Control Policy IDs attribute not updated correctly")
+									 if(v_responsePrimitive.primitiveContent.subscription.accessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.subscription.accessControlPolicyIDs)){
+										 setverdict(fail, __SCOPE__ & ": Error: Access Control Policy IDs attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -7170,7 +7484,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 	 
 							  //Check that the resource has been udpated correctly
 							  if(ischosen(v_primitiveContentRetrieveResource.subscription)) {
-							   if(v_primitiveContentRetrieveResource.subscription.accessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.node.accessControlPolicyIDs)){
+							   if(v_primitiveContentRetrieveResource.subscription.accessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.subscription.accessControlPolicyIDs)){
 								setverdict(fail, __SCOPE__ & ": Error: Access Control Policy IDs attribute not updated correctly")
 							  }
 							}
@@ -7183,7 +7497,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.subscription.labels := v_labels;
 						v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
 						v_ae1.done;
@@ -7195,7 +7510,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
 									 if(v_responsePrimitive.primitiveContent.subscription.labels != v_labels){
-										 setverdict(fail, __SCOPE__, ": Error: Labels attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -7216,7 +7531,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.group_.labels := v_labels;
 						v_ae1.start(f_CSE_DMR_UPD_015(int9, m_createGroupBase, v_updateRequest));//Group
 						v_ae1.done;
@@ -7228,7 +7544,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
 									 if(v_responsePrimitive.primitiveContent.group_.labels != v_labels){
-										 setverdict(fail, __SCOPE__, ": Error: Labels attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -7249,7 +7565,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var RequestPrimitive v_updateRequestPrimitive;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_DMR_UPD_015(int9, m_createGroupBase, v_updateRequest, true));//Group
 						v_ae1.done;
 						
@@ -7261,8 +7578,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 							 //Check attribute 1
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
-									 if(v_responsePrimitive.primitiveContent.group_.accessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.node.accessControlPolicyIDs)){
-										 setverdict(fail, __SCOPE__, ": Error: Access Control Policy IDs attribute not updated correctly")
+									 if(v_responsePrimitive.primitiveContent.group_.accessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.group_.accessControlPolicyIDs)){
+										 setverdict(fail, __SCOPE__ & ": Error: Access Control Policy IDs attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -7270,7 +7587,7 @@ module OneM2M_Testcases_CSE_Release_1 {
  
 							//Check that the resource has been udpated correctly
 							  if(ischosen(v_primitiveContentRetrieveResource.group_)) {
-							   if(v_primitiveContentRetrieveResource.group_.accessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.node.accessControlPolicyIDs)){
+							   if(v_primitiveContentRetrieveResource.group_.accessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.group_.accessControlPolicyIDs)){
 								setverdict(fail, __SCOPE__ & ": Error: Access Control Policy IDs attribute not updated correctly")
 							  }
 							}
@@ -7283,7 +7600,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.group_.membersAccessControlPolicyIDs := v_membersAccessControlPolicyIDs;
 						v_ae1.start(f_CSE_DMR_UPD_015(int9, m_createGroupBase, v_updateRequest));//Group
 						v_ae1.done;
@@ -7295,7 +7613,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
 									 if(v_responsePrimitive.primitiveContent.group_.membersAccessControlPolicyIDs != v_membersAccessControlPolicyIDs){
-										 setverdict(fail, __SCOPE__, ": Error: Members Access Control Policy IDs attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Members Access Control Policy IDs attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -7316,7 +7634,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.group_.groupName := v_groupName;
 						v_ae1.start(f_CSE_DMR_UPD_015(int9, m_createGroupBase, v_updateRequest));//Group
 						v_ae1.done;
@@ -7328,7 +7647,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
 									 if(v_responsePrimitive.primitiveContent.group_.groupName != v_groupName){
-										 setverdict(fail, __SCOPE__, ": Error: Group name attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Group name attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -7356,7 +7675,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.remoteCSE.expirationTime := v_expirationTime;
 						
 						v_ae1.start(f_CSE_DMR_UPD_016(int16, m_createRemoteCSEBase, v_updateRequest));//Remote CSE
@@ -7369,7 +7689,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.remoteCSE)) {
 									if(v_responsePrimitive.primitiveContent.remoteCSE.expirationTime != v_expirationTime){
-										setverdict(fail, __SCOPE__, ": Error: Expiration time attribute not updated correctly")
+										setverdict(fail, __SCOPE__ & ": Error: Expiration time attribute not updated correctly")
 									}
 								}
 							}
@@ -7390,7 +7710,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.remoteCSE.requestReachability := v_requestReachability;
 						
 						v_ae1.start(f_CSE_DMR_UPD_016(int16, m_createRemoteCSEBase, v_updateRequest));//Remote CSE
@@ -7401,7 +7722,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.remoteCSE)) {
 									if(v_responsePrimitive.primitiveContent.remoteCSE.requestReachability != v_requestReachability){
-										setverdict(fail, __SCOPE__, ": Error: Request Reachability attribute not updated correctly")
+										setverdict(fail, __SCOPE__ & ": Error: Request Reachability attribute not updated correctly")
 									}
 								}
 							}
@@ -7422,7 +7743,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateAeBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.aE.expirationTime := v_expirationTime;
 						
 						v_ae1.start(f_CSE_DMR_UPD_016(int2, m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM), v_updateRequest));//AE
@@ -7435,7 +7757,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.aE)) {
 									if(v_responsePrimitive.primitiveContent.aE.expirationTime != v_expirationTime){
-										setverdict(fail, __SCOPE__, ": Error: Expiration time attribute not updated correctly")
+										setverdict(fail, __SCOPE__ & ": Error: Expiration time attribute not updated correctly")
 									}
 								}
 							}
@@ -7456,7 +7778,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateAeBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.aE.requestReachability := v_requestReachability;
 
 						v_ae1.start(f_CSE_DMR_UPD_016(int2, m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM), v_updateRequest));//AE
@@ -7469,7 +7792,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.aE)) {
 									if(v_responsePrimitive.primitiveContent.aE.requestReachability != v_requestReachability){
-										setverdict(fail, __SCOPE__, ": Error: Request Reachability attribute not updated correctly")
+										setverdict(fail, __SCOPE__ & ": Error: Request Reachability attribute not updated correctly")
 									}
 								}
 							}
@@ -7490,7 +7813,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.container.expirationTime := v_expirationTime;
 						
 						v_ae1.start(f_CSE_DMR_UPD_016(int3, m_createContainerBase, v_updateRequest));//Container
@@ -7503,7 +7827,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.container)) {
 									if(v_responsePrimitive.primitiveContent.container.expirationTime != v_expirationTime){
-										setverdict(fail, __SCOPE__, ": Error: Expiration time attribute not updated correctly")
+										setverdict(fail, __SCOPE__ & ": Error: Expiration time attribute not updated correctly")
 									}
 								}
 							}
@@ -7524,7 +7848,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.accessControlPolicy.expirationTime := v_expirationTime;
 						
 						v_ae1.start(f_CSE_DMR_UPD_016(int1, m_createAcpBase, v_updateRequest));//AccessControlPolicy
@@ -7537,7 +7862,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.accessControlPolicy)) {
 									if(v_responsePrimitive.primitiveContent.accessControlPolicy.expirationTime != v_expirationTime){
-										setverdict(fail, __SCOPE__, ": Error: Expiration time attribute not updated correctly")
+										setverdict(fail, __SCOPE__ & ": Error: Expiration time attribute not updated correctly")
 									}
 								}
 							}
@@ -7558,7 +7883,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.accessControlPolicy.privileges := v_privileges_1;
 						v_ae1.start(f_CSE_DMR_UPD_016(int1, m_createAcpBase, v_updateRequest));//AccessControlPolicy
 						v_ae1.done;
@@ -7570,7 +7896,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.accessControlPolicy)) {
 									if(v_responsePrimitive.primitiveContent.accessControlPolicy.privileges != v_privileges_1){
-										setverdict(fail, __SCOPE__, ": Error: Privileges attribute not updated correctly")
+										setverdict(fail, __SCOPE__ & ": Error: Privileges attribute not updated correctly")
 									}
 								}
 							}
@@ -7591,7 +7917,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.accessControlPolicy.selfPrivileges := v_privileges_1;
 						v_ae1.start(f_CSE_DMR_UPD_016(int1, m_createAcpBase, v_updateRequest));//AccessControlPolicy
 						v_ae1.done;
@@ -7603,7 +7930,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.accessControlPolicy)) {
 									if(v_responsePrimitive.primitiveContent.accessControlPolicy.selfPrivileges != v_privileges_1){
-										setverdict(fail, __SCOPE__, ": Error: Self Privileges attribute not updated correctly")
+										setverdict(fail, __SCOPE__ & ": Error: Self Privileges attribute not updated correctly")
 									}
 								}
 							}
@@ -7624,7 +7951,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.subscription.expirationTime := v_expirationTime;
 						
 						v_ae1.start(f_CSE_DMR_UPD_016(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
@@ -7637,7 +7965,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
 									if(v_responsePrimitive.primitiveContent.subscription.expirationTime != v_expirationTime){
-										setverdict(fail, __SCOPE__, ": Error: Expiration time attribute not updated correctly")
+										setverdict(fail, __SCOPE__ & ": Error: Expiration time attribute not updated correctly")
 									}
 								}
 							}
@@ -7659,7 +7987,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);					
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;					
 						v_updateRequest.primitiveContent.subscription.notificationURI := v_notificationURI;
 						
 						v_ae1.start(f_CSE_DMR_UPD_016(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
@@ -7672,7 +8001,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
 									if(v_responsePrimitive.primitiveContent.subscription.notificationURI != v_notificationURI){
-										setverdict(fail, __SCOPE__, ": Error: Notification URI attribute not updated correctly")
+										setverdict(fail, __SCOPE__ & ": Error: Notification URI attribute not updated correctly")
 									}
 								}
 							}
@@ -7693,7 +8022,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.subscription.notificationContentType := v_notificationContentType;
 						
 						v_ae1.start(f_CSE_DMR_UPD_016(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
@@ -7706,7 +8036,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
 									if(v_responsePrimitive.primitiveContent.subscription.notificationContentType != v_notificationContentType){
-										setverdict(fail, __SCOPE__, ": Error: Notification Content Type attribute not updated correctly")
+										setverdict(fail, __SCOPE__ & ": Error: Notification Content Type attribute not updated correctly")
 									}
 								}
 							}
@@ -7727,7 +8057,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.group_.expirationTime := v_expirationTime;
 						
 						v_ae1.start(f_CSE_DMR_UPD_016(int9, m_createGroupBase, v_updateRequest));//Group
@@ -7740,7 +8071,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
 									if(v_responsePrimitive.primitiveContent.group_.expirationTime != v_expirationTime){
-										setverdict(fail, __SCOPE__, ": Error: Expiration Time attribute not updated correctly")
+										setverdict(fail, __SCOPE__ & ": Error: Expiration Time attribute not updated correctly")
 									}
 								}
 							}
@@ -7761,7 +8092,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.group_.maxNrOfMembers := v_maxNrOfMembers;
 						
 						v_ae1.start(f_CSE_DMR_UPD_016(int9, m_createGroupBase, v_updateRequest));//Group
@@ -7774,7 +8106,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
 									if(v_responsePrimitive.primitiveContent.group_.maxNrOfMembers != v_maxNrOfMembers){
-										setverdict(fail, __SCOPE__, ": Error: Maximum Number of Members attribute not updated correctly")
+										setverdict(fail, __SCOPE__ & ": Error: Maximum Number of Members attribute not updated correctly")
 									}
 								}
 							}
@@ -7795,7 +8127,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.group_.memberIDs := v_memberIDs;
 						
 						v_ae1.start(f_CSE_DMR_UPD_016(int9, m_createGroupBase, v_updateRequest));//Group
@@ -7808,7 +8141,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
 									if(v_responsePrimitive.primitiveContent.group_.memberIDs != v_memberIDs){
-										setverdict(fail, __SCOPE__, ": Error: Member IDs attribute not updated correctly")
+										setverdict(fail, __SCOPE__ & ": Error: Member IDs attribute not updated correctly")
 									}
 								}
 							}
@@ -7838,7 +8171,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_DEL_001_CNT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                 		
 						v_ae1.start(f_CSE_DMR_DEL_001(int3, m_createContainerBase));//Container
 						v_ae1.done;
@@ -7851,7 +8185,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_DEL_001_GRP() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                 		
 						v_ae1.start(f_CSE_DMR_DEL_001(int9, m_createGroupBase));//Group
 						v_ae1.done;
@@ -7860,7 +8195,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_DEL_001_ACP() runs on Tester system CseSystem {
 						// Local variables
  						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                 
 						v_ae1.start(f_CSE_DMR_DEL_001(int1, m_createAcpBase));//AccessControlPolicy
 						v_ae1.done;
@@ -7869,7 +8205,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_DEL_001_SUB() runs on Tester system CseSystem {
 							// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                 
 						v_ae1.start(f_CSE_DMR_DEL_001(int23, m_createSubscriptionBase));//Subscription
 						v_ae1.done;
@@ -7878,7 +8215,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_DEL_001_CIN() runs on AeSimu system CseSystem {
 							// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                 
 						v_ae1.start(f_CSE_DMR_DEL_001(int4, m_createContentInstanceBase));//ContentInstance
 						v_ae1.done;
@@ -7895,7 +8233,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_DEL_002_CNT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                 		
 						v_ae1.start(f_CSE_DMR_DEL_002(int3, m_createContainerBase));//Container
 						v_ae1.done;
@@ -7904,7 +8243,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_DEL_002_GRP() runs on Tester system CseSystem {
 						// Local variables
  						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                 		
 						v_ae1.start(f_CSE_DMR_DEL_002(int9, m_createGroupBase));//Group
 						v_ae1.done;
@@ -7913,7 +8253,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_DEL_002_ACP() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                 
 						v_ae1.start(f_CSE_DMR_DEL_002(int1, m_createAcpBase));//AccessControlPolicy
 						v_ae1.done;
@@ -7922,7 +8263,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_DEL_002_SUB() runs on Tester system CseSystem {
 							// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                 
 						v_ae1.start(f_CSE_DMR_DEL_002(int23, m_createSubscriptionBase));//Subscription
 						v_ae1.done;
@@ -7931,197 +8273,319 @@ module OneM2M_Testcases_CSE_Release_1 {
                 
 				};//end of group g_CSE_DMR_DEL_002
 
-				group g_CSE_DMR_DEL_005{
+				/**
+				 * @desc Check that the stateTag attribute of a container resource is increased when a child resource is deleted
+				 * 
+				 */
+				testcase TC_CSE_DMR_DEL_005() runs on Tester system CseSystem {
+			
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
+							
+					v_ae1.start(f_CSE_DMR_DEL_005());
+				  	  	
+					v_ae1.done;
+				  	  		
+				}
 
-					/**
-					 * @desc Check that the stateTag attribute of a container resource is increased when a child resource is deleted
-					 * 
-					 */
-					testcase TC_CSE_DMR_DEL_005() runs on AeSimu system CseSystem {
-						// Local variables
-						var MsgIn v_response;
-						var RequestPrimitive v_request;
-						var integer v_aeIndex := -1;
-						var integer v_resourceIndex := -1;
-						var integer v_childResourceIndex := -1; 
-						const ResourceType c_containerResourceType := int3;          			
-                
-						// Test control
-            
-						// Test component configuration
-						f_cf01Up();
-            
-						// Test adapter configuration
-            
-						// Preamble
-						v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
-						
-						v_resourceIndex := f_cse_createResource(c_containerResourceType, m_createContainerBase, v_aeIndex); 
-            			
-						if(ispresent(vc_resourcesList[v_resourceIndex].resource.container.stateTag)) {
-            				
-							v_childResourceIndex := f_cse_createResource(c_containerResourceType, m_createContainerBase, v_resourceIndex); 
-            				
-							// Test Body
-							mcaPort.send(f_getMsgOutPrimitive(m_request(m_delete(f_getResourceAddress(v_childResourceIndex), f_getOriginator(v_childResourceIndex)))));
-							            	
-							tc_ac.start;
-							alt {
-								[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) -> value v_response {
-									tc_ac.stop;
-									setverdict(pass, __SCOPE__ & ": Resource type " & int2str(enum2int(c_containerResourceType)) & " delete successfully");
-								}
-								[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
-									tc_ac.stop;
-									setverdict(fail, __SCOPE__ & ": Wrong response status code");
-								}
-								[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
-									tc_ac.stop;
-									setverdict(fail, __SCOPE__ & ": Error while deleting resource type " & int2str(enum2int(c_containerResourceType)));
-								}
-								[] tc_ac.timeout {
-									setverdict(fail, __SCOPE__ & ": No answer while deleting resource type " & int2str(enum2int(c_containerResourceType)));
-								}
+				function f_CSE_DMR_DEL_005() runs on AeSimu system CseSystem {
+					// Local variables
+					var MsgIn v_response;
+					var RequestPrimitive v_request;
+					var integer v_aeIndex := -1;
+					var integer v_resourceIndex := -1;
+					var integer v_childResourceIndex := -1; 
+					const ResourceType c_containerResourceType := int3;          			
+        					   
+					// Test control
+        
+					// Test component configuration
+					f_cf01Up();
+        
+					// Test adapter configuration
+        
+					// Preamble
+					v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+					
+					v_resourceIndex := f_cse_createResource(c_containerResourceType, m_createContainerBase, v_aeIndex); 
+        			
+					if(ispresent(vc_resourcesList[v_resourceIndex].resource.container.stateTag)) {
+        				
+						v_childResourceIndex := f_cse_createResource(c_containerResourceType, m_createContainerBase, v_resourceIndex); 
+        				
+						// Test Body
+						mcaPort.send(f_getMsgOutPrimitive(m_request(m_delete(f_getResourceAddress(v_childResourceIndex), f_getOriginator(v_childResourceIndex)))));
+						            	
+						tc_ac.start;
+						alt {
+							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) -> value v_response {
+								tc_ac.stop;
+								setverdict(pass, __SCOPE__ & ": Resource type " & int2str(enum2int(c_containerResourceType)) & " delete successfully");
 							}
-            	
-            	
-            	
-							mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)))));
-            
-							tc_ac.start;
-							alt {
-								[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
-									tc_ac.stop;
-									if(v_response.primitive.responsePrimitive.primitiveContent.container.stateTag == 2) { //(Create and Delete)
-										setverdict(pass, __SCOPE__ & ": The stateTag attribute is incremented");	
-									}
-									else{
-										setverdict(fail, __SCOPE__ & ": Error the stateTag attribute is not incremented");
-									}
-								}
-								[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
-									tc_ac.stop;
-									setverdict(fail, __SCOPE__ & ": Error while retrieving resource attributes");
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+								tc_ac.stop;
+								setverdict(fail, __SCOPE__ & ": Wrong response status code");
+							}
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+								tc_ac.stop;
+								setverdict(fail, __SCOPE__ & ": Error while deleting resource type " & int2str(enum2int(c_containerResourceType)));
+							}
+							[] tc_ac.timeout {
+								setverdict(fail, __SCOPE__ & ": No answer while deleting resource type " & int2str(enum2int(c_containerResourceType)));
+							}
+						}
+        	
+        	
+        	
+						mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)))));
+        
+						tc_ac.start;
+						alt {
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+								tc_ac.stop;
+								if(v_response.primitive.responsePrimitive.primitiveContent.container.stateTag == 2) { //(Create and Delete)
+									setverdict(pass, __SCOPE__ & ": The stateTag attribute is incremented");	
 								}
-								[] tc_ac.timeout {
-									setverdict(fail, __SCOPE__ & ": No answer while retrieving resource attributes");
+								else{
+									setverdict(fail, __SCOPE__ & ": Error the stateTag attribute is not incremented");
 								}
-							}	
-            					
-						}//end if
-						else{
-							setverdict(fail, __SCOPE__ & ": Error the stateTag attribute is empty");
-						}
-            			
-						// Postamble
-						f_cse_postamble_deleteResources();
-            
-						// Tear down
-						f_cf01Down();
-            				
-					}//end f_CSE_DMR_DEL_005
-				} // end group g_CSE_DMR_DEL_005
-                
-				group g_CSE_DMR_DEL_006{
-
-					/**
-					 * @desc Check that the IUT decreases the field value of attribute currentNrOfInstances and currentByteSize of parent container when a latest contentInstance resource is deleted successfully
-					 * 
-					 */
-					testcase TC_CSE_DMR_DEL_006() runs on AeSimu system CseSystem {
-						// Local variables
-						var integer v_aeIndex := -1;
-						var integer v_containerIndex := -1;
-						var integer v_contentInstanceIndex := -1; 
-						var PrimitiveContent v_attributesContainer, v_attributesContainer_afterDeletion;
-								   
-						// Test control
-            
-						// Test component configuration
-						f_cf01Up();
-            
-						// Test adapter configuration
-            
-						// Preamble
-						v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
-						
-						v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex); 
+							}
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
+								tc_ac.stop;
+								setverdict(fail, __SCOPE__ & ": Error while retrieving resource attributes");
+							}
+							[] tc_ac.timeout {
+								setverdict(fail, __SCOPE__ & ": No answer while retrieving resource attributes");
+							}
+						}	
+        					
+					}//end if
+					else{
+						setverdict(fail, __SCOPE__ & ": Error the stateTag attribute is empty");
+					}
+        			
+					// Postamble
+					f_cse_postamble_deleteResources();
+        
+					// Tear down
+					f_cf01Down();
+        				
+				}//end f_CSE_DMR_DEL_005
+				
+				/**
+				 * @desc Check that the IUT decreases the field value of attribute currentNrOfInstances and currentByteSize of parent container when a latest contentInstance resource is deleted successfully
+				 * 
+				 */
+				testcase TC_CSE_DMR_DEL_006() runs on Tester system CseSystem {
+			
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
+							
+					v_ae1.start(f_CSE_DMR_DEL_006());
+				  	  	
+					v_ae1.done;
+				  	  		
+				}
+				
+				function f_CSE_DMR_DEL_006() runs on AeSimu system CseSystem {
+					// Local variables
+					var integer v_aeIndex := -1;
+					var integer v_containerIndex := -1;
+					var integer v_contentInstanceIndex := -1; 
+					var PrimitiveContent v_attributesContainer, v_attributesContainer_afterDeletion;
+							   
+					// Test control
+        
+					// Test component configuration
+					f_cf01Up();
+        
+					// Test adapter configuration
+        
+					// Preamble
+					v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+					
+					v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex); 
+					
+					v_contentInstanceIndex := f_cse_createResource(int4, m_createContentInstanceBase, v_containerIndex); 
+					
+					v_attributesContainer := f_cse_retrieveResource(v_containerIndex);
+        			
+					if(not(ispresent(v_attributesContainer.container.currentNrOfInstances))) {
+						setverdict(fail, __SCOPE__ & ": Error the currentNrOfInstances attribute is empty");
+						f_checkAeSimuStatus();
+					}
 						
-						v_contentInstanceIndex := f_cse_createResource(int4, m_createContentInstanceBase, v_containerIndex); 
+					// Test Body
+					f_cse_deleteResource(v_contentInstanceIndex);
+				
+					v_attributesContainer_afterDeletion := f_cse_retrieveResource(v_containerIndex);
+					
+					if(not(ispresent(v_attributesContainer.container.currentNrOfInstances))) {
+						setverdict(fail, __SCOPE__ & ": Error the currentNrOfInstances attribute is empty");
+						f_checkAeSimuStatus();
+					}
+					
+					if((v_attributesContainer.container.currentNrOfInstances > v_attributesContainer_afterDeletion.container.currentNrOfInstances) and
+						(v_attributesContainer.container.currentByteSize > v_attributesContainer_afterDeletion.container.currentByteSize)) {
+						setverdict(pass, __SCOPE__ & ": The currentNrOfInstances and currentByteSize attributes are decreased");
+					} else {
+						setverdict(fail, __SCOPE__ & ": currentNrOfInstances and/or currentByteSize attributes are not decreased");
+					}
 						
-						v_attributesContainer := f_cse_retrieveResource(v_containerIndex);
-            			
-						if(not(ispresent(v_attributesContainer.container.currentNrOfInstances))) {
-							setverdict(fail, __SCOPE__ & ": Error the currentNrOfInstances attribute is empty");
-							f_checkAeSimuStatus();
-						}
+					// Postamble
+					f_cse_postamble_deleteResources();
+        
+					// Tear down
+					f_cf01Down();
+        				
+				}//end f_CSE_DMR_DEL_006
+
+				/**
+				 * @desc Check that the IUT accepts the DELETE Request of the latest contentInstance resource target to a container resource
+				 * 
+				 */
+				testcase TC_CSE_DMR_DEL_007() runs on Tester system CseSystem {
+			
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
 							
-						// Test Body
-						f_cse_deleteResource(v_contentInstanceIndex);
+					v_ae1.start(f_CSE_DMR_DEL_007());
+				  	  	
+					v_ae1.done;
+				  	  		
+				}
+				
+				function f_CSE_DMR_DEL_007() runs on AeSimu system CseSystem {
+					// Local variables
+					var MsgIn v_response;
+					var RequestPrimitive v_request;
+					var integer v_aeIndex := -1;
+					var integer v_containerIndex := -1;
+					var integer v_contentInstanceIndex_1 := -1;
+					var integer v_contentInstanceIndex_2 := -1; 
+					const ResourceType c_containerResourceType := int3;
+							   
+					// Test control
+        
+					// Test component configuration
+					f_cf01Up();
+        
+					// Test adapter configuration
+        
+					// Preamble
+					v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+					
+					v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex); 
+					
+					v_contentInstanceIndex_1 := f_cse_createResource(int4, m_createContentInstance_noResourceName, v_containerIndex); 
 					
-						v_attributesContainer_afterDeletion := f_cse_retrieveResource(v_containerIndex);
+					f_sleep(1.0);
+					
+					v_contentInstanceIndex_2 := f_cse_createResource(int4, m_createContentInstance_noResourceName, v_containerIndex);
 						
-						if(not(ispresent(v_attributesContainer.container.currentNrOfInstances))) {
-							setverdict(fail, __SCOPE__ & ": Error the currentNrOfInstances attribute is empty");
-							f_checkAeSimuStatus();
+					// Test Body
+					v_request := valueof(m_delete(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameLatest, f_getOriginator(v_containerIndex)));
+					            	
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
+					tc_ac.start;
+					alt {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) -> value v_response {
+							tc_ac.stop;
+							setverdict(pass, __SCOPE__ & ": Resource type " & int2str(enum2int(c_containerResourceType)) & " deleted successfuly");
 						}
-						
-						if((v_attributesContainer.container.currentNrOfInstances > v_attributesContainer_afterDeletion.container.currentNrOfInstances) and
-							(v_attributesContainer.container.currentByteSize > v_attributesContainer_afterDeletion.container.currentByteSize)) {
-							setverdict(pass, __SCOPE__ & ": The currentNrOfInstances and currentByteSize attributes are decreased");
-						} else {
-							setverdict(fail, __SCOPE__ & ": currentNrOfInstances and/or currentByteSize attributes are not decreased");
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Wrong response status code");
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Error while deleting resource type " & int2str(enum2int(c_containerResourceType)));
+						}
+						[] tc_ac.timeout {
+							setverdict(fail, __SCOPE__ & ": No answer while deleting resource type " & int2str(enum2int(c_containerResourceType)));
+						}
+					}
+					
+					f_checkAeSimuStatus();
+		       		            	
+					mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve((f_getResourceAddress(v_contentInstanceIndex_2)), f_getOriginator(v_contentInstanceIndex_2)))));
+				            
+					tc_ac.start;
+					alt {
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Resource type" & int2str(enum2int(c_containerResourceType)) & " has already been deleted");	
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
+							tc_ac.stop;
+							setverdict(pass, __SCOPE__ & ": Error while retrieving resource attributes as" & int2str(enum2int(c_containerResourceType)) & " has been deleted");
 						}
+						[] tc_ac.timeout {
+							setverdict(fail, __SCOPE__ & ": No answer while retrieving resource attributes");
+						}
+					}
+				    
+					// Postamble
+					f_cse_postamble_deleteResources();
+        
+					// Tear down
+					f_cf01Down();
+        				
+				}//end f_CSE_DMR_DEL_007
+
+				/**
+				 * @desc Check that the IUT accepts the DELETE Request of the oldest contentInstance resource target to a container resource
+				 * 
+				 */
+				testcase TC_CSE_DMR_DEL_009() runs on Tester system CseSystem {
+			
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
 							
-						// Postamble
-						f_cse_postamble_deleteResources();
-            
-						// Tear down
-						f_cf01Down();
-            				
-					}//end f_CSE_DMR_DEL_006
-				} // end group g_CSE_DMR_DEL_006
-				
-				group g_CSE_DMR_DEL_007{
+					v_ae1.start(f_CSE_DMR_DEL_009());
+				  	  	
+					v_ae1.done;
+				  	  		
+				}
 
-					/**
-					 * @desc Check that the IUT accepts the DELETE Request of the latest contentInstance resource target to a container resource
-					 * 
-					 */
-					testcase TC_CSE_DMR_DEL_007() runs on AeSimu system CseSystem {
-						// Local variables
-						var MsgIn v_response;
-						var RequestPrimitive v_request;
-						var integer v_aeIndex := -1;
-						var integer v_containerIndex := -1;
-						var integer v_contentInstanceIndex_1 := -1;
-						var integer v_contentInstanceIndex_2 := -1; 
-						const ResourceType c_containerResourceType := int3;
-								   
-						// Test control
-            
-						// Test component configuration
-						f_cf01Up();
-            
-						// Test adapter configuration
-            
-						// Preamble
-						v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
-						
-						v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex); 
-						
-						v_contentInstanceIndex_1 := f_cse_createResource(int4, m_createContentInstance_noResourceName, v_containerIndex); 
-						
-						f_sleep(1.0);
+				function f_CSE_DMR_DEL_009() runs on AeSimu system CseSystem {
+					// Local variables
+					var MsgIn v_response;
+					var RequestPrimitive v_request;
+					var integer v_aeIndex := -1;
+					var integer v_containerIndex := -1;
+					var integer v_contentInstanceIndex_1 := -1;
+					var integer v_contentInstanceIndex_2 := -1; 
+					const ResourceType c_containerResourceType := int3;
+							   
+					// Test control
+        
+					// Test component configuration
+					f_cf01Up();
+        
+					// Test adapter configuration
+        
+					// Preamble
+					v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+					
+					v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex); 
+					
+					v_contentInstanceIndex_1 := f_cse_createResource(int4, m_createContentInstance_noResourceName, v_containerIndex); 
+					
+					f_sleep(1.0);
+											
+					v_contentInstanceIndex_2 := f_cse_createResource(int4, m_createContentInstance_noResourceName, v_containerIndex);
 						
-						v_contentInstanceIndex_2 := f_cse_createResource(int4, m_createContentInstance_noResourceName, v_containerIndex);
-							
-						// Test Body
-						v_request := valueof(m_delete(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameLatest, f_getOriginator(v_containerIndex)));
-						            	
-						mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
-						tc_ac.start;
-						alt {
+					// Test Body
+					v_request := valueof(m_delete(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameOldest, f_getOriginator(v_containerIndex)));
+					            	
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
+					tc_ac.start;
+					alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) -> value v_response {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__ & ": Resource type " & int2str(enum2int(c_containerResourceType)) & " deleted successfuly");
@@ -8137,120 +8601,34 @@ module OneM2M_Testcases_CSE_Release_1 {
 							[] tc_ac.timeout {
 								setverdict(fail, __SCOPE__ & ": No answer while deleting resource type " & int2str(enum2int(c_containerResourceType)));
 							}
-						}
-						
-						f_checkAeSimuStatus();
-			       		            	
-						mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve((f_getResourceAddress(v_contentInstanceIndex_2)), f_getOriginator(v_contentInstanceIndex_2)))));
-					            
-						tc_ac.start;
-						alt {
+					   }
+					   
+					f_checkAeSimuStatus();
+					   
+					mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve((f_getResourceAddress(v_contentInstanceIndex_1)), f_getOriginator(v_contentInstanceIndex_1)))));
+				            
+					tc_ac.start;
+					alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
-								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Resource type" & int2str(enum2int(c_containerResourceType)) & " has already been deleted");	
+							   tc_ac.stop;
+							   setverdict(fail, __SCOPE__ & ": Resource type" & int2str(enum2int(c_containerResourceType)) & " has already been deleted");	
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
-								tc_ac.stop;
-								setverdict(pass, __SCOPE__ & ": Error while retrieving resource attributes as" & int2str(enum2int(c_containerResourceType)) & " has been deleted");
+							   tc_ac.stop;
+							   setverdict(pass, __SCOPE__ & ": Error while retrieving resource attributes as " & int2str(enum2int(c_containerResourceType)) & " has been deleted");
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, __SCOPE__ & ": No answer while retrieving resource attributes");
+							   setverdict(fail, __SCOPE__ & ": No answer while retrieving resource attributes");
 							}
 						}
-					    
-						// Postamble
-						f_cse_postamble_deleteResources();
-            
-						// Tear down
-						f_cf01Down();
-            				
-					}//end f_CSE_DMR_DEL_007
-				} // end group g_CSE_DMR_DEL_007
-				
-				group g_CSE_DMR_DEL_009{
-
-					/**
-					 * @desc Check that the IUT accepts the DELETE Request of the oldest contentInstance resource target to a container resource
-					 * 
-					 */
-					testcase TC_CSE_DMR_DEL_009() runs on AeSimu system CseSystem {
-						// Local variables
-						var MsgIn v_response;
-						var RequestPrimitive v_request;
-						var integer v_aeIndex := -1;
-						var integer v_containerIndex := -1;
-						var integer v_contentInstanceIndex_1 := -1;
-						var integer v_contentInstanceIndex_2 := -1; 
-						const ResourceType c_containerResourceType := int3;
-								   
-						// Test control
-            
-						// Test component configuration
-						f_cf01Up();
-            
-						// Test adapter configuration
-            
-						// Preamble
-						v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
 						
-						v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex); 
-						
-						v_contentInstanceIndex_1 := f_cse_createResource(int4, m_createContentInstance_noResourceName, v_containerIndex); 
-						
-						f_sleep(1.0);
-												
-						v_contentInstanceIndex_2 := f_cse_createResource(int4, m_createContentInstance_noResourceName, v_containerIndex);
-							
-						// Test Body
-						v_request := valueof(m_delete(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameOldest, f_getOriginator(v_containerIndex)));
-						            	
-						mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
-						tc_ac.start;
-						alt {
-								[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) -> value v_response {
-									tc_ac.stop;
-									setverdict(pass, __SCOPE__ & ": Resource type " & int2str(enum2int(c_containerResourceType)) & " deleted successfuly");
-								}
-								[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
-									tc_ac.stop;
-									setverdict(fail, __SCOPE__ & ": Wrong response status code");
-								}
-								[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
-									tc_ac.stop;
-									setverdict(fail, __SCOPE__ & ": Error while deleting resource type " & int2str(enum2int(c_containerResourceType)));
-								}
-								[] tc_ac.timeout {
-									setverdict(fail, __SCOPE__ & ": No answer while deleting resource type " & int2str(enum2int(c_containerResourceType)));
-								}
-						   }
-						   
-						f_checkAeSimuStatus();
-						   
-						mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve((f_getResourceAddress(v_contentInstanceIndex_1)), f_getOriginator(v_contentInstanceIndex_1)))));
-					            
-						tc_ac.start;
-						alt {
-								[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
-								   tc_ac.stop;
-								   setverdict(fail, __SCOPE__ & ": Resource type" & int2str(enum2int(c_containerResourceType)) & " has already been deleted");	
-								}
-								[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
-								   tc_ac.stop;
-								   setverdict(pass, __SCOPE__ & ": Error while retrieving resource attributes as " & int2str(enum2int(c_containerResourceType)) & " has been deleted");
-								}
-								[] tc_ac.timeout {
-								   setverdict(fail, __SCOPE__ & ": No answer while retrieving resource attributes");
-								}
-							}
-							
-						// Postamble
-						f_cse_postamble_deleteResources();
-            
-						// Tear down
-						f_cf01Down();
-            				
-					}//end f_CSE_DMR_DEL_009
-				} // end group g_CSE_DMR_DEL_009
+					// Postamble
+					f_cse_postamble_deleteResources();
+        
+					// Tear down
+					f_cf01Down();
+        				
+				}//end f_CSE_DMR_DEL_009
 				
 			}//end group Delete
 			
@@ -8267,7 +8645,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_SUB_CRE_001_SUB() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 							
 					v_ae1.start(f_CSE_SUB_CRE_001_SUB());
 				  	  	
@@ -8341,7 +8720,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_SUB_CRE_001_CIN() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 								
 					v_ae1.start(f_CSE_SUB_CRE_001_CIN());
 					  	  	
@@ -8419,7 +8799,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_SUB_CRE_002() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 								
 					v_ae1.start(f_CSE_SUB_CRE_002());
 					  	  	
@@ -8498,7 +8879,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_SUB_CRE_003() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 								
 					v_ae1.start(f_CSE_SUB_CRE_003());
 					  	  	
@@ -8571,7 +8953,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_SUB_CRE_004() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 								
 					v_ae1.start(f_CSE_SUB_CRE_004());
 					  	  	
@@ -8634,7 +9017,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_SUB_CRE_005() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 								
 					v_ae1.start(f_CSE_SUB_CRE_005());
 					  	  	
@@ -8718,7 +9102,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_SUB_UPD_001() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 								
 					v_ae1.start(f_CSE_SUB_UPD_001());
 					  	  	
@@ -8805,7 +9190,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_SUB_DEL_001() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 									
 					v_ae1.start(f_CSE_SUB_DEL_001());
 						  	  	
@@ -8906,7 +9292,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_SEC_ACP_CRE_001() runs on Tester system CseSystem {
 					
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 									
 						v_ae1.start(f_CSE_SEC_ACP_CRE_001());
 						  	  	
@@ -8990,7 +9377,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_SEC_ACP_CRE_002() runs on Tester system CseSystem {
 					
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 										
 						v_ae1.start(f_CSE_SEC_ACP_CRE_002());
 							  	  	
@@ -9075,7 +9463,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_SEC_ACP_CRE_003() runs on Tester system CseSystem {
 					
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 										
 						v_ae1.start(f_CSE_SEC_ACP_CRE_003());
 							  	  	
@@ -9159,7 +9548,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_SEC_ACP_CRE_004() runs on Tester system CseSystem {
 					
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 										
 						v_ae1.start(f_CSE_SEC_ACP_CRE_004());
 							  	  	
@@ -9237,7 +9627,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_SEC_ACP_UPD_001() runs on Tester system CseSystem {
 					
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 										
 						v_ae1.start(f_CSE_SEC_ACP_UPD_001());
 							  	  	
@@ -9274,8 +9665,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						
 						v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpIndex1].resource)}, -);
 
-						v_accessControlRule_1 := valueof(m_createAcr({f_getOriginator(v_aeIndex)}, int59)); // c_CRUDNDi
-						v_accessControlRule_2 := valueof(m_createAcr({PX_SUPER_AE_ID, f_getOriginator(v_aeIndex)}, int63)); // c_CRDNDi 
+						v_accessControlRule_1 := valueof(m_createAcr({f_getOriginator(v_aeIndex)}, int59)); // c_CRDNDi
+						v_accessControlRule_2 := valueof(m_createAcr({PX_SUPER_AE_ID, f_getOriginator(v_aeIndex)}, int63)); // c_CRUDNDi 
 						v_setOfArcs_1.accessControlRule_list := {v_accessControlRule_1};
 						v_setOfArcs_2.accessControlRule_list := {v_accessControlRule_2};
 						v_updateRequest := valueof(m_updateAcpPrivileges(v_setOfArcs_1, v_setOfArcs_2));
@@ -9330,7 +9721,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_SEC_ACP_UPD_002() runs on Tester system CseSystem {
 					
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 										
 						v_ae1.start(f_CSE_SEC_ACP_UPD_002());
 							  	  	
@@ -9428,7 +9820,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						 */
 						testcase TC_CSE_SEC_ACP_001_CRE() runs on Tester system CseSystem { //Create
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_001(m_createContainerBase));	
 							v_ae1.done;
@@ -9438,7 +9831,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 							var template RequestPrimitive v_updateRequest := m_updateAeBase;
 							var Labels v_labels_1:= {"VALUE_1"};
-							f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+							v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 							v_updateRequest.primitiveContent.aE.labels := v_labels_1;
 
 							v_ae1.start(f_CSE_SEC_ACP_001(v_updateRequest));	
@@ -9447,7 +9841,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 	
 						testcase TC_CSE_SEC_ACP_001_RET() runs on Tester system CseSystem { //Retrieve
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_001(m_retrieve("Temporary", "Temporary")));	
 							v_ae1.done;
@@ -9455,7 +9850,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 	
 						testcase TC_CSE_SEC_ACP_001_DEL() runs on Tester system CseSystem { //Delete
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_001(m_delete("Temporary", "Temporary")));	
 							v_ae1.done;
@@ -9471,7 +9867,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						 */
 						testcase TC_CSE_SEC_ACP_002_CRE() runs on Tester system CseSystem { //Create
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_002(m_createContainerBase, int2001));	
 							v_ae1.done;
@@ -9483,14 +9880,16 @@ module OneM2M_Testcases_CSE_Release_1 {
 							var template RequestPrimitive v_updateRequest := m_updateAeBase;
 							var Labels v_labels_1:= {"VALUE_1"};
 							v_updateRequest.primitiveContent.aE.labels := v_labels_1;
-							f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+							v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 							v_ae1.start(f_CSE_SEC_ACP_002(v_updateRequest, int2004));	
 							v_ae1.done;
 						}//end TC_CSE_SEC_ACP_002_UPD
 	
 						testcase TC_CSE_SEC_ACP_002_RET() runs on Tester system CseSystem { //Retrieve
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-							f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+							v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_002(m_retrieve("Temporary", "Temporary"), int2000));	
 							v_ae1.done;
@@ -9498,7 +9897,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 	
 						testcase TC_CSE_SEC_ACP_002_DEL() runs on Tester system CseSystem { //Delete
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_002(m_delete("Temporary", "Temporary"), int2002));	
 							v_ae1.done;
@@ -9514,7 +9914,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						 */
 						testcase TC_CSE_SEC_ACP_003_CRE() runs on Tester system CseSystem { //Create
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_003(m_createContainerBase, int2001));	
 							v_ae1.done;
@@ -9525,7 +9926,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						
 							var template RequestPrimitive v_updateRequest := m_updateAeBase;
 							var Labels v_labels_1:= {"VALUE_1"};
-							f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+							v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 							v_updateRequest.primitiveContent.aE.labels := v_labels_1;
 
 							v_ae1.start(f_CSE_SEC_ACP_003(v_updateRequest, int2004));	
@@ -9534,7 +9936,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						
 						testcase TC_CSE_SEC_ACP_003_RET() runs on Tester system CseSystem { //Retrieve
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_003(m_retrieve("Temporary", "Temporary"), int2000));	
 							v_ae1.done;
@@ -9542,7 +9945,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						
 						testcase TC_CSE_SEC_ACP_003_DEL() runs on Tester system CseSystem { //Delete
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_003(m_delete("Temporary", "Temporary"), int2002));	
 							v_ae1.done;
@@ -9558,7 +9962,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						 */
 						testcase TC_CSE_SEC_ACP_004_CRE() runs on Tester system CseSystem { //Create
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_004(m_createContainerBase, int2001));	
 							v_ae1.done;
@@ -9569,7 +9974,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						
 							var template RequestPrimitive v_updateRequest := m_updateAeBase;
 							var Labels v_labels_1:= {"VALUE_1"};
-							f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+							v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 							v_updateRequest.primitiveContent.aE.labels := v_labels_1;
 
 							v_ae1.start(f_CSE_SEC_ACP_004(v_updateRequest, int2004));	
@@ -9578,7 +9984,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 		
 						testcase TC_CSE_SEC_ACP_004_RET() runs on Tester system CseSystem { //Retrieve
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_004(m_retrieve("Temporary", "Temporary"), int2000));	
 							v_ae1.done;
@@ -9586,7 +9993,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 		
 						testcase TC_CSE_SEC_ACP_004_DEL() runs on Tester system CseSystem { //Delete
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_004(m_delete("Temporary", "Temporary"), int2002));	
 							v_ae1.done;
@@ -9602,7 +10010,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						 */
 						testcase TC_CSE_SEC_ACP_005_CRE() runs on Tester system CseSystem { //Create
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_005(m_createContainerBase, int2001));	
 							v_ae1.done;
@@ -9614,14 +10023,16 @@ module OneM2M_Testcases_CSE_Release_1 {
 							var template RequestPrimitive v_updateRequest := m_updateAeBase;
 							var Labels v_labels_1:= {"VALUE_1"};
 							v_updateRequest.primitiveContent.aE.labels := v_labels_1;
-							f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+							v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 							v_ae1.start(f_CSE_SEC_ACP_005(v_updateRequest, int2004));	
 							v_ae1.done;
 						}//end TC_CSE_SEC_ACP_005_UPD
 		
 						testcase TC_CSE_SEC_ACP_005_RET() runs on Tester system CseSystem { //Retrieve
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_005(m_retrieve("Temporary", "Temporary"), int2000));	
 							v_ae1.done;
@@ -9629,7 +10040,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 		
 						testcase TC_CSE_SEC_ACP_005_DEL() runs on Tester system CseSystem { //Delete
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_005(m_delete("Temporary", "Temporary"), int2002));	
 							v_ae1.done;
@@ -9646,7 +10058,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						testcase TC_CSE_SEC_ACP_006_CRE() runs on Tester system CseSystem { //Create
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
-							f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+							v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 							v_ae1.start(f_CSE_SEC_ACP_006(m_createContainerBase, int2001));	
 							v_ae1.done;
 						}//end TC_CSE_SEC_ACP_006_CRE
@@ -9657,14 +10070,16 @@ module OneM2M_Testcases_CSE_Release_1 {
 							var template RequestPrimitive v_updateRequest := m_updateAeBase;
 							var Labels v_labels_1:= {"VALUE_1"};
 							v_updateRequest.primitiveContent.aE.labels := v_labels_1;
-							f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+							v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 							v_ae1.start(f_CSE_SEC_ACP_006(v_updateRequest, int2004));	
 							v_ae1.done;
 						}//end TC_CSE_SEC_ACP_006_UPD
 		
 						testcase TC_CSE_SEC_ACP_006_RET() runs on Tester system CseSystem { //Retrieve
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_006(m_retrieve("Temporary", "Temporary"), int2000));	
 							v_ae1.done;
@@ -9672,7 +10087,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 		
 						testcase TC_CSE_SEC_ACP_006_DEL() runs on Tester system CseSystem { //Delete
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_006(m_delete("Temporary", "Temporary"), int2002));	
 							v_ae1.done;
@@ -9688,7 +10104,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						 */
 						testcase TC_CSE_SEC_ACP_007_CRE() runs on Tester system CseSystem { //Create
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_007(m_createContainerBase, int2001));	
 							v_ae1.done;
@@ -9700,14 +10117,16 @@ module OneM2M_Testcases_CSE_Release_1 {
 							var template RequestPrimitive v_updateRequest := m_updateAeBase;
 							var Labels v_labels_1:= {"VALUE_1"};
 							v_updateRequest.primitiveContent.aE.labels := v_labels_1;
-							f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+							v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 							v_ae1.start(f_CSE_SEC_ACP_007(v_updateRequest, int2004));	
 							v_ae1.done;
 						}//end TC_CSE_SEC_ACP_007_UPD
 		
 						testcase TC_CSE_SEC_ACP_007_RET() runs on Tester system CseSystem { //Retrieve
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_007(m_retrieve("Temporary", "Temporary"), int2000));	
 							v_ae1.done;
@@ -9715,7 +10134,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 		
 						testcase TC_CSE_SEC_ACP_007_DEL() runs on Tester system CseSystem { //Delete
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_007(m_delete("Temporary", "Temporary"), int2002));	
 							v_ae1.done;
@@ -9731,7 +10151,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						 */
 						testcase TC_CSE_SEC_ACP_008_CRE() runs on Tester system CseSystem { //Create
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_008(m_createContainerBase, int2001));	
 							v_ae1.done;
@@ -9743,14 +10164,16 @@ module OneM2M_Testcases_CSE_Release_1 {
 							var template RequestPrimitive v_updateRequest := m_updateAeBase;
 							var Labels v_labels_1:= {"VALUE_1"};
 							v_updateRequest.primitiveContent.aE.labels := v_labels_1;
-							f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+							v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 							v_ae1.start(f_CSE_SEC_ACP_008(v_updateRequest, int2004));	
 							v_ae1.done;
 						}//end TC_CSE_SEC_ACP_008_UPD
 		
 						testcase TC_CSE_SEC_ACP_008_RET() runs on Tester system CseSystem { //Retrieve
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_008(m_retrieve("Temporary", "Temporary"), int2000));	
 							v_ae1.done;
@@ -9758,7 +10181,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 		
 						testcase TC_CSE_SEC_ACP_008_DEL() runs on Tester system CseSystem { //Delete
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_008(m_delete("Temporary", "Temporary"), int2002));	
 							v_ae1.done;
@@ -9774,7 +10198,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						 */
 						testcase TC_CSE_SEC_ACP_009_CRE() runs on Tester system CseSystem { //Create
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_009(m_createContainerBase, int2001));	
 							v_ae1.done;
@@ -9786,14 +10211,16 @@ module OneM2M_Testcases_CSE_Release_1 {
 							var template RequestPrimitive v_updateRequest := m_updateAeBase;
 							var Labels v_labels_1:= {"VALUE_1"};
 							v_updateRequest.primitiveContent.aE.labels := v_labels_1;
-							f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+							v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 							v_ae1.start(f_CSE_SEC_ACP_009(v_updateRequest, int2004));	
 							v_ae1.done;
 						}//end TC_CSE_SEC_ACP_009_UPD
 		
 						testcase TC_CSE_SEC_ACP_009_RET() runs on Tester system CseSystem { //Retrieve
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_009(m_retrieve("Temporary", "Temporary"), int2000));	
 							v_ae1.done;
@@ -9801,7 +10228,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 		
 						testcase TC_CSE_SEC_ACP_009_DEL() runs on Tester system CseSystem { //Delete
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_009(m_delete("Temporary", "Temporary"), int2002));	
 							v_ae1.done;
@@ -9817,7 +10245,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						 */
 						testcase TC_CSE_SEC_ACP_010_CRE() runs on Tester system CseSystem { //Create
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_010(m_createContainerBase, int2001));	
 							v_ae1.done;
@@ -9829,14 +10258,16 @@ module OneM2M_Testcases_CSE_Release_1 {
 							var template RequestPrimitive v_updateRequest := m_updateAeBase;
 							var Labels v_labels_1:= {"VALUE_1"};
 							v_updateRequest.primitiveContent.aE.labels := v_labels_1;
-							f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+							v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 							v_ae1.start(f_CSE_SEC_ACP_010(v_updateRequest, int2004));	
 							v_ae1.done;
 						}//end TC_CSE_SEC_ACP_010_UPD
 		
 						testcase TC_CSE_SEC_ACP_010_RET() runs on Tester system CseSystem { //Retrieve
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-							f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+							v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_010(m_retrieve("Temporary", "Temporary"), int2000));	
 							v_ae1.done;
@@ -9844,7 +10275,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 		
 						testcase TC_CSE_SEC_ACP_010_DEL() runs on Tester system CseSystem { //Delete
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_010(m_delete("Temporary", "Temporary"), int2002));	
 							v_ae1.done;
@@ -9860,7 +10292,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						 */
 						testcase TC_CSE_SEC_ACP_011_CRE() runs on Tester system CseSystem { //Create
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_011(m_createContainerBase, int2001));	
 							v_ae1.done;
@@ -9872,14 +10305,16 @@ module OneM2M_Testcases_CSE_Release_1 {
 							var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 							var Labels v_labels_1:= {"VALUE_1"};
 							v_updateRequest.primitiveContent.container.labels := v_labels_1;
-							f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+							v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 							v_ae1.start(f_CSE_SEC_ACP_011(v_updateRequest, int2004));	
 							v_ae1.done;
 						}//end TC_CSE_SEC_ACP_011_UPD
 	
 						testcase TC_CSE_SEC_ACP_011_RET() runs on Tester system CseSystem { //Retrieve
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_011(m_retrieve("Temporary", "Temporary"), int2000));	
 							v_ae1.done;
@@ -9887,7 +10322,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 	
 						testcase TC_CSE_SEC_ACP_011_DEL() runs on Tester system CseSystem { //Delete
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_011(m_delete("Temporary", "Temporary"), int2002));	
 							v_ae1.done;
@@ -9903,7 +10339,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						 */
 						testcase TC_CSE_SEC_ACP_012_CRE() runs on Tester system CseSystem { //Create
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_012(m_createContainerBase, int62));	
 							v_ae1.done;
@@ -9915,14 +10352,16 @@ module OneM2M_Testcases_CSE_Release_1 {
 							var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 							var Labels v_labels_1:= {"VALUE_1"};
 							v_updateRequest.primitiveContent.container.labels := v_labels_1;
-							f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+							v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 							v_ae1.start(f_CSE_SEC_ACP_012(v_updateRequest, int59));
 							v_ae1.done;
 						}//end TC_CSE_SEC_ACP_012_UPD
 	
 						testcase TC_CSE_SEC_ACP_012_RET() runs on Tester system CseSystem { //Retrieve
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_012(m_retrieve("Temporary", "Temporary"), int61));
 							v_ae1.done;
@@ -9930,7 +10369,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 	
 						testcase TC_CSE_SEC_ACP_012_DEL() runs on Tester system CseSystem { //Delete
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_012(m_delete("Temporary", "Temporary"), int55));
 							v_ae1.done;
@@ -9953,7 +10393,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 			testcase TC_CSE_DIS_001() runs on Tester system CseSystem {
 					
 				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 										
 				v_ae1.start(f_CSE_DIS_001());
 							  	  	
@@ -10016,7 +10457,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 			testcase TC_CSE_DIS_002() runs on Tester system CseSystem {
 					
 				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 											
 				v_ae1.start(f_CSE_DIS_002());
 								  	  	
@@ -10089,7 +10531,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 			testcase TC_CSE_DIS_003() runs on Tester system CseSystem {
 					
 				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 											
 				v_ae1.start(f_CSE_DIS_003());
 								  	  	
@@ -10161,7 +10604,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 			testcase TC_CSE_DIS_004() runs on Tester system CseSystem {
 					
 				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 											
 				v_ae1.start(f_CSE_DIS_004());
 								  	  	
@@ -10233,7 +10677,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 			testcase TC_CSE_DIS_005() runs on Tester system CseSystem {
 					
 				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 											
 				v_ae1.start(f_CSE_DIS_005());
 								  	  	
@@ -10303,7 +10748,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 			testcase TC_CSE_DIS_006() runs on Tester system CseSystem {
 					
 				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 											
 				v_ae1.start(f_CSE_DIS_006());
 								  	  	
@@ -10370,7 +10816,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 			testcase TC_CSE_DIS_007() runs on Tester system CseSystem {
 					
 				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 											
 				v_ae1.start(f_CSE_DIS_007());
 								  	  	
@@ -10442,7 +10889,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 					var FilterCriteria v_filterCriteria := valueof(m_filterCriteria);
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 					v_filterCriteria.createdBefore := "20171231T012345";
 					v_filterCriteria.createdAfter := "20181231T012345";
 					v_filterCriteria.filterUsage := int1;
@@ -10458,7 +10906,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 					var FilterCriteria v_filterCriteria := valueof(m_filterCriteria);
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 					v_filterCriteria.unmodifiedSince := "20171231T012345";
 					v_filterCriteria.modifiedSince := "20181231T012345";
 					v_filterCriteria.filterUsage := int1;
@@ -10474,7 +10923,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 					var FilterCriteria v_filterCriteria := valueof(m_filterCriteria);
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 					v_filterCriteria.stateTagSmaller := 1;
 					v_filterCriteria.stateTagBigger := 2;
 					v_filterCriteria.filterUsage := int1;
@@ -10490,7 +10940,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 					var FilterCriteria v_filterCriteria := valueof(m_filterCriteria);
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 					v_filterCriteria.expireBefore := "20171231T012345";
 					v_filterCriteria.expireAfter := "20181231T012345";
 					v_filterCriteria.filterUsage := int1;
@@ -10509,7 +10960,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 			testcase TC_CSE_DIS_009() runs on Tester system CseSystem {
 					
 				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 											
 				v_ae1.start(f_CSE_DIS_009());
 								  	  	
@@ -10594,7 +11046,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_GMG_CRE_001() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 											
 					v_ae1.start(f_CSE_GMG_CRE_001());
 								  	  	
@@ -10682,7 +11135,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_GMG_CRE_002() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 												
 					v_ae1.start(f_CSE_GMG_CRE_002());
 									  	  	
@@ -10767,7 +11221,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_GMG_CRE_003() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 												
 					v_ae1.start(f_CSE_GMG_CRE_003());
 									  	  	
@@ -10806,7 +11261,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							setverdict(pass, __SCOPE__ & ": Resource created successfully");
 						
 							if(not match({v_memberID}, v_response.primitive.responsePrimitive.primitiveContent.group_.memberIDs)){
-								setverdict(fail, __SCOPE__, ": Error, presence of duplicate member IDs ");
+								setverdict(fail, __SCOPE__ & ": Error, presence of duplicate member IDs ");
 							}
 							if(lengthof(v_response.primitive.responsePrimitive.primitiveContent.group_.memberIDs) != 1) {
 							   setverdict(fail, __SCOPE__ & ": Error, wrong number of memberIDs attribute");      
@@ -10835,7 +11290,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_GMG_CRE_004() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 												
 					v_ae1.start(f_CSE_GMG_CRE_004());
 									  	  	
@@ -10871,11 +11327,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__ & ": Resource created successfully");
 							if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.group_.memberTypeValidated)){
-								setverdict(fail, __SCOPE__, ": Error, memberTypeValidated attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, memberTypeValidated attribute not provided");
 							}
 							else {
 								if(v_response.primitive.responsePrimitive.primitiveContent.group_.memberTypeValidated == false){
-									setverdict(fail, __SCOPE__, ": Error, memberTypeValidated attribute not correct");
+									setverdict(fail, __SCOPE__ & ": Error, memberTypeValidated attribute not correct");
 								}
 							}     
 						}
@@ -10903,7 +11359,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_GMG_CRE_005() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 												
 					v_ae1.start(f_CSE_GMG_CRE_005());
 									  	  	
@@ -10941,20 +11398,20 @@ module OneM2M_Testcases_CSE_Release_1 {
 							
 							// check for memberTypeValidated
 							if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.group_.memberTypeValidated)){
-								setverdict(fail, __SCOPE__, ": Error, memberTypeValidated attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, memberTypeValidated attribute not provided");
 							}
 							else {
 								if(v_response.primitive.responsePrimitive.primitiveContent.group_.memberTypeValidated == false){
-									setverdict(fail, __SCOPE__, ": Error, memberTypeValidated attribute not correct");
+									setverdict(fail, __SCOPE__ & ": Error, memberTypeValidated attribute not correct");
 								}
 							}
 							// check for memberType (MIXED)
 							if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.group_.memberType)){
-								setverdict(fail, __SCOPE__, ": Error, memberType attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, memberType attribute not provided");
 							} 
 							else {
 								if(v_response.primitive.responsePrimitive.primitiveContent.group_.memberType != int0){ 
-									setverdict(fail, __SCOPE__, ": Error, memberType attribute not correct");
+									setverdict(fail, __SCOPE__ & ": Error, memberType attribute not correct");
 								}
 							}
 						}
@@ -10982,7 +11439,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_GMG_CRE_006() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 												
 					v_ae1.start(f_CSE_GMG_CRE_006());
 									  	  	
@@ -11024,19 +11482,19 @@ module OneM2M_Testcases_CSE_Release_1 {
 							
 							// check for memberTypeValidated
 							if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.group_.memberTypeValidated)){
-								setverdict(fail, __SCOPE__, ": Error, memberTypeValidated attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, memberTypeValidated attribute not provided");
 							} else {
 								if(v_response.primitive.responsePrimitive.primitiveContent.group_.memberTypeValidated == false){
-									setverdict(fail, __SCOPE__, ": Error, memberTypeValidated attribute not correct");
+									setverdict(fail, __SCOPE__ & ": Error, memberTypeValidated attribute not correct");
 								}
 							}
 							// check for membersId
 							if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.group_.memberIDs)){
-								setverdict(fail, __SCOPE__, ": Error, memberIDs attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, memberIDs attribute not provided");
 							} 
 							else {
 								if(not match({f_getResourceId(vc_resourcesList[v_containerIndex].resource)}, v_response.primitive.responsePrimitive.primitiveContent.group_.memberIDs)){
-									setverdict(fail, __SCOPE__, ": Error, memberIDs attribute not correct");
+									setverdict(fail, __SCOPE__ & ": Error, memberIDs attribute not correct");
 								}
 							}
 						}
@@ -11065,7 +11523,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_GMG_CRE_007() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 												
 					v_ae1.start(f_CSE_GMG_CRE_007());
 									  	  	
@@ -11137,7 +11596,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_GMG_RET_001() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 												
 					v_ae1.start(f_CSE_GMG_RET_001());
 									  	  	
@@ -11196,16 +11656,16 @@ module OneM2M_Testcases_CSE_Release_1 {
 							setverdict(pass, __SCOPE__ & ": creation successfull by using fanOutPoint in group resource");
     
 							if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list)){
-								setverdict(fail, __SCOPE__, ": Error, aggregatedResponse attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, aggregatedResponse attribute not provided");
 							}
 							else{
 								if(lengthof(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list) != c_numberOfResponsePrimitive){
-									setverdict(fail, __SCOPE__, ": Error, length of aggregatedResponse is not valid");
+									setverdict(fail, __SCOPE__ & ": Error, length of aggregatedResponse is not valid");
 								}
 								else{
 									for(i:=0; i<c_numberOfResponsePrimitive; i:=i+1){
 										if(not match(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list[i].primitiveContent, v_contentResponse)){
-											setverdict(fail, __SCOPE__, ": Error, aggregatedResponse doesn't match with template expected");
+											setverdict(fail, __SCOPE__ & ": Error, aggregatedResponse doesn't match with template expected");
 										}
 									}
 								}
@@ -11243,7 +11703,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_GMG_UPD_001() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 												
 					v_ae1.start(f_CSE_GMG_UPD_001());
 									  	  	
@@ -11324,7 +11785,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 			  testcase TC_CSE_GMG_UPD_002() runs on Tester system CseSystem {
 					
 				  var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 													
 				  v_ae1.start(f_CSE_GMG_UPD_002());
 										  	  	
@@ -11372,14 +11834,14 @@ module OneM2M_Testcases_CSE_Release_1 {
      
 							// check for membersId
 							if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.group_.memberIDs)){
-								setverdict(fail, __SCOPE__, ": Error, memberIDs attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, memberIDs attribute not provided");
 							} 
 							else {
 								if(lengthof(v_response.primitive.responsePrimitive.primitiveContent.group_.memberIDs) != 1) {
 								   setverdict(fail, __SCOPE__ & ": Error, wrong number of memberIDs attribute");      
 								}                               
 								if(v_response.primitive.responsePrimitive.primitiveContent.group_.memberIDs[0] != v_memberId_2){
-									setverdict(fail, __SCOPE__, ": Error, memberIDs attribute not correct");
+									setverdict(fail, __SCOPE__ & ": Error, memberIDs attribute not correct");
 								}
 							}
 						 }
@@ -11400,7 +11862,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					 if(getverdict == pass){ 
 						 if(ischosen(v_primitiveContentRetrievedResource.group_)){
 							if(v_primitiveContentRetrievedResource.group_.memberIDs[0] != v_memberId_2){
-								setverdict(fail, __SCOPE__, ": Error, memberIDs attribute not updated");
+								setverdict(fail, __SCOPE__ & ": Error, memberIDs attribute not updated");
 							}
 						  }
 					 }
@@ -11419,7 +11881,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_GMG_UPD_003() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 													
 					v_ae1.start(f_CSE_GMG_UPD_003());
 										  	  	
@@ -11462,11 +11925,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 							setverdict(pass, __SCOPE__ & ": update successful"); 
                              
 							 if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.group_.memberTypeValidated)) {
-								setverdict(fail, __SCOPE__, ": Error, memberTypeValidated attribute not provided");    
+								setverdict(fail, __SCOPE__ & ": Error, memberTypeValidated attribute not provided");    
 							 } 
 							 else {
 								if(v_response.primitive.responsePrimitive.primitiveContent.group_.memberTypeValidated == false) {
-									setverdict(fail, __SCOPE__, ": Error, memberTypeValidated wrong value");  
+									setverdict(fail, __SCOPE__ & ": Error, memberTypeValidated wrong value");  
 								}
 							 }
 						}
@@ -11487,7 +11950,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					if(getverdict == pass){ 
 						 if(ischosen(v_primitiveContentRetrievedResource.group_)){
 							if(v_primitiveContentRetrievedResource.group_.memberTypeValidated == false){
-								setverdict(fail, __SCOPE__, ": Error,  memberTypeValidated attribute not updated");
+								setverdict(fail, __SCOPE__ & ": Error,  memberTypeValidated attribute not updated");
 							}
 						  }
 					 } 
@@ -11506,7 +11969,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_GMG_UPD_004() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 													
 					v_ae1.start(f_CSE_GMG_UPD_004());
 										  	  	
@@ -11554,21 +12018,21 @@ module OneM2M_Testcases_CSE_Release_1 {
                              
 							//memberTypeValidated attribute set to FALSE
 							if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.group_.memberTypeValidated)) {
-								setverdict(fail, __SCOPE__, ": Error, memberTypeValidated attribute not provided");    
+								setverdict(fail, __SCOPE__ & ": Error, memberTypeValidated attribute not provided");    
 							}
 							else {
 								if(v_response.primitive.responsePrimitive.primitiveContent.group_.memberTypeValidated != true) {
-									setverdict(fail, __SCOPE__, ": Error, memberTypeValidated must be TRUE");
+									setverdict(fail, __SCOPE__ & ": Error, memberTypeValidated must be TRUE");
 								}
 							}
                                 
 							//memberType attribute set to MIXED
 							if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.group_.memberType)) {
-								setverdict(fail, __SCOPE__, ": Error, memberType attribute not provided");    
+								setverdict(fail, __SCOPE__ & ": Error, memberType attribute not provided");    
 							}
 							else {
 								if(v_response.primitive.responsePrimitive.primitiveContent.group_.memberType != int0) { //Mixed is int0 in release 2 and int24 in release 1
-									setverdict(fail, __SCOPE__, ": Error, memberType was not set to MIXED");
+									setverdict(fail, __SCOPE__ & ": Error, memberType was not set to MIXED");
 								}
 							}
                                 
@@ -11590,11 +12054,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 					if(getverdict == pass){ 
 						 if(ischosen(v_primitiveContentRetrievedResource.group_)){
 							if(v_primitiveContentRetrievedResource.group_.memberTypeValidated == false){
-								setverdict(fail, __SCOPE__, ": Error,  memberTypeValidated attribute not updated");
+								setverdict(fail, __SCOPE__ & ": Error,  memberTypeValidated attribute not updated");
 							}
 							
 							if(v_primitiveContentRetrievedResource.group_.memberType != int0){
-								setverdict(fail, __SCOPE__, ": Error,  memberType attribute not set to MIXED");
+								setverdict(fail, __SCOPE__ & ": Error,  memberType attribute not set to MIXED");
 							}
 						  }
 					 }
@@ -11613,7 +12077,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_GMG_UPD_005() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 													
 					v_ae1.start(f_CSE_GMG_UPD_005());
 										  	  	
@@ -11662,24 +12127,24 @@ module OneM2M_Testcases_CSE_Release_1 {
                                                           
 							//memberTypeValidated attribute set to TRUE
 							if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.group_.memberTypeValidated)) {
-								setverdict(fail, __SCOPE__, ": Error, memberTypeValidated attribute not provided");    
+								setverdict(fail, __SCOPE__ & ": Error, memberTypeValidated attribute not provided");    
 							} 
 							else {
 								if(v_response.primitive.responsePrimitive.primitiveContent.group_.memberTypeValidated != true) {
-									setverdict(fail, __SCOPE__, ": Error, memberTypeValidated must be TRUE");
+									setverdict(fail, __SCOPE__ & ": Error, memberTypeValidated must be TRUE");
 								}
 							}
 
 							//memberIDs attribute set to v_memberID1
 							if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.group_.memberIDs)){
-								setverdict(fail, __SCOPE__, ": Error, memberIDs attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, memberIDs attribute not provided");
 							}
 							else {                               
 								if(lengthof(v_response.primitive.responsePrimitive.primitiveContent.group_.memberIDs) != 1) {
 								   setverdict(fail, __SCOPE__ & ": Error, wrong number of memberIDs attribute");      
 								}                               
 								if(v_response.primitive.responsePrimitive.primitiveContent.group_.memberIDs[0] != v_memberId_1){
-									setverdict(fail, __SCOPE__, ": Error, memberIDs attribute not correct");
+									setverdict(fail, __SCOPE__ & ": Error, memberIDs attribute not correct");
 								}
 							}                                   
 						}
@@ -11700,11 +12165,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 					if(getverdict == pass){ 
 						 if(ischosen(v_primitiveContentRetrievedResource.group_)){
 							if(v_primitiveContentRetrievedResource.group_.memberTypeValidated == false){
-								setverdict(fail, __SCOPE__, ": Error,  memberTypeValidated attribute not updated");
+								setverdict(fail, __SCOPE__ & ": Error,  memberTypeValidated attribute not updated");
 							}
 		
 							if(v_primitiveContentRetrievedResource.group_.memberIDs[0] != v_memberId_1){
-								setverdict(fail, __SCOPE__, ": Error,  memberIDs attribute not correct");
+								setverdict(fail, __SCOPE__ & ": Error,  memberIDs attribute not correct");
 							}
 						  }
 					 }
@@ -11723,7 +12188,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_GMG_UPD_006() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 													
 					v_ae1.start(f_CSE_GMG_UPD_006());
 										  	  	
@@ -11795,7 +12261,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_GMG_UPD_007() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 													
 					v_ae1.start(f_CSE_GMG_UPD_007());
 										  	  	
@@ -11888,7 +12355,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_GMG_UPD_008() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 													
 					v_ae1.start(f_CSE_GMG_UPD_008());
 										  	  	
@@ -11971,7 +12439,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_GMG_UPD_009() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 													
 					v_ae1.start(f_CSE_GMG_UPD_009());
 										  	  	
@@ -12031,7 +12500,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							tc_ac.stop;
                             
 							if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.group_.memberTypeValidated)) {
-								setverdict(fail, __SCOPE__, ": Error, memberTypeValidated attribute not provided");    
+								setverdict(fail, __SCOPE__ & ": Error, memberTypeValidated attribute not provided");    
 							 } else {
 								if(v_response.primitive.responsePrimitive.primitiveContent.group_.memberTypeValidated == false) {
 									if(lengthof(v_response.primitive.responsePrimitive.primitiveContent.group_.memberIDs) != 2) {
@@ -12040,11 +12509,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 										if(v_response.primitive.responsePrimitive.primitiveContent.group_.memberIDs[0] == v_memberId_1 and v_response.primitive.responsePrimitive.primitiveContent.group_.memberIDs[1] == v_memberId_2) {
 											setverdict(pass, __SCOPE__ & ": update successful");       
 										} else {
-											setverdict(fail, __SCOPE__, ": Error, wrong memberIDs");   
+											setverdict(fail, __SCOPE__ & ": Error, wrong memberIDs");   
 										}
 									}
 								} else {
-									setverdict(fail, __SCOPE__, ": Error, memberTypeValidated must be set to FALSE");  
+									setverdict(fail, __SCOPE__ & ": Error, memberTypeValidated must be set to FALSE");  
 								}   
 							}                            
 						}
@@ -12061,11 +12530,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 					if(getverdict == pass){ 
 						 if(ischosen(v_primitiveContentRetrievedResource.group_)){
 							if(v_primitiveContentRetrievedResource.group_.memberTypeValidated != false){
-								setverdict(fail, __SCOPE__, ": Error,  memberTypeValidated attribute not updated");
+								setverdict(fail, __SCOPE__ & ": Error,  memberTypeValidated attribute not updated");
 							}
 
 							if((v_primitiveContentRetrievedResource.group_.memberIDs[0] != v_memberId_1) and (v_primitiveContentRetrievedResource.group_.memberIDs[1] != v_memberId_2)){
-								setverdict(fail, __SCOPE__, ": Error,  memberIDs attribute not correct");
+								setverdict(fail, __SCOPE__ & ": Error,  memberIDs attribute not correct");
 							}
 						  }
 					 }
@@ -12084,7 +12553,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_GMG_UPD_010() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 													
 					v_ae1.start(f_CSE_GMG_UPD_010());
 										  	  	
@@ -12182,7 +12652,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					 */
 					testcase TC_CSE_GMG_001_CRE() runs on Tester system CseSystem { //Create
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 						v_ae1.start(f_CSE_GMG_001(m_createContainerBase, int2001));
 						v_ae1.done;
@@ -12194,14 +12665,16 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var Labels v_labels_1:= {"VALUE_1"};
 						v_updateRequest.primitiveContent.container.labels := v_labels_1;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_GMG_001(v_updateRequest, int2004));
 						v_ae1.done;
 					}//end TC_CSE_GMG_001_UPD
 	
 					testcase TC_CSE_GMG_001_RET() runs on Tester system CseSystem { //Retrieve
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_ae1.start(f_CSE_GMG_001(m_retrieve("Temporary", "Temporary"), int2000));
 						v_ae1.done;
@@ -12209,7 +12682,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 	
 					testcase TC_CSE_GMG_001_DEL() runs on Tester system CseSystem { //Delete
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 						v_ae1.start(f_CSE_GMG_001(m_delete("Temporary", "Temporary"), int2002));	
 						v_ae1.done;
@@ -12225,7 +12699,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					 */
 					testcase TC_CSE_GMG_002_CRE() runs on Tester system CseSystem { //Create
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 						v_ae1.start(f_CSE_GMG_002(m_createContainerBase, int62));	//c_RUDNDi
 						v_ae1.done;
@@ -12237,14 +12712,16 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var Labels v_labels_1:= {"VALUE_1"};
 						v_updateRequest.primitiveContent.container.labels := v_labels_1;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_GMG_002(v_updateRequest, int59));//c_CRDNDi
 						v_ae1.done;
 					}//end TC_CSE_GMG_002_UPD
 	
 					testcase TC_CSE_GMG_002_RET() runs on Tester system CseSystem { //Retrieve
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 						v_ae1.start(f_CSE_GMG_002(m_retrieve("Temporary", "Temporary"), int61));//c_CUDNDi
 						v_ae1.done;
@@ -12252,7 +12729,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 	
 					testcase TC_CSE_GMG_002_DEL() runs on Tester system CseSystem { //Delete
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 						v_ae1.start(f_CSE_GMG_002(m_delete("Temporary", "Temporary"), int55)); //c_CRUNDi	
 						v_ae1.done;
@@ -12268,7 +12746,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					 */
 					testcase TC_CSE_GMG_003_CRE() runs on Tester system CseSystem { //Create
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 						v_ae1.start(f_CSE_GMG_003(m_createContainerBase, int2001));
 						v_ae1.done;
@@ -12280,14 +12759,16 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var Labels v_labels_1:= {"VALUE_1"};
 						v_updateRequest.primitiveContent.container.labels := v_labels_1;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_GMG_003(v_updateRequest, int2004));
 						v_ae1.done;
 					}//end TC_CSE_GMG_003_UPD
 	
 					testcase TC_CSE_GMG_003_RET() runs on Tester system CseSystem { //Retrieve
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 						v_ae1.start(f_CSE_GMG_003(m_retrieve("Temporary", "Temporary"), int2000));
 						v_ae1.done;
@@ -12295,7 +12776,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 	
 					testcase TC_CSE_GMG_003_DEL() runs on Tester system CseSystem { //Delete
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 						v_ae1.start(f_CSE_GMG_003(m_delete("Temporary", "Temporary"), int2002));	
 						v_ae1.done;
@@ -12311,7 +12793,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					 */
 					testcase TC_CSE_GMG_004_CRE() runs on Tester system CseSystem { //Create
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 						v_ae1.start(f_CSE_GMG_004(m_createContainerBase, int62));	//c_RUDNDi
 						v_ae1.done;
@@ -12323,14 +12806,16 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var Labels v_labels_1:= {"VALUE_1"};
 						v_updateRequest.primitiveContent.container.labels := v_labels_1;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_GMG_004(v_updateRequest, int59));//c_CRDNDi
 						v_ae1.done;
 					}//end TC_CSE_GMG_004_UPD
 	
 					testcase TC_CSE_GMG_004_RET() runs on Tester system CseSystem { //Retrieve
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 						v_ae1.start(f_CSE_GMG_004(m_retrieve("Temporary", "Temporary"), int61));//c_CUDNDi
 						v_ae1.done;
@@ -12338,7 +12823,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 	
 					testcase TC_CSE_GMG_004_DEL() runs on Tester system CseSystem { //Delete
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 						v_ae1.start(f_CSE_GMG_004(m_delete("Temporary", "Temporary"), int55)); //c_CRUNDi	
 						v_ae1.done;
@@ -12357,7 +12843,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						
 						var template PrimitiveContent v_contentResponse;
 						v_contentResponse.container := mw_contentContainer_rc1;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_GMG_005(m_createContainerBase, v_contentResponse, int2001));
 						v_ae1.done;
 					}//end TC_CSE_GMG_005_CRE
@@ -12368,7 +12855,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var template PrimitiveContent v_contentResponse;
 						var Labels v_labels_1:= {"VALUE_1"};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.container := mw_contentContainerBase;
 						v_contentResponse.container.labels := ?;
 						v_updateRequest.primitiveContent.container.labels := v_labels_1;
@@ -12381,7 +12869,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.container := mw_contentContainerBase;
 						
 						v_ae1.start(f_CSE_GMG_005(m_retrieve("Temporary", "Temporary"), v_contentResponse, int2000));
@@ -12392,7 +12881,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
 						v_contentResponse.container := mw_contentContainerBase;// TODO see with wath should it be matched
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_GMG_005(m_delete("Temporary", "Temporary"), v_contentResponse, int2002));	
 						v_ae1.done;
 					}//end TC_CSE_GMG_005_DEL
@@ -12409,7 +12899,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.container := mw_contentContainer_rc1;
 						
 						v_ae1.start(f_CSE_GMG_006(m_createContainerBase, v_contentResponse, int2001));
@@ -12421,7 +12912,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var template PrimitiveContent v_contentResponse;
 						var Labels v_labels_1:= {"VALUE_1"};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.container := mw_contentContainerBase;
 						v_contentResponse.container.labels := ?;
 						v_updateRequest.primitiveContent.container.labels := v_labels_1;
@@ -12434,7 +12926,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.container := mw_contentContainerBase;
 						
 						v_ae1.start(f_CSE_GMG_006(m_retrieve("Temporary", "Temporary"), v_contentResponse, int2000));
@@ -12445,7 +12938,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.container := mw_contentContainerBase;// TODO see with wath should it be matched
 						
 						v_ae1.start(f_CSE_GMG_006(m_delete("Temporary", "Temporary"), v_contentResponse, int2002));	
diff --git a/OneM2M_Testcases_CSE_Release_2.ttcn b/OneM2M_Testcases_CSE_Release_2.ttcn
index ea0143fd3fbb5cb16698bddf4805057d9ad3c381..9309676a4df9c22f3027261a169a1596967eaf61 100644
--- a/OneM2M_Testcases_CSE_Release_2.ttcn
+++ b/OneM2M_Testcases_CSE_Release_2.ttcn
@@ -43,7 +43,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						
 					v_request := valueof(m_delete(v_resourceAddress, PX_SUPER_AE_ID));
 					    
-					mcaPort.send(f_getMsgOutPrimitive(f_getMsgOutPrimitive(m_request(v_request))));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 					
 					t_ac.start;
 					alt {
@@ -109,7 +109,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_REG_CRE_012_AE_NL() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_create.primitiveContent.aE.nodeLink := "http://127.0.0.1/";
 						v_ae1.start(f_CSE_REG_CRE_012(v_create));
 						v_ae1.done;
@@ -118,7 +119,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_REG_CRE_012_AE_OR() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_create.primitiveContent.aE.ontologyRef := "MyOntologyRef";
 						v_ae1.start(f_CSE_REG_CRE_012(v_create));
 						v_ae1.done;
@@ -232,7 +234,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						
 						 var RequestPrimitive v_request;
 						 var template PrimitiveContent v_contentResponse;
-						 f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						 v_request := valueof(m_createRemoteCSEBase);
 						 v_request.primitiveContent.remoteCSE.cseType := int2;	//MN_CSE
 						 v_request.primitiveContent.remoteCSE.resourceName := c_defaultRemoteCSEResourceName;
@@ -252,7 +255,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						
 						 var RequestPrimitive v_request;
 						 var template PrimitiveContent v_contentResponse;
-						 f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						 v_request := valueof(m_createRemoteCSEBase);
 						 v_request.primitiveContent.remoteCSE.cseType := int2;	//MN_CSE
 						 v_request.primitiveContent.remoteCSE.expirationTime := "20301231T012345";
@@ -286,7 +290,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						
 						 var template RequestPrimitive v_createRequest := m_createAe(PX_APP_ID);
 						 var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						 v_createRequest.primitiveContent.aE.nodeLink := "http://127.0.0.1/";
 
 						 v_contentResponse.aE := mw_contentAeBase;
@@ -302,7 +307,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						
 						 var template RequestPrimitive v_createRequest := m_createAe(PX_APP_ID);
 						 var template PrimitiveContent v_contentResponse;
-						 f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						 v_createRequest.primitiveContent.aE.contentSerialization := {applicationxml};
 
 						 v_contentResponse.aE := mw_contentAeBase;
@@ -330,7 +336,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;	
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
     						
 						v_updateRequest.primitiveContent.remoteCSE.expirationTime := "20301231T012345";
 	
@@ -343,7 +350,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;	
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 
 						v_updateRequest.primitiveContent.remoteCSE.requestReachability := true;
 
@@ -368,6 +376,125 @@ module OneM2M_Testcases_CSE_Release_2 {
 		
 		group Data_Management_and_Repository {
 						
+			group g_CSE_DMR_001 {
+		
+				/**
+				 * @desc Check that the IUT rejects a Non-Blocking Synchronous Request if the IUT does not support the <request> resource
+				 * 
+				 */
+				testcase TC_CSE_DMR_001_CRE() runs on Tester system CseSystem {
+					// Local variables
+					var template RequestPrimitive v_createRequest := m_createContainerBase;
+					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+			
+					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+					v_cse1.done;
+					v_cse1.start(f_CSE_DMR_001(v_createRequest)); //Create Container
+					v_cse1.done;
+			
+				}
+				
+				testcase TC_CSE_DMR_001_UPD() runs on Tester system CseSystem {
+					// Local variables
+					var template RequestPrimitive v_createRequest := m_createContainerBase;
+					var template RequestPrimitive v_updateRequest := m_updateContainerBase;
+					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+					var Labels v_labels_1 := {"VALUE_1"};
+			
+					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+					v_cse1.done;
+					v_updateRequest.primitiveContent.container.labels := v_labels_1;
+			
+					v_cse1.start(f_CSE_DMR_001(v_updateRequest)); //Update Container
+					v_cse1.done;
+	  
+				}
+
+				testcase TC_CSE_DMR_001_RET() runs on Tester system CseSystem {
+					// Local variables
+					var template RequestPrimitive v_createRequest := m_createContainerBase;
+					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+			
+					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+					v_cse1.done;
+					v_cse1.start(f_CSE_DMR_001(m_retrieve("NotInitialized", "NotInitialized"))); //Retrieve Container
+					v_cse1.done;
+	
+				}
+		
+				testcase TC_CSE_DMR_001_DEL() runs on Tester system CseSystem {
+					// Local variables
+					var template RequestPrimitive v_createRequest := m_createContainerBase;
+					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+			
+					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+					v_cse1.done;
+					v_cse1.start(f_CSE_DMR_001(m_delete("NotInitialized", "NotInitialized"))); //Delete Container
+					v_cse1.done;
+
+				}
+
+			}// end group g_CSE_DMR_001
+			
+			group g_CSE_DMR_002 {
+				
+				/**
+				 * @desc Check that the IUT rejects a Non-Blocking Synchronous Request if the IUT does not support the <request> resource
+				 * 
+				 */
+				testcase TC_CSE_DMR_002_CRE() runs on Tester system CseSystem {
+					// Local variables
+					var template RequestPrimitive v_createRequest := m_createContainerBase;
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+				
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
+					v_ae1.start(f_CSE_DMR_002(v_createRequest)); //Create Container
+					v_ae1.done;
+				
+				}
+					
+				testcase TC_CSE_DMR_002_UPD() runs on Tester system CseSystem {
+					// Local variables
+					var template RequestPrimitive v_createRequest := m_createContainerBase;
+					var template RequestPrimitive v_updateRequest := m_updateContainerBase;
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+					var Labels v_labels_1 := {"VALUE_1"};
+				
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
+					v_updateRequest.primitiveContent.container.labels := v_labels_1;
+				
+					v_ae1.start(f_CSE_DMR_002(v_updateRequest)); //Update Container
+					v_ae1.done;
+		  
+				}
+	
+				testcase TC_CSE_DMR_002_RET() runs on Tester system CseSystem {
+					// Local variables
+					var template RequestPrimitive v_createRequest := m_createContainerBase;
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+				
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
+					v_ae1.start(f_CSE_DMR_002(m_retrieve("NotInitialized", "NotInitialized"))); //Retrieve Container
+					v_ae1.done;
+		
+				}
+			
+				testcase TC_CSE_DMR_002_DEL() runs on Tester system CseSystem {
+					// Local variables
+					var template RequestPrimitive v_createRequest := m_createContainerBase;
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+				
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
+					v_ae1.start(f_CSE_DMR_002(m_delete("NotInitialized", "NotInitialized"))); //Delete Container
+					v_ae1.done;
+	
+				}
+			}// end group g_CSE_DMR_002
+			
 			group Create {
 				
 				group g_CSE_DMR_CRE_001 {
@@ -381,7 +508,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createScheduleBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_createRequest.primitiveContent.schedule.resourceName := omit;
 						v_ae1.start(f_CSE_DMR_CRE_001(int18, v_createRequest, -));//Schedule
@@ -391,7 +519,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 																	
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.schedule.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
 						}
 						
@@ -402,7 +530,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createScheduleBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_createRequest.primitiveContent.schedule.resourceName := omit;
 						v_ae1.start(f_CSE_DMR_CRE_001(int18, v_createRequest, m_createAeAux(omit,omit)));//Schedule
@@ -412,7 +541,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 											
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.schedule.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
 						}
 						
@@ -423,7 +552,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createScheduleBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_createRequest.primitiveContent.schedule.resourceName := omit;
 						v_ae1.start(f_CSE_DMR_CRE_001(int18, v_createRequest, m_createSubscriptionBase));//Schedule
@@ -433,7 +563,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 																		
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.schedule.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
 						}
 					
@@ -444,7 +574,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createPollingChannelBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						
 						v_createRequest.primitiveContent.pollingChannel.resourceName := omit;
@@ -456,7 +587,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.pollingChannel.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
 						}
 						
@@ -467,7 +598,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_createRequest.primitiveContent.subscription.resourceName := omit;
 						v_ae1.start(f_CSE_DMR_CRE_001(int23, v_createRequest, m_createScheduleBase));//Subscription
@@ -477,7 +609,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.subscription.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
 						}		
 					}
@@ -487,7 +619,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_createRequest.primitiveContent.subscription.resourceName := omit;
 						v_ae1.start(f_CSE_DMR_CRE_001(int23, v_createRequest, m_createGroupBase));//Subscription
@@ -497,28 +630,108 @@ module OneM2M_Testcases_CSE_Release_2 {
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.subscription.resourceName)){
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
+							}
+						}		
+					}
+					
+					testcase TC_CSE_DMR_CRE_001_SUB_AEA() runs on Tester system CseSystem {
+						//Local variables
+						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var RequestPrimitive v_createAEAnnc := valueof(m_createAEAnnc(omit, omit, omit, PX_CSE1_ID));
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+	
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_createRequest.primitiveContent.timeSeries.resourceName := omit;
+						v_cse1.start(f_CSE_DMR_CRE_001_cseSimu(int23, v_createRequest, int10002, v_createAEAnnc));//Subscription
+						v_cse1.done;	 
+							
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_cse1);
+							if(not ispresent(v_responsePrimitive.primitiveContent.subscription.resourceName)){
+								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+							}
+						}		
+					}
+					
+					testcase TC_CSE_DMR_CRE_001_CNT_AEA() runs on Tester system CseSystem {
+						//Local variables
+						var template RequestPrimitive v_createRequest := m_createContainerBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var RequestPrimitive v_createAEAnnc := valueof(m_createAEAnnc(omit, omit, omit, PX_CSE1_ID));
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_createRequest.primitiveContent.container.resourceName := omit;
+						v_cse1.start(f_CSE_DMR_CRE_001_cseSimu(int3, v_createRequest, int10002, v_createAEAnnc));//Container
+						v_cse1.done;	 
+		
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_cse1);
+							if(not ispresent(v_responsePrimitive.primitiveContent.subscription.resourceName)){
+								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+							}
+						}		
+						
+					}
+					
+					testcase TC_CSE_DMR_CRE_001_GRP_AEA() runs on Tester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createGroupBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var RequestPrimitive v_createAEAnnc := valueof(m_createAEAnnc(omit, omit, omit, PX_CSE1_ID));
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_createRequest.primitiveContent.group_.resourceName := omit;
+						v_cse1.start(f_CSE_DMR_CRE_001_cseSimu(int9, v_createRequest, int10002, v_createAEAnnc));//Group
+						v_cse1.done;
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_cse1);
+							if(not ispresent(v_responsePrimitive.primitiveContent.group_.resourceName)){
 								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
 							}
 						}		
 					}
 					
+					testcase TC_CSE_DMR_CRE_001_ACP_AEA() runs on Tester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createAcpBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var RequestPrimitive v_createAEAnnc := valueof(m_createAEAnnc(omit, omit, omit, PX_CSE1_ID));
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_createRequest.primitiveContent.accessControlPolicy.resourceName := omit;
+						v_cse1.start(f_CSE_DMR_CRE_001_cseSimu(int1, v_createRequest, int10002, v_createAEAnnc));//Access Control Policy
+						v_cse1.done;
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_cse1);
+							if(not ispresent(v_responsePrimitive.primitiveContent.accessControlPolicy.resourceName)){
+								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+							}
+						}		
+					}
+										
 					testcase TC_CSE_DMR_CRE_001_NOD_CB() runs on Tester system CseSystem {
 						// Local variables
 						var template RequestPrimitive v_createRequest := m_createNodeBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						 
 						v_createRequest.primitiveContent.node.resourceName := omit;
 
 						v_ae1.start(f_CSE_DMR_CRE_001(int14, v_createRequest, -));//Node
-						v_ae1.done;
-						
-						 
+						v_ae1.done;	
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.node.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
 						}
 						
@@ -529,17 +742,16 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createMgmtCmdBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_createRequest.primitiveContent.mgmtCmd.resourceName := omit;
 						v_ae1.start(f_CSE_DMR_CRE_001(int12, v_createRequest, -));//Management Command
-						v_ae1.done;
-						
-						 
+						v_ae1.done;						 
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.mgmtCmd.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
 						}
 						
@@ -550,17 +762,16 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createLocationPolicyBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_createRequest.primitiveContent.locationPolicy.resourceName := omit;
 						v_ae1.start(f_CSE_DMR_CRE_001(int10, v_createRequest, -));//Location Policy
 						v_ae1.done;
-						
-						 
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.locationPolicy.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
 						}
 						
@@ -571,17 +782,16 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createStatsConfigBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_createRequest.primitiveContent.statsConfig.resourceName := omit;
 						v_ae1.start(f_CSE_DMR_CRE_001(int22, v_createRequest, -));//Stats Config
 						v_ae1.done;
-						
-						 
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.statsConfig.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
 						}
 					}
@@ -591,18 +801,17 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createStatsCollectBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						 
 						v_createRequest.primitiveContent.statsCollect.resourceName := omit;
 						
 						v_ae1.start(f_CSE_DMR_CRE_001(int21, v_createRequest, -));//Stats Collect
 						v_ae1.done;
-						
-						 
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.statsCollect.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
 						}
 						
@@ -613,17 +822,16 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createM2mServiceSubscriptionProfileBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_createRequest.primitiveContent.m2mServiceSubscriptionProfile.resourceName := omit;
 						v_ae1.start(f_CSE_DMR_CRE_001(int11, v_createRequest, -));//Subscription Profile
 						v_ae1.done;
-						
-						 
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.m2mServiceSubscriptionProfile.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
 						}
 						
@@ -634,17 +842,16 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createServiceSubscribedAppRuleBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						 
 						v_createRequest.primitiveContent.serviceSubscribedAppRule.resourceName := omit;
 						v_ae1.start(f_CSE_DMR_CRE_001(int19, v_createRequest, -));//Service Subscribed App
 						v_ae1.done;
-						
-						 
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.serviceSubscribedAppRule.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
 						}
 						
@@ -656,6 +863,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 	
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.timeSeries.resourceName := omit;
 						v_ae1.start(f_CSE_DMR_CRE_001(int29, v_createRequest, -));//TimeSeries
 						v_ae1.done; 
@@ -674,6 +883,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;	
 	
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.timeSeries.resourceName := omit;
 
 						v_ae1.start(f_CSE_DMR_CRE_001(int29, v_createRequest, m_createAeAux(omit,omit)));//TimeSeries
@@ -693,8 +904,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ResponsePrimitive v_responsePrimitive;
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 	
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_createRequest.primitiveContent.timeSeries.resourceName := omit;
-						v_cse1.start(f_CSE_DMR_CRE_001_cseSimu(int29, v_createRequest));//TimeSeries
+						v_cse1.start(f_CSE_DMR_CRE_001_cseSimu(int29, v_createRequest, -, -));//TimeSeries
 						v_cse1.done;	 
 							
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_cse1);
@@ -704,12 +917,34 @@ module OneM2M_Testcases_CSE_Release_2 {
 						}		
 					}
 					
+					testcase TC_CSE_DMR_CRE_001_TS_AEA() runs on Tester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var RequestPrimitive v_createAEAnnc := valueof(m_createAEAnnc(omit, omit, omit, PX_CSE1_ID));
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_createRequest.primitiveContent.timeSeries.resourceName := omit;
+						v_cse1.start(f_CSE_DMR_CRE_001_cseSimu(int29, v_createRequest, int10002, v_createAEAnnc));//TimeSeries
+						v_cse1.done;
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_cse1);
+							if(not ispresent(v_responsePrimitive.primitiveContent.timeSeries.resourceName)){
+								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+							}
+						}		
+					}
+					
 					testcase TC_CSE_DMR_CRE_001_TSI_TS() runs on Tester system CseSystem {
 						// Local variables
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 	
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.timeSeriesInstance.resourceName := omit;
 						v_ae1.start(f_CSE_DMR_CRE_001(int30, v_createRequest, m_createTimeSeriesBase));//TimeSeriesInstance
 						v_ae1.done;	 
@@ -734,7 +969,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 			
 						v_ae1.start(f_CSE_DMR_CRE_002(int18, m_createScheduleBase));//Schedule
 						v_ae1.done;
@@ -743,10 +979,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 																		
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.schedule.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							} else {
 								if(v_responsePrimitive.primitiveContent.schedule.resourceName != c_defaultScheduleResourceName){
-									setverdict(fail, __SCOPE__, ": Error, resourceName attribute not correct");
+									setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not correct");
 								}
 							}
 						}
@@ -756,7 +992,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 			
 						v_ae1.start(f_CSE_DMR_CRE_002(int15, m_createPollingChannelBase));//Pollingchannel
 						v_ae1.done;
@@ -765,10 +1002,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.pollingChannel.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							} else {
 								if(v_responsePrimitive.primitiveContent.pollingChannel.resourceName != c_defaultPollingChannelResourceName){
-									setverdict(fail, __SCOPE__, ": Error, resourceName attribute not correct");
+									setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not correct");
 								}
 							}
 						}
@@ -779,6 +1016,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_DMR_CRE_002(int29, m_createTimeSeriesBase));//TimeSeries
 						v_ae1.done;	 
 							
@@ -804,7 +1043,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_CRE_003_SCH() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 						v_ae1.start(f_CSE_DMR_CRE_003(int18, m_createScheduleBase));//Schedule
 						v_ae1.done;
@@ -813,7 +1053,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_CRE_003_PCH() runs on Tester system CseSystem {
 						// Local variables                        
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 						v_ae1.start(f_CSE_DMR_CRE_003(int15, m_createPollingChannelBase));//Pollingchannel
 						v_ae1.done;
@@ -822,6 +1063,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_CRE_003_TS() runs on Tester system CseSystem {
 						// Local variables    
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 						v_ae1.start(f_CSE_DMR_CRE_003(int29, m_createTimeSeriesBase));//TimeSeries
 						v_ae1.done;
@@ -839,7 +1082,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 						v_ae1.start(f_CSE_DMR_CRE_004(int18, m_createScheduleBase));//Schedule
 						v_ae1.done;
@@ -849,7 +1093,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
                         
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 						v_ae1.start(f_CSE_DMR_CRE_004(int15, m_createPollingChannelBase));//Pollingchannel
 						v_ae1.done;
@@ -860,6 +1105,8 @@ module OneM2M_Testcases_CSE_Release_2 {
     
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_DMR_CRE_004(int29, m_createTimeSeriesBase));//TimeSeries
 						v_ae1.done;
 					}
@@ -878,6 +1125,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 		
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_DMR_CRE_006(int3, v_createRequest));		
 						v_ae1.done;		 
 														
@@ -894,6 +1143,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 		
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_DMR_CRE_006(int3, v_createRequest));
 						v_ae1.done;
 																				
@@ -911,6 +1162,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 								
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						
 						v_ae1.start(f_CSE_DMR_CRE_006(int3, v_createRequest));
 						v_ae1.done;		 
 														
@@ -927,6 +1181,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_DMR_CRE_006(int29, v_createRequest));		
 						v_ae1.done;		 
 									
@@ -943,6 +1199,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_DMR_CRE_006(int29, v_createRequest));
 						v_ae1.done;
 															
@@ -960,6 +1218,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 			
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_DMR_CRE_006(int29, v_createRequest));
 						v_ae1.done;		 
 									
@@ -986,6 +1246,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						const integer c_maxNumberOfInstances := 1;	
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequestContainer.primitiveContent.container.maxNrOfInstances := c_maxNumberOfInstances;
 						v_createRequestContentInstance2.primitiveContent.contentInstance.resourceName := c_defaultContentInstanceResourceName & "2";	//Resource 2
 
@@ -1001,6 +1263,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						const integer c_maxNumberOfInstances := 1;	
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequestTimeSeries.primitiveContent.timeSeries.maxNrOfInstances := c_maxNumberOfInstances;
 						v_createRequestTimeSeriesInstance2.primitiveContent.timeSeriesInstance.resourceName := c_defaultTimeSeriesInstanceResourceName & "2";	//Resource 2
 
@@ -1026,6 +1290,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						const XSD.String c_primitiveContent2 := "Content2";		
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 		
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequestContainer.primitiveContent.container.maxByteSize := c_maxByteSize;
 						v_createRequestContentInstance1.primitiveContent.contentInstance.content := c_primitiveContent1;	//ContentInstance 1
 						v_createRequestContentInstance2.primitiveContent.contentInstance.content := c_primitiveContent2;	//ContentInstance 2
@@ -1045,6 +1311,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						const XSD.String c_primitiveContent2 := "Content2";		
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequestTimeSeries.primitiveContent.container.maxByteSize := c_maxByteSize;
 						v_createRequestTimeSeriesInstance1.primitiveContent.timeSeriesInstance.content := c_primitiveContent1;	//ContentInstance 1
 						v_createRequestTimeSeriesInstance2.primitiveContent.timeSeriesInstance.content := c_primitiveContent2;	//ContentInstance 2
@@ -1064,11 +1332,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 					 */
 					testcase TC_CSE_DMR_CRE_012_CNT_ET() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						const AttributeList c_optionalAttribute := {"expirationTime"};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.container.expirationTime := "20301231T012345";
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int3, v_createRequest, c_optionalAttribute));
@@ -1078,11 +1346,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_CRE_012_CIN_ET() runs on Tester system CseSystem {//TODO
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
 						const AttributeList c_optionalAttribute := {"expirationTime"};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.contentInstance.expirationTime := "20301231T012345";
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int4, v_createRequest, c_optionalAttribute));			
@@ -1091,11 +1359,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_CRE_012_CIN_OR() runs on Tester system CseSystem {//TODO
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-					
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;					
 						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
 						const AttributeList c_optionalAttribute := {"ontologyRef"};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.contentInstance.ontologyRef := "MyOntologyRef";
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int4, v_createRequest, c_optionalAttribute));
@@ -1105,11 +1373,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_CRE_012_ACP_ET() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createAcpBase;
 						const AttributeList c_optionalAttribute := {"expirationTime"};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.accessControlPolicy.expirationTime := "20301231T012345";
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int1, v_createRequest, c_optionalAttribute));
@@ -1119,11 +1387,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_CRE_012_SUB_ET() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"expirationTime"};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.expirationTime := "20301231T012345";
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
@@ -1133,11 +1401,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_CRE_012_SUB_ENC() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"eventNotificationCriteria"};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.eventNotificationCriteria := valueof(m_eventNotificationCriteria({int1}, -));
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
@@ -1147,11 +1415,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_CRE_012_SUB_EXC() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"expirationCounter"};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.expirationCounter := 1;
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
@@ -1161,11 +1429,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_CRE_012_SUB_GPI() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"groupID"};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.groupID := "MyGroupID";
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
@@ -1175,11 +1443,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_CRE_012_SUB_NFU() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"notificationForwardingURI"};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.notificationForwardingURI := "MyForwardingURI";
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
@@ -1189,11 +1457,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_CRE_012_SUB_BN() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"batchNotify"};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.batchNotify := {0, "PT1S"};
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
@@ -1202,11 +1470,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_CRE_012_SUB_RL() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"rateLimit"};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.rateLimit := {0, omit};
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
@@ -1216,11 +1484,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_CRE_012_SUB_PSN() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"preSubscriptionNotify"};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.preSubscriptionNotify := 1;
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
@@ -1230,11 +1498,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_CRE_012_SUB_PN() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"pendingNotification"};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.pendingNotification := int1;
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));			
@@ -1243,11 +1511,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_CRE_012_SUB_NSP() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"notificationStoragePriority"};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.notificationStoragePriority := 1;
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
@@ -1257,11 +1525,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_CRE_012_SUB_LN() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"latestNotify"};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.latestNotify := true;
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
@@ -1271,11 +1539,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_CRE_012_SUB_NCT() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"notificationContentType"};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.notificationContentType := int1;
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
@@ -1285,11 +1553,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_CRE_012_SUB_NEC() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"notificationEventCat"};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.notificationEventCat := {alt_1 := 100};
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
@@ -1299,11 +1567,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_CRE_012_SUB_SU() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"subscriberURI"};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.subscriberURI := "NotInitialized";
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
@@ -1317,6 +1585,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						const AttributeList c_optionalAttribute := {"accessControlPolicyIDs"};
 	
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.timeSeries.accessControlPolicyIDs := {"NotInitialized"};
 	
 						v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, c_optionalAttribute));			
@@ -1329,6 +1599,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						const AttributeList c_optionalAttribute := {"expirationTime"};
 	
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.timeSeries.expirationTime := "20301231T012345";
 	
 						v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, c_optionalAttribute));
@@ -1342,6 +1614,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						const AttributeList c_optionalAttribute := {"labels"};
 	
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.timeSeries.labels := {"MyLabel"};
 	
 						v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, c_optionalAttribute));
@@ -1355,6 +1629,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						var AttributeList v_optionalAttribute := {"creator"};
 	
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.timeSeries.creator := "NullValue";
 	
 						v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, v_optionalAttribute));
@@ -1368,6 +1644,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						const AttributeList c_optionalAttribute := {"maxNrOfInstances"};
 	
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.timeSeries.maxNrOfInstances := 0;
 	
 						v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, c_optionalAttribute));
@@ -1381,6 +1659,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						const AttributeList c_optionalAttribute := {"maxByteSize"};
 	
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.timeSeries.maxByteSize := 0;
 	
 						v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, c_optionalAttribute));
@@ -1394,6 +1674,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						const AttributeList c_optionalAttribute := {"maxInstanceAge"};
 	
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.timeSeries.maxInstanceAge := 0;
 	
 						v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, c_optionalAttribute));
@@ -1407,6 +1689,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						const AttributeList c_optionalAttribute := {"periodicInterval"};
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.timeSeries.periodicInterval := 0;
 
 						v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, c_optionalAttribute));
@@ -1420,6 +1704,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						const AttributeList c_optionalAttribute := {"missingDataDetect"};
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.timeSeries.missingDataDetect := true;
 
 						v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, c_optionalAttribute));
@@ -1433,6 +1719,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						const AttributeList c_optionalAttribute := {"missingDataMaxNr"};
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.timeSeries.missingDataMaxNr := 0;
 
 						v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, c_optionalAttribute));
@@ -1446,6 +1734,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						const AttributeList c_optionalAttribute := {"missingDataDetectTimer"};
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.timeSeries.missingDataDetectTimer := 0;
 
 						v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, c_optionalAttribute));
@@ -1459,6 +1749,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						const AttributeList c_optionalAttribute := {"ontologyRef"};
 	
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.timeSeries.ontologyRef := "MyOntologyRef";
 	
 						v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, c_optionalAttribute));
@@ -1472,6 +1764,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
 						const AttributeList c_optionalAttribute := {"expirationTime"};
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.timeSeriesInstance.expirationTime := "20301231T012345";
 
 						v_ae1.start(f_CSE_DMR_CRE_012(int30, v_createRequest, c_optionalAttribute));
@@ -1485,6 +1779,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
 						const AttributeList c_optionalAttribute := {"labels"};
 	
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.timeSeriesInstance.labels := {"MyLabel"};
 	
 						v_ae1.start(f_CSE_DMR_CRE_012(int30, v_createRequest, c_optionalAttribute));
@@ -1498,6 +1794,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
 						const AttributeList c_optionalAttribute := {"labels"};
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.timeSeriesInstance.sequenceNr := 0;
 
 						v_ae1.start(f_CSE_DMR_CRE_012(int30, v_createRequest, c_optionalAttribute));
@@ -1520,6 +1818,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						const integer c_maxByteSize := 1;		
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 		
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequestContainer.primitiveContent.container.maxByteSize := c_maxByteSize;
 
 						v_ae1.start(f_CSE_DMR_CRE_013(int3, v_createRequestContainer, int4, v_createRequestContentInstance));//ContentInstance under Container
@@ -1533,6 +1833,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						const integer c_maxByteSize := 1;		
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequestTimeSeries.primitiveContent.timeSeries.maxByteSize := c_maxByteSize;
 
 						v_ae1.start(f_CSE_DMR_CRE_013(int29, v_createRequestTimeSeries, int30, v_createRequestTimeSeriesInstance));//TimeSeriesInstance under TimeSeries
@@ -1555,6 +1857,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						const integer c_maxByteSize := 512;	
 		
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_parentResourceRequest.primitiveContent.timeSeries.maxByteSize := c_maxByteSize;
 		
 						v_ae1.start(f_CSE_DMR_CRE_014(int29, v_parentResourceRequest, int30, v_childResourceRequest));		
@@ -1573,7 +1877,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_CRE_015_CNT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						                        
 						v_ae1.start(f_CSE_DMR_CRE_015(int3, m_createContainerBase));//Container
 						v_ae1.done;
@@ -1583,7 +1888,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						                        
 						v_ae1.start(f_CSE_DMR_CRE_015(int9, m_createGroupBase));//Group
 						v_ae1.done;
@@ -1593,7 +1899,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 							
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						                        
 						v_ae1.start(f_CSE_DMR_CRE_015(int1, m_createAcpBase));//AccessControlPolicy
 						v_ae1.done;
@@ -1603,7 +1910,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 							
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						                        
 						v_ae1.start(f_CSE_DMR_CRE_015(int18, m_createScheduleBase));//Schedule
 						v_ae1.done;
@@ -1613,7 +1921,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 							
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						                        
 						v_ae1.start(f_CSE_DMR_CRE_015(int15, m_createPollingChannelBase));//PollingChannel
 						v_ae1.done;
@@ -1623,7 +1932,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						                        
 						v_ae1.start(f_CSE_DMR_CRE_015(int23, m_createSubscriptionBase));//Subscription
 						v_ae1.done;
@@ -1641,7 +1951,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var template PrimitiveContent v_contentResponse;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 					
 						v_contentResponse.uRI := mw_contentContainer_rc2;
 					                        
@@ -1653,7 +1964,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var template PrimitiveContent v_contentResponse;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 					
 						v_contentResponse.uRI := mw_contentGroup_rc2;
 					
@@ -1665,7 +1977,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var template PrimitiveContent v_contentResponse;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 											
 						v_contentResponse.uRI := mw_contentAcp_rc2;
 						
@@ -1677,7 +1990,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var template PrimitiveContent v_contentResponse;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 											
 						v_contentResponse.uRI := mw_contentSchedule_rc2;
 						
@@ -1689,7 +2003,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var template PrimitiveContent v_contentResponse;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 											
 						v_contentResponse.uRI := mw_contentPollingChannel_rc2;
 						
@@ -1701,7 +2016,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var template PrimitiveContent v_contentResponse;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 											
 						v_contentResponse.uRI := mw_contentSubscription_rc2;
 
@@ -1714,6 +2030,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template PrimitiveContent v_contentResponse;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.uRI := mw_contentTimeSeries_rc2;
 
 						v_ae1.start(f_CSE_DMR_CRE_016(int29, m_createTimeSeriesBase, v_contentResponse));//TimeSeries
@@ -1732,7 +2050,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var template PrimitiveContent v_contentResponse;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 					
 						v_contentResponse.resource := mw_contentContainer_rc3;
 					                        
@@ -1744,7 +2063,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var template PrimitiveContent v_contentResponse;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 					
 						v_contentResponse.resource := mw_contentGroup_rc3;
 					
@@ -1756,7 +2076,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var template PrimitiveContent v_contentResponse;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 					
 						v_contentResponse.resource := mw_contentAcp_rc3;
 						
@@ -1768,7 +2089,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var template PrimitiveContent v_contentResponse;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 					
 						v_contentResponse.resource := mw_contentSchedule_rc3;
 						
@@ -1780,7 +2102,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var template PrimitiveContent v_contentResponse;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 					
 						v_contentResponse.resource := mw_contentPollingChannel_rc3;
 						
@@ -1792,7 +2115,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var template PrimitiveContent v_contentResponse;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 					
 						v_contentResponse.resource := mw_contentSubscription_rc3;
 
@@ -1805,6 +2129,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template PrimitiveContent v_contentResponse;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.resource := mw_contentTimeSeries_rc3;
 
 						v_ae1.start(f_CSE_DMR_CRE_017(int29, m_createTimeSeriesBase, v_contentResponse));//TimeSeries
@@ -1813,6 +2139,85 @@ module OneM2M_Testcases_CSE_Release_2 {
 				
 				} // end g_CSE_DMR_CRE_017
 				
+				group g_CSE_DMR_CRE_019 {
+					
+					testcase TC_CSE_DMR_CRE_019_CNTA_AEA() runs on Tester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createContainerAnncBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+	
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_createRequest.primitiveContent.containerAnnc.resourceName := omit;
+						v_cse1.start(f_CSE_DMR_CRE_019(int10003, v_createRequest));//ContainerAnnc
+						v_cse1.done;
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_cse1);
+							if(not ispresent(v_responsePrimitive.primitiveContent.containerAnnc.resourceName)){
+								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+							}
+						}		
+					}
+
+					testcase TC_CSE_DMR_CRE_019_GRPA_AEA() runs on Tester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createGroupAnncBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_createRequest.primitiveContent.groupAnnc.resourceName := omit;
+						v_cse1.start(f_CSE_DMR_CRE_019(int10009, v_createRequest));//GroupAnnc
+						v_cse1.done;
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_cse1);
+							if(not ispresent(v_responsePrimitive.primitiveContent.groupAnnc.resourceName)){
+								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+							}
+						}		
+					}
+
+					testcase TC_CSE_DMR_CRE_019_ACPA_AEA() runs on Tester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createAcpAnncBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_createRequest.primitiveContent.accessControlPolicyAnnc.resourceName := omit;
+						v_cse1.start(f_CSE_DMR_CRE_019(int10001, v_createRequest));//AccessControlPolicyAnnc
+						v_cse1.done;
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_cse1);
+							if(not ispresent(v_responsePrimitive.primitiveContent.accessControlPolicyAnnc.resourceName)){
+								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+							}
+						}		
+					}
+					
+					testcase TC_CSE_DMR_CRE_019_TSA_AEA() runs on Tester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesAnncBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_createRequest.primitiveContent.timeSeriesAnnc.resourceName := omit;
+						v_cse1.start(f_CSE_DMR_CRE_019(int10029, v_createRequest));//TimeSeriesAnnc
+						v_cse1.done;
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_cse1);
+							if(not ispresent(v_responsePrimitive.primitiveContent.timeSeriesAnnc.resourceName)){
+								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+							}
+						}		
+					}
+					
+				} //end g_CSE_DMR_CRE_019
 				
 				group g_CSE_DMR_CRE_020 {
 					
@@ -1822,11 +2227,12 @@ module OneM2M_Testcases_CSE_Release_2 {
 					 */
 					testcase TC_CSE_DMR_CRE_020_ACP() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createAcpBase;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
-						v_createRequest.primitiveContent.accessControlPolicy.announceTo := {f_getAnnouncementTargetPoA()};
+						
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
 						                    
 						v_ae1.start(f_CSE_DMR_CRE_020(int1, v_createRequest, mw_createAccessControlPolicyAnnc));//AccessControlPolicy
 						v_ae1.done;
@@ -1834,11 +2240,12 @@ module OneM2M_Testcases_CSE_Release_2 {
 
 					testcase TC_CSE_DMR_CRE_020_CNT() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
-						v_createRequest.primitiveContent.container.announceTo := {f_getAnnouncementTargetPoA()};
+						
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
 					
 						v_ae1.start(f_CSE_DMR_CRE_020(int3, v_createRequest, mw_createContainerAnncBase));//Container
 						v_ae1.done;
@@ -1848,8 +2255,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
-						v_createRequest.primitiveContent.contentInstance.announceTo := {f_getAnnouncementTargetPoA()};
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};
 						
 						v_ae1.start(f_CSE_DMR_CRE_020(int4, v_createRequest, mw_createContentInstanceAnncBase));//ContentInstance
 						v_ae1.done;
@@ -1857,11 +2265,12 @@ module OneM2M_Testcases_CSE_Release_2 {
 				
 					testcase TC_CSE_DMR_CRE_020_GRP() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
-						v_createRequest.primitiveContent.group_.announceTo := {f_getAnnouncementTargetPoA()};
+						
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
 						
 						v_ae1.start(f_CSE_DMR_CRE_020(int9, v_createRequest, mw_createGroupAnncBase));//Group
 						v_ae1.done;
@@ -1869,11 +2278,12 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_CRE_020_LCP() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createLocationPolicy(int1, omit, omit, omit, omit);
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
-						v_createRequest.primitiveContent.locationPolicy.announceTo := {f_getAnnouncementTargetPoA()};
+						
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.locationPolicy.announceTo := {PX_CSE1_ID};
 						
 						v_ae1.start(f_CSE_DMR_CRE_020(int10, v_createRequest, mw_createLocationPolicyAnncBase));//LocationPolicy
 						v_ae1.done;
@@ -1881,11 +2291,12 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_CRE_020_MGO() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createMgmtObjBase;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
-						v_createRequest.primitiveContent.mgmtResource.announceTo := {f_getAnnouncementTargetPoA()};
+						
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.mgmtResource.announceTo := {PX_CSE1_ID};
 
 						v_ae1.start(f_CSE_DMR_CRE_020(int13, v_createRequest, mw_createMgmtObjAnncBase));//MgmtObj
 						v_ae1.done;
@@ -1893,11 +2304,12 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_CRE_020_NOD() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createNodeBase;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
-						v_createRequest.primitiveContent.node.announceTo := {f_getAnnouncementTargetPoA()};
+						
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.node.announceTo := {PX_CSE1_ID};
 						
 						v_ae1.start(f_CSE_DMR_CRE_020(int14, v_createRequest, mw_createNodeAnnc));//Node
 						v_ae1.done;
@@ -1905,11 +2317,12 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_CRE_020_SCH() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createScheduleBase;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
-						v_createRequest.primitiveContent.schedule.announceTo := {f_getAnnouncementTargetPoA()};
+						
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.schedule.announceTo := {PX_CSE1_ID};
 
 						v_ae1.start(f_CSE_DMR_CRE_020(int18, v_createRequest, mw_createScheduleAnncBase));//Schedule
 						v_ae1.done;
@@ -1920,6 +2333,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 	
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.timeSeries.announceTo := {f_getAnnouncementTargetPoA()};
 	
 						v_ae1.start(f_CSE_DMR_CRE_020(int29, v_createRequest, mw_createTimeSeriesAnncBase));//TimeSeries
@@ -1931,6 +2346,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.timeSeriesInstance.announceTo := {f_getAnnouncementTargetPoA()};
 
 						v_ae1.start(f_CSE_DMR_CRE_020(int30, v_createRequest, mw_createTimeSeriesInstanceAnncBase));//TimeSeriesInstance
@@ -1947,16 +2364,15 @@ module OneM2M_Testcases_CSE_Release_2 {
 					 */
 					testcase TC_CSE_DMR_CRE_021_CNT() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var RequestPrimitive v_requestPrimitive;
-						var XSD.NonNegativeInteger maxByteSize := 512;		//Correct value? Shall be indicated in TP?
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
-						//v_createRequest.primitiveContent.container.announceTo := {f_getAnnouncementTargetPoA()};
+						var XSD.NonNegativeInteger v_maxByteSize := 512;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
-						v_createRequest.primitiveContent.container.maxByteSize := maxByteSize;						
-						v_createRequest.primitiveContent.container.announcedAttribute := {"maxByteSize"};		//Correct value? Shall be indicated in TP?
+						v_createRequest.primitiveContent.container.maxByteSize := v_maxByteSize;						
+						v_createRequest.primitiveContent.container.announcedAttribute := {"mbs"};
 	
 						v_ae1.start(f_CSE_DMR_CRE_021(int3, v_createRequest, mw_createContainerAnncBase()));//Container
 						v_ae1.done;
@@ -1965,7 +2381,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							//Check if maxByteSize attribute has been announced
 							v_requestPrimitive := f_getRequestPrimitive(v_ae1);
 							if (ispresent(v_requestPrimitive.primitiveContent.containerAnnc.maxByteSize)){
-								if(v_requestPrimitive.primitiveContent.containerAnnc.maxByteSize != maxByteSize){
+								if(v_requestPrimitive.primitiveContent.containerAnnc.maxByteSize != v_maxByteSize){
 									setverdict(fail, __SCOPE__ & ": Error: Value of maxByteSize has not been announced successfully");
 								}else{
 									setverdict(pass, __SCOPE__ & ": Value of maxByteSize has been announced successfully");
@@ -1978,16 +2394,15 @@ module OneM2M_Testcases_CSE_Release_2 {
 	
 					testcase TC_CSE_DMR_CRE_021_CIN() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
 						var RequestPrimitive v_requestPrimitive;
-						var XSD.NonNegativeInteger v_contentSize := 512;			//Correct value? Shall be indicated in TP?
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
-						//v_createRequest.primitiveContent.contentInstance.announceTo := {f_getAnnouncementTargetPoA()};
+						var XSD.NonNegativeInteger v_contentSize := 512;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.contentInstance.contentSize := v_contentSize;						
-						v_createRequest.primitiveContent.contentInstance.announcedAttribute := {"contentSize"};	//Correct value? Shall be indicated in TP?
+						v_createRequest.primitiveContent.contentInstance.announcedAttribute := {"cs"};
 		
 						v_ae1.start(f_CSE_DMR_CRE_021(int4, v_createRequest, mw_createContentInstanceAnncBase()));//ContentInstance
 						v_ae1.done;
@@ -2009,15 +2424,15 @@ module OneM2M_Testcases_CSE_Release_2 {
 
 					testcase TC_CSE_DMR_CRE_021_GRP() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
 						var RequestPrimitive v_requestPrimitive;
-						var XSD.PositiveInteger maxNrOfMembers := 10;						//Correct value? Shall be indicated in TP?
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
-						v_createRequest.primitiveContent.group_.announceTo := {f_getAnnouncementTargetPoA()};
-						v_createRequest.primitiveContent.group_.maxNrOfMembers := maxNrOfMembers;
-						v_createRequest.primitiveContent.group_.announcedAttribute := {"maxNrOfMembers"};	//Correct value? Shall be indicated in TP?
+						var XSD.PositiveInteger v_maxNrOfMembers := 10;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
+						v_createRequest.primitiveContent.group_.maxNrOfMembers := v_maxNrOfMembers;
+						v_createRequest.primitiveContent.group_.announcedAttribute := {"mnm"};
 		
 						v_ae1.start(f_CSE_DMR_CRE_021(int9, v_createRequest, mw_createGroupAnncBase()));//Group
 						v_ae1.done;
@@ -2026,7 +2441,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							//Check if maxNrOfMembers attribute has been announced
 							v_requestPrimitive := f_getRequestPrimitive(v_ae1);
 							if (ispresent(v_requestPrimitive.primitiveContent.groupAnnc.maxNrOfMembers)){
-								if(v_requestPrimitive.primitiveContent.groupAnnc.maxNrOfMembers != maxNrOfMembers){
+								if(v_requestPrimitive.primitiveContent.groupAnnc.maxNrOfMembers != v_maxNrOfMembers){
 									setverdict(fail, __SCOPE__ & ": Error: Value of maxNrOfMembers has not been announced successfully");
 								}else{
 									setverdict(pass, __SCOPE__ & ": Value of maxNrOfMembers has been announced successfully");
@@ -2039,15 +2454,15 @@ module OneM2M_Testcases_CSE_Release_2 {
 	
 					testcase TC_CSE_DMR_CRE_021_LCP() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createLocationPolicy(int1, omit, omit, omit, omit);
 						var RequestPrimitive v_requestPrimitive;
-						var LocationSource locationSource := int1;//Network-based		//Correct value? Shall be indicated in TP?
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
-						v_createRequest.primitiveContent.locationPolicy.announceTo := {f_getAnnouncementTargetPoA()};
-						v_createRequest.primitiveContent.locationPolicy.locationSource := locationSource;
-						v_createRequest.primitiveContent.locationPolicy.announcedAttribute := {"locationSource"};		//Correct value? Shall be indicated in TP?
+						var LocationSource v_locationSource := int1;//Network-based
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.locationPolicy.announceTo := {PX_CSE1_ID};
+						v_createRequest.primitiveContent.locationPolicy.locationSource := v_locationSource;
+						v_createRequest.primitiveContent.locationPolicy.announcedAttribute := {"los"};
 		
 						v_ae1.start(f_CSE_DMR_CRE_021(int10, v_createRequest, mw_createLocationPolicyAnncBase()));//LocationPolicy
 						v_ae1.done;
@@ -2056,7 +2471,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							//Check if locationSource attribute has been announced
 							v_requestPrimitive := f_getRequestPrimitive(v_ae1);
 							if (ispresent(v_requestPrimitive.primitiveContent.locationPolicyAnnc.locationSource)){
-								if(v_requestPrimitive.primitiveContent.locationPolicyAnnc.locationSource != locationSource){
+								if(v_requestPrimitive.primitiveContent.locationPolicyAnnc.locationSource != v_locationSource){
 									setverdict(fail, __SCOPE__ & ": Error: Value of locationSource has not been announced successfully");
 								}else{
 									setverdict(pass, __SCOPE__ & ": Value of locationSource has been announced successfully");
@@ -2069,15 +2484,15 @@ module OneM2M_Testcases_CSE_Release_2 {
 	
 					testcase TC_CSE_DMR_CRE_021_MGO() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createMgmtObjBase;
 						var RequestPrimitive v_requestPrimitive;
-						var XSD.String description := "Description of mgmtObj";	//Correct value? Shall be indicated in TP?
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
-						v_createRequest.primitiveContent.mgmtResource.announceTo := {f_getAnnouncementTargetPoA()};
-						v_createRequest.primitiveContent.mgmtResource.description := description;			
-						v_createRequest.primitiveContent.mgmtResource.announcedAttribute := {"description"};			//Correct value? Shall be indicated in TP?
+						var XSD.String v_description := "Description of mgmtObj";
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.mgmtResource.announceTo := {PX_CSE1_ID};
+						v_createRequest.primitiveContent.mgmtResource.description := v_description;			
+						v_createRequest.primitiveContent.mgmtResource.announcedAttribute := {"dc"};
 
 						v_ae1.start(f_CSE_DMR_CRE_021(int13, v_createRequest, mw_createMgmtObjAnncBase()));//MgmtObj
 						v_ae1.done;
@@ -2086,7 +2501,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							//Check if description attribute has been announced
 							v_requestPrimitive := f_getRequestPrimitive(v_ae1);
 							if (ispresent(v_requestPrimitive.primitiveContent.announcedMgmtResource.description)){
-								if(v_requestPrimitive.primitiveContent.announcedMgmtResource.description != description){
+								if(v_requestPrimitive.primitiveContent.announcedMgmtResource.description != v_description){
 									setverdict(fail, __SCOPE__ & ": Error: Value of description has not been announced successfully");
 								}else{
 									setverdict(pass, __SCOPE__ & ": Value of description has been announced successfully");
@@ -2099,12 +2514,12 @@ module OneM2M_Testcases_CSE_Release_2 {
 	
 					testcase TC_CSE_DMR_CRE_021_NOD() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createNodeBase;
 						var RequestPrimitive v_requestPrimitive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
-						v_createRequest.primitiveContent.node.announceTo := {f_getAnnouncementTargetPoA()};
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.node.announceTo := {PX_CSE1_ID};
 						
 						//TODO node to be done. hostedCSELink attribute (OA) to be added!!!
 		
@@ -2114,15 +2529,15 @@ module OneM2M_Testcases_CSE_Release_2 {
 	
 					testcase TC_CSE_DMR_CRE_021_SCH() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createScheduleBase;
 						var RequestPrimitive v_requestPrimitive;
-						var ScheduleEntries scheduleElement := {{"0 0 0,1,2 1 1 * *"}};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
-						v_createRequest.primitiveContent.schedule.announceTo := {f_getAnnouncementTargetPoA()};
-						v_createRequest.primitiveContent.schedule.scheduleElement := scheduleElement;			//Correct value? Shall be indicated in TP?
-						v_createRequest.primitiveContent.schedule.announcedAttribute := {"scheduleElement"};			//Correct value? Shall be indicated in TP?
+						var ScheduleEntries v_scheduleElement := {{"0 0 0,1,2 1 1 * *"}};
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_createRequest.primitiveContent.schedule.announceTo := {PX_CSE1_ID};
+						v_createRequest.primitiveContent.schedule.scheduleElement := v_scheduleElement;
+						v_createRequest.primitiveContent.schedule.announcedAttribute := {"se"};
 						
 						v_ae1.start(f_CSE_DMR_CRE_021(int18, v_createRequest, mw_createScheduleAnncBase()));//Schedule
 						v_ae1.done;
@@ -2131,7 +2546,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							//Check if scheduleElement attribute has been announced
 							v_requestPrimitive := f_getRequestPrimitive(v_ae1);
 							if (ispresent(v_requestPrimitive.primitiveContent.scheduleAnnc.scheduleElement)){
-								if(v_requestPrimitive.primitiveContent.scheduleAnnc.scheduleElement != scheduleElement){
+								if(v_requestPrimitive.primitiveContent.scheduleAnnc.scheduleElement != v_scheduleElement){
 									setverdict(fail, __SCOPE__ & ": Error: Value of scheduleElement has not been announced successfully");
 								}else{
 									setverdict(pass, __SCOPE__ & ": Value of scheduleElement has been announced successfully");
@@ -2147,12 +2562,13 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						var RequestPrimitive v_requestPrimitive;
-						var XSD.NonNegativeInteger v_maxByteSize := 512;		//Correct value? Shall be indicated in TP?
+						var XSD.NonNegativeInteger v_maxByteSize := 512;
 
-						//v_createRequest.primitiveContent.container.announceTo := {f_getAnnouncementTargetPoA()};
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize;						
-						v_createRequest.primitiveContent.timeSeries.announcedAttribute := {"maxByteSize"};		//Correct value? Shall be indicated in TP?
+						v_createRequest.primitiveContent.timeSeries.announcedAttribute := {"mbs"};
 
 						v_ae1.start(f_CSE_DMR_CRE_021(int29, v_createRequest, mw_createTimeSeriesAnncBase()));//TimeSeries
 						v_ae1.done;
@@ -2177,12 +2593,13 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
 						var RequestPrimitive v_requestPrimitive;
-						var XSD.NonNegativeInteger v_sequenceNr := 8;		//Correct value? Shall be indicated in TP?
+						var XSD.NonNegativeInteger v_sequenceNr := 8;
 
-						//v_createRequest.primitiveContent.container.announceTo := {f_getAnnouncementTargetPoA()};
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.timeSeriesInstance.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.timeSeriesInstance.sequenceNr := v_sequenceNr;						
-						v_createRequest.primitiveContent.timeSeriesInstance.announcedAttribute := {"sequenceNr"};		//Correct value? Shall be indicated in TP?
+						v_createRequest.primitiveContent.timeSeriesInstance.announcedAttribute := {"snr"};
 
 						v_ae1.start(f_CSE_DMR_CRE_021(int30, v_createRequest, mw_createTimeSeriesInstanceAnncBase()));//TimeSeriesInstance
 						v_ae1.done;
@@ -2216,11 +2633,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 					 */
 					testcase TC_CSE_DMR_RET_001_SCH() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var ResponsePrimitive v_responsePrimitive;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.schedule := mw_contentSchedule_rc1;
 						
 						v_ae1.start(f_CSE_DMR_RET_001(int18, m_createScheduleBase, v_contentResponse));//Schedule
@@ -2230,11 +2647,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_RET_001_PCH() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var ResponsePrimitive v_responsePrimitive;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.pollingChannel := mw_contentPollingChannelBase;
 						
 						v_ae1.start(f_CSE_DMR_RET_001(int15, m_createPollingChannelBase, v_contentResponse));//PollingChannel
@@ -2248,6 +2665,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ResponsePrimitive v_responsePrimitive;
 						var template PrimitiveContent v_contentResponse;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.timeSeries := mw_contentTimeSeries_rc1;
 
 						v_ae1.start(f_CSE_DMR_RET_001(int29, m_createTimeSeriesBase, v_contentResponse));//TimeSeries
@@ -2266,7 +2685,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_002() runs on Tester system CseSystem {
 					
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 													
 						v_ae1.start(f_CSE_DMR_RET_002());
 										  	  	
@@ -2343,18 +2763,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_003_SCH() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
-	
-						v_ae1.start(f_CSE_DMR_RET_003(int18, m_createScheduleBase));//Schedule
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-					}
-					
-					testcase TC_CSE_DMR_RET_003_PCH() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 	
-						v_ae1.start(f_CSE_DMR_RET_003(int15, m_createPollingChannelBase));//PollingChannel
+						v_ae1.start(f_CSE_DMR_RET_003(int18, m_createScheduleBase));//Schedule
 						v_ae1.done;
 					}
 					
@@ -2362,6 +2774,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_DMR_RET_003(int29, m_createTimeSeriesBase));//TimeSeries
 						v_ae1.done;
 					}
@@ -2376,10 +2790,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 					 */
 					testcase TC_CSE_DMR_RET_004_CNT() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.container := m_contentContainer_allOmit;
 						v_contentResponse.container.parentID := ?;
                         
@@ -2389,10 +2804,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 
 					testcase TC_CSE_DMR_RET_004_GRP() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.group_ := m_contentGroup_allOmit;
 						v_contentResponse.group_.parentID := ?;
 												
@@ -2402,10 +2818,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_RET_004_ACP() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.accessControlPolicy := m_contentAcp_allOmit;
 						v_contentResponse.accessControlPolicy.parentID := ?;
 							
@@ -2417,7 +2834,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var template PrimitiveContent v_contentResponse;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 					
 						v_contentResponse.schedule := m_contentSchedule_allOmit;
 						v_contentResponse.schedule.parentID := ?;
@@ -2430,7 +2848,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var template PrimitiveContent v_contentResponse;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 					
 						v_contentResponse.pollingChannel := m_contentPollingChannel_allOmit;
 						v_contentResponse.pollingChannel.parentID := ?;
@@ -2443,7 +2862,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var template PrimitiveContent v_contentResponse;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 					
 						v_contentResponse.subscription := m_contentSubscription_allOmit;
 						v_contentResponse.subscription.parentID := ?;
@@ -2457,6 +2877,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template PrimitiveContent v_contentResponse;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.timeSeries := m_contentTimeSeries_allOmit;
 						v_contentResponse.timeSeries.parentID := ?;
 		
@@ -2474,10 +2896,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 					 */
 					testcase TC_CSE_DMR_RET_005_CNT() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.container := m_contentContainer_allOmit;
 						v_contentResponse.container.parentID := ?;
 						                       
@@ -2487,10 +2910,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 
 					testcase TC_CSE_DMR_RET_005_GRP() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.group_ := m_contentGroup_allOmit;
 						v_contentResponse.group_.parentID := ?;
 																		
@@ -2500,10 +2924,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_RET_005_ACP() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-					
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;					
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.accessControlPolicy := m_contentAcp_allOmit;
 						v_contentResponse.accessControlPolicy.parentID := ?;
 							
@@ -2515,7 +2939,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.schedule := m_contentSchedule_allOmit;
 						v_contentResponse.schedule.parentID := ?;
 								
@@ -2527,7 +2952,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.pollingChannel := m_contentPollingChannel_allOmit;
 						v_contentResponse.pollingChannel.parentID := ?;
 								
@@ -2537,10 +2963,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_RET_005_SUB() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.subscription := m_contentSubscription_allOmit;
 						v_contentResponse.subscription.parentID := ?;
 								
@@ -2553,6 +2980,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.timeSeries := m_contentTimeSeries_allOmit;
 						v_contentResponse.timeSeries.parentID := ?;
 			
@@ -2571,10 +3000,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 					 */
 					testcase TC_CSE_DMR_RET_006_CNT() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.container := m_contentContainer_allOmit;
 						v_contentResponse.container.parentID := ?;
 						v_contentResponse.container.creationTime := ?;
@@ -2585,10 +3015,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 
 					testcase TC_CSE_DMR_RET_006_GRP() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.group_ := m_contentGroup_allOmit;
 						v_contentResponse.group_.parentID := ?;
 						v_contentResponse.group_.creationTime := ?;
@@ -2599,10 +3030,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_RET_006_ACP() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.accessControlPolicy := m_contentAcp_allOmit;
 						v_contentResponse.accessControlPolicy.parentID := ?;
 						v_contentResponse.accessControlPolicy.creationTime := ?;
@@ -2613,10 +3045,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 				
 					testcase TC_CSE_DMR_RET_006_SCH() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.schedule := m_contentSchedule_allOmit;
 						v_contentResponse.schedule.parentID := ?;
 						v_contentResponse.schedule.creationTime := ?;
@@ -2627,10 +3060,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_RET_006_PCH() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-					
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;					
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.pollingChannel := m_contentPollingChannel_allOmit;
 						v_contentResponse.pollingChannel.parentID := ?;
 						v_contentResponse.pollingChannel.creationTime := ?;
@@ -2641,10 +3074,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_RET_006_SUB() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.subscription := m_contentSubscription_allOmit;
 						v_contentResponse.subscription.parentID := ?;
 						v_contentResponse.subscription.creationTime := ?;
@@ -2658,6 +3092,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.timeSeries := m_contentTimeSeries_allOmit;
 						v_contentResponse.timeSeries.parentID := ?;
 						v_contentResponse.timeSeries.creationTime := ?;
@@ -2678,7 +3114,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_007_CNT_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                         
 						v_ae1.start(f_CSE_DMR_RET_007(int3, m_createContainerBase));//Container
 						v_ae1.done;
@@ -2687,7 +3124,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_007_GRP_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_ae1.start(f_CSE_DMR_RET_007(int9, m_createGroupBase));//Group
 						v_ae1.done;
@@ -2696,7 +3134,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_007_ACP_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 	
 						v_ae1.start(f_CSE_DMR_RET_007(int1, m_createAcpBase));//AccessControlPolicy
 						v_ae1.done;
@@ -2705,7 +3144,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_007_SCH_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 	
 						v_ae1.start(f_CSE_DMR_RET_007(int18, m_createScheduleBase));//Schedule
 						v_ae1.done;
@@ -2714,7 +3154,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_007_PCH_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 	
 						v_ae1.start(f_CSE_DMR_RET_007(int15, m_createPollingChannelBase));//PollingChannel
 						v_ae1.done;
@@ -2723,7 +3164,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_007_SUB_LBL() runs on AeSimu system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 	
 						v_ae1.start(f_CSE_DMR_RET_007(int23, m_createSubscriptionBase));//Subscription
 						v_ae1.done;
@@ -2733,6 +3175,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_DMR_RET_007(int29, m_createSubscriptionBase));//TimeSeries
 						v_ae1.done;
 					}
@@ -2745,65 +3189,73 @@ module OneM2M_Testcases_CSE_Release_2 {
 					 * @desc Check that the IUT responds with an error when the AE tries to retrieve a non-existing attributes of the TARGET_RESOURCE_ADDRESS resource (“multiple” attributes case)
 					 * 
 					 */
-					testcase TC_CSE_DMR_RET_008_CNT_AT() runs on Tester system CseSystem {
+					testcase TC_CSE_DMR_RET_008_CNT_LBL_AT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                         
-						v_ae1.start(f_CSE_DMR_RET_008(int3, m_createContainerBase));//Container
+						v_ae1.start(f_CSE_DMR_RET_008(int3, m_createContainerBase, {"lbl", "at"}));//Container
 						v_ae1.done;
 					}
 
-					testcase TC_CSE_DMR_RET_008_GRP_AT() runs on Tester system CseSystem {
+					testcase TC_CSE_DMR_RET_008_GRP_LBL_AT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
-						v_ae1.start(f_CSE_DMR_RET_008(int9, m_createGroupBase));//Group
+						v_ae1.start(f_CSE_DMR_RET_008(int9, m_createGroupBase, {"lbl", "at"}));//Group
 						v_ae1.done;
 					}
 					
-					testcase TC_CSE_DMR_RET_008_ACP_AT() runs on Tester system CseSystem {
+					testcase TC_CSE_DMR_RET_008_ACP_LBL_AT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 	
-						v_ae1.start(f_CSE_DMR_RET_008(int1, m_createAcpBase));//AccessControlPolicy
+						v_ae1.start(f_CSE_DMR_RET_008(int1, m_createAcpBase, {"lbl", "at"}));//AccessControlPolicy
 						v_ae1.done;
 					}
 				
-					testcase TC_CSE_DMR_RET_008_SCH_AT() runs on Tester system CseSystem {
+					testcase TC_CSE_DMR_RET_008_SCH_LBL_AT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 	
-						v_ae1.start(f_CSE_DMR_RET_008(int18, m_createScheduleBase));//Schedule
+						v_ae1.start(f_CSE_DMR_RET_008(int18, m_createScheduleBase, {"lbl", "at"}));//Schedule
 						v_ae1.done;
 					}
 					
-					testcase TC_CSE_DMR_RET_008_PCH_AT() runs on Tester system CseSystem {
+					testcase TC_CSE_DMR_RET_008_SUB_LBL_AT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 	
-						v_ae1.start(f_CSE_DMR_RET_008(int15, m_createPollingChannelBase));//PollingChannel
+						v_ae1.start(f_CSE_DMR_RET_008(int23, m_createSubscriptionBase, {"lbl", "at"}));//Subscription
 						v_ae1.done;
 					}
 					
-					testcase TC_CSE_DMR_RET_008_SUB_AT() runs on Tester system CseSystem {
+					testcase TC_CSE_DMR_RET_008_PCH_LBL_PI() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
-	
-						v_ae1.start(f_CSE_DMR_RET_008(int23, m_createSubscriptionBase));//Subscription
+
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_ae1.start(f_CSE_DMR_RET_008(int15, m_createPollingChannelBase, {"lbl", "pi"}));//PollingChannel
 						v_ae1.done;
 					}
 					
-					testcase TC_CSE_DMR_RET_008_TS_AT() runs on Tester system CseSystem {
+					testcase TC_CSE_DMR_RET_008_TS_LBL_AT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
-						v_ae1.start(f_CSE_DMR_RET_008(int29, m_createTimeSeriesBase));//TimeSeries
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_ae1.start(f_CSE_DMR_RET_008(int29, m_createTimeSeriesBase, {"lbl", "at"}));//TimeSeries
 						v_ae1.done;
 					}
 
@@ -2818,7 +3270,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_009() runs on Tester system CseSystem {
 					
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 														
 						v_ae1.start(f_CSE_DMR_RET_009());
 											  	  	
@@ -2884,7 +3337,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_011() runs on Tester system CseSystem {
 					
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 														
 						v_ae1.start(f_CSE_DMR_RET_011());
 											  	  	
@@ -2952,7 +3406,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.schedule := mw_contentSchedule_rc1;
 						
 						v_ae1.start(f_CSE_DMR_RET_013(int18, m_createScheduleBase, v_contentResponse));//Schedule
@@ -2965,6 +3420,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.timeSeries := mw_contentTimeSeries_rc1;
 	
 						v_ae1.start(f_CSE_DMR_RET_013(int29, m_createTimeSeriesBase, v_contentResponse));//TimeSeries
@@ -2983,7 +3440,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_014_SCH() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 	
 						v_ae1.start(f_CSE_DMR_RET_014(int18, m_createScheduleBase));//Schedule
 						v_ae1.done;
@@ -2993,6 +3451,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_DMR_RET_014(int29, m_createTimeSeriesBase));//TimeSeries
 						v_ae1.done;
 					}
@@ -3010,7 +3470,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 					
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.accessControlPolicy := m_contentAcp_allOmit;
 						v_contentResponse.accessControlPolicy.parentID := ?;
 							
@@ -3023,7 +3484,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.aE := m_contentAe_allOmit;
 						v_contentResponse.aE.parentID := ?;
 							
@@ -3036,7 +3498,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.container := m_contentContainer_allOmit;
 						v_contentResponse.container.parentID := ?;
                         
@@ -3049,7 +3512,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.group_ := m_contentGroup_allOmit;
 						v_contentResponse.group_.parentID := ?;
 												
@@ -3062,7 +3526,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.remoteCSE := m_contentRemoteCSE_allOmit;
 						v_contentResponse.remoteCSE.parentID := ?;
 		
@@ -3074,7 +3539,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.schedule := m_contentSchedule_allOmit;
 						v_contentResponse.schedule.parentID := ?;
 							
@@ -3087,7 +3553,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.subscription := m_contentSubscription_allOmit;
 						v_contentResponse.subscription.parentID := ?;
 							
@@ -3100,6 +3567,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.timeSeries := m_contentTimeSeries_allOmit;
 						v_contentResponse.timeSeries.parentID := ?;
 		
@@ -3120,7 +3589,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.accessControlPolicy := m_contentAcp_allOmit;
 						v_contentResponse.accessControlPolicy.parentID := ?;
 							
@@ -3133,7 +3603,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 					
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.aE := m_contentAe_allOmit;
 						v_contentResponse.aE.parentID := ?;
 								
@@ -3146,7 +3617,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.container := m_contentContainer_allOmit;
 						v_contentResponse.container.parentID := ?;
 						                       
@@ -3159,7 +3631,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.group_ := m_contentGroup_allOmit;
 						v_contentResponse.group_.parentID := ?;
 																		
@@ -3172,7 +3645,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.remoteCSE := m_contentRemoteCSE_allOmit;
 						v_contentResponse.remoteCSE.parentID := ?;
 								
@@ -3184,7 +3658,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.schedule := m_contentSchedule_allOmit;
 						v_contentResponse.schedule.parentID := ?;
 								
@@ -3197,7 +3672,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 					
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.subscription := m_contentSubscription_allOmit;
 						v_contentResponse.subscription.parentID := ?;
 								
@@ -3210,6 +3686,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.timeSeries := m_contentTimeSeries_allOmit;
 						v_contentResponse.timeSeries.parentID := ?;
 			
@@ -3230,7 +3708,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.accessControlPolicy := m_contentAcp_allOmit;
 						v_contentResponse.accessControlPolicy.parentID := ?;
 						v_contentResponse.accessControlPolicy.creationTime := ?;
@@ -3244,7 +3723,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.aE := m_contentAe_allOmit;
 						v_contentResponse.aE.parentID := ?;
 						v_contentResponse.aE.creationTime := ?;
@@ -3258,7 +3738,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_contentResponse.container := m_contentContainer_allOmit;
 						v_contentResponse.container.parentID := ?;
@@ -3271,7 +3752,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					/*testcase TC_CSE_DMR_RET_017_DLV() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						var template PrimitiveContent v_contentResponse;
 					
 						v_contentResponse.delivery := m_contentDelivery_allOmit;
@@ -3287,7 +3769,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.group_ := m_contentGroup_allOmit;
 						v_contentResponse.group_.parentID := ?;
 						v_contentResponse.group_.creationTime := ?;
@@ -3301,7 +3784,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.locationPolicy := m_contentLocationPolicy_allOmit;
 						v_contentResponse.locationPolicy.parentID := ?;
 						v_contentResponse.locationPolicy.creationTime := ?;
@@ -3315,7 +3799,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 					
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.mgmtCmd := m_contentMgmtCmd_allOmit;
 						v_contentResponse.mgmtCmd.parentID := ?;
 						v_contentResponse.mgmtCmd.creationTime := ?;
@@ -3329,7 +3814,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.node := m_contentNode_allOmit;
 						v_contentResponse.node.parentID := ?;
 						v_contentResponse.node.creationTime := ?;
@@ -3343,7 +3829,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.remoteCSE := m_contentRemoteCSE_allOmit;
 						v_contentResponse.remoteCSE.parentID := ?;
 						v_contentResponse.remoteCSE.creationTime := ?;
@@ -3357,7 +3844,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 					
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.schedule := m_contentSchedule_allOmit;
 						v_contentResponse.schedule.parentID := ?;
 						v_contentResponse.schedule.creationTime := ?;
@@ -3371,7 +3859,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.statsCollect := m_contentStatsCollect_allOmit;
 						v_contentResponse.statsCollect.parentID := ?;
 						v_contentResponse.statsCollect.creationTime := ?;
@@ -3385,7 +3874,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.statsConfig := m_contentStatsConfig_allOmit;
 						v_contentResponse.statsConfig.parentID := ?;
 						v_contentResponse.statsConfig.creationTime := ?;
@@ -3399,7 +3889,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.subscription := m_contentSubscription_allOmit;
 						v_contentResponse.subscription.parentID := ?;
 						v_contentResponse.subscription.creationTime := ?;
@@ -3413,6 +3904,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.timeSeries := m_contentTimeSeries_allOmit;
 						v_contentResponse.timeSeries.parentID := ?;
 						v_contentResponse.timeSeries.creationTime := ?;
@@ -3432,7 +3925,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_018_ACP_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 	
 						v_ae1.start(f_CSE_DMR_RET_018(int1, m_createAcpBase));//AccessControlPolicy
 						v_ae1.done;
@@ -3441,7 +3935,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_018_AE_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 	
 						v_ae1.start(f_CSE_DMR_RET_018(int2, m_createAe(PX_APP_ID)));//AE
 						v_ae1.done;
@@ -3450,7 +3945,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_018_CNT_LBL() runs on Tester system CseSystem {
 						// Local variables
  						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                         
 						v_ae1.start(f_CSE_DMR_RET_018(int3, m_createContainerBase));//Container
 						v_ae1.done;
@@ -3459,7 +3955,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_018_GRP_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_ae1.start(f_CSE_DMR_RET_018(int9, m_createGroupBase));//Group
 						v_ae1.done;
@@ -3468,7 +3965,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_018_CSR_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 						v_ae1.start(f_CSE_DMR_RET_018(int16, m_createRemoteCSEBase));//RemoteCSE
 						v_ae1.done;
@@ -3477,16 +3975,18 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_018_SCH_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 	
 						v_ae1.start(f_CSE_DMR_RET_018(int18, m_createScheduleBase));//Schedule
 						v_ae1.done;
 					}
 										
-					testcase TC_CSE_DMR_RET_018_SUB_LBL() runs on AeSimu system CseSystem {
+					testcase TC_CSE_DMR_RET_018_SUB_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 	
 						v_ae1.start(f_CSE_DMR_RET_018(int23, m_createSubscriptionBase));//Subscription
 						v_ae1.done;
@@ -3496,6 +3996,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_DMR_RET_018(int29, m_createTimeSeriesBase));//TimeSeries
 						v_ae1.done;
 					}
@@ -3511,7 +4013,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_019_ACP_LBL_AT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 	
 						v_ae1.start(f_CSE_DMR_RET_019(int1, m_createAcpBase));//AccessControlPolicy
 						v_ae1.done;
@@ -3520,7 +4023,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_019_AE_LBL_AT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 	
 						v_ae1.start(f_CSE_DMR_RET_019(int2, m_createAe(PX_APP_ID)));//AE
 						v_ae1.done;
@@ -3529,7 +4033,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_019_CNT_LBL_AT() runs on Tester system CseSystem {
 						// Local variables
  						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                         
 						v_ae1.start(f_CSE_DMR_RET_019(int3, m_createContainerBase));//Container
 						v_ae1.done;
@@ -3538,7 +4043,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_019_GRP_LBL_AT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_ae1.start(f_CSE_DMR_RET_019(int9, m_createGroupBase));//Group
 						v_ae1.done;
@@ -3547,7 +4053,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_019_CSR_LBL_AT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 						v_ae1.start(f_CSE_DMR_RET_019(int16, m_createRemoteCSEBase));//RemoteCSE
 						v_ae1.done;
@@ -3556,7 +4063,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_019_SCH_LBL_AT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 	
 						v_ae1.start(f_CSE_DMR_RET_019(int18, m_createScheduleBase));//Schedule
 						v_ae1.done;
@@ -3565,7 +4073,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_019_SUB_LBL_AT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 	
 						v_ae1.start(f_CSE_DMR_RET_019(int23, m_createSubscriptionBase));//Subscription
 						v_ae1.done;
@@ -3575,6 +4084,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_DMR_RET_019(int29, m_createTimeSeriesBase));//TimeSeries
 						v_ae1.done;
 					}
@@ -3590,7 +4101,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_020_RCN_0() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_DMR_RET_020(int3, m_createContainerBase, int0));//ResultContent = 0 (nothing)
 						v_ae1.done;
 					}
@@ -3598,7 +4110,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_020_RCN_2() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_DMR_RET_020(int3, m_createContainerBase, int2));//ResultContent = 2 (hierarchical address)
 						v_ae1.done;
 					}
@@ -3606,7 +4119,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_020_RCN_3() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_DMR_RET_020(int3, m_createContainerBase, int3));//ResultContent = 3 (attributes and hierarchichal address)
 						v_ae1.done;
 					}
@@ -3624,7 +4138,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.container := mw_contentContainer_rc1;
 		                        
 						v_ae1.start(f_CSE_DMR_RET_021(int3, m_createContainerBase, v_contentResponse, int3, m_createContainerBase));//Container
@@ -3636,7 +4151,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.group_ := mw_contentGroup_rc1;
 		
 						v_ae1.start(f_CSE_DMR_RET_021(int9, m_createGroupBase, v_contentResponse, int23, m_createSubscriptionBase));//Group
@@ -3648,7 +4164,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.accessControlPolicy := mw_contentAcp_rc1;
 			
 						v_ae1.start(f_CSE_DMR_RET_021(int1, m_createAcpBase,v_contentResponse, int23, m_createSubscriptionBase));//AccessControlPolicy
@@ -3660,7 +4177,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.schedule := mw_contentSchedule_rc1;
 			
 						v_ae1.start(f_CSE_DMR_RET_021(int18, m_createScheduleBase, v_contentResponse, int23, m_createSubscriptionBase));//Schedule 
@@ -3672,7 +4190,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.pollingChannel := mw_contentPollingChannelBase;
 			
 						v_ae1.start(f_CSE_DMR_RET_021(int15, m_createPollingChannelBase, v_contentResponse, omit, omit));//PollingChannel
@@ -3684,7 +4203,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.subscription := mw_contentSubscription_rc1;
 
 						v_ae1.start(f_CSE_DMR_RET_021(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase));//Subscription
@@ -3696,6 +4216,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.timeSeries := mw_contentTimeSeries_rc1;
 
 						v_ae1.start(f_CSE_DMR_RET_021(int29, m_createTimeSeriesBase, v_contentResponse, int23, m_createSubscriptionBase));//TimeSeries
@@ -3715,7 +4237,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.container := mw_contentContainer_rc4;
 		                        
 						v_ae1.start(f_CSE_DMR_RET_022(int3, m_createContainerBase, v_contentResponse, int3, m_createContainerBase));//Container
@@ -3727,7 +4250,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.group_ := mw_contentGroup_rc4;
 		
 						v_ae1.start(f_CSE_DMR_RET_022(int9, m_createGroupBase, v_contentResponse, int23, m_createSubscriptionBase));//Group
@@ -3739,7 +4263,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.accessControlPolicy := mw_contentAcp_rc4;
 			
 						v_ae1.start(f_CSE_DMR_RET_022(int1, m_createAcpBase,v_contentResponse, int23, m_createSubscriptionBase));//AccessControlPolicy
@@ -3751,7 +4276,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.schedule := mw_contentSchedule_rc4;
 			
 						v_ae1.start(f_CSE_DMR_RET_022(int18, m_createScheduleBase, v_contentResponse, int23, m_createSubscriptionBase));//Schedule
@@ -3763,7 +4289,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.pollingChannel := mw_contentPollingChannelBase;
 			
 						v_ae1.start(f_CSE_DMR_RET_022(int15, m_createPollingChannelBase, v_contentResponse, omit, omit));//PollingChannel
@@ -3775,7 +4302,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.subscription := mw_contentSubscription_rc4;
 
 						v_ae1.start(f_CSE_DMR_RET_022(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase));//Subscription
@@ -3787,6 +4315,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.timeSeries := mw_contentTimeSeries_rc4;
 
 						v_ae1.start(f_CSE_DMR_RET_022(int29, m_createTimeSeriesBase, v_contentResponse, int23, m_createSubscriptionBase));//TimeSeries
@@ -3806,7 +4336,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.container := mw_contentContainer_rc5;
 		                        
 						v_ae1.start(f_CSE_DMR_RET_023(int3, m_createContainerBase, v_contentResponse, int3, m_createContainerBase));//Container
@@ -3818,7 +4349,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.group_ := mw_contentGroup_rc5;
 		
 						v_ae1.start(f_CSE_DMR_RET_023(int9, m_createGroupBase, v_contentResponse, int23, m_createSubscriptionBase));//Group
@@ -3830,7 +4362,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.accessControlPolicy := mw_contentAcp_rc5;
 			
 						v_ae1.start(f_CSE_DMR_RET_023(int1, m_createAcpBase,v_contentResponse, int23, m_createSubscriptionBase));//AccessControlPolicy
@@ -3842,7 +4375,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.schedule := mw_contentSchedule_rc5;
 			
 						v_ae1.start(f_CSE_DMR_RET_023(int18, m_createScheduleBase, v_contentResponse, int23, m_createSubscriptionBase));//Schedule 
@@ -3853,7 +4387,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.pollingChannel := mw_contentPollingChannelBase;
 			
 						v_ae1.start(f_CSE_DMR_RET_023(int15, m_createPollingChannelBase, v_contentResponse, omit, omit));//PollingChannel
@@ -3864,7 +4399,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.subscription := mw_contentSubscription_rc5;
 
 						v_ae1.start(f_CSE_DMR_RET_023(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase));//Subscription
@@ -3876,6 +4412,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.timeSeries := mw_contentTimeSeries_rc5;
 
 						v_ae1.start(f_CSE_DMR_RET_023(int29, m_createTimeSeriesBase, v_contentResponse, int23, m_createSubscriptionBase));//TimeSeries
@@ -3894,7 +4432,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.container := mw_contentContainer_rc6;
 		                        
 						v_ae1.start(f_CSE_DMR_RET_024(int3, m_createContainerBase, v_contentResponse, int3, m_createContainerBase));//Container
@@ -3905,7 +4444,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.group_ := mw_contentGroup_rc6;
 		
 						v_ae1.start(f_CSE_DMR_RET_024(int9, m_createGroupBase, v_contentResponse, int23, m_createSubscriptionBase));//Group
@@ -3916,7 +4456,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.accessControlPolicy := mw_contentAcp_rc6;
 			
 						v_ae1.start(f_CSE_DMR_RET_024(int1, m_createAcpBase,v_contentResponse, int23, m_createSubscriptionBase));//AccessControlPolicy
@@ -3927,18 +4468,21 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.schedule := mw_contentSchedule_rc6;
 			
 						v_ae1.start(f_CSE_DMR_RET_024(int18, m_createScheduleBase, v_contentResponse, int23, m_createSubscriptionBase));//Schedule
 						v_ae1.done;
 					}
 		
+					//Only Release 3
 					testcase TC_CSE_DMR_RET_024_PCH() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.pollingChannel := mw_contentPollingChannelBase;
 			
 						v_ae1.start(f_CSE_DMR_RET_024(int15, m_createPollingChannelBase, v_contentResponse, omit, omit));//PollingChannel
@@ -3949,7 +4493,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.subscription := mw_contentSubscription_rc6;
 
 						v_ae1.start(f_CSE_DMR_RET_024(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase));//Subscription
@@ -3961,6 +4506,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.timeSeries := mw_contentTimeSeries_rc6;
 
 						v_ae1.start(f_CSE_DMR_RET_024(int29, m_createTimeSeriesBase, v_contentResponse, int23, m_createSubscriptionBase));//TimeSeries
@@ -3979,7 +4526,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.container := mw_contentContainer_rc8;
 		                        
 						v_ae1.start(f_CSE_DMR_RET_025(int3, m_createContainerBase, v_contentResponse, int3, m_createContainerBase));//Container
@@ -3990,7 +4538,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.group_ := mw_contentGroup_rc8;
 		
 						v_ae1.start(f_CSE_DMR_RET_025(int9, m_createGroupBase, v_contentResponse, int23, m_createSubscriptionBase));//Group
@@ -4001,7 +4550,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.accessControlPolicy := mw_contentAcp_rc8;
 			
 						v_ae1.start(f_CSE_DMR_RET_025(int1, m_createAcpBase,v_contentResponse, int23, m_createSubscriptionBase));//AccessControlPolicy
@@ -4012,18 +4562,21 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.schedule := mw_contentSchedule_rc8;
 			
 						v_ae1.start(f_CSE_DMR_RET_025(int18, m_createScheduleBase, v_contentResponse, int23, m_createSubscriptionBase));//Schedule 
 						v_ae1.done;
 					}
 		
+					//Only Release 3
 					testcase TC_CSE_DMR_RET_025_PCH() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.pollingChannel := mw_contentPollingChannelBase;
 			
 						v_ae1.start(f_CSE_DMR_RET_025(int15, m_createPollingChannelBase, v_contentResponse, omit, omit));//PollingChannel
@@ -4034,7 +4587,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.subscription := mw_contentSubscription_rc8;
 
 						v_ae1.start(f_CSE_DMR_RET_025(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase));//Subscription
@@ -4046,6 +4600,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.timeSeries := mw_contentTimeSeries_rc8;
 
 						v_ae1.start(f_CSE_DMR_RET_025(int29, m_createTimeSeriesBase, v_contentResponse, int23, m_createSubscriptionBase));//TimeSeries
@@ -4072,7 +4628,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.schedule.labels := v_labels_1;
 						v_updateRequest.primitiveContent.schedule.labels := v_labels_2;
 
@@ -4113,7 +4670,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.pollingChannel.labels := v_labels_1;
 						v_updateRequest.primitiveContent.pollingChannel.labels := v_labels_2;
 
@@ -4153,6 +4711,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.timeSeries.labels := v_labels_1;
 						v_updateRequest.primitiveContent.timeSeries.labels := v_labels_2;
 
@@ -4197,7 +4757,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.schedule.labels := v_labels_1;
 						
 						v_ae1.start(f_CSE_DMR_UPD_002(int18, m_createScheduleBase,v_updateRequest));//Schedule
@@ -4234,7 +4795,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.pollingChannel.labels := v_labels_1;
 						
 						v_ae1.start(f_CSE_DMR_UPD_002(int15, m_createPollingChannelBase,v_updateRequest));//PollingChannel
@@ -4271,6 +4833,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.timeSeries.labels := v_labels_1;
 	
 						v_ae1.start(f_CSE_DMR_UPD_002(int29, m_createTimeSeriesBase,v_updateRequest));//TimeSeries
@@ -4317,7 +4881,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createScheduleBase;
 						var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.schedule.labels := v_labels_1;
 						v_updateRequest.primitiveContent.schedule.labels := v_labels_2;
 						
@@ -4361,7 +4926,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createPollingChannelBase;
 						var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.pollingChannel.labels := v_labels_1;
 						v_updateRequest.primitiveContent.pollingChannel.labels := v_labels_2;
 						
@@ -4406,6 +4972,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.timeSeries.labels := v_labels_1;
 						v_updateRequest.primitiveContent.timeSeries.labels := v_labels_2;
 	
@@ -4457,7 +5025,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.schedule.scheduleElement := {{"0 0 0,1,2 1 1 * *"}};//Attribute 1
 						v_updateRequest.primitiveContent.schedule.scheduleElement := {{"1 1 1,2 1 1 * *"}}; //Attribute 1
 						v_updateRequest.primitiveContent.schedule.announceTo := {f_getAnnouncementTargetPoA()};//Attribute 2
@@ -4508,56 +5077,6 @@ module OneM2M_Testcases_CSE_Release_2 {
 						}
 					}
 					
-					testcase TC_CSE_DMR_UPD_004_PCH_LBL_ACP_LBL() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var Labels v_labels_1 := {"VALUE_1"};
-						var Labels v_labels_2 := {"To be deleted"};
-						var AttributeAux_list v_nullFields;
-						var template RequestPrimitive v_createRequest := m_createPollingChannelBase;
-						var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
-						var ResponsePrimitive v_responsePrimitive;
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
-						v_createRequest.primitiveContent.pollingChannel.labels := v_labels_1;//Attribute 3
-						//No Attribute 1
-						//v_updateRequest.primitiveContent.pollingChannel.accessControlPolicyIDs := v_acp;//Attribute 2 TODO Find another alternative for Attribute 2
-						v_updateRequest.primitiveContent.pollingChannel.labels := v_labels_2;//Attribute 3
-						
-						v_nullFields := {{"labels", omit}};
-      						
-						v_ae1.start(f_CSE_DMR_UPD_004(int15, v_createRequest, v_updateRequest, v_nullFields));//PollingChannel
-						v_ae1.done;
-						
-						 
-																		
-						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							if(ispresent(v_responsePrimitive.primitiveContent)) {
-								if(ischosen(v_responsePrimitive.primitiveContent.pollingChannel)) {
-									//Check attribute 1
-        							
-									//Check attribute 2 TODO once another alternative is found, activate this checking
-									/*if(not match(v_responsePrimitive.primitiveContent.pollingChannel.accessControlPolicyIDs, valueof(v_updateRequest.primitiveContent.pollingChannel.accessControlPolicyIDs))){
-										setverdict(fail, __SCOPE__ & ": Error: ACPI attribute not added correctly")
-									}*/
-									//Check attribute 3
-									if(ispresent(v_responsePrimitive.primitiveContent.pollingChannel.labels)){
-										setverdict(fail, __SCOPE__ & ": Error: Labels attribute not deleted correctly")
-									}
-								}
-							}
-							
-							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
-							
-							//Check that the resource has been udpated correctly
-							  if(ischosen(v_primitiveContentRetrieveResource.pollingChannel)) {
-							   if(ispresent (v_primitiveContentRetrieveResource.pollingChannel.labels)){
-								setverdict(fail, __SCOPE__ & ": Error: Labels attribute not deleted correctly")
-								}
-							}
-						}
-					}
-					
 					testcase TC_CSE_DMR_UPD_004_TS_ET_MNI_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
@@ -4569,6 +5088,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AttributeAux_list v_nullFields;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.timeSeries.labels := v_labels_1;//Attribute 3
 						v_updateRequest.primitiveContent.timeSeries.expirationTime := "20301231T012345";//Attribute 1
 						v_updateRequest.primitiveContent.timeSeries.maxNrOfInstances := 5;//Attribute 2
@@ -4631,7 +5152,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var Labels v_labels_1 := {"VALUE_1"};
 						var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.schedule.labels := v_labels_1;
 										
 						v_ae1.start(f_CSE_DMR_UPD_006(int18, m_createScheduleBase, v_updateRequest));//Schedule
@@ -4648,30 +5170,6 @@ module OneM2M_Testcases_CSE_Release_2 {
 						}
 					}
 					
-					testcase TC_CSE_DMR_UPD_006_PCH_LBL() runs on Tester system CseSystem {
-						// Local variable
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var Labels v_labels_1 := {"VALUE_1"};
-						var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
-						v_updateRequest.primitiveContent.pollingChannel.labels := v_labels_1;
-							
-						v_ae1.start(f_CSE_DMR_UPD_006(int15, m_createPollingChannelBase, v_updateRequest));//PollingChannel
-						v_ae1.done;
-						
-						if(getverdict == pass){ 
-							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
-
-							//Check that the resource has NOT been udpated
-							  if(ischosen(v_primitiveContentRetrieveResource.pollingChannel)) {
-							   if(v_primitiveContentRetrieveResource.pollingChannel.labels == v_labels_1){
-								 setverdict(fail, __SCOPE__ & ": Error: Labels attribute updated")
-								}
-							}
-						}
-					}
-					
 					testcase TC_CSE_DMR_UPD_006_TS_LBL() runs on Tester system CseSystem {
 						// Local variable
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
@@ -4679,6 +5177,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.timeSeries.labels := v_labels_1;
 		
 						v_ae1.start(f_CSE_DMR_UPD_006(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
@@ -4696,8 +5196,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						}
 					}
 					
-				} // end g_CSE_DMR_UPD_006				
-								
+				} // end g_CSE_DMR_UPD_006
 				
 				group g_CSE_DMR_UPD_007{
 					
@@ -4711,7 +5210,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var Timestamp v_creationTime := "21001231T012345";
 						var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent := {schedule_update_invalid := m_contentUpdateSchedule_invalid};
 						v_updateRequest.primitiveContent.schedule_update_invalid.creationTime := v_creationTime;
 										
@@ -4735,7 +5235,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var Timestamp v_creationTime := "21001231T012345";
 						var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent := {pollingChannel_update_invalid := m_contentUpdatePollingChannel_invalid};
 						v_updateRequest.primitiveContent.pollingChannel_update_invalid.creationTime := v_creationTime;
 							
@@ -4760,6 +5261,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent := {timeSeries_update_invalid := m_contentUpdateTimeSeries_invalid};
 						v_updateRequest.primitiveContent.timeSeries_update_invalid.creationTime := v_creationTime;
 		
@@ -4792,7 +5295,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
 						var AttributeAux_list v_nullFields;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_nullFields := {{"expirationTime", omit}};
 						
 						v_updateRequest.primitiveContent.schedule.expirationTime := v_expirationTime;
@@ -4818,7 +5322,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
 						var AttributeAux_list v_nullFields;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_nullFields := {{"expirationTime", omit}};
 						
 						v_updateRequest.primitiveContent.pollingChannel.expirationTime := v_expirationTime;
@@ -4851,7 +5356,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var XSD.PositiveInteger v_expirationCounter := 1;
 						var template RequestPrimitive v_createRequest := m_createScheduleBase;
 						var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent := {schedule_update_invalid := m_contentUpdateSchedule_invalid};
 
 						v_updateRequest.primitiveContent.schedule_update_invalid.expirationCounter := v_expirationCounter;
@@ -4866,7 +5372,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var XSD.PositiveInteger v_expirationCounter := 1;
 						var template RequestPrimitive v_createRequest := m_createPollingChannelBase;
 						var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent := {pollingChannel_update_invalid := m_contentUpdatePollingChannel_invalid};
 						
 						v_updateRequest.primitiveContent.pollingChannel_update_invalid.expirationCounter := v_expirationCounter;
@@ -4882,6 +5389,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent := {timeSeries_update_invalid := m_contentUpdateTimeSeries_invalid};
 	
 						v_updateRequest.primitiveContent.timeSeries_update_invalid.expirationCounter := v_expirationCounter;
@@ -4906,6 +5415,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var Labels v_labels_1:= {"VALUE_1"};
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 						
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						
 						v_updateRequest.primitiveContent.container.labels := v_labels_1;
 		
 						v_ae1.start(f_CSE_DMR_UPD_010(int3, v_createRequest, v_updateRequest));//Container
@@ -4932,6 +5444,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var Labels v_labels_1:= {"VALUE_1"};
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 						
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.timeSeries.labels := v_labels_1;
 		
 						v_ae1.start(f_CSE_DMR_UPD_010(int29, v_createRequest, v_updateRequest));//TimeSeries
@@ -4967,6 +5481,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createChildRequest := m_createContentInstanceBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 		
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.contentInstance.labels := v_labels;
 
 						v_ae1.start(f_CSE_DMR_UPD_011(int3, v_createParentRequest, int4, v_createChildRequest, v_updateRequest));//ContentInstance under Container
@@ -4992,6 +5508,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createChildRequest := m_createTimeSeriesInstanceBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 		
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.timeSeriesInstance.labels := v_labels;
 
 						v_ae1.start(f_CSE_DMR_UPD_011(int29, v_createParentRequest, int30, v_createChildRequest, v_updateRequest));//TimeSeriesInstance under TimeSeries
@@ -5024,7 +5542,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createAcpBase;
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 						var ResponsePrimitive v_responsePrimitive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.accessControlPolicy.expirationTime := v_expirationTime_1;
 						v_updateRequest.primitiveContent.accessControlPolicy.expirationTime := v_expirationTime_2;
 
@@ -5055,7 +5574,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.container.expirationTime := v_expirationTime_1;
 						v_updateRequest.primitiveContent.container.expirationTime := v_expirationTime_2;
 
@@ -5085,7 +5605,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 	
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.container.ontologyRef := v_ontologyRef_1;
 						v_updateRequest.primitiveContent.container.ontologyRef := v_ontologyRef_2;
 	
@@ -5114,7 +5635,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.accessControlPolicyIDs := v_accessControlPolicyIDs_1;
 						v_updateRequest.primitiveContent.subscription.accessControlPolicyIDs := v_accessControlPolicyIDs_2;
 
@@ -5144,7 +5666,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.batchNotify := v_batchNotify_1;
 						v_updateRequest.primitiveContent.subscription.batchNotify := v_batchNotify_2;
 
@@ -5175,7 +5698,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.eventNotificationCriteria := v_eventNotificationCriteria_1;
 						v_updateRequest.primitiveContent.subscription.eventNotificationCriteria := v_eventNotificationCriteria_2;
 
@@ -5206,7 +5730,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.expirationTime := v_expirationTime_1;
 						v_updateRequest.primitiveContent.subscription.expirationTime := v_expirationTime_2;
 
@@ -5237,7 +5762,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.expirationCounter := v_expirationCounter_1;
 						v_updateRequest.primitiveContent.subscription.expirationCounter := v_expirationCounter_2;
 
@@ -5268,7 +5794,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.groupID := v_groupID_1;
 						v_updateRequest.primitiveContent.subscription.groupID := v_groupID_2;
 
@@ -5299,7 +5826,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.latestNotify := v_latestNotify_1;
 						v_updateRequest.primitiveContent.subscription.latestNotify := v_latestNotify_2;
 
@@ -5330,7 +5858,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.notificationContentType := v_notificationContentType_1;
 						v_updateRequest.primitiveContent.subscription.notificationContentType := v_notificationContentType_2;
 
@@ -5361,7 +5890,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.notificationEventCat := v_notificationEventCat_1;
 						v_updateRequest.primitiveContent.subscription.notificationEventCat := v_notificationEventCat_2;
 
@@ -5392,7 +5922,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.notificationForwardingURI := v_notificationForwardingURI_1;
 						v_updateRequest.primitiveContent.subscription.notificationForwardingURI := v_notificationForwardingURI_2;
 
@@ -5423,7 +5954,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.notificationStoragePriority := v_notificationStoragePriority_1;
 						v_updateRequest.primitiveContent.subscription.notificationStoragePriority := v_notificationStoragePriority_2;
 
@@ -5454,7 +5986,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.pendingNotification := v_pendingNotification_1;
 						v_updateRequest.primitiveContent.subscription.pendingNotification := v_pendingNotification_2;
 
@@ -5485,7 +6018,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.rateLimit := v_rateLimit_1;
 						v_updateRequest.primitiveContent.subscription.rateLimit := v_rateLimit_2;
 
@@ -5516,6 +6050,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
 						var ResponsePrimitive v_responsePrimitive;
 	
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.timeSeries.accessControlPolicyIDs := v_accessControlPolicyIDs_1;
 						v_updateRequest.primitiveContent.timeSeries.accessControlPolicyIDs := v_accessControlPolicyIDs_2;
 	
@@ -5544,6 +6080,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
 						var ResponsePrimitive v_responsePrimitive;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.timeSeries.labels := v_labels_1;
 						v_updateRequest.primitiveContent.timeSeries.labels := v_labels_2;
 
@@ -5569,10 +6107,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var XSD.NonNegativeInteger v_maxByteSize_1 := 256;
 						var XSD.NonNegativeInteger v_maxByteSize_2 := 512;
 						var ResponsePrimitive v_responsePrimitive;
-
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize_1;
 						v_updateRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize_2;
 
@@ -5597,10 +6136,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var XSD.NonNegativeInteger v_maxInstanceAge_1 := 60;
 						var XSD.NonNegativeInteger v_maxInstanceAge_2 := 120;
 						var ResponsePrimitive v_responsePrimitive;
-
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.timeSeries.maxInstanceAge := v_maxInstanceAge_1;
 						v_updateRequest.primitiveContent.timeSeries.maxInstanceAge := v_maxInstanceAge_2;
 
@@ -5629,6 +6169,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.timeSeries.maxNrOfInstances := v_maxNrOfInstances_1;
 						v_updateRequest.primitiveContent.timeSeries.maxNrOfInstances := v_maxNrOfInstances_2;
 
@@ -5657,6 +6199,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.timeSeries.periodicInterval := v_periodicInterval_1;
 						v_updateRequest.primitiveContent.timeSeries.periodicInterval := v_periodicInterval_2;
 
@@ -5685,6 +6229,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
 	
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.timeSeries.missingDataDetect := v_missingDataDetect_1;
 						v_updateRequest.primitiveContent.timeSeries.missingDataDetect := v_missingDataDetect_2;
 	
@@ -5713,6 +6259,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.timeSeries.missingDataMaxNr := v_missingDataMaxNr_1;
 						v_updateRequest.primitiveContent.timeSeries.missingDataMaxNr := v_missingDataMaxNr_2;
 
@@ -5741,6 +6289,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.timeSeries.missingDataDetectTimer := v_missingDataDetectTimer_1;
 						v_updateRequest.primitiveContent.timeSeries.missingDataDetectTimer := v_missingDataDetectTimer_2;
 
@@ -5769,6 +6319,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.timeSeries.ontologyRef := v_ontologyRef_1;
 						v_updateRequest.primitiveContent.timeSeries.ontologyRef := v_ontologyRef_2;
 
@@ -5801,7 +6353,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updateNodeBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.node.labels := v_labels;
 						
 						v_ae1.start(f_CSE_DMR_UPD_015(int9, m_createNodeBase, v_updateRequest));//Node
@@ -5814,7 +6367,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.node)) {
 									 if(v_responsePrimitive.primitiveContent.node.labels != v_labels){
-										 setverdict(fail, __SCOPE__, ": Error: Labels attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -5837,7 +6390,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 						
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_DMR_UPD_015(int9, m_createNodeBase, v_updateRequest, true));//Node
 						v_ae1.done;
 						
@@ -5851,7 +6405,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.node)) {
 									 if(v_responsePrimitive.primitiveContent.node.accessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.node.accessControlPolicyIDs)){
-										 setverdict(fail, __SCOPE__, ": Error: Access Control Policy attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Access Control Policy attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -5877,7 +6431,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updateAeBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.aE.ontologyRef := v_ontoLogyRef;
 						v_ae1.start(f_CSE_DMR_UPD_015(int2, m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM), v_updateRequest));//AE
 						v_ae1.done;
@@ -5889,7 +6444,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.aE)) {
 									 if(v_responsePrimitive.primitiveContent.aE.ontologyRef != v_ontoLogyRef){
-										 setverdict(fail, __SCOPE__, ": Error: Ontology Ref attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Ontology Ref attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -5911,7 +6466,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.container.ontologyRef := v_ontoLogyRef;
 						
 						v_ae1.start(f_CSE_DMR_UPD_015(int3, m_createContainerBase, v_updateRequest));//Container
@@ -5924,7 +6480,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.container)) {
 									 if(v_responsePrimitive.primitiveContent.container.ontologyRef != v_ontoLogyRef){
-										 setverdict(fail, __SCOPE__, ": Error: Ontology Ref attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Ontology Ref attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -5946,7 +6502,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.container.locationID := v_locationID;
 						
 						v_ae1.start(f_CSE_DMR_UPD_015(int3, m_createContainerBase, v_updateRequest));//Container
@@ -5959,7 +6516,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.container)) {
 									 if(v_responsePrimitive.primitiveContent.container.locationID != v_locationID){
-										 setverdict(fail, __SCOPE__, ": Error: Location ID attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Location ID attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -5981,7 +6538,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.subscription.eventNotificationCriteria:=v_eventNotificationCriteria ;
 						v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
 						v_ae1.done;
@@ -5993,7 +6551,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
 									 if(v_responsePrimitive.primitiveContent.subscription.eventNotificationCriteria != v_eventNotificationCriteria){
-										 setverdict(fail, __SCOPE__, ": Error: Event Notification Criteria attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Event Notification Criteria attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -6015,7 +6573,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.subscription.expirationCounter:=v_expirationCounter;
 						v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
 						v_ae1.done;
@@ -6027,7 +6586,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
 									 if(v_responsePrimitive.primitiveContent.subscription.expirationCounter != v_expirationCounter){
-										 setverdict(fail, __SCOPE__, ": Error: Expiration Counter attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Expiration Counter attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -6049,7 +6608,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.subscription.groupID:=v_groupID;
 						v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
 						v_ae1.done;
@@ -6061,7 +6621,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
 									 if(v_responsePrimitive.primitiveContent.subscription.groupID != v_groupID){
-										 setverdict(fail, __SCOPE__, ": Error: Group ID attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Group ID attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -6083,7 +6643,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.subscription.notificationForwardingURI:=v_notificationForwardingURI;
 						v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
 						v_ae1.done;
@@ -6095,7 +6656,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
 									 if(v_responsePrimitive.primitiveContent.subscription.notificationForwardingURI != v_notificationForwardingURI){
-										 setverdict(fail, __SCOPE__, ": Error: Notification Forwarding URI attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Notification Forwarding URI attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -6117,7 +6678,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.subscription.batchNotify:=v_batchNotify;
 						v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
 						v_ae1.done;
@@ -6129,7 +6691,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
 									 if(v_responsePrimitive.primitiveContent.subscription.batchNotify != v_batchNotify){
-										 setverdict(fail, __SCOPE__, ": Error: Batch Notify attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Batch Notify attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -6151,7 +6713,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.subscription.rateLimit:=v_rateLimit;
 						v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
 						v_ae1.done;
@@ -6163,7 +6726,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
 									 if(v_responsePrimitive.primitiveContent.subscription.rateLimit != v_rateLimit){
-										 setverdict(fail, __SCOPE__, ": Error: Rate Limit attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Rate Limit attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -6185,7 +6748,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.subscription.pendingNotification:=v_pendingNotification;
 						v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
 						v_ae1.done;
@@ -6197,7 +6761,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
 									 if(v_responsePrimitive.primitiveContent.subscription.pendingNotification != v_pendingNotification){
-										 setverdict(fail, __SCOPE__, ": Error: Pending Notification attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Pending Notification attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -6219,7 +6783,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.subscription.notificationStoragePriority:=v_notificationStoragePriority;
 						v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
 						v_ae1.done;
@@ -6231,7 +6796,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
 									 if(v_responsePrimitive.primitiveContent.subscription.notificationStoragePriority != v_notificationStoragePriority){
-										 setverdict(fail, __SCOPE__, ": Error: Notification Storage priority attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Notification Storage priority attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -6253,7 +6818,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.subscription.latestNotify:=v_latestNotify;
 						v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
 						v_ae1.done;
@@ -6265,7 +6831,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
 									 if(v_responsePrimitive.primitiveContent.subscription.latestNotify != v_latestNotify){
-										 setverdict(fail, __SCOPE__, ": Error: Latest Notify priority attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Latest Notify priority attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -6281,13 +6847,14 @@ module OneM2M_Testcases_CSE_Release_2 {
 					}
 					
 					testcase TC_CSE_DMR_UPD_015_SUB_NEC() runs on Tester system CseSystem {
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var EventCat v_eventCat:= {alt_1:= 300};
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 						
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.subscription.notificationEventCat:=v_eventCat;
 						v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
 						v_ae1.done;						 
@@ -6297,7 +6864,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
 									 if(v_responsePrimitive.primitiveContent.subscription.notificationEventCat != v_eventCat){
-										 setverdict(fail, __SCOPE__, ": Error: Notification Event Cat attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Notification Event Cat attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -6319,6 +6886,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 	
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest, true));//TimeSeries
 						v_ae1.done;	 
 
@@ -6351,6 +6920,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 	
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.timeSeries.labels := v_labels;
 	
 						v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
@@ -6383,6 +6954,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 	
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.timeSeries.maxNrOfInstances := v_maxNrOfInstances;
 	
 						v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
@@ -6415,6 +6988,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 	
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize;
 	
 						v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
@@ -6447,6 +7022,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 	
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.timeSeries.maxInstanceAge := v_maxInstanceAge;
 	
 						v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
@@ -6479,6 +7056,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.timeSeries.periodicInterval := v_periodicInterval;
 
 						v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
@@ -6511,6 +7090,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.timeSeries.missingDataDetect := v_missingDataDetect;
 
 						v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
@@ -6543,6 +7124,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.timeSeries.missingDataMaxNr := v_missingDataMaxNr;
 
 						v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
@@ -6575,6 +7158,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.timeSeries.missingDataDetectTimer := v_missingDataDetectTimer;
 
 						v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
@@ -6607,6 +7192,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 	
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.timeSeries.ontologyRef := v_ontoLogyRef;
 	
 						v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
@@ -6646,7 +7233,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updateNodeBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.node.expirationTime := v_expirationTime;
 						
 						v_ae1.start(f_CSE_DMR_UPD_016(int9, m_createNodeBase, v_updateRequest));//Node
@@ -6659,7 +7247,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.node)) {
 									if(v_responsePrimitive.primitiveContent.node.expirationTime != v_expirationTime){
-										setverdict(fail, __SCOPE__, ": Error: Expiration time attribute not updated correctly")
+										setverdict(fail, __SCOPE__ & ": Error: Expiration time attribute not updated correctly")
 									}
 								}
 							}
@@ -6681,7 +7269,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var XSD.Token v_targetId := "TARGET-ID";
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.node.nodeID := v_targetId;
 						
 						v_ae1.start(f_CSE_DMR_UPD_016(int9, m_createNodeBase, v_updateRequest));//Node
@@ -6694,7 +7283,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.node)) {
 									if(v_responsePrimitive.primitiveContent.node.nodeID != v_targetId){
-										setverdict(fail, __SCOPE__, ": Error: NodeID attribute not updated correctly")
+										setverdict(fail, __SCOPE__ & ": Error: NodeID attribute not updated correctly")
 									}
 								}
 							}
@@ -6716,6 +7305,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 	
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.timeSeries.expirationTime := v_expirationTime;
 	
 						v_ae1.start(f_CSE_DMR_UPD_016(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
@@ -6742,30 +7333,226 @@ module OneM2M_Testcases_CSE_Release_2 {
 					}
 					
 				} // end group g_CSE_DMR_UPD_016
-
-			}//end group Update
-			
-			group Delete {
-			
-				group g_CSE_DMR_DEL_001{
-
+				
+				group g_CSE_DMR_UPD_017 {
+				    
 					/**
-					 * @desc Check that the IUT accepts the deletion of a RESOURCE_TYPE resource
-					 * 
-					 */
-					testcase TC_CSE_DMR_DEL_001_SCH() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
-                
-						v_ae1.start(f_CSE_DMR_DEL_001(int18, m_createScheduleBase));//Schedule
-						v_ae1.done;
-					};
-                
-					testcase TC_CSE_DMR_DEL_001_PCH() runs on Tester system CseSystem {
+					 * @desc Check that the IUT updates successfully the value of the announceTo optional attribute of the RESOURCE_TYPE resource
+					*/
+					testcase TC_CSE_DMR_UPD_017_ACP() runs on Tester system CseSystem {
+						// Local variables
+						var MnCseSimu v_cse1 := MnCseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createAcpBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
+						var template RequestPrimitive v_updateRequest := m_updateAcpBase;	
+			
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						
+						v_updateRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};					
+			
+						v_cse1.start(f_CSE_DMR_UPD_017(int1, v_createRequest, v_createRequestAnnc, v_updateRequest));//AccessControlPolicy
+						v_cse1.done;
+					}
+					
+					testcase TC_CSE_DMR_UPD_017_CNT() runs on Tester system CseSystem {
+						// Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createContainerBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
+						var template RequestPrimitive v_updateRequest := m_updateContainerBase;	
+
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						
+						v_updateRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
+  
+						v_cse1.start(f_CSE_DMR_UPD_017(int3, v_createRequest, v_createRequestAnnc, v_updateRequest));//Container
+						v_cse1.done;
+					}
+
+					testcase TC_CSE_DMR_UPD_017_GRP() runs on Tester system CseSystem {
+						// Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createGroupBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
+						var template RequestPrimitive v_updateRequest := m_updateGroupBase;	
+
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_updateRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
+  
+						v_cse1.start(f_CSE_DMR_UPD_017(int9, v_createRequest, v_createRequestAnnc, v_updateRequest));//Group
+						v_cse1.done;
+					}
+					
+					testcase TC_CSE_DMR_UPD_017_SCH() runs on Tester system CseSystem {
+						// Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createScheduleBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createScheduleAnncBase;
+						var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
+
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_updateRequest.primitiveContent.schedule.announceTo := {PX_CSE1_ID};
+  
+						v_cse1.start(f_CSE_DMR_UPD_017(int18, v_createRequest, v_createRequestAnnc, v_updateRequest));//Schedule
+						v_cse1.done;
+					}
+					
+					testcase TC_CSE_DMR_UPD_017_TS() runs on Tester system CseSystem {
+						// Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
+
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_cse1.done;
+						v_updateRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
+  
+						v_cse1.start(f_CSE_DMR_UPD_017(int29, v_createRequest, v_createRequestAnnc, v_updateRequest));//TimeSeries
+						v_cse1.done;
+					}
+					
+					testcase TC_CSE_DMR_UPD_017_TSI() runs on Tester system CseSystem {
+						// Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnncBase;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesInstanceBase;
+
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_cse1.done;
+						v_updateRequest.primitiveContent.timeSeriesInstance.announceTo := {PX_CSE1_ID};
+  
+						v_cse1.start(f_CSE_DMR_UPD_017(int29, v_createRequest, v_createRequestAnnc, v_updateRequest));//TimeSeriesInstance
+						v_cse1.done;
+					}
+				  
+				} //end group g_CSE_DMR_UPD_017
+				
+				group g_CSE_DMR_UPD_018 {
+					
+					testcase TC_CSE_DMR_UPD_018_CNT_MBS() runs on Tester system CseSystem {
+						// Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createContainerBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
+						var template RequestPrimitive v_updateRequest := m_updateContainerBase;	
+						var template RequestPrimitive v_updateRequestAnnc := mw_updateContainerAnnc;
+						var XSD.NonNegativeInteger v_maxByteSize := 512;
+
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
+						v_createRequest.primitiveContent.container.maxByteSize := v_maxByteSize;	
+	
+						v_createRequestAnnc.primitiveContent.containerAnnc.maxByteSize := v_maxByteSize;
+	
+						v_updateRequest.primitiveContent.container.announcedAttribute := {"mbs"};
+	
+						v_updateRequestAnnc.primitiveContent.containerAnnc.maxByteSize := v_maxByteSize;
+  
+						v_cse1.start(f_CSE_DMR_UPD_018(int3, v_createRequest, v_createRequestAnnc, v_updateRequest, v_updateRequestAnnc));//Container
+						v_cse1.done;
+					}
+
+					testcase TC_CSE_DMR_UPD_018_GRP_MT() runs on Tester system CseSystem {
+						// Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createGroupBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
+						var template RequestPrimitive v_updateRequest := m_updateGroupBase;	
+						var template RequestPrimitive v_updateRequestAnnc := mw_updateGroupAnnc;
+						var MemberType v_memberType := int3;
+
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
+						v_createRequest.primitiveContent.group_.memberType := v_memberType;
+	
+						v_createRequestAnnc.primitiveContent.groupAnnc.memberType := v_memberType;
+	
+						v_updateRequest.primitiveContent.group_.announcedAttribute := {"mt"};
+	
+						v_updateRequestAnnc.primitiveContent.groupAnnc.memberType := v_memberType;
+  
+						v_cse1.start(f_CSE_DMR_UPD_018(int9, v_createRequest, v_createRequestAnnc, v_updateRequest, v_updateRequestAnnc));//Group
+						v_cse1.done;
+					}
+					
+					testcase TC_CSE_DMR_UPD_018_SCH_SE() runs on Tester system CseSystem {
+						// Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createGroupBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
+						var template RequestPrimitive v_updateRequest := m_updateGroupBase;	
+						var template RequestPrimitive v_updateRequestAnnc := mw_updateGroupAnnc;
+
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_createRequest.primitiveContent.schedule.announceTo := {PX_CSE1_ID};
+						v_createRequestAnnc.primitiveContent.scheduleAnnc.scheduleElement := {{"0 0 0,1,2 1 1 * *"}};//Attribute 1
+
+						v_updateRequest.primitiveContent.schedule.announcedAttribute := {"se"};
+						v_updateRequestAnnc.primitiveContent.scheduleAnnc.scheduleElement := {{"1 1 1,2 1 1 * *"}}; //Attribute 1
+  
+						v_cse1.start(f_CSE_DMR_UPD_018(int18, v_createRequest, v_createRequestAnnc, v_updateRequest, v_updateRequestAnnc));//Group
+						v_cse1.done;
+					}
+					
+					testcase TC_CSE_DMR_UPD_018_TS_MBS() runs on Tester system CseSystem {
+						// Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;	
+						var template RequestPrimitive v_updateRequestAnnc := mw_updateTimeSeriesAnnc;
+						var XSD.NonNegativeInteger v_maxByteSize := 512;
+
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_cse1.done;
+						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
+						v_createRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize;	
+
+						v_createRequestAnnc.primitiveContent.timeSeriesAnnc.maxByteSize := v_maxByteSize;
+
+						v_updateRequest.primitiveContent.timeSeries.announcedAttribute := {"mbs"};
+
+						v_updateRequestAnnc.primitiveContent.timeSeriesAnnc.maxByteSize := v_maxByteSize;
+  
+						v_cse1.start(f_CSE_DMR_UPD_018(int29, v_createRequest, v_createRequestAnnc, v_updateRequest, v_updateRequestAnnc));//TimeSeries
+						v_cse1.done;
+					}
+					
+				} //end group g_CSE_DMR_UPD_018
+			}//end group Update
+			
+			group Delete {
+			
+				group g_CSE_DMR_DEL_001{
+
+					/**
+					 * @desc Check that the IUT accepts the deletion of a RESOURCE_TYPE resource
+					 * 
+					 */
+					testcase TC_CSE_DMR_DEL_001_SCH() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+                
+						v_ae1.start(f_CSE_DMR_DEL_001(int18, m_createScheduleBase));//Schedule
+						v_ae1.done;
+					};
+                
+					testcase TC_CSE_DMR_DEL_001_PCH() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                 
 						v_ae1.start(f_CSE_DMR_DEL_001(int15, m_createPollingChannelBase));//PollingChannel
 						v_ae1.done;
@@ -6775,6 +7562,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_DMR_DEL_001(int29, m_createTimeSeriesBase));//TimeSeries
 						v_ae1.done;
 					};
@@ -6783,6 +7572,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_DMR_DEL_001(int30, m_createTimeSeriesInstanceBase));//TimeSeriesInstance
 						v_ae1.done;
 					};
@@ -6798,18 +7589,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_DEL_002_SCH() runs on Tester system CseSystem {
 						// Local variables
   						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
-                
-						v_ae1.start(f_CSE_DMR_DEL_002(int18, m_createScheduleBase));//Schedule
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
-					};
                 
-					testcase TC_CSE_DMR_DEL_002_PCH() runs on Tester system CseSystem {
-						// Local variables
- 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
-                
-						v_ae1.start(f_CSE_DMR_DEL_002(int15, m_createPollingChannelBase));//PollingChannel
+						v_ae1.start(f_CSE_DMR_DEL_002(int18, m_createScheduleBase));//Schedule
 						v_ae1.done;
 					};
 					
@@ -6817,6 +7600,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_DMR_DEL_002(int29, m_createTimeSeriesBase));//TimeSeries
 						v_ae1.done;
 					};
@@ -6832,7 +7617,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_DEL_003() runs on Tester system CseSystem {
 					
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 														
 						v_ae1.start(f_CSE_DMR_DEL_003());
 											  	  	
@@ -6903,7 +7689,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_DEL_004_CNT() runs on Tester system CseSystem {
 						// Local variables
  						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                 		
 						v_ae1.start(f_CSE_DMR_DEL_004(int3, m_createContainerBase, int3, m_createContainerBase));//Container
 						v_ae1.done;
@@ -6912,7 +7699,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_DEL_004_GRP() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                 		
 						v_ae1.start(f_CSE_DMR_DEL_004(int9, m_createGroupBase, int23, m_createSubscriptionBase));//Group
 						v_ae1.done;
@@ -6921,7 +7709,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_DEL_004_ACP() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                 
 						v_ae1.start(f_CSE_DMR_DEL_004(int1, m_createAcpBase, int23, m_createSubscriptionBase));//AccessControlPolicy
 						v_ae1.done;
@@ -6930,23 +7719,18 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_DEL_004_SCH() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                 
 						v_ae1.start(f_CSE_DMR_DEL_004(int18, m_createScheduleBase, int23, m_createSubscriptionBase));//Schedule
 						v_ae1.done;
 					};
-                
-					testcase TC_CSE_DMR_DEL_004_PCH() runs on Tester system CseSystem {
-						// Local variables
-						// don't exist pollingChannel's child resource
-						//v_ae1.start(f_CSE_DMR_DEL_004(int15, m_createPollingChannelBase, int23, m_createSubscriptionBase);//PollingChannel  TODO ResourceType needed is PollingChannelURI
-//						v_ae1.done;
-					};
-                
+                        
 					testcase TC_CSE_DMR_DEL_004_SUB() runs on Tester system CseSystem {
 							// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                 
 						v_ae1.start(f_CSE_DMR_DEL_004(int23, m_createSubscriptionBase, int18, m_createScheduleBase));//Subscription
 						v_ae1.done;
@@ -6956,6 +7740,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_DMR_DEL_004(int29, m_createTimeSeriesBase, int23, m_createSubscriptionBase));//TimeSeries
 						v_ae1.done;
 					};	
@@ -6973,6 +7759,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 		
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_DMR_DEL_005(int3, m_createContainerBase, int3, m_createContainerBase));//Container
 						v_ae1.done;
 						
@@ -6994,6 +7782,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 		
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_DMR_DEL_005(int29, m_createTimeSeriesBase, int30, m_createTimeSeriesInstanceBase));//TimeSeries
 						v_ae1.done;
 						
@@ -7022,6 +7812,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_DMR_DEL_006(int3, m_createContainerBase, int4, m_createContentInstanceBase));//ContentInstance under Container
 						v_ae1.done;
 	
@@ -7031,6 +7823,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_DMR_DEL_006(int29, m_createTimeSeriesBase, int30, m_createTimeSeriesInstanceBase));//TimeSeriesInstance under TimeSeries
 						v_ae1.done;
 						
@@ -7047,7 +7841,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_DEL_008() runs on Tester system CseSystem {
 					
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 														
 						v_ae1.start(f_CSE_DMR_DEL_008());
 											  	  	
@@ -7116,7 +7911,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_DEL_010() runs on Tester system CseSystem {
 					
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 														
 						v_ae1.start(f_CSE_DMR_DEL_010());
 											  	  	
@@ -7186,7 +7982,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 			 testcase TC_CSE_LOC_001() runs on Tester system CseSystem {
 					
 				 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 																
 				 v_ae1.start(f_CSE_LOC_001());
 													  	  	
@@ -7255,7 +8052,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 			testcase TC_CSE_LOC_002() runs on Tester system CseSystem {
 					
 				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 																	
 				v_ae1.start(f_CSE_LOC_002());
 														  	  	
@@ -7331,7 +8129,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 			testcase TC_CSE_LOC_003() runs on Tester system CseSystem {
 					
 				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 																	
 				v_ae1.start(f_CSE_LOC_003());
 														  	  	
@@ -7412,7 +8211,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 			testcase TC_CSE_LOC_004() runs on Tester system CseSystem {
 					
 				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 																	
 				v_ae1.start(f_CSE_LOC_004());
 														  	  	
@@ -7484,7 +8284,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 			testcase TC_CSE_LOC_005() runs on Tester system CseSystem {
 					
 				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 																	
 				v_ae1.start(f_CSE_LOC_005());
 														  	  	
@@ -7557,7 +8358,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 			testcase TC_CSE_LOC_006() runs on Tester system CseSystem {
 					
 				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 																	
 				v_ae1.start(f_CSE_LOC_006());
 														  	  	
@@ -7634,7 +8436,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 			testcase TC_CSE_LOC_007() runs on Tester system CseSystem {
 					
 				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 																	
 				v_ae1.start(f_CSE_LOC_007());
 														  	  	
@@ -7713,7 +8516,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 			testcase TC_CSE_LOC_008() runs on Tester system CseSystem {
 					
 				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 																	
 				v_ae1.start(f_CSE_LOC_008());
 														  	  	
@@ -7791,7 +8595,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 			testcase TC_CSE_LOC_009_01() runs on Tester system CseSystem {
 					
 				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 																	
 				v_ae1.start(f_CSE_LOC_009_01());
 														  	  	
@@ -7866,7 +8671,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 			testcase TC_CSE_LOC_BV_009_02() runs on Tester system CseSystem {
 					
 				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 																	
 				v_ae1.start(f_CSE_LOC_009_02());
 														  	  	
@@ -7940,7 +8746,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 			testcase TC_CSE_LOC_009_03() runs on Tester system CseSystem {
 					
 				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 																	
 				v_ae1.start(f_CSE_LOC_009_03());
 														  	  	
@@ -8028,7 +8835,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 			testcase TC_CSE_LOC_012() runs on Tester system CseSystem {
 					
 				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 																	
 				v_ae1.start(f_CSE_LOC_012());
 														  	  	
@@ -8099,7 +8907,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 			testcase TC_CSE_LOC_013() runs on Tester system CseSystem {
 					
 				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 																	
 				v_ae1.start(f_CSE_LOC_013());
 														  	  	
@@ -8187,6 +8996,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						const XSD.String c_content := "Random Value";	
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_childResourceRequest.primitiveContent.contentInstance.content := "Random Value";
 
 						v_ae1.start(f_CSE_SUB_CRE_001(int3, v_parentResourceRequest, int4, v_childResourceRequest));		
@@ -8199,6 +9010,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_SUB_CRE_001(int23, v_parentResourceRequest, int23, v_parentResourceRequest));		
 						v_ae1.done;
 					}
@@ -8211,6 +9024,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						const XSD.String c_content := "Random Value";	
 	
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_childResourceRequest.primitiveContent.timeSeriesInstance.content := "Random Value";
 	
 						v_ae1.start(f_CSE_SUB_CRE_001(int29, v_parentResourceRequest, int30, v_childResourceRequest));		
@@ -8230,7 +9045,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 				testcase TC_CSE_SUB_NTF_001() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 														
 					v_ae1.start(f_CSE_SUB_NTF_001());
 											  	  	
@@ -8306,7 +9122,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 				testcase TC_CSE_SUB_NTF_002() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 															
 					v_ae1.start(f_CSE_SUB_NTF_002());
 												  	  	
@@ -8382,7 +9199,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 				testcase TC_CSE_SUB_NTF_003() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 															
 					v_ae1.start(f_CSE_SUB_NTF_003());
 												  	  	
@@ -8431,12 +9249,12 @@ module OneM2M_Testcases_CSE_Release_2 {
 					vc_ae2.start(f_cse_notifyProcedure_aggregatedNoficationHandler(v_contentResponse, c_numberOfAggregatedNotification)); 
 
 					v_updateRequest.primitiveContent.aE.labels := v_labels_1;
-					f_cse_updateResource(int2, v_aeIndex, v_updateRequest);		// Update request 1
+					f_cse_updateResource(int2, v_aeIndex, v_updateRequest); // Update request 1
 					t_batchNotificationTimer.start;					
 					
 					v_updateRequest := m_updateAeBase;
 					v_updateRequest.primitiveContent.aE.appName := "MyAppName2"; 
-					f_cse_updateResource(int2, v_aeIndex, v_updateRequest);	// Update request 2
+					f_cse_updateResource(int2, v_aeIndex, v_updateRequest); // Update request 2
 
 					vc_ae2.done;
 					v_elapsedTime := t_batchNotificationTimer.read;
@@ -8467,7 +9285,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 				testcase TC_CSE_SUB_UPD_002() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 															
 					v_ae1.start(f_CSE_SUB_UPD_002());
 												  	  	
@@ -8555,7 +9374,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 				testcase TC_CSE_SUB_UPD_003() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 																
 					v_ae1.start(f_CSE_SUB_UPD_003());
 													  	  	
@@ -8639,7 +9459,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 				testcase TC_CSE_SUB_UPD_004() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 																
 					v_ae1.start(f_CSE_SUB_UPD_004());
 													  	  	
@@ -8734,7 +9555,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 				testcase TC_CSE_SUB_UPD_005() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 																
 					v_ae1.start(f_CSE_SUB_UPD_005());
 													  	  	
@@ -8821,7 +9643,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 				testcase TC_CSE_SUB_UPD_006() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 																
 					v_ae1.start(f_CSE_SUB_UPD_006());
 													  	  	
@@ -8905,7 +9728,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 				testcase TC_CSE_SUB_UPD_007() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 																
 					v_ae1.start(f_CSE_SUB_UPD_007());
 													  	  	
@@ -8978,7 +9802,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 				testcase TC_CSE_SUB_UPD_008() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 																
 					v_ae1.start(f_CSE_SUB_UPD_008());
 													  	  	
@@ -9055,7 +9880,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 				testcase TC_CSE_SUB_UPD_009() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 																
 					v_ae1.start(f_CSE_SUB_UPD_009());
 													  	  	
@@ -9147,7 +9973,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 				testcase TC_CSE_SUB_DEL_002() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 																
 					v_ae1.start(f_CSE_SUB_DEL_002());
 													  	  	
@@ -9231,7 +10058,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 				testcase TC_CSE_SUB_DEL_003() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 																
 					v_ae1.start(f_CSE_SUB_DEL_003());
 													  	  	
@@ -9336,14 +10164,19 @@ module OneM2M_Testcases_CSE_Release_2 {
 			group Basic {
 		
 				group g_CSE_ANNC_001 {
-			
+
+					/**
+					 * @desc Check that the IUT provides confirmation of the announcement of a resource to the originator of the initiating request after a successful resource announcement procedure
+					 *  
+					 */
 					testcase TC_CSE_ANNC_001_ACP_UPD() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
                   
 						v_ae1.start(f_CSE_ANNC_001(int1, v_createRequestAnnc, omit, v_updateRequest));//AccessControlPolicy
@@ -9356,7 +10189,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						
 						var template RequestPrimitive v_createRequest := m_createAcpBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
   
 						v_ae1.start(f_CSE_ANNC_001(int1, v_createRequestAnnc, v_createRequest, omit));//AccessControlPolicy
@@ -9369,7 +10203,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
   
 						v_ae1.start(f_CSE_ANNC_001(int3, v_createRequestAnnc, omit, v_updateRequest));//Container
@@ -9382,7 +10217,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
   
 						v_ae1.start(f_CSE_ANNC_001(int3, v_createRequestAnnc, v_createRequest, omit));//Container
@@ -9395,7 +10231,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
   
 						v_ae1.start(f_CSE_ANNC_001(int9, v_createRequestAnnc, omit, v_updateRequest));//Group
@@ -9408,7 +10245,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
   
 						v_ae1.start(f_CSE_ANNC_001(int9, v_createRequestAnnc, v_createRequest, omit));//Group
@@ -9421,7 +10259,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						
 						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnncBase;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};
   
 						v_ae1.start(f_CSE_ANNC_001(int4, v_createRequestAnnc, v_createRequest, omit));//ContentInstance
@@ -9434,6 +10273,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
   
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
   
 						v_ae1.start(f_CSE_ANNC_001(int29, v_createRequestAnnc, omit, v_updateRequest));//TimeSeries
@@ -9446,6 +10287,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
   
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
   
 						v_ae1.start(f_CSE_ANNC_001(int29, v_createRequestAnnc, v_createRequest, omit));//TimeSeries
@@ -9458,6 +10301,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnncBase;
   
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.timeSeriesInstance.announceTo := {PX_CSE1_ID};
   
 						v_ae1.start(f_CSE_ANNC_001(int30, v_createRequestAnnc, v_createRequest, omit));//TimeSeriesInstance
@@ -9472,12 +10317,18 @@ module OneM2M_Testcases_CSE_Release_2 {
 				
 				group g_CSE_ANNC_CRE_001 {
 					
+					/**
+					 * @desc Check that the accessControlPolicyIDs attribute is announced when accessControlPolicyIDs attribute of the original resource is not present
+					 *  
+					 */
 					testcase TC_CSE_ANNC_CRE_001() runs on Tester system CseSystem {
 						//Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
-												
+											
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;	
 						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
 						
 						v_ae1.start(f_CSE_ANNC_CRE_001(int3, v_createRequestAnnc, v_createRequest));//Container
@@ -9488,15 +10339,22 @@ module OneM2M_Testcases_CSE_Release_2 {
 				
 				group g_CSE_ANNC_CRE_002 {
 					
+					/**
+					 * @desc Check that the IUT announces successfully the RESOURCE_TYPE resource when a new CSE-ID is provided in announcedTo optional attribute and IUT having not been announced to announcement target CSE
+					 *  
+					 */
 					testcase TC_CSE_ANNC_CRE_002_ACP() runs on Tester system CseSystem {
 						// Local variables
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
+						var template RequestPrimitive v_createRequest := m_createAcpBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
+						
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_updateRequest.primitiveContent.accessControlPolicy.announceTo := {"/CSE2_ID"};
   
-						v_updateRequest.primitiveContent.accessControlPolicy.announceTo := {f_getAnnouncementTargetPoA()};
-  
-						v_cse1.start(f_CSE_ANNC_CRE_002(int1, v_createRequestAnnc, v_updateRequest));//AccessControlPolicy
+						v_cse1.start(f_CSE_ANNC_CRE_002(int1, v_createRequest, v_updateRequest, v_createRequestAnnc));//AccessControlPolicy
 						v_cse1.done;
 					}
 
@@ -9504,11 +10362,14 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
+						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
+						
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_updateRequest.primitiveContent.container.announceTo := {"/CSE2_ID"};
   
-						v_updateRequest.primitiveContent.container.announceTo := {f_getAnnouncementTargetPoA()};
-  
-						v_cse1.start(f_CSE_ANNC_CRE_002(int3, v_createRequestAnnc, v_updateRequest));//Container
+						v_cse1.start(f_CSE_ANNC_CRE_002(int3, v_createRequest, v_updateRequest, v_createRequestAnnc));//Container
 						v_cse1.done;
 					}
 
@@ -9516,11 +10377,14 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
+						var template RequestPrimitive v_createRequest := m_createGroupBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
+						
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_updateRequest.primitiveContent.group_.announceTo := {"/CSE2_ID"};
   
-						v_updateRequest.primitiveContent.group_.announceTo := {f_getAnnouncementTargetPoA()};
-  
-						v_cse1.start(f_CSE_ANNC_CRE_002(int9, v_createRequestAnnc, v_updateRequest));//Group
+						v_cse1.start(f_CSE_ANNC_CRE_002(int9, v_createRequest, v_updateRequest, v_createRequestAnnc));//Group
 						v_cse1.done;
 					}
 					
@@ -9528,23 +10392,32 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
   
-						v_updateRequest.primitiveContent.timeSeries.announceTo := {f_getAnnouncementTargetPoA()};
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_updateRequest.primitiveContent.timeSeries.announceTo := {"/CSE2_ID"};
   
-						v_cse1.start(f_CSE_ANNC_CRE_002(int29, v_createRequestAnnc, v_updateRequest));//TimeSeries
+						v_cse1.start(f_CSE_ANNC_CRE_002(int29, v_createRequest, v_updateRequest, v_createRequestAnnc));//TimeSeries
 						v_cse1.done;
 					}
 				} //end group g_CSE_ANNC_CRE_002
 				
 				group g_CSE_ANNC_CRE_003 {
 					
+					/**
+					 * @desc Host CSE of original resource removes an announcement target CSE from the announceTo attribute if it does not return successful CREATE response for the announced resource (for a CREATE initiating resource announcement)
+					 *  
+					 */
 					testcase TC_CSE_ANNC_CRE_003() runs on Tester system CseSystem {
 						//Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnnc;
 							
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};
 	
 						v_ae1.start(f_CSE_ANNC_CRE_003(int4, v_createRequestAnnc, v_createRequest));//ContentInstance
@@ -9556,12 +10429,18 @@ module OneM2M_Testcases_CSE_Release_2 {
 				
 				group g_CSE_ANNC_CRE_004 {
 					
+					/**
+					 * @desc Check that the IUT announces successfully the RESOURCE_TYPE resource during its creation when announceTo optional attribute is provided and its parent resource having been announced to the announcement target CSE
+					 *  
+					 */
 					testcase TC_CSE_ANNC_CRE_004_ACP() runs on Tester system CseSystem {
 						// Local variables
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template RequestPrimitive v_createRequest := m_createAcpBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
   
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
   
 						v_cse1.start(f_CSE_ANNC_CRE_004_CseSimu(int1, v_createRequestAnnc, v_createRequest));//AccessControlPolicy
@@ -9574,6 +10453,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
   
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
   
 						v_cse1.start(f_CSE_ANNC_CRE_004_CseSimu(int3, v_createRequestAnnc, v_createRequest));//Container
@@ -9586,6 +10467,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnnc;
   
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};
   
 						v_cse1.start(f_CSE_ANNC_CRE_004_CseSimu(int4, v_createRequestAnnc, v_createRequest));//ContentInstance
@@ -9598,6 +10481,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
   
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
   
 						v_cse1.start(f_CSE_ANNC_CRE_004_CseSimu(int9, v_createRequestAnnc, v_createRequest));//Group
@@ -9610,6 +10495,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
   
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
   
 						v_cse1.start(f_CSE_ANNC_CRE_004_CseSimu(int29, v_createRequestAnnc, v_createRequest));//TimeSeries
@@ -9620,13 +10507,19 @@ module OneM2M_Testcases_CSE_Release_2 {
 				
 				group g_CSE_ANNC_CRE_005 {
 					
+					/**
+					 * @desc Check that the IUT announces successfully the RESOURCE_TYPE resource during its creation when announceTo optional attribute is provided and IUT having been already announced to announcement target CSE
+					 *  
+					 */
 					testcase TC_CSE_ANNC_CRE_005_ACP() runs on Tester system CseSystem {
 						//Local variables
 						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						 var template RequestPrimitive v_createRequest := m_createAcpBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
 	  
-						 v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
+						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						 v_createRequest.primitiveContent.accessControlPolicy.announceTo := {"/CSE2_ID"};
 	  
 						 v_cse1.start(f_CSE_ANNC_CRE_005_CseSimu(int1, v_createRequestAnnc, v_createRequest));//AccessControlPolicy
 						 v_cse1.done;
@@ -9638,7 +10531,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createContainerBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
   
-						 v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
+						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						 v_createRequest.primitiveContent.container.announceTo := {"/CSE2_ID"};
   
 						 v_cse1.start(f_CSE_ANNC_CRE_005_CseSimu(int3, v_createRequestAnnc, v_createRequest));//Container
 						 v_cse1.done;
@@ -9650,6 +10545,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnnc;
   
+						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						 v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};
   
 						 v_cse1.start(f_CSE_ANNC_CRE_005_CseSimu(int4, v_createRequestAnnc, v_createRequest));//ContentInstance
@@ -9663,7 +10560,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createGroupBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
   
-						 v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
+						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						 v_createRequest.primitiveContent.group_.announceTo := {"/CSE2_ID"};
   
 						 v_cse1.start(f_CSE_ANNC_CRE_005_CseSimu(int9, v_createRequestAnnc, v_createRequest));//Group
 						 v_cse1.done;
@@ -9675,7 +10574,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
   
-						 v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						 v_createRequest.primitiveContent.timeSeries.announceTo := {"/CSE2_ID"};
   
 						 v_cse1.start(f_CSE_ANNC_CRE_005_CseSimu(int29, v_createRequestAnnc, v_createRequest));//TimeSeries
 						 v_cse1.done;
@@ -9687,7 +10588,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnncBase;
   
-						 v_createRequest.primitiveContent.timeSeriesInstance.announceTo := {PX_CSE1_ID};
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						 v_createRequest.primitiveContent.timeSeriesInstance.announceTo := {"/CSE2_ID"};
   
 						 v_cse1.start(f_CSE_ANNC_CRE_005_CseSimu(int30, v_createRequestAnnc, v_createRequest));//TimeSeriesInstance
 						 v_cse1.done;
@@ -9697,12 +10600,18 @@ module OneM2M_Testcases_CSE_Release_2 {
 				
 				group g_CSE_ANNC_CRE_006 {
 					
+					/**
+					 * @desc Check that the IUT announces successfully the RESOURCE_TYPE resource during its creation when announceTo optional attribute is provided and IUT has registered and created a <remoteCSE> resource to the announcement target CSE
+					 *  
+					 */
 					testcase TC_CSE_ANNC_CRE_006_ACP() runs on Tester system CseSystem {
 						//Local variables
 						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						 var template RequestPrimitive v_createRequest := m_createAcpBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
   
+						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						 v_cse1.done;
 						 v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
   
 						 v_cse1.start(f_CSE_ANNC_CRE_006_CseSimu(int1, v_createRequestAnnc, v_createRequest));//AccessControlPolicy
@@ -9715,6 +10624,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createContainerBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
   
+						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						 v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
   
 						 v_cse1.start(f_CSE_ANNC_CRE_006_CseSimu(int3, v_createRequestAnnc, v_createRequest));//Container
@@ -9727,6 +10638,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnnc;
   
+						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						 v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};
   
 						 v_cse1.start(f_CSE_ANNC_CRE_006_CseSimu(int4, v_createRequestAnnc, v_createRequest));//ContentInstance
@@ -9740,6 +10653,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createGroupBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
   
+						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						 v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
   
 						 v_cse1.start(f_CSE_ANNC_CRE_006_CseSimu(int9, v_createRequestAnnc, v_createRequest));//Group
@@ -9752,6 +10667,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
 	  
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						 v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
 	  
 						 v_cse1.start(f_CSE_ANNC_CRE_006_CseSimu(int29, v_createRequestAnnc, v_createRequest));//TimeSeries
@@ -9764,6 +10681,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnncBase;
   
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						 v_createRequest.primitiveContent.timeSeriesInstance.announceTo := {PX_CSE1_ID};
   
 						 v_cse1.start(f_CSE_ANNC_CRE_006_CseSimu(int30, v_createRequestAnnc, v_createRequest));//TimeSeriesInstance
@@ -9774,13 +10693,19 @@ module OneM2M_Testcases_CSE_Release_2 {
 				
 				group g_CSE_ANNC_CRE_007 {
 					
+					/**
+					 * @desc Check that the IUT announces successfully the RESOURCE_TYPE resource during its creation when announceTo optional attribute is provided and IUT having not been announced to announcement target CSE
+					 *  
+					 */
 					testcase TC_CSE_ANNC_CRE_007_ACP() runs on Tester system CseSystem {
 						//Local variables
 						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						 var template RequestPrimitive v_createRequest := m_createAcpBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
 	  
-						 v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
+						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						 v_cse1.done;
+						 v_createRequest.primitiveContent.accessControlPolicy.announceTo := {"/CSE2_ID"};
 	  
 						 v_cse1.start(f_CSE_ANNC_CRE_007_CseSimu(int1, v_createRequestAnnc, v_createRequest));//AccessControlPolicy
 						 v_cse1.done;
@@ -9792,7 +10717,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createContainerBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
 	  
-						 v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
+						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						 v_cse1.done;
+						 v_createRequest.primitiveContent.container.announceTo := {"/CSE2_ID"};
 	  
 						 v_cse1.start(f_CSE_ANNC_CRE_007_CseSimu(int3, v_createRequestAnnc, v_createRequest));//Container
 						 v_cse1.done;
@@ -9804,7 +10731,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnnc;
 	  
-						 v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};
+						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						 v_cse1.done;
+						 v_createRequest.primitiveContent.contentInstance.announceTo := {"/CSE2_ID"};
 	  
 						 v_cse1.start(f_CSE_ANNC_CRE_007_CseSimu(int4, v_createRequestAnnc, v_createRequest));//ContentInstance
 						 v_cse1.done;
@@ -9817,7 +10746,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createGroupBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
 	  
-						 v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
+						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						 v_cse1.done;
+						 v_createRequest.primitiveContent.group_.announceTo := {"/CSE2_ID"};
 	  
 						 v_cse1.start(f_CSE_ANNC_CRE_007_CseSimu(int9, v_createRequestAnnc, v_createRequest));//Group
 						 v_cse1.done;
@@ -9829,8 +10760,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
   
-						 v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
-  
+						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						 v_cse1.done;
+						 v_createRequest.primitiveContent.accessControlPolicy.announceTo := {"/CSE2_ID"};
+						 
 						 v_cse1.start(f_CSE_ANNC_CRE_007_CseSimu(int29, v_createRequestAnnc, v_createRequest));//TimeSeries
 						 v_cse1.done;
 					}
@@ -9840,8 +10773,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						 var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnncBase;
-  
-						 v_createRequest.primitiveContent.timeSeriesInstance.announceTo := {PX_CSE1_ID};
+						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						 v_cse1.done;
+						 
+						 v_createRequest.primitiveContent.timeSeriesInstance.announceTo := {"/CSE2_ID"};
   
 						 v_cse1.start(f_CSE_ANNC_CRE_007_CseSimu(int30, v_createRequestAnnc, v_createRequest));//TimeSeriesInstance
 						 v_cse1.done;
@@ -9851,57 +10786,57 @@ module OneM2M_Testcases_CSE_Release_2 {
 				
 				group g_CSE_ANNC_CRE_008 {
 					
-					testcase TC_CSE_ANNC_CRE_008_ACP_MBS() runs on Tester system CseSystem {
-						//Local variables
-						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						 var template RequestPrimitive v_createRequest := m_createAcpBase;
-						 var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
-  
-						 v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
-						 v_createRequest.primitiveContent.accessControlPolicy.announcedAttribute := {"maxByteSize"};
-  
-						 v_cse1.start(f_CSE_ANNC_CRE_008_CseSimu(int1, v_createRequestAnnc, v_createRequest));//AccessControlPolicy
-						 v_cse1.done;
-					}
-
-					testcase TC_CSE_ANNC_CRE_007_CNT_CNF() runs on Tester system CseSystem {
+					/**
+					 * @desc Check that the IUT announces successfully the RESOURCE_TYPE resource during its creation when announceTo and announcedAttribute optional attributes are provided and its parent resource having been announced to the announcement target CSE
+					 *  
+					 */
+					testcase TC_CSE_ANNC_CRE_008_CNT_MBS() runs on Tester system CseSystem {
 						//Local variables
 						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						 var template RequestPrimitive v_createRequest := m_createContainerBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
   
+						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						 v_cse1.done;
 						 v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
-						 v_createRequest.primitiveContent.container.announcedAttribute := {"contentInfo"};
-  
+						 v_createRequest.primitiveContent.container.announcedAttribute := {"mbs"};
+						 v_createRequestAnnc.primitiveContent.containerAnnc.maxByteSize := ?;
+						 
 						 v_cse1.start(f_CSE_ANNC_CRE_008_CseSimu(int3, v_createRequestAnnc, v_createRequest));//Container
 						 v_cse1.done;
 					}
 
-					testcase TC_CSE_ANNC_CRE_007_CIN_MT() runs on Tester system CseSystem {
+					testcase TC_CSE_ANNC_CRE_008_CIN_CNF() runs on Tester system CseSystem {
 						//Local variables
 						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						 var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnnc;
   
+						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						 v_cse1.done;
 						 v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};
-						 v_createRequest.primitiveContent.container.announcedAttribute := {"memberType"};
-  
+						 v_createRequest.primitiveContent.contentInstance.announcedAttribute := {"cnf"};
+						 v_createRequestAnnc.primitiveContent.contentInstanceAnnc.contentInfo:= ?;
+						 
 						 v_cse1.start(f_CSE_ANNC_CRE_008_CseSimu(int4, v_createRequestAnnc, v_createRequest));//ContentInstance
 						 v_cse1.done;
-
 					}
 
-					testcase TC_CSE_ANNC_CRE_007_GRP_LOI() runs on Tester system CseSystem {
+					testcase TC_CSE_ANNC_CRE_008_GRP_MT() runs on Tester system CseSystem {
 						//Local variables
 						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						 var template RequestPrimitive v_createRequest := m_createGroupBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
   
+						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						 v_cse1.done;
 						 v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
-						 v_createRequest.primitiveContent.container.announcedAttribute := {"locationContainerID"};
-   
+						 v_createRequest.primitiveContent.group_.announcedAttribute := {"mt"};
+						 v_createRequestAnnc.primitiveContent.groupAnnc.memberType:= ?;
+						 
 						 v_cse1.start(f_CSE_ANNC_CRE_008_CseSimu(int9, v_createRequestAnnc, v_createRequest));//Group
 						 v_cse1.done;
+
 					}
 					
 					testcase TC_CSE_ANNC_CRE_008_TS_MBS() runs on Tester system CseSystem {
@@ -9909,10 +10844,13 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						 var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
-  
+						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						 v_cse1.done;
+						 
 						 v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
-						 v_createRequest.primitiveContent.timeSeries.announcedAttribute := {"maxByteSize"};
-  
+						 v_createRequest.primitiveContent.timeSeries.announcedAttribute := {"mbs"};
+						 v_createRequestAnnc.primitiveContent.timeSeriesAnnc.maxByteSize := ?;
+						 
 						 v_cse1.start(f_CSE_ANNC_CRE_008_CseSimu(int29, v_createRequestAnnc, v_createRequest));//TimeSeries
 						 v_cse1.done;
 					}
@@ -9923,9 +10861,12 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnncBase;
 	  
+						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						 v_cse1.done;
 						 v_createRequest.primitiveContent.timeSeriesInstance.announceTo := {PX_CSE1_ID};
-						 v_createRequest.primitiveContent.timeSeriesInstance.announcedAttribute := {"contentSize"};
-	  
+						 v_createRequest.primitiveContent.timeSeriesInstance.announcedAttribute := {"cs"};
+						 v_createRequestAnnc.primitiveContent.timeSeriesInstanceAnnc.contentSize := ?;
+						 
 						 v_cse1.start(f_CSE_ANNC_CRE_008_CseSimu(int30, v_createRequestAnnc, v_createRequest));//TimeSeriesInstance
 						 v_cse1.done;
 					}
@@ -9934,14 +10875,21 @@ module OneM2M_Testcases_CSE_Release_2 {
 				
 				group g_CSE_ANNC_CRE_009 {
 					
+					/**
+					 * @desc Check that the labels attribute is announced when such attribute is present in the original resource
+					 *  
+					 */
 					testcase TC_CSE_ANNC_CRE_009_CNT() runs on Tester system CseSystem {
 						//Local variables
 						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						 var template RequestPrimitive v_createRequest := m_createContainerBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
-	  
+	    				 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						 v_cse1.done;
+						 
 						 v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
 						 v_createRequest.primitiveContent.container.labels := {"MyLabel"};
+						 v_createRequestAnnc.primitiveContent.containerAnnc.labels := ?;
 	  
 						 v_cse1.start(f_CSE_ANNC_CRE_009_CseSimu(int3, v_createRequestAnnc, v_createRequest));//Container
 						 v_cse1.done;
@@ -9953,12 +10901,18 @@ module OneM2M_Testcases_CSE_Release_2 {
 				
 				group g_CSE_ANNC_RET_001 {
 					
+					/**
+					 * @desc Host of <resourceAnnc> returns the <resourceAnnc> representation in a RETRIEVE response
+					 *  
+					 */
 					testcase TC_CSE_ANNC_RET_001_ACP() runs on Tester system CseSystem {
 						//Local variables
 						 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						 var template RequestPrimitive v_createRequest := m_createAcpBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
   
+						 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						 v_ae1.start(f_CSE_ANNC_RET_001(int1, v_createRequestAnnc, v_createRequest));//AccessControlPolicy
 						 v_ae1.done;
 					}
@@ -9969,6 +10923,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createContainerBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
 	  
+						 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						 v_ae1.start(f_CSE_ANNC_RET_001(int3, v_createRequestAnnc, v_createRequest));//Container
 						 v_ae1.done;
 					}
@@ -9979,6 +10935,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnnc;
   
+						 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						 v_ae1.start(f_CSE_ANNC_RET_001(int4, v_createRequestAnnc, v_createRequest));//ContentInstance
 						 v_ae1.done;
 					}
@@ -9989,6 +10947,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createGroupBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
   
+						 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						 v_ae1.start(f_CSE_ANNC_RET_001(int9, v_createRequestAnnc, v_createRequest));//Group
 						 v_ae1.done;
 					}
@@ -9999,6 +10959,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
   
+						 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						 v_ae1.start(f_CSE_ANNC_RET_001(int29, v_createRequestAnnc, v_createRequest));//TimeSeries
 						 v_ae1.done;
 					}
@@ -10009,6 +10971,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnncBase;
   
+						 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						 v_ae1.start(f_CSE_ANNC_RET_001(int30, v_createRequestAnnc, v_createRequest));//TimeSeriesInstance
 						 v_ae1.done;
 					}
@@ -10017,12 +10981,18 @@ module OneM2M_Testcases_CSE_Release_2 {
 				
 				group g_CSE_ANNC_RET_002 {
 					
+					/**
+					 * @desc Host of <resourceAnnc> returns the original <resource> representation from the original resource hosting CSE in a RETRIEVE response when result content is set to “original-resource”
+					 *  
+					 */
 					testcase TC_CSE_ANNC_RET_002_ACP() runs on Tester system CseSystem {
 						//Local variables
 						 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						 var template RequestPrimitive v_createRequest := m_createAcpBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
   
+						 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						 v_ae1.start(f_CSE_ANNC_RET_002(int1, v_createRequestAnnc, v_createRequest));//AccessControlPolicy
 						 v_ae1.done;
 					}
@@ -10033,6 +11003,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createContainerBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
 	  
+						 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						 v_ae1.start(f_CSE_ANNC_RET_002(int3, v_createRequestAnnc, v_createRequest));//Container
 						 v_ae1.done;
 					}
@@ -10043,6 +11015,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnnc;
   
+						 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						 v_ae1.start(f_CSE_ANNC_RET_002(int4, v_createRequestAnnc, v_createRequest));//ContentInstance
 						 v_ae1.done;
 					}
@@ -10053,6 +11027,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createGroupBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
   
+						 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						 v_ae1.start(f_CSE_ANNC_RET_002(int9, v_createRequestAnnc, v_createRequest));//Group
 						 v_ae1.done;
 					}
@@ -10063,6 +11039,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
 	  
+						 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						 v_ae1.start(f_CSE_ANNC_RET_002(int29, v_createRequestAnnc, v_createRequest));//TimeSeries
 						 v_ae1.done;
 					}
@@ -10073,6 +11051,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnncBase;
   
+						 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						 v_ae1.start(f_CSE_ANNC_RET_002(int30, v_createRequestAnnc, v_createRequest));//TimeSeriesInstance
 						 v_ae1.done;
 					}
@@ -10085,6 +11065,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 
 				group g_CSE_ANNC_UPD_001{
 
+					/**
+					 * @desc Check that the IUT announces successfully the RESOURCE_TYPE resource when a new CSE-ID is provided in announcedTo optional attribute and its parent resource having been announced to the announcement target CSE
+					 *  
+					 */
 					testcase TC_CSE_ANNC_UPD_001_ACP() runs on Tester system CseSystem {
 						// Local variables
 						var MnCseSimu v_cse1 := MnCseSimu.create("CSE1") alive;
@@ -10092,6 +11076,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;	
 			
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_updateRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};					
 			
 						v_cse1.start(f_CSE_ANNC_UPD_001(int1, v_createRequest, v_createRequestAnnc, v_updateRequest));//AccessControlPolicy
@@ -10105,6 +11091,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;	
 			
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_updateRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
   
 						v_cse1.start(f_CSE_ANNC_UPD_001(int3, v_createRequest, v_createRequestAnnc, v_updateRequest));//Container
@@ -10118,6 +11106,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;	
 			
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_updateRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
   
 						v_cse1.start(f_CSE_ANNC_UPD_001(int9, v_createRequest, v_createRequestAnnc, v_updateRequest));//Group
@@ -10130,7 +11120,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;	
-
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_updateRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
   
 						v_cse1.start(f_CSE_ANNC_UPD_001(int29, v_createRequest, v_createRequestAnnc, v_updateRequest));//TimeSeries
@@ -10141,6 +11135,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 	
 				group g_CSE_ANNC_UPD_002{
 
+					/**
+					 * @desc Check that the IUT initiates de-announcement of the RESOURCE_TYPE resource when a CSE-ID is deleted from the announceTo optional attribute
+					 *  
+					 */
 					testcase TC_CSE_ANNC_UPD_002_ACP() runs on Tester system CseSystem {
 						// Local variables
 						var MnCseSimu v_cse1 := MnCseSimu.create("CSE1") alive;
@@ -10150,6 +11148,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AttributeAux_list v_nullFields;
 						var ListOfURIs v_announceTo := {"To be deleted"};
 
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};		
 						
 						v_updateRequest.primitiveContent.accessControlPolicy.announceTo := v_announceTo;
@@ -10168,6 +11168,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AttributeAux_list v_nullFields;
 						var ListOfURIs v_announceTo := {"To be deleted"};
 
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
 						
 						v_updateRequest.primitiveContent.container.announceTo := v_announceTo;
@@ -10186,6 +11188,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AttributeAux_list v_nullFields;
 						var ListOfURIs v_announceTo := {"To be deleted"};
 
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
 						
 						v_updateRequest.primitiveContent.group_.announceTo := v_announceTo;
@@ -10203,7 +11207,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;	
 						var AttributeAux_list v_nullFields;
 						var ListOfURIs v_announceTo := {"To be deleted"};
-
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
 	
 						v_updateRequest.primitiveContent.timeSeries.announceTo := v_announceTo;
@@ -10217,6 +11225,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 	
 				group g_CSE_ANNC_UPD_003{
 
+					/**
+					 * @desc Check that the IUT provides confirmation of resource de-announcement to the originator of the initiating request after a successful resource de-announcement procedure originator (for an UPDATE initiating resource de-announcement)
+					 *  
+					 */
 					testcase TC_CSE_ANNC_UPD_003_ACP() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
@@ -10228,6 +11240,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ListOfURIs v_announceTo := {"To be deleted"};
 						var PrimitiveContent v_primitiveContentRetrieveResource;
   
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
 						
 						v_updateRequest.primitiveContent.accessControlPolicy.announceTo := v_announceTo;
@@ -10269,6 +11283,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ListOfURIs v_announceTo := {"To be deleted"};
 						var PrimitiveContent v_primitiveContentRetrieveResource;
   
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
 						
 						v_updateRequest.primitiveContent.container.announceTo := v_announceTo;
@@ -10310,6 +11326,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ListOfURIs v_announceTo := {"To be deleted"};
 						var PrimitiveContent v_primitiveContentRetrieveResource;
   
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
 						
 						v_updateRequest.primitiveContent.group_.announceTo := v_announceTo;
@@ -10350,6 +11368,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ListOfURIs v_announceTo := {"To be deleted"};
 						var PrimitiveContent v_primitiveContentRetrieveResource;
   
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
 	
 						v_updateRequest.primitiveContent.timeSeries.announceTo := v_announceTo;
@@ -10383,6 +11403,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 				
 				group g_CSE_ANNC_UPD_004 {
 		
+					/**
+					 * @desc HOST CSE of original resource returns INVALID response if announcedAttributes contains an attribute that is not marked OA
+					 *  
+					 */
 					testcase TC_CSE_ANNC_UPD_004_ACP() runs on Tester system CseSystem {
 						// Local variables
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
@@ -10390,6 +11414,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;	
 
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_updateRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
 						v_updateRequest.primitiveContent.accessControlPolicy.announcedAttribute := {"ToBeDeleted"};
 						v_updateRequest.primitiveContent.accessControlPolicy.parentID := PX_CSE1_ID;			
@@ -10405,6 +11431,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_updateRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
 						v_updateRequest.primitiveContent.container.announcedAttribute := {"ToBeDeleted"};
 						v_updateRequest.primitiveContent.container.parentID := PX_CSE1_ID;
@@ -10420,6 +11448,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;	
 
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_updateRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
 						v_updateRequest.primitiveContent.group_.announcedAttribute := {"ToBeDeleted"};
 						v_updateRequest.primitiveContent.group_.parentID := PX_CSE1_ID;
@@ -10434,7 +11464,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;	
-
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_updateRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
 						v_updateRequest.primitiveContent.timeSeries.announcedAttribute := {"ToBeDeleted"};
 						v_updateRequest.primitiveContent.timeSeries.parentID := PX_CSE1_ID;
@@ -10446,6 +11480,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 	
 				group g_CSE_ANNC_UPD_005 {
 		
+					/**
+					 * @desc Check that the labels attribute is de-announced when such attribute is deleted from the original resource
+					 *  
+					 */
 					testcase TC_CSE_ANNC_UPD_005() runs on Tester system CseSystem {
 						// Local variables
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
@@ -10458,6 +11496,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AttributeAux_list v_nullFields;
 						var Labels v_labels_2 := {"To be deleted"};	
 
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.container.labels := v_labels_1;
 						
@@ -10484,6 +11524,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 				
 				group g_CSE_ANNC_UPD_006 {
 					
+					/**
+					 * @desc Check that the IUT announces successfully the RESOURCE_TYPE resource when a new CSE-ID is provided in announcedTo optional attribute and IUT having been already announced to announcement target CSE
+					 *  
+					 */
 					testcase TC_CSE_ANNC_UPD_006_ACP() runs on Tester system CseSystem {
 						//Local variables
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
@@ -10491,6 +11535,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 						
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_updateRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
 						
 						v_cse1.start(f_CSE_ANNC_UPD_006(int1, v_createRequest, v_createRequestAnnc, v_updateRequest));//AccessControlPolicy
@@ -10504,6 +11550,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 	
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_updateRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
 	
 						v_cse1.start(f_CSE_ANNC_UPD_006(int3, v_createRequest, v_createRequestAnnc, v_updateRequest));//Container
@@ -10517,6 +11565,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_updateRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
 
 						v_cse1.start(f_CSE_ANNC_UPD_006(int9, v_createRequest, v_createRequestAnnc, v_updateRequest));//Group
@@ -10529,7 +11579,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
-
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_updateRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
 
 						v_cse1.start(f_CSE_ANNC_UPD_006(int29, v_createRequest, v_createRequestAnnc, v_updateRequest));//TimeSeries
@@ -10539,6 +11593,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 				
 				group g_CSE_ANNC_UPD_007 {
 					
+					/**
+					 * @desc Check that the IUT announces successfully the RESOURCE_TYPE resource when a new CSE-ID is provided in announcedTo optional attribute and IUT has registered and created a <remoteCSE> resource to the announcement target CSE
+					 *  
+					 */
 					testcase TC_CSE_ANNC_UPD_007_ACP() runs on Tester system CseSystem {
 						//Local variables
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
@@ -10546,6 +11604,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 	
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_updateRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
 	
 						v_cse1.start(f_CSE_ANNC_UPD_007(int1, v_createRequest, v_createRequestAnnc, v_updateRequest));//AccessControlPolicy
@@ -10559,6 +11619,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_updateRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
 
 						v_cse1.start(f_CSE_ANNC_UPD_007(int3, v_createRequest, v_createRequestAnnc, v_updateRequest));//Container
@@ -10572,6 +11634,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_updateRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
 
 						v_cse1.start(f_CSE_ANNC_UPD_007(int9, v_createRequest, v_createRequestAnnc, v_updateRequest));//Group
@@ -10584,7 +11648,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
-
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_updateRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
 
 						v_cse1.start(f_CSE_ANNC_UPD_007(int29, v_createRequest, v_createRequestAnnc, v_updateRequest));//TimeSeries
@@ -10594,6 +11659,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 				
 				group g_CSE_ANNC_UPD_008 {
 					
+					/**
+					 * @desc Check that the IUT provides confirmation of the announcement of an attribute to the originator of the initiating request after a successful attribute announcement procedure
+					 *  
+					 */
 					testcase TC_CSE_ANNC_UPD_008_CNT_MBS() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
@@ -10606,11 +11675,13 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 						var XSD.NonNegativeInteger v_maxByteSize := 512;
   
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.container.maxByteSize := v_maxByteSize;
 						v_createRequest.primitiveContent.container.announcedAttribute := v_announcedAttribute;
 
-						v_updateRequest.primitiveContent.container.announcedAttribute := {"maxByteSize"};
+						v_updateRequest.primitiveContent.container.announcedAttribute := {"mbs"};
   
 						v_ae1.start(f_CSE_ANNC_UPD_008(int3, v_createRequestAnnc, v_createRequest, v_updateRequest));//Container
 						v_ae1.done;
@@ -10652,11 +11723,13 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 						var MemberType v_memberType := int3;
   
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.group_.memberType := v_memberType;
 						v_createRequest.primitiveContent.group_.announcedAttribute := v_announcedAttribute;
 
-						v_updateRequest.primitiveContent.group_.announcedAttribute := {"memberType"};
+						v_updateRequest.primitiveContent.group_.announcedAttribute := {"mt"};
   
 						v_ae1.start(f_CSE_ANNC_UPD_008(int9, v_createRequestAnnc, v_createRequest, v_updateRequest));//Group
 						v_ae1.done;
@@ -10698,11 +11771,13 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 						var XSD.NonNegativeInteger v_maxByteSize := 512;
   
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize;
 						v_createRequest.primitiveContent.timeSeries.announcedAttribute := v_announcedAttribute;
 
-						v_updateRequest.primitiveContent.timeSeries.announcedAttribute := {"maxByteSize"};
+						v_updateRequest.primitiveContent.timeSeries.announcedAttribute := {"mbs"};
   
 						v_ae1.start(f_CSE_ANNC_UPD_008(int29, v_createRequestAnnc, v_createRequest, v_updateRequest));//TimeSeries
 						v_ae1.done;
@@ -10735,6 +11810,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 				
 				group g_CSE_ANNC_UPD_009{
 
+					/**
+					 * @desc Check that the IUT updates successfully RESOURCE_TYPE announced variant resource when a new OA attribute is provided to announcedAttribute attribute of the original resource
+					 *  
+					 */
 					testcase TC_CSE_ANNC_UPD_009_CNT_MBS() runs on Tester system CseSystem {
 						// Local variables
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
@@ -10744,12 +11823,14 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequestAnnc := mw_updateContainerAnnc;
 						var XSD.NonNegativeInteger v_maxByteSize := 512;
 
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.container.maxByteSize := v_maxByteSize;	
 						
 						v_createRequestAnnc.primitiveContent.containerAnnc.maxByteSize := v_maxByteSize;
 						
-						v_updateRequest.primitiveContent.container.announcedAttribute := {"maxByteSize"};
+						v_updateRequest.primitiveContent.container.announcedAttribute := {"mbs"};
 						
 						v_updateRequestAnnc.primitiveContent.containerAnnc.maxByteSize := v_maxByteSize;
   
@@ -10766,12 +11847,14 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequestAnnc := mw_updateGroupAnnc;
 						var MemberType v_memberType := int3;
 
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.group_.memberType := v_memberType;
 						
 						v_createRequestAnnc.primitiveContent.groupAnnc.memberType := v_memberType;
 						
-						v_updateRequest.primitiveContent.group_.announcedAttribute := {"memberType"};
+						v_updateRequest.primitiveContent.group_.announcedAttribute := {"mt"};
 						
 						v_updateRequestAnnc.primitiveContent.groupAnnc.memberType := v_memberType;
   
@@ -10787,13 +11870,17 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;	
 						var template RequestPrimitive v_updateRequestAnnc := mw_updateTimeSeriesAnnc;
 						var XSD.NonNegativeInteger v_maxByteSize := 512;
-
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize;	
 	
 						v_createRequestAnnc.primitiveContent.timeSeriesAnnc.maxByteSize := v_maxByteSize;
 	
-						v_updateRequest.primitiveContent.timeSeries.announcedAttribute := {"maxByteSize"};
+						v_updateRequest.primitiveContent.timeSeries.announcedAttribute := {"mbs"};
 	
 						v_updateRequestAnnc.primitiveContent.timeSeriesAnnc.maxByteSize := v_maxByteSize;
   
@@ -10805,6 +11892,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 				
 				group g_CSE_ANNC_UPD_010{
 					
+					/**
+					 * @desc Check that the IUT updates successfully the RESOURCE_TYPE announced variant resource when a MA attribute of its original resource is updated.
+					 *  
+					 */
 					testcase TC_CSE_ANNC_UPD_010_ACP() runs on Tester system CseSystem {
 						// Local variables
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
@@ -10815,6 +11906,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var Timestamp v_expirationTime_1 := "21001231T012345";
 						var Timestamp v_expirationTime_2 := "21101231T012345";
 
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.accessControlPolicy.expirationTime := v_expirationTime_1;	
 
@@ -10838,6 +11931,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var Timestamp v_expirationTime_1 := "21001231T012345";
 						var Timestamp v_expirationTime_2 := "21101231T012345";
 
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.container.expirationTime := v_expirationTime_1;	
 		
@@ -10861,6 +11956,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var Timestamp v_expirationTime_1 := "21001231T012345";
 						var Timestamp v_expirationTime_2 := "21101231T012345";
 
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.group_.expirationTime := v_expirationTime_1;
 		
@@ -10883,7 +11980,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequestAnnc := mw_updateTimeSeriesAnnc;
 						var Timestamp v_expirationTime_1 := "21001231T012345";
 						var Timestamp v_expirationTime_2 := "21101231T012345";
-
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.timeSeries.expirationTime := v_expirationTime_1;
 
@@ -10901,6 +12002,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 				
 				group g_CSE_ANNC_UPD_011{
 
+					/**
+					 * @desc Check that the IUT updates successfully the RESOURCE_TYPE announced variant resource when a optional attribute present in the announcedAttribute attribute of its original resource is updated.
+					 *  
+					 */
 					testcase TC_CSE_ANNC_UPD_011_CNT_MBS() runs on Tester system CseSystem {
 						// Local variables
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
@@ -10911,9 +12016,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var XSD.NonNegativeInteger v_maxByteSize_1 := 512;
 						var XSD.NonNegativeInteger v_maxByteSize_2 := 1024;
 
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.container.maxByteSize := v_maxByteSize_1;
-						v_createRequest.primitiveContent.container.announcedAttribute := {"maxByteSize"};	
+						v_createRequest.primitiveContent.container.announcedAttribute := {"mbs"};	
 		
 						v_createRequestAnnc.primitiveContent.containerAnnc.maxByteSize := v_maxByteSize_1;
 		
@@ -10935,9 +12042,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var MemberType v_memberType_1 := int3;
 						var MemberType v_memberType_2 := int4;
 
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.group_.memberType := v_memberType_1;
-						v_createRequest.primitiveContent.group_.announcedAttribute := {"memberType"};
+						v_createRequest.primitiveContent.group_.announcedAttribute := {"mt"};
 		
 						v_createRequestAnnc.primitiveContent.groupAnnc.memberType := v_memberType_1;
 		
@@ -10958,10 +12067,14 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequestAnnc := mw_updateTimeSeriesAnnc;
 						var XSD.NonNegativeInteger v_maxByteSize_1 := 512;
 						var XSD.NonNegativeInteger v_maxByteSize_2 := 1024;
-
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize_1;
-						v_createRequest.primitiveContent.timeSeries.announcedAttribute := {"maxByteSize"};	
+						v_createRequest.primitiveContent.timeSeries.announcedAttribute := {"mbs"};	
 
 						v_createRequestAnnc.primitiveContent.timeSeriesAnnc.maxByteSize := v_maxByteSize_1;
 
@@ -10977,6 +12090,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 				
 				group g_CSE_ANNC_UPD_012{
 
+					/**
+					 * @desc Check that the IUT de-announces successfully an announced attribute when such attribute is deleted from announcedAttribute attribute.
+					 *  
+					 */
 					testcase TC_CSE_ANNC_UPD_012_CNT_MBS() runs on Tester system CseSystem {
 						// Local variables
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
@@ -10989,9 +12106,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AttributeAux_list v_nullFields;
 						var ListOfNCNames v_announcedAttribute := {"ToBeDeleted"};
 
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.container.maxByteSize := v_maxByteSize;
-						v_createRequest.primitiveContent.container.announcedAttribute := {"maxByteSize"};	
+						v_createRequest.primitiveContent.container.announcedAttribute := {"mbs"};	
 
 						v_createRequestAnnc.primitiveContent.containerAnnc.maxByteSize := v_maxByteSize;
 						
@@ -11027,9 +12146,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AttributeAux_list v_nullFields;
 						var ListOfNCNames v_announcedAttribute := {"ToBeDeleted"};
 
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.group_.memberType := v_memberType;
-						v_createRequest.primitiveContent.group_.announcedAttribute := {"memberType"};
+						v_createRequest.primitiveContent.group_.announcedAttribute := {"mt"};
 
 						v_createRequestAnnc.primitiveContent.groupAnnc.memberType := v_memberType;
 
@@ -11063,10 +12184,14 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var XSD.NonNegativeInteger v_maxByteSize := 512;
 						var AttributeAux_list v_nullFields;
 						var ListOfNCNames v_announcedAttribute := {"ToBeDeleted"};
-
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize;
-						v_createRequest.primitiveContent.timeSeries.announcedAttribute := {"maxByteSize"};	
+						v_createRequest.primitiveContent.timeSeries.announcedAttribute := {"mbs"};	
 
 						v_createRequestAnnc.primitiveContent.timeSeriesAnnc.maxByteSize := v_maxByteSize;
 	
@@ -11094,6 +12219,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 				
 				group g_CSE_ANNC_UPD_013{
 	
+					/**
+					 * @desc Check that the IUT provides confirmation of the de-announcement of an attribute to the originator of the initiating request after a successful attribute de-announcement procedure
+					 *  
+					 */
 					testcase TC_CSE_ANNC_UPD_013_CNT_MBS() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
@@ -11106,9 +12235,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 						var XSD.NonNegativeInteger v_maxByteSize := 512;
 	  
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.container.maxByteSize := v_maxByteSize;
-						v_createRequest.primitiveContent.container.announcedAttribute := {"maxByteSize"};
+						v_createRequest.primitiveContent.container.announcedAttribute := {"mbs"};
 		
 						v_updateRequest.primitiveContent.container.announcedAttribute := v_announcedAttribute;
 						v_nullFields := {{"announcedAttribute", omit}};
@@ -11150,9 +12281,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 						var MemberType v_memberType := int3;
 	  
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.group_.memberType := v_memberType;
-						v_createRequest.primitiveContent.group_.announcedAttribute := {"memberType"};
+						v_createRequest.primitiveContent.group_.announcedAttribute := {"mt"};
 		
 						v_updateRequest.primitiveContent.group_.announcedAttribute := v_announcedAttribute;
 						v_nullFields := {{"announcedAttribute", omit}};
@@ -11193,9 +12326,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 						var XSD.NonNegativeInteger v_maxByteSize := 512;
   
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize;
-						v_createRequest.primitiveContent.timeSeries.announcedAttribute := {"maxByteSize"};
+						v_createRequest.primitiveContent.timeSeries.announcedAttribute := {"mbs"};
 
 						v_updateRequest.primitiveContent.container.announcedAttribute := v_announcedAttribute;
 						v_nullFields := {{"announcedAttribute", omit}};
@@ -11229,6 +12364,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 				
 				group g_CSE_ANNC_UPD_014{
 					
+					/**
+					 * @desc Host CSE of original resource removes an announcement target CSE from the announceTo attribute if it does not return successful CREATE response for the announced resource (for an UPDATE initiating resource announcement)
+					 *  
+					 */
 					testcase TC_CSE_ANNC_UPD_014_CNT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
@@ -11237,6 +12376,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;	
 						var ResponsePrimitive v_responsePrimitive;	
 						 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
   
 						v_ae1.start(f_CSE_ANNC_UPD_014(int3, v_createRequestAnnc, v_createRequest, v_updateRequest));//Container
@@ -11260,12 +12401,18 @@ module OneM2M_Testcases_CSE_Release_2 {
 				
 				group g_CSE_ANNC_DEL_001{
 		
+					/**
+					 * @desc Check that the IUT provides confirmation of resource de-announcement to the originator of the initiating request after a successful resource de-announcement procedure (for a DELETE initiating resource de-announcement)
+					 *  
+					 */
 					testcase TC_CSE_ANNC_DEL_001_ACP() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createAcpBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
   
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
   
 						v_ae1.start(f_CSE_ANNC_DEL_001(int1, v_createRequestAnnc, v_createRequest));//AccessControlPolicy
@@ -11278,6 +12425,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
   
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
   
 						v_ae1.start(f_CSE_ANNC_DEL_001(int3, v_createRequestAnnc, v_createRequest));//Container
@@ -11290,6 +12439,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
   
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
   
 						v_ae1.start(f_CSE_ANNC_DEL_001(int9, v_createRequestAnnc, v_createRequest));//Group
@@ -11302,6 +12453,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
   
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
   
 						v_ae1.start(f_CSE_ANNC_DEL_001(int29, v_createRequestAnnc, v_createRequest));//TimeSeries
@@ -11312,12 +12465,18 @@ module OneM2M_Testcases_CSE_Release_2 {
 	
 				group g_CSE_ANNC_DEL_002{
 		
+					/**
+					 * @desc Check that the IUT deletes all announced resources when the original resource is deleted.
+					 *  
+					 */
 					testcase TC_CSE_ANNC_DEL_002_ACP() runs on Tester system CseSystem {
 						// Local variables
 						var MnCseSimu v_cse1 := MnCseSimu.create("CSE1") alive;
 						var template RequestPrimitive v_createRequest := m_createAcpBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
   
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
   
 						v_cse1.start(f_CSE_ANNC_DEL_002(int1, v_createRequestAnnc, v_createRequest));//AccessControlPolicy
@@ -11330,6 +12489,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
   
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
   
 						v_cse1.start(f_CSE_ANNC_DEL_002(int3, v_createRequestAnnc, v_createRequest));//Container
@@ -11342,6 +12503,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
   
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
   
 						v_cse1.start(f_CSE_ANNC_DEL_002(int9, v_createRequestAnnc, v_createRequest));//Group
@@ -11353,7 +12516,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
-  
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
   
 						v_cse1.start(f_CSE_ANNC_DEL_002(int29, v_createRequestAnnc, v_createRequest));//TimeSeries
@@ -11375,6 +12542,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 										
+				v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 				v_ae1.start(f_CSE_PCH_001());
 							  	  	
 				v_ae1.done;
@@ -11385,9 +12554,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 				// Local variables
 				var integer v_aeIndex := -1;
 				var integer v_resourceIndex := -1;
-				var RequestPrimitive v_request;
-				var MsgIn v_response;
-				var RequestPrimitive v_requestNotify;
+				var integer v_acpAuxIndex := -1;
+				var RequestPrimitive v_req1;
+				var MsgIn v_resp1;
+				var RequestPrimitive v_req2;
 				
 				// Test control
 	
@@ -11398,22 +12568,24 @@ module OneM2M_Testcases_CSE_Release_2 {
 	
 				// Preamble
 				vc_cse1.start(f_cse_registerRemoteCse(m_createRemoteCSEBase));
-				vc_cse1.done;
+				f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
 				
-				v_aeIndex := f_cse_preamble_registerAe();//AE1 is registred;
+				v_acpAuxIndex := f_cse_preamble_createAcpAux();
+				
+				v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);//AE1 is registred;
 				
 				v_resourceIndex := f_cse_createResource(int15, m_createPollingChannelBase, v_aeIndex);
 				
-				v_request := valueof(m_retrievePollingRequest(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
-				mcaPort.send(m_request(v_request));
+				v_req1 := valueof(m_retrievePollingRequest(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
+				mcaPort.send(f_getMsgOutPrimitive(m_request(v_req1)));
 				
-				v_requestNotify := valueof(m_notify(f_getResourceAddress(v_aeIndex)));
+				v_req2 := valueof(m_notifyNotification(f_getResourceAddress(v_aeIndex), m_contentNotification_subscriptionVerification));
 				
-				vc_cse1.start(f_cse_notifyProcedure_notify(v_requestNotify));
+				vc_cse1.start(f_cse_notifyProcedure_notify(v_req2));
 				
 				tc_ac.start;
 				alt {
-					[] mcaPort.receive(mw_response(mw_responsePollingResponse(v_requestNotify))) -> value v_response {
+					[] mcaPort.receive(mw_response(mw_responsePollingResponse(v_req2))) -> value v_resp1 {
 						tc_ac.stop;
 						setverdict(pass, __SCOPE__ & ": Polling response received");
 					}
@@ -11449,6 +12621,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 										
+				v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 				v_ae1.start(f_CSE_PCH_002());
 							  	  	
 				v_ae1.done;
@@ -11457,7 +12631,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 									
 			function f_CSE_PCH_002() runs on AeSimu {
 				// Local variables
-				var integer v_aeIndex := -1;
+				var integer v_aeIndex, v_acpAuxIndex := -1;
 				var integer v_resourceIndex := -1;
 				var RequestPrimitive v_request;
 				var MsgIn v_response;
@@ -11474,16 +12648,18 @@ module OneM2M_Testcases_CSE_Release_2 {
 				vc_cse1.start(f_cse_registerRemoteCse(m_createRemoteCSEBase));
 				vc_cse1.done;
 				
-				v_aeIndex := f_cse_preamble_registerAe();//AE1 is registred;
+				v_acpAuxIndex := f_cse_preamble_createAcpAux();
+				
+				v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);//AE1 is registred;
 				
 				v_resourceIndex := f_cse_createResource(int15, m_createPollingChannelBase, v_aeIndex);
 				
-				v_requestNotify := valueof(m_notify(f_getResourceAddress(v_aeIndex)));
+				v_requestNotify := valueof(m_notifyNotification(f_getResourceAddress(v_aeIndex), m_contentNotification_subscriptionVerification));
 				
 				vc_cse1.start(f_cse_notifyProcedure_notify(v_requestNotify));
 				
 				v_request := valueof(m_retrievePollingRequest(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
-				mcaPort.send(m_request(v_request));
+				mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 								
 				tc_ac.start;
 				alt {
@@ -11515,49 +12691,61 @@ module OneM2M_Testcases_CSE_Release_2 {
 				f_cf01Down();
 			} // end TC_CSE_PCH_002
 			
+			/**
+			 * @desc Check that the IUT which hosts <pollingChannel> resource forwards the polling response message to the CSE when receiving a Notify request to the <pollingChannelURI> resource from the AE
+			 * 
+			*/
 			testcase TC_CSE_PCH_003() runs on Tester system CseSystem {
 					
 				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 							
+				v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 				v_ae1.start(f_CSE_PCH_003());
-				  	  	
 				v_ae1.done;
 				  	  		
 			}
 			
 			function f_CSE_PCH_003() runs on AeSimu {
 				//Local variables
-				 var integer v_aeIndex := -1;
-				 var integer v_resourceIndex := -1;
-				 var RequestPrimitive v_request;
-				 var MsgIn v_response;
-				 var RequestPrimitive v_requestNotify;
+				var integer v_aeIndex, v_acpAuxIndex := -1;
+				var integer v_resourceIndex := -1;
+				var RequestPrimitive v_req1;
+				var RequestPrimitive v_req2;
+				var RequestPrimitive v_req3;
+				var MsgIn v_resp1, v_resp3;
+				var ResponsePrimitive v_resp2;//Response to a Notify Request
 	
-				 // Test control
+				// Test control
 
 
-				 // Test component configuration
-				 f_cf02Up();
+				// Test component configuration
+				f_cf02Up();
 
-				 // Test adapter configuration
+				// Test adapter configuration
 
-				 // Preamble
-				 vc_cse1.start(f_cse_registerRemoteCse(m_createRemoteCSEBase));
-				 vc_cse1.done;
-	
-				 v_aeIndex := f_cse_preamble_registerAe();//AE1 is registred;
+				// Preamble
+				vc_cse1.start(f_cse_registerRemoteCse(m_createRemoteCSEBase));
+				vc_cse1.done;
 	
-				 v_resourceIndex := f_cse_createResource(int15, m_createPollingChannelBase, v_aeIndex);
+				v_acpAuxIndex := f_cse_preamble_createAcpAux();
+				
+			    v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);//AE1 is registred;
+				
+				v_resourceIndex := f_cse_createResource(int15, m_createPollingChannelBase, v_aeIndex);
 				 
-				v_request := valueof(m_retrievePollingRequest(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
-				mcaPort.send(m_request(v_request));
+				v_req1 := valueof(m_retrievePollingRequest(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
+				mcaPort.send(f_getMsgOutPrimitive(m_request(v_req1)));
 				
-				v_requestNotify := valueof(m_notify(f_getResourceAddress(v_aeIndex)));
-				vc_cse1.start(f_cse_notifyProcedure_notify(v_requestNotify));
+				//v_req2 := valueof(m_notifyNotification(f_getResourceAddress(v_aeIndex), m_contentNotification_subscriptionVerification));
+				v_req2 := valueof(m_notify(f_getResourceAddress(v_aeIndex)));
+				v_req2.requestExpirationTimestamp := {alt_1 := 15000};
+				
+				vc_cse1.start(f_cse_notifyProcedure_notify(v_req2));
 				
 				tc_ac.start;
 				alt {
-					[] mcaPort.receive(mw_response(mw_responsePollingResponse(v_requestNotify))) -> value v_response {
+					[] mcaPort.receive(mw_response(mw_responsePollingResponse(v_req2))) -> value v_resp1 {
 						tc_ac.stop;
 						setverdict(pass, __SCOPE__ & ": Polling response received");
 					}
@@ -11576,9 +12764,37 @@ module OneM2M_Testcases_CSE_Release_2 {
 					[] tc_ac.timeout {
 						setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
 					}
-				 }
+				}
 				 
-				mcaPort.send(m_request(v_requestNotify));
+				f_checkAeSimuStatus();
+				
+				//Send response in any case
+				v_resp2 := valueof(m_responseNotification(int2000, omit));
+				v_resp2.requestIdentifier := v_resp1.primitive.responsePrimitive.primitiveContent.requestPrimitive.requestIdentifier;
+				v_req3 := valueof(m_notifyResponsePrimitive(f_getResourceAddress(v_resourceIndex) & "/" & c_resourceShortNamePollingChannelUri, v_resp2));
+				v_req3.from_ := f_getOriginator(v_aeIndex);
+				mcaPort.send(f_getMsgOutPrimitive(m_request(v_req3)));
+				 
+				tc_ac.start;
+				alt {
+					[] mcaPort.receive(mw_response(mw_responseNotify(int2000))) -> value v_resp3 {
+						tc_ac.stop;
+						setverdict(pass, __SCOPE__ & ": Polling response received");
+					}
+					[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
+						tc_ac.stop;
+						setverdict(fail, __SCOPE__&":INFO: Error while performing notification");
+					}
+					[] mcaPort.receive {
+						tc_ac.stop;
+						setverdict(fail, __SCOPE__&":INFO: Unexpected message received");
+					}
+					[] tc_ac.timeout {
+						setverdict(fail, __SCOPE__&":INFO: No answer while performing notification");
+					}
+				}
+				
+				f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
 				
 				//Postamble
  			    f_cse_postamble_deleteResources();
@@ -11591,8 +12807,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 		
 				var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 				
+				v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 				v_cse1.start(f_CSE_PCH_004());
-	  	  	
 				v_cse1.done;
 			}
 			
@@ -11628,7 +12845,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 			  	}
 			   
 			   	//Trigger IUT for sending a polling request (req1)
-				v_utRequest2 := valueof(m_utRetrievePollingChannel(f_getLocalResourceAddress(v_localResourceIndex) & "/" & c_resourceShortNamePollingChannelUri));
+				v_utRequest2 := valueof(m_utRetrievePollingChannelUri(f_getLocalResourceAddress(v_localResourceIndex) & "/" & c_resourceShortNamePollingChannelUri));
 				f_sendUtPrimitive(v_utRequest2,v_action2);
 				
 				tc_ac.start;
@@ -11642,7 +12859,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						//Put in the primitiveContent a Notify request (req2) (simulated) from another node CSE
 						v_request_req2 := valueof(m_notify(f_getResourceAddress(vc_remoteCseIndex)));
 						v_response_rsp1.primitiveContent := { requestPrimitive := v_request_req2 };
-						mccPortIn.send(m_response(v_response_rsp1));
+						mccPortIn.send(f_getMsgOutPrimitive(m_response(v_response_rsp1)));
 				   }
 				   [] tc_ac.timeout {
 					   setverdict(inconc, __SCOPE__&":INFO: No request received for creating resource type Polling Channel");
@@ -11674,193 +12891,114 @@ module OneM2M_Testcases_CSE_Release_2 {
 			
 			group g_CSE_PCH_005 {
 				
-			  testcase TC_CSE_PCH_005_CRE() runs on Tester system CseSystem {
-					
-				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-				var RequestPrimitive v_request;
-				var integer v_aeIndex1 := -1;
-				var integer v_aeIndex2 := -1;
-				var template RequestPrimitive v_createRequest := m_createPollingChannelBase;
-				
-				
-				v_request := f_getCreateRequestPrimitive(int15, v_createRequest, v_aeIndex1);
-				v_request.to_ := f_getResourceAddress(v_aeIndex2);
-				
-				v_ae1.start(f_CSE_PCH_005(v_aeIndex1, v_aeIndex2, v_request));
-				v_ae1.done;
-	  	  		
-			 }
-			 
-			 testcase TC_CSE_PCH_005_RET() runs on Tester system CseSystem {
+				testcase TC_CSE_PCH_005_RET() runs on Tester system CseSystem {
 		
-				 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-				 var RequestPrimitive v_request;
-				 var integer v_aeIndex1 := -1;
-				 var integer v_aeIndex2 := -1;
-				 var template RequestPrimitive v_createRequest := m_createPollingChannelBase;
-	
-				 
-				 v_request := f_getCreateRequestPrimitive(int15, v_createRequest, v_aeIndex1);
-				 
-				 v_request := valueof(m_retrievePollingRequest(f_getResourceAddress(v_aeIndex1), f_getOriginator(v_aeIndex1)));
-				 v_request.to_ := f_getResourceAddress(v_aeIndex2);
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ 					
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
 				 
-				 v_ae1.start(f_CSE_PCH_005(v_aeIndex1, v_aeIndex2, v_request));
-				 v_ae1.done;
-			  }
+				 	v_ae1.start(f_CSE_PCH_005(m_retrieve("NotInitialized", "NotInitialized")));
+				 	v_ae1.done;
+			  	}
 			  
-			  testcase TC_CSE_PCH_005_UPD() runs on Tester system CseSystem {
+			  	testcase TC_CSE_PCH_005_UPD() runs on Tester system CseSystem {
 					
-				  var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-	
-				  var RequestPrimitive v_request;
-				  var integer v_aeIndex1 := -1;
-				  var integer v_aeIndex2 := -1;
-				  var template RequestPrimitive v_createRequest := m_createPollingChannelBase;
-
-				  
-				  v_request := f_getCreateRequestPrimitive(int15, v_createRequest, v_aeIndex1);
-				  
- 
-				  v_request := valueof(m_updatePollingChannelBase);
-				  v_request.to_ := f_getResourceAddress(v_aeIndex2);
-				  
-				  v_ae1.start(f_CSE_PCH_005(v_aeIndex1, v_aeIndex2, v_request));	
-				  v_ae1.done;
-	
-			   }
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+					var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
+					var Labels v_labels_1 := {"VALUE_1"};
+				
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
+					v_updateRequest.primitiveContent.pollingChannel.labels := v_labels_1;
+					 
+					v_ae1.start(f_CSE_PCH_005(v_updateRequest));
+					v_ae1.done;
+		
+				  }
 			   
 			   testcase TC_CSE_PCH_005_DEL() runs on Tester system CseSystem {
 					
-				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-	
-				var RequestPrimitive v_request;
-				var integer v_aeIndex1 := -1;
-				var integer v_aeIndex2 := -1;
-				var template RequestPrimitive v_createRequest := m_createPollingChannelBase;
-
-				
-				v_request := f_getCreateRequestPrimitive(int15, v_createRequest, v_aeIndex1);
-				
- 
-				v_request := valueof(m_deletePollingChannelBase(f_getResourceAddress(v_aeIndex1)));
-				v_request.to_ := f_getResourceAddress(v_aeIndex2);
-				
-				v_ae1.start(f_CSE_PCH_005(v_aeIndex1, v_aeIndex2, v_request));
-			    v_ae1.done;
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+					
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
+					 
+					v_ae1.start(f_CSE_PCH_005(m_delete("NotInitialized", "NotInitialized")));
+					v_ae1.done;
 	
-			}
+				}
 			
-			function f_CSE_PCH_005(inout integer p_aeIndex1, inout integer p_aeIndex2, RequestPrimitive p_requestprimitive) runs on AeSimu {
-				
-				//Local variables
-				var integer v_aeIndex1 := -1;
-				var integer v_aeIndex2 := -1;
-				var integer v_resourceIndex := -1;
-				var integer v_acpAuxIndex := -1;
-				var RequestPrimitive v_request;
-				var MsgIn v_response;
-				var RequestPrimitive v_requestNotify;
-	
-				// Test control
-	
-				// Test component configuration
-				f_cf01Up(true);
-	
-				// Test adapter configuration
-	
-				// Preamble
- 			    v_acpAuxIndex := f_cse_preamble_createAcpAux(-, int63);//c_CUDNDi)
- 			    
-				p_aeIndex1 := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);//c_CRDNDi);
-				
-				p_aeIndex2 := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);//c_CRDNDi);
-				
-				//v_resourceIndex := f_cse_createResource(int15, m_createPollingChannelBase, v_aeIndex);
-				mcaPort.send(m_request(p_requestprimitive));
-				tc_ac.start;
-				alt {
-					[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) {
-						tc_ac.stop;
-						setverdict(pass, __SCOPE__&":INFO: Polling Resource type not created as originator has no privilege");
-					}
-					[] tc_ac.timeout {
-						setverdict(inconc, __SCOPE__&":INFO: No answer while creating polling resource type");
-					}
-				}	
-				
-				
-			}
-		 } //end group g_CSE_PCH_005
-		 
-		 /**
-		  * @desc Check that the IUT sends the response with a status to the CSE1 when the request expires according to its Request Expiration Timestamp
-		  * 
-		  */
-		 testcase TC_CSE_PCH_006() runs on Tester system CseSystem {
-	
-			 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+		 	} //end group g_CSE_PCH_005
+			 
+			 /**
+			  * @desc Check that the IUT sends the response with a status to the CSE1 when the request expires according to its Request Expiration Timestamp
+			  * 
+			  */
+			 testcase TC_CSE_PCH_006() runs on Tester system CseSystem {
+		
+				 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+				 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+							v_cse1.done;
 				
-			 v_cse1.start(f_CSE_PCH_006());
+				 v_cse1.start(f_CSE_PCH_006());
+				 v_cse1.done;
+			 }
+					
+			function f_CSE_PCH_006() runs on CseSimu {
+				 // Local variables
+				 var integer v_aeIndex, v_aeIndexForResourceAddress := -1;
+				 var integer v_resourceIndex := -1;
+				 var MsgIn v_response;
+				 var RequestPrimitive v_requestNotify;
 
-			 v_cse1.done;
-	  	  		
-		 }
+				 // Test control
 
-		 function f_CSE_PCH_006() runs on CseSimu {
-			 // Local variables
-			 var integer v_aeIndex := -1;
-			 var integer v_resourceIndex := -1;
-			 var RequestPrimitive v_request;
-			 var MsgIn v_response;
-			 var RequestPrimitive v_requestNotify;
+				 // Test component configuration
+				 f_cf02UpCseSimuMaster();
 
-			 // Test control
+				 // Test adapter configuration
 
-			 // Test component configuration
-			 f_cf02UpCseSimuMaster();
+				 // Preamble
+				 vc_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSEBase);
 
-			 // Test adapter configuration
+				 vc_ae1.start(f_cse_preamble_registerAe());//AE1 is registred;
+				 f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
+				 
+				 v_aeIndex := f_getLatestResourceIndex(vc_ae1);
+				 
+				 v_aeIndexForResourceAddress := f_getResource(vc_ae1);
 
-			 // Preamble
-			 vc_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSEBase);
+				 vc_ae1.start(f_cse_createResource(int15, m_createPollingChannelBase, v_aeIndex));//PollingChannel is created;
+				 f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
+				 
+				 v_requestNotify := valueof(m_notify(f_getResourceAddress(v_aeIndexForResourceAddress)));	
+				 v_requestNotify.from_ := PX_CSE1_ID;
+
+				 mccPort.send(f_getMsgOutPrimitive(m_request(v_requestNotify)));
+				 tc_ac.start;
+				 alt {
+					 [] mccPort.receive(mw_response(mw_responsePrimitive(int4108))) -> value vc_response {
+						 tc_ac.stop;
+						 setverdict(pass, __SCOPE__ & ":Response status code set to 4108 (REQUEST_TIMEOUT)");
+					 }
+					 [] mccPort.receive(mw_response()) {
+						 tc_ac.stop;
+						 setverdict(fail, __SCOPE__&":INFO: Unexpected message received");
+					 }
+					 [] tc_ac.timeout {
+						 setverdict(fail, __SCOPE__&":INFO: No answer while performing notification");
+					 }
+				 }	
 
-			 vc_ae1.start(f_cse_preamble_registerAe());//AE1 is registred;
-			 vc_ae1.done;
-			 f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
-			 v_aeIndex := f_getResource(vc_ae1);
-	
-			 vc_ae1.start(f_cse_createResource(int15, m_createPollingChannelBase, v_aeIndex));//PollingChannel is created;
-			 vc_ae1.done;
+				 // Postamble
+				 f_cse_postamble_deleteResourcesCSE();
 
-			 v_requestNotify := valueof(m_notify(f_getResourceAddress(v_aeIndex)));	
-			 v_request.from_ := PX_CSE1_ID;
-		
-			 mccPort.send(m_request(v_request));
-			 tc_ac.start;
-			 alt {
-				 [] mccPort.receive(mw_response(mw_responsePrimitive(int4108))) -> value vc_response {
-					 tc_ac.stop;
-					 setverdict(pass, __SCOPE__ & ":Response status code set to 4108 (REQUEST_TIMEOUT)");
-				 }
-				 [] mccPort.receive(mw_response()) {
-					 tc_ac.stop;
-					 setverdict(inconc, __SCOPE__&":INFO: Unexpected message received");
-				 }
-				 [] tc_ac.timeout {
-					 setverdict(inconc, __SCOPE__&":INFO: No answer while performing notification");
-				 }
-			 }	
-		
-			 // Postamble
-			 f_cse_postamble_deleteResourcesCSE();
-
-			 // Tear down
-			 f_cf02DownCseSimuMaster();
-		 } // end f_CSE_PCH_006
+				 // Tear down
+				 f_cf02DownCseSimuMaster();
+			 } // end f_CSE_PCH_006
 			
 		}//end group PollingChannel
-
 		
 		group Non_Blocking_Requests{
 
@@ -11877,6 +13015,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 				
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_NBR_SYN_001(m_createContainerBase, -)); //Create Container
 						v_ae1.done;
 				
@@ -11889,6 +13029,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var Labels v_labels_1 := {"VALUE_1"};
 				
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.container.labels := v_labels_1;
 				
 						v_ae1.start(f_CSE_NBR_SYN_001(m_updateContainerBase, m_createContainerBase)); //Update Container
@@ -11901,6 +13043,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 				
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_NBR_SYN_001(m_retrieve("NotInitialized", "NotInitialized"), m_createContainerBase)); //Retrieve Container
 						v_ae1.done;
 		
@@ -11911,6 +13055,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 				
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_NBR_SYN_001(m_delete("NotInitialized", "NotInitialized"), m_createContainerBase)); //Delete Container
 						v_ae1.done;
 
@@ -11929,6 +13075,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_NBR_SYN_002(m_createContainerBase, -)); //Create Container
 						v_ae1.done;
 
@@ -11941,6 +13089,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var Labels v_labels_1 := {"VALUE_1"};
 				
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.container.labels := v_labels_1;
 
 						v_ae1.start(f_CSE_NBR_SYN_002(m_updateContainerBase, m_createContainerBase)); //Update Container
@@ -11953,6 +13103,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_NBR_SYN_002(m_retrieve("NotInitialized", "NotInitialized"), m_createContainerBase)); //Retrieve Container
 						v_ae1.done;
 
@@ -11963,6 +13115,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_NBR_SYN_002(m_delete("NotInitialized", "NotInitialized"), m_createContainerBase)); //Delete Container
 						v_ae1.done;
 
@@ -11973,7 +13127,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 				group g_CSE_NBR_SYN_003{
 			
 					/**
-					 * @desc  
+					 * @desc  Check that the IUT returns successfully the <request> resource after receiving a Non-Blocking Synchronous Request OPERATION and it contains the expected result in operationResult attribute
 					 * 
 					 */
 					testcase TC_CSE_NBR_SYN_003_CRE() runs on Tester system CseSystem {
@@ -11981,6 +13135,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_NBR_SYN_003(m_createContainerBase, -, int1)); //Create Container
 						v_ae1.done;
 
@@ -11993,6 +13149,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var Labels v_labels_1 := {"VALUE_1"};
 				
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.container.labels := v_labels_1;
 
 						v_ae1.start(f_CSE_NBR_SYN_003(m_updateContainerBase, m_createContainerBase, int3)); //Update Container
@@ -12005,6 +13163,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_NBR_SYN_003(m_retrieve("NotInitialized", "NotInitialized"), m_createContainerBase, int2)); //Retrieve Container
 						v_ae1.done;
 
@@ -12015,6 +13175,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_NBR_SYN_003(m_delete("NotInitialized", "NotInitialized"), m_createContainerBase, int4)); //Delete Container
 						v_ae1.done;
 
@@ -12036,6 +13198,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_NBR_ASY_001(m_createContainerBase, -)); //Create Container
 						v_ae1.done;
 
@@ -12048,6 +13212,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var Labels v_labels_1 := {"VALUE_1"};
 				
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.container.labels := v_labels_1;
 
 						v_ae1.start(f_CSE_NBR_ASY_001(m_updateContainerBase, m_createContainerBase)); //Update Container
@@ -12060,6 +13226,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_NBR_ASY_001(m_retrieve("NotInitialized", "NotInitialized"), m_createContainerBase)); //Retrieve Container
 						v_ae1.done;
 
@@ -12070,6 +13238,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_NBR_ASY_001(m_delete("NotInitialized", "NotInitialized"), m_createContainerBase)); //Delete Container
 						v_ae1.done;
 
@@ -12088,6 +13258,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_NBR_ASY_002(m_createContainerBase, -)); //Create Container
 						v_ae1.done;
 
@@ -12100,6 +13272,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var Labels v_labels_1 := {"VALUE_1"};
 				
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.container.labels := v_labels_1;
 
 						v_ae1.start(f_CSE_NBR_ASY_002(m_updateContainerBase, m_createContainerBase)); //Update Container
@@ -12112,6 +13286,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_NBR_ASY_002(m_retrieve("NotInitialized", "NotInitialized"), m_createContainerBase)); //Retrieve Container
 						v_ae1.done;
 
@@ -12122,6 +13298,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_NBR_ASY_002(m_delete("NotInitialized", "NotInitialized"), m_createContainerBase)); //Delete Container
 						v_ae1.done;
 
@@ -12140,6 +13318,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_NBR_ASY_003(m_createContainerBase, -, int2001)); //Create Container
 						v_ae1.done;
 
@@ -12152,6 +13332,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var Labels v_labels_1 := {"VALUE_1"};
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.container.labels := v_labels_1;
 
 						v_ae1.start(f_CSE_NBR_ASY_003(m_updateContainerBase, m_createContainerBase, int2004)); //Update Container
@@ -12164,6 +13346,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_NBR_ASY_003(m_retrieve("NotInitialized", "NotInitialized"), m_createContainerBase, int2000)); //Retrieve Container
 						v_ae1.done;
 
@@ -12174,6 +13358,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_NBR_ASY_003(m_delete("NotInitialized", "NotInitialized"), m_createContainerBase, int2002)); //Delete Container
 						v_ae1.done;
 
@@ -12192,6 +13378,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_NBR_ASY_004(m_createContainerBase, -)); //Create Container
 						v_ae1.done;
 
@@ -12204,6 +13392,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var Labels v_labels_1 := {"VALUE_1"};
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.container.labels := v_labels_1;
 
 						v_ae1.start(f_CSE_NBR_ASY_004(m_updateContainerBase, m_createContainerBase)); //Update Container
@@ -12216,6 +13406,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_NBR_ASY_004(m_retrieve("NotInitialized", "NotInitialized"), m_createContainerBase)); //Retrieve Container
 						v_ae1.done;
 
@@ -12226,6 +13418,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_NBR_ASY_004(m_delete("NotInitialized", "NotInitialized"), m_createContainerBase)); //Delete Container
 						v_ae1.done;
 
@@ -12233,6 +13427,66 @@ module OneM2M_Testcases_CSE_Release_2 {
 
 				}// end group g_CSE_NBR_ASY_004
 				
+				group g_CSE_NBR_ASY_005{
+			
+					/**
+					 * @desc Check that the IUT sends the result of the requested Non-Blocking Asynchronous OPERATION as notification to the Originator when no notification target list is provided 
+					 * 
+					 */
+					testcase TC_CSE_NBR_ASY_005_CRE() runs on Tester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createContainerBase;
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_ae1.start(f_CSE_NBR_ASY_005(m_createContainerBase, -, int2001)); //Create Container
+						v_ae1.done;
+
+					}
+
+					testcase TC_CSE_NBR_ASY_005_UPD() runs on Tester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createContainerBase;
+						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var Labels v_labels_1 := {"VALUE_1"};
+
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_updateRequest.primitiveContent.container.labels := v_labels_1;
+
+						v_ae1.start(f_CSE_NBR_ASY_005(m_updateContainerBase, m_createContainerBase, int2004)); //Update Container
+						v_ae1.done;
+  
+					}
+
+					testcase TC_CSE_NBR_ASY_005_RET() runs on Tester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createContainerBase;
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_ae1.start(f_CSE_NBR_ASY_005(m_retrieve("NotInitialized", "NotInitialized"), m_createContainerBase, int2000)); //Retrieve Container
+						v_ae1.done;
+
+					}
+
+					testcase TC_CSE_NBR_ASY_005_DEL() runs on Tester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createContainerBase;
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_ae1.start(f_CSE_NBR_ASY_005(m_delete("NotInitialized", "NotInitialized"), m_createContainerBase, int2002)); //Delete Container
+						v_ae1.done;
+
+					}
+
+				}// end group g_CSE_NBR_ASY_005
+
 			}// end group Asynchronous	
 
 		}// end group Non_Blocking_Requests
@@ -12248,6 +13502,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 					
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 					v_ae1.start(f_CSE_TS_001());
 		  	  	
 					v_ae1.done;
@@ -12278,7 +13534,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					//Create data points and force a missingDataPoint
 					f_cse_generateMissingDataPoint(v_resourceIndex);
 					// Test Body
-    				mcaPort.send(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))));
+    				mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)))));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) -> value v_response {
@@ -12326,6 +13582,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 					
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 					v_ae1.start(f_CSE_TS_002());
 		  	  	
 					v_ae1.done;
@@ -12359,7 +13617,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					f_cse_generateMissingDataPoint(v_resourceIndex);
 					
 					//Retrieve first missing data point
-    				mcaPort.send(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))));
+    				mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)))));
 
 					tc_ac.start;
 					alt {
@@ -12403,7 +13661,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					f_cse_generateMissingDataPoint(v_resourceIndex);
 					
 					//Retrieve second missing data point
-					mcaPort.send(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)))));
 	
 					tc_ac.start;
 					alt {
@@ -12414,7 +13672,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 								setverdict(inconc, __SCOPE__ & ": missingDataList attribute not present");
 							} else {
 								if(ischosen(v_response.primitive.responsePrimitive.primitiveContent.timeSeries.missingDataList.alt_)) {
-									if(v_missingDataPointTimestamp < v_response.primitive.responsePrimitive.primitiveContent.timeSeries.missingDataList.alt_[0]) {
+									if(f_getTime(v_missingDataPointTimestamp) < f_getTime(v_response.primitive.responsePrimitive.primitiveContent.timeSeries.missingDataList.alt_[0])) {
 										setverdict(pass, __SCOPE__ & ": missingData point inserted in missingDataList");
 									} else {
 										setverdict(fail, __SCOPE__ & ": missingData point not inserted in missingDataList");
@@ -12465,6 +13723,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 	
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 											
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 					v_ae1.start(f_CSE_TS_003());
 								  	  	
 					v_ae1.done;
@@ -12483,7 +13743,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					var XSD.NonNegativeInteger v_missingDataPointNumber := 1;
 					var template PrimitiveContent v_contentNotification := {timeSeries := mw_contentTimeSeries(?,v_missingDataPointNumber)}; 
 	
-					v_eventNotificationCriteria.missingData := valueof(m_missingData(v_missingDataPointNumber, "1000"));
+					v_eventNotificationCriteria.missingData := valueof(m_missingData(v_missingDataPointNumber, "P60"));
 
 					// Test control
 
@@ -12531,6 +13791,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 							
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 					v_ae1.start(f_CSE_TS_004());
 				  	  	
 					v_ae1.done;
@@ -12585,9 +13847,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__ & ":ERROR: Notification received");
 							//Send response in any case
-							v_responsePrimitive := valueof(m_responseNotification(int2001, omit));
+							v_responsePrimitive := valueof(m_responseNotification(int2000, omit));
 							v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
-							mcaPortIn.send(m_response(v_responsePrimitive));
+							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 						}
 						[] tc_ac.timeout {
 							setverdict(pass, __SCOPE__ & ": Notification not received");
@@ -12595,7 +13857,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					}	
 					
 					//Check if the IUT restarts missing data point counter and timer
-					mcaPort.send(m_request(m_retrieve(f_getResourceAddress(v_timeSeriesIndex), f_getOriginator(v_timeSeriesIndex))));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_timeSeriesIndex), f_getOriginator(v_timeSeriesIndex)))));
 					
 					v_contentResponse.timeSeries := mw_contentTimeSeries_rc1;
 					v_contentResponse.timeSeries.missingDataCurrentNr := 0;