diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index 2b335fcb250a8afd84a68c03b5030453e8363df8..2c7bc62af1d46159fdb165683cd30bca0efdec85 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -566,18 +566,18 @@ module OneM2M_PermutationFunctions {
 	
 						//primitives for mcaPortIn
 					   	var MsgIn v_request;
-						var integer v_aeIndex := -1;
-					   	var integer v_resourceIndex := -1;
-					   	var integer v_parentIndex := -1;
-					   	var PrimitiveContent v_modifiedResource;						
+						var integer v_auxInteger := -1;
+					   	var PrimitiveContent v_modifiedResource;
+					   	var PrimitiveContent v_localResource;
 	
 					   	f_cf03Up();
 					   
 					   	//Preamble
-					   	v_aeIndex := f_ae_preamble_registerAe();
-	
+						
 					   	//Send Trigger Message
-						p_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_aeIndex);
+						v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))), vc_cSEBaseIndex, int2);
+						v_auxInteger := f_setLocalResource(v_localResource, int2);
+						p_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_auxInteger);
 					   	f_sendUtPrimitive(p_utRequest,p_action);
 	
 					   //Test behavior
@@ -588,8 +588,8 @@ module OneM2M_PermutationFunctions {
 							   tc_ac.stop;
 							   setverdict(pass, __SCOPE__, " : AE update request is accepted!");
 							   
-							   v_resourceIndex := f_processCreateRequestPrimitive(v_request.primitive.requestPrimitive);
-							   
+							   vc_response.primitive.responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, omit));
+
 							   mcaPortIn.send(m_response(vc_response.primitive.responsePrimitive));
 						   }
 							[] mcaPortIn.receive(mw_request(?)) -> value v_request {
@@ -609,11 +609,16 @@ 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_auxInteger := -1;
 
 						//Test component configuration
 						f_cf03Up();
 
 						//send triggering primitive to SUT
+						v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
+						v_auxInteger := f_setLocalResource(v_localResource, int3);
+						p_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_auxInteger);
 						f_sendUtPrimitive(p_utRequest,p_action);
 
 						//Test behavior
@@ -650,24 +655,28 @@ module OneM2M_PermutationFunctions {
 
 			group Retrieve {
 				
-					function f_AE_DMR_RET_001(ResourceType p_resourceType, XSD.AnyURI p_address, in universal charstring p_action) runs on CseSimu {
+					function f_AE_DMR_RET_001(ResourceType p_resourceType, template PrimitiveContent p_primitiveContent, in universal charstring p_action) runs on CseSimu {
 		
 						//variables
-						var template UtTriggerPrimitive v_utRequest := m_utRetrieve (p_address);
+						var template UtTriggerPrimitive v_utRequest;
 						var MsgIn v_request;
 						var ResponsePrimitive v_responsePrimitive;
+						var PrimitiveContent v_localResource;
+						var integer v_auxInteger := -1;
 		
 						//Test component configuration
 						f_cf03Up();
 		
 						//send triggering primitive to SUT
-						v_utRequest.requestPrimitive.resourceType := p_resourceType;
+						v_localResource := f_ae_generateLocalResource(valueof(p_primitiveContent), vc_cSEBaseIndex, p_resourceType);
+						v_auxInteger := f_setLocalResource(v_localResource, p_resourceType);
+						v_utRequest := m_utRetrieve(f_getLocalResourceAddress(v_auxInteger));
 						f_sendUtPrimitive(v_utRequest,p_action);
 						
 						//Test behavior
 						tc_ac.start;
 						alt{
-							[] mcaPortIn.receive(mw_request(mw_retrieve(p_address))) -> value v_request {
+							[] mcaPortIn.receive(mw_request(mw_retrieve(f_getLocalResourceAddress(v_auxInteger)))) -> value v_request {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__, " : retrieve resource type request is accepted!!");
 								
@@ -712,6 +721,7 @@ module OneM2M_PermutationFunctions {
 						f_cf03Up();
 
 						//send triggering primitive to SUT
+						p_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress();
 						f_sendUtPrimitive(p_utRequest,p_action);
 
 						//Test behavior
diff --git a/OneM2M_Testcases_AE_Release_1.ttcn b/OneM2M_Testcases_AE_Release_1.ttcn
index d3115f62fc60f9e72c3e9f5a14fb907d43a33c86..7ee95c21c433cb219a6409987e2e9803f04eebe3 100644
--- a/OneM2M_Testcases_AE_Release_1.ttcn
+++ b/OneM2M_Testcases_AE_Release_1.ttcn
@@ -36,18 +36,23 @@ module OneM2M_Testcases_AE_Release_1 {
 					 * @desc  Check that the IUT sends the creation of a <container> resource using unstructured resource identifier
 					 */
 		
-					testcase TC_AE_GEN_CRE_001_CSR() runs on CseSimu system AeSystem {
+					testcase TC_AE_GEN_CRE_001_CSR() runs on Tester system AeSystem {
 						
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+												
 						// 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");
 							stop;
 						}
 						
-						f_AE_GEN_CRE_001(e_cseRelative);
+						v_cse1.start(f_AE_GEN_CRE_001(e_cseRelative));
+						v_cse1.done;
 					}
 					
-					testcase TC_AE_GEN_CRE_001_SPR() runs on CseSimu system AeSystem {
+					testcase TC_AE_GEN_CRE_001_SPR() runs on Tester system AeSystem {
+						
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 												
 						// Test control
 						if(not(PICS_PRIMITIVE_SCOPE_SP_RELATIVE)) {
@@ -55,18 +60,21 @@ module OneM2M_Testcases_AE_Release_1 {
 							stop;
 						}
 						
-						f_AE_GEN_CRE_001(e_spRelative);
+						v_cse1.start(f_AE_GEN_CRE_001(e_spRelative));
+						v_cse1.done;
 					}
 					
-					testcase TC_AE_GEN_CRE_001_ABS() runs on CseSimu system AeSystem {
+					testcase TC_AE_GEN_CRE_001_ABS() runs on Tester system AeSystem {
+						
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						
 						// Test control
 						if(not(PICS_PRIMITIVE_SCOPE_ABSOLUTE)) {
 							setverdict(inconc, __SCOPE__, ": Unstructured-Absolute-Resource-ID format support is required to run this test case");
 							stop;
 						}
-						
-						f_AE_GEN_CRE_001(e_absolute);
+						v_cse1.start(f_AE_GEN_CRE_001(e_absolute));
+						v_cse1.done;
 					}
 					
 				}//end group g_AE_GEN_CRE_002
@@ -77,34 +85,43 @@ module OneM2M_Testcases_AE_Release_1 {
 					 * @desc  Check that the IUT sends the creation of a <container> resource using structured resource identifier
 					 */
 
-					testcase TC_AE_GEN_CRE_002_CSR() runs on CseSimu system AeSystem {
+					testcase TC_AE_GEN_CRE_002_CSR() runs on Tester system AeSystem {
+						
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						
 						if(not(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE)) {
 							setverdict(inconc, __SCOPE__, ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
-						f_AE_GEN_CRE_002(e_cseRelative);
+						v_cse1.start(f_AE_GEN_CRE_002(e_cseRelative));
+						v_cse1.done;
 					}
 
-					testcase TC_AE_GEN_CRE_002_SPR() runs on CseSimu system AeSystem {
+					testcase TC_AE_GEN_CRE_002_SPR() runs on Tester system AeSystem {
+						
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						
 						if(not(PICS_PRIMITIVE_SCOPE_SP_RELATIVE)) {
 							setverdict(inconc, __SCOPE__, ": Structured-SP-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
-						f_AE_GEN_CRE_002(e_spRelative);
+						v_cse1.start(f_AE_GEN_CRE_002(e_spRelative));
+						v_cse1.done;
 					}
 
-					testcase TC_AE_GEN_CRE_002_ABS() runs on CseSimu system AeSystem {
+					testcase TC_AE_GEN_CRE_002_ABS() runs on Tester system AeSystem {
+						
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						
 						if(not(PICS_PRIMITIVE_SCOPE_ABSOLUTE)) {
 							setverdict(inconc, __SCOPE__, ": Structured-Absolute-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
-						f_AE_GEN_CRE_002(e_absolute);
+						v_cse1.start(f_AE_GEN_CRE_002(e_absolute));
+						v_cse1.done;
 					}
 
 				} //end group g_AE_GEN_CRE_002
@@ -119,7 +136,9 @@ module OneM2M_Testcases_AE_Release_1 {
 					 * @desc  Check that the IUT sends the update of a <container>  resource using unstructured resource identifier
 					 */
 		
-					testcase TC_AE_GEN_UPD_001_CSR() runs on CseSimu system AeSystem {
+					testcase TC_AE_GEN_UPD_001_CSR() runs on Tester system AeSystem {
+						
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						
 						// Test control
 						if(not(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE)) {
@@ -127,10 +146,13 @@ module OneM2M_Testcases_AE_Release_1 {
 							stop;
 						}
 						
-						f_AE_GEN_UPD_001(e_cseRelative);
+						v_cse1.start(f_AE_GEN_UPD_001(e_cseRelative));
+						v_cse1.done;
 					}
 					
-					testcase TC_AE_GEN_UPD_001_SPR() runs on CseSimu system AeSystem {
+					testcase TC_AE_GEN_UPD_001_SPR() runs on Tester system AeSystem {
+						
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						
 					//Test control
 					if(not(PICS_PRIMITIVE_SCOPE_SP_RELATIVE)) {
@@ -138,10 +160,13 @@ module OneM2M_Testcases_AE_Release_1 {
 						stop;
 					}
 						
-						f_AE_GEN_UPD_001(e_spRelative);
+						v_cse1.start(f_AE_GEN_UPD_001(e_spRelative));
+						v_cse1.done;
 					}
 					
-					testcase TC_AE_GEN_UPD_001_ABS() runs on CseSimu system AeSystem {
+					testcase TC_AE_GEN_UPD_001_ABS() runs on Tester system AeSystem {
+						
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_ABSOLUTE)) {
@@ -149,7 +174,8 @@ module OneM2M_Testcases_AE_Release_1 {
 							stop;
 						}
 						
-						f_AE_GEN_UPD_001(e_absolute);
+						v_cse1.start(f_AE_GEN_UPD_001(e_absolute));
+						v_cse1.done;
 					}
 					
 				}//end group g_AE_GEN_UPD_001
@@ -160,7 +186,9 @@ module OneM2M_Testcases_AE_Release_1 {
 					 * @desc  Check that the IUT sends the update of a <container>  resource using structured resource identifier
 					 */
 
-					testcase TC_AE_GEN_UPD_002_CSR() runs on CseSimu system AeSystem {
+					testcase TC_AE_GEN_UPD_002_CSR() runs on Tester system AeSystem {
+						
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE)) {
@@ -168,10 +196,13 @@ module OneM2M_Testcases_AE_Release_1 {
 							stop;
 						}
 						
-						f_AE_GEN_UPD_002(e_cseRelative);
+						v_cse1.start(f_AE_GEN_UPD_002(e_cseRelative));
+						v_cse1.done;
 					}
 
-					testcase TC_AE_GEN_UPD_002_SPR() runs on CseSimu system AeSystem {
+					testcase TC_AE_GEN_UPD_002_SPR() runs on Tester system AeSystem {
+						
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_SP_RELATIVE)) {
@@ -179,10 +210,13 @@ module OneM2M_Testcases_AE_Release_1 {
 							stop;
 						}
 						
-						f_AE_GEN_UPD_002(e_spRelative);
+						v_cse1.start(f_AE_GEN_UPD_002(e_spRelative));
+						v_cse1.done;
 					}
 
-					testcase TC_AE_GEN_UPD_002_ABS() runs on CseSimu system AeSystem {
+					testcase TC_AE_GEN_UPD_002_ABS() runs on Tester system AeSystem {
+						
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_ABSOLUTE)) {
@@ -190,7 +224,8 @@ module OneM2M_Testcases_AE_Release_1 {
 							stop;
 						}
 						
-						f_AE_GEN_UPD_002(e_absolute);
+						v_cse1.start(f_AE_GEN_UPD_002(e_absolute));
+						v_cse1.done;
 					}
 
 				} //end group g_AE_GEN_UPD_002
@@ -205,7 +240,9 @@ module OneM2M_Testcases_AE_Release_1 {
 					 * @desc  Check that the IUT sends the retrieval of a <container>  resource using unstructured resource identifier
 					 */
 
-					testcase TC_AE_GEN_RET_001_CSR() runs on CseSimu system AeSystem {
+					testcase TC_AE_GEN_RET_001_CSR() runs on Tester system AeSystem {
+						
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						
 						// Test control
 						if(not(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE)) {
@@ -213,10 +250,13 @@ module OneM2M_Testcases_AE_Release_1 {
 							stop;
 						}
 						
-						f_AE_GEN_RET_001(e_cseRelative);
+						v_cse1.start(f_AE_GEN_RET_001(e_cseRelative));
+						v_cse1.done;
 					}
 		
-					testcase TC_AE_GEN_RET_001_SPR() runs on CseSimu system AeSystem {
+					testcase TC_AE_GEN_RET_001_SPR() runs on Tester system AeSystem {
+						
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_SP_RELATIVE)) {
@@ -224,10 +264,13 @@ module OneM2M_Testcases_AE_Release_1 {
 							stop;
 						}
 						
-						f_AE_GEN_RET_001(e_spRelative);
+						v_cse1.start(f_AE_GEN_RET_001(e_spRelative));
+						v_cse1.done;
 					}
 		
-					testcase TC_AE_GEN_RET_001_ABS() runs on CseSimu system AeSystem {
+					testcase TC_AE_GEN_RET_001_ABS() runs on Tester system AeSystem {
+						
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_ABSOLUTE)) {
@@ -235,7 +278,8 @@ module OneM2M_Testcases_AE_Release_1 {
 							stop;
 						}
 						
-						f_AE_GEN_RET_001(e_absolute);
+						v_cse1.start(f_AE_GEN_RET_001(e_absolute));
+						v_cse1.done;
 					}
 		
 				}//end group g_AE_GEN_RET_001
@@ -246,7 +290,9 @@ module OneM2M_Testcases_AE_Release_1 {
 					 * @desc  Check that the IUT sends the retrieval of a <container>  resource using structured resource identifier
 					 */
 
-					testcase TC_AE_GEN_RET_002_CSR() runs on CseSimu system AeSystem {
+					testcase TC_AE_GEN_RET_002_CSR() runs on Tester system AeSystem {
+						
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE)) {
@@ -254,10 +300,13 @@ module OneM2M_Testcases_AE_Release_1 {
 							stop;
 						}
 						
-						f_AE_GEN_RET_002(e_cseRelative);
+						v_cse1.start(f_AE_GEN_RET_002(e_cseRelative));
+						v_cse1.done;
 					}
 
-					testcase TC_AE_GEN_RET_002_SPR() runs on CseSimu system AeSystem {
+					testcase TC_AE_GEN_RET_002_SPR() runs on Tester system AeSystem {
+						
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_SP_RELATIVE)) {
@@ -265,10 +314,13 @@ module OneM2M_Testcases_AE_Release_1 {
 							stop;
 						}
 						
-						f_AE_GEN_RET_002(e_spRelative);
+						v_cse1.start(f_AE_GEN_RET_002(e_spRelative));
+						v_cse1.done;
 					}
 
-					testcase TC_AE_GEN_RET_002_ABS() runs on CseSimu system AeSystem {
+					testcase TC_AE_GEN_RET_002_ABS() runs on Tester system AeSystem {
+						
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_ABSOLUTE)) {
@@ -276,7 +328,8 @@ module OneM2M_Testcases_AE_Release_1 {
 							stop;
 						}
 						
-						f_AE_GEN_RET_002(e_absolute);
+						v_cse1.start(f_AE_GEN_RET_002(e_absolute));
+						v_cse1.done;
 					}
 
 				} //end group g_AE_GEN_RET_002
@@ -291,7 +344,9 @@ module OneM2M_Testcases_AE_Release_1 {
 					 * @desc  Check that the IUT sends the deletion of a <container>  resource using unstructured resource identifier
 					 */
 
-					testcase TC_AE_GEN_DEL_001_CSR() runs on CseSimu system AeSystem {
+					testcase TC_AE_GEN_DEL_001_CSR() runs on Tester system AeSystem {
+						
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE)) {
@@ -299,10 +354,13 @@ module OneM2M_Testcases_AE_Release_1 {
 							stop;
 						}
 						
-						f_AE_GEN_DEL_001(e_cseRelative);
+						v_cse1.start(f_AE_GEN_DEL_001(e_cseRelative));
+						v_cse1.done;
 					}
 		
-					testcase TC_AE_GEN_DEL_001_SPR() runs on CseSimu system AeSystem {
+					testcase TC_AE_GEN_DEL_001_SPR() runs on Tester system AeSystem {
+						
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_SP_RELATIVE)) {
@@ -310,10 +368,13 @@ module OneM2M_Testcases_AE_Release_1 {
 							stop;
 						}
 						
-						f_AE_GEN_DEL_001(e_spRelative);
+						v_cse1.start(f_AE_GEN_DEL_001(e_spRelative));
+						v_cse1.done;
 					}
 		
-					testcase TC_AE_GEN_DEL_001_ABS() runs on CseSimu system AeSystem {
+					testcase TC_AE_GEN_DEL_001_ABS() runs on Tester system AeSystem {
+						
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_ABSOLUTE)) {
@@ -321,7 +382,8 @@ module OneM2M_Testcases_AE_Release_1 {
 							stop;
 						}
 						
-						f_AE_GEN_DEL_001(e_absolute);
+						v_cse1.start(f_AE_GEN_DEL_001(e_absolute));
+						v_cse1.done;
 					}
 		
 				}//end group g_AE_GEN_DEL_001
@@ -332,7 +394,9 @@ module OneM2M_Testcases_AE_Release_1 {
 					 * @desc  Check that the IUT sends the deletion of a <container>  resource using structured resource identifier
 					 */
 
-					testcase TC_AE_GEN_DEL_002_CSR() runs on CseSimu system AeSystem {
+					testcase TC_AE_GEN_DEL_002_CSR() runs on Tester system AeSystem {
+						
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE)) {
@@ -340,10 +404,13 @@ module OneM2M_Testcases_AE_Release_1 {
 							stop;
 						}
 						
-						f_AE_GEN_DEL_002(e_cseRelative);
+						v_cse1.start(f_AE_GEN_DEL_002(e_cseRelative));
+						v_cse1.done;
 					}
 
-					testcase TC_AE_GEN_DEL_002_SPR() runs on CseSimu system AeSystem {
+					testcase TC_AE_GEN_DEL_002_SPR() runs on Tester system AeSystem {
+						
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_SP_RELATIVE)) {
@@ -351,10 +418,13 @@ module OneM2M_Testcases_AE_Release_1 {
 							stop;
 						}
 						
-						f_AE_GEN_DEL_002(e_spRelative);
+						v_cse1.start(f_AE_GEN_DEL_002(e_spRelative));
+						v_cse1.done;
 					}
 
-					testcase TC_AE_GEN_DEL_002_ABS() runs on CseSimu system AeSystem {
+					testcase TC_AE_GEN_DEL_002_ABS() runs on Tester system AeSystem {
+						
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_ABSOLUTE)) {
@@ -362,7 +432,8 @@ module OneM2M_Testcases_AE_Release_1 {
 							stop;
 						}
 						
-						f_AE_GEN_DEL_002(e_absolute);
+						v_cse1.start(f_AE_GEN_DEL_002(e_absolute));
+						v_cse1.done;
 					}
 
 				} //end group g_AE_GEN_DEL_002
@@ -379,7 +450,16 @@ module OneM2M_Testcases_AE_Release_1 {
 				 * @desc  Check that the IUT sends an AE initial registration request with no AE-ID-STEM provided when it is started
 				 */
 
-				testcase TC_AE_REG_CRE_001() runs on CseSimu system AeSystem {
+				testcase TC_AE_REG_CRE_001() runs on Tester system AeSystem {
+						
+					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+					
+					v_cse1.start(f_AE_REG_CRE_001());
+					
+					v_cse1.done;
+				}
+					
+				function f_AE_REG_CRE_001() runs on CseSimu {
 
 					//primitives for utPort
 					var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
@@ -430,17 +510,22 @@ module OneM2M_Testcases_AE_Release_1 {
 				
 				group g_AE_REG_CRE_002 {
 				
-					testcase TC_AE_REG_CRE_002_RN() runs on CseSimu system AeSystem {
+					testcase TC_AE_REG_CRE_002_RN() runs on Tester system AeSystem {
+						
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						//primitives for utPort
 						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";
 						v_utRequest.requestPrimitive.primitiveContent.aE.resourceName := "UNINITIALIZED";
 						v_createAe.primitiveContent.aE.resourceName := complement("UNINITIALIZED");
-						f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action);
+						v_cse1.start(f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action));
+						v_cse1.done;
 					}
 	
-					testcase TC_AE_REG_CRE_002_ET() runs on CseSimu system AeSystem {
+					testcase TC_AE_REG_CRE_002_ET() runs on Tester system AeSystem {
+						
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						//primitives for utPort
 						var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
 						var template RequestPrimitive v_createAe := mw_createAe;
@@ -448,70 +533,91 @@ module OneM2M_Testcases_AE_Release_1 {
 						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
-						f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action);
+						v_cse1.start(f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action));
+						v_cse1.done;
 					}
 	
-					testcase TC_AE_REG_CRE_002_LBL() runs on CseSimu system AeSystem {
+					testcase TC_AE_REG_CRE_002_LBL() runs on Tester system AeSystem {
+						
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						//primitives for utPort
 						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";
 						v_utRequest.requestPrimitive.primitiveContent.aE.labels := {"UNINITIALIZED"};
 						v_createAe.primitiveContent.aE.labels := complement({*,"UNINITIALIZED",*});
-						f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action);
+						v_cse1.start(f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action));
+						v_cse1.done;
 					}
 	
-					testcase TC_AE_REG_CRE_002_APN() runs on CseSimu system AeSystem {
+					testcase TC_AE_REG_CRE_002_APN() runs on Tester system AeSystem {
+						
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						//primitives for utPort
 						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";
 						v_utRequest.requestPrimitive.primitiveContent.aE.appName := "UNINITIALIZED";
 						v_createAe.primitiveContent.aE.appName := complement("UNINITIALIZED");
-						f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action);
+						v_cse1.start(f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action));
+						v_cse1.done;
 					}
 	
-					testcase TC_AE_REG_CRE_002_API() runs on CseSimu system AeSystem {
+					testcase TC_AE_REG_CRE_002_API() runs on Tester system AeSystem {
+						
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						//primitives for utPort
 						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";
 						v_utRequest.requestPrimitive.primitiveContent.aE.app_ID := "UNINITIALIZED";
 						v_createAe.primitiveContent.aE.app_ID := complement("UNINITIALIZED");
-						f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action);
+						v_cse1.start(f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action));
+						v_cse1.done;
 					}
 	
-					testcase TC_AE_REG_CRE_002_POA() runs on CseSimu system AeSystem {
+					testcase TC_AE_REG_CRE_002_POA() runs on Tester system AeSystem {
+						
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						//primitives for utPort
 						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";
 						v_utRequest.requestPrimitive.primitiveContent.aE.pointOfAccess := {"UNINITIALIZED"};
 						v_createAe.primitiveContent.aE.pointOfAccess := complement({*,"UNINITIALIZED",*});
-						f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action);
+						v_cse1.start(f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action));
+						v_cse1.done;
 					}
 	
-					testcase TC_AE_REG_CRE_002_OR() runs on CseSimu system AeSystem {
+					testcase TC_AE_REG_CRE_002_OR() runs on Tester system AeSystem {
+						
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						//primitives for utPort
 						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";
 						v_utRequest.requestPrimitive.primitiveContent.aE.ontologyRef := "UNINITIALIZED";
 						v_createAe.primitiveContent.aE.ontologyRef := complement("UNINITIALIZED");
-						f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action);
+						v_cse1.start(f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action));
+						v_cse1.done;
 					}
 	
-					testcase TC_AE_REG_CRE_002_NL() runs on CseSimu system AeSystem {
+					testcase TC_AE_REG_CRE_002_NL() runs on Tester system AeSystem {
+						
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						//primitives for utPort
 						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";
 						v_utRequest.requestPrimitive.primitiveContent.aE.nodeLink := "UNINITIALIZED";
 						v_createAe.primitiveContent.aE.nodeLink := complement("UNINITIALIZED");
-						f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action);
+						v_cse1.start(f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action));
+						v_cse1.done;
 					}
 	
-					testcase TC_AE_REG_CRE_002_RR() runs on CseSimu system AeSystem {
+					testcase TC_AE_REG_CRE_002_RR() runs on Tester system AeSystem {
+						
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						//primitives for utPort
 						var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
 						var template RequestPrimitive v_createAe := mw_createAe;
@@ -519,10 +625,13 @@ module OneM2M_Testcases_AE_Release_1 {
 						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
-						f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action);
+						v_cse1.start(f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action));
+						v_cse1.done;
 					}
 	
-					testcase TC_AE_REG_CRE_002_CSZ() runs on CseSimu system AeSystem {
+					testcase TC_AE_REG_CRE_002_CSZ() runs on Tester system AeSystem {
+						
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						//primitives for utPort
 						var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
 						var template RequestPrimitive v_createAe := mw_createAe;
@@ -530,7 +639,8 @@ module OneM2M_Testcases_AE_Release_1 {
 						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
-						f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action);
+						v_cse1.start(f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action));
+						v_cse1.done;
 					}
 	
 				}//End of subgroup AE_REG_CRE_002
@@ -543,7 +653,17 @@ module OneM2M_Testcases_AE_Release_1 {
 				 * @desc Check that the IUT sends AE deregistration request to CSE
 				 */
 	
-				testcase TC_AE_REG_DEL_001() runs on CseSimu system AeSystem {
+				testcase TC_AE_REG_DEL_001() runs on Tester system AeSystem {
+						
+					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+					
+					v_cse1.start(f_AE_REG_DEL_001());
+					
+					v_cse1.done;
+					
+				}
+					
+				function f_AE_REG_DEL_001() runs on CseSimu {
 	
 					//variables
 					var MsgIn v_request;
@@ -595,7 +715,16 @@ module OneM2M_Testcases_AE_Release_1 {
 				 * @desc Check that the IUT sends a Container creation request when it is triggered
 				 */
 			
-				testcase TC_AE_DMR_CRE_001() runs on CseSimu system AeSystem {
+				testcase TC_AE_DMR_CRE_001() runs on Tester system AeSystem {
+						
+					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+					
+					v_cse1.start(f_AE_DMR_CRE_001());
+					
+					v_cse1.done;
+				}
+
+				function f_AE_DMR_CRE_001() runs on CseSimu {
 	
 					//variables
 					var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
@@ -640,7 +769,16 @@ module OneM2M_Testcases_AE_Release_1 {
 				/**
 				 * @desc Check that the IUT sends a ContentInstance creation request when it is triggered
 				 */
-				testcase TC_AE_DMR_CRE_002() runs on CseSimu system AeSystem {
+				testcase TC_AE_DMR_CRE_002() runs on Tester system AeSystem {
+						
+					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+					
+					v_cse1.start(f_AE_DMR_CRE_002());
+					
+					v_cse1.done;
+				}
+
+				function f_AE_DMR_CRE_002() runs on CseSimu {
 	
 					var template UtTriggerPrimitive v_utRequest := m_utCreateContentInstance;
 					var MsgIn v_request;
@@ -696,50 +834,65 @@ module OneM2M_Testcases_AE_Release_1 {
 				 
 				 group g_AE_DMR_CRE_003 {
 				 
-					testcase TC_AE_DMR_CRE_003_CNF() runs on CseSimu system AeSystem {
+					testcase TC_AE_DMR_CRE_003_CNF() runs on Tester system AeSystem {
+						
+						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";
 						v_utRequest.requestPrimitive.primitiveContent.contentInstance.contentInfo := "UNINITIALIZED";
 						v_request.primitiveContent.contentInstance.contentInfo := complement("UNINITIALIZED");
-						f_AE_DMR_CRE_003(v_utRequest,v_request,v_action);
+						v_cse1.start(f_AE_DMR_CRE_003(v_utRequest,v_request,v_action));
+						v_cse1.done;
 					}
 					
-					testcase TC_AE_DMR_CRE_003_RN() runs on CseSimu system AeSystem {
+					testcase TC_AE_DMR_CRE_003_RN() runs on Tester system AeSystem {
+						
+						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";
 						v_utRequest.requestPrimitive.primitiveContent.contentInstance.resourceName := "UNINITIALIZED";
 						v_request.primitiveContent.contentInstance.resourceName := complement("UNINITIALIZED");
-						f_AE_DMR_CRE_003(v_utRequest,v_request,v_action);
+						v_cse1.start(f_AE_DMR_CRE_003(v_utRequest,v_request,v_action));
+						v_cse1.done;
 					}
 					
-					testcase TC_AE_DMR_CRE_003_ET() runs on CseSimu system AeSystem {
+					testcase TC_AE_DMR_CRE_003_ET() runs on Tester system AeSystem {
+						
+						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";
 						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
-						f_AE_DMR_CRE_003(v_utRequest,v_request,v_action);
+						v_cse1.start(f_AE_DMR_CRE_003(v_utRequest,v_request,v_action));
+						v_cse1.done;
 					}
 					
-					testcase TC_AE_DMR_CRE_003_LBL() runs on CseSimu system AeSystem {
+					testcase TC_AE_DMR_CRE_003_LBL() runs on Tester system AeSystem {
+						
+						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";
 						v_utRequest.requestPrimitive.primitiveContent.contentInstance.labels := {"UNINITIALIZED"};
 						v_request.primitiveContent.contentInstance.labels := complement({*,"UNINITIALIZED",*});
-						f_AE_DMR_CRE_003(v_utRequest,v_request,v_action);
+						v_cse1.start(f_AE_DMR_CRE_003(v_utRequest,v_request,v_action));
+						v_cse1.done;
 					}
 					
-					testcase TC_AE_DMR_CRE_003_CR() runs on CseSimu system AeSystem {
+					testcase TC_AE_DMR_CRE_003_CR() runs on Tester system AeSystem {
+						
+						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";
 						v_utRequest.requestPrimitive.primitiveContent.contentInstance.creator := "UNINITIALIZED";
 						v_request.primitiveContent.contentInstance.creator := complement("UNINITIALIZED");
-						f_AE_DMR_CRE_003(v_utRequest,v_request,v_action);
+						v_cse1.start(f_AE_DMR_CRE_003(v_utRequest,v_request,v_action));
+						v_cse1.done;
 					}
 	
 				 }//End of subgroup AE_DMR_CRE_003
@@ -752,89 +905,116 @@ module OneM2M_Testcases_AE_Release_1 {
 				 
 				 group g_AE_DMR_CRE_004 {
 				 
-					testcase TC_AE_DMR_CRE_004_ACPI() runs on CseSimu system AeSystem {
+					testcase TC_AE_DMR_CRE_004_ACPI() runs on Tester system AeSystem {
+						
+						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";
 						v_utRequest.requestPrimitive.primitiveContent.container.accessControlPolicyIDs := {"UNINITIALIZED"};
 						v_request.primitiveContent.container.accessControlPolicyIDs := complement({*,"UNINITIALIZED",*});
-						f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
+						v_cse1.start(f_AE_DMR_CRE_004(v_utRequest,v_request,v_action));
+						v_cse1.done;
 					}
 				 	
-					testcase TC_AE_DMR_CRE_004_MNI() runs on CseSimu system AeSystem {
+					testcase TC_AE_DMR_CRE_004_MNI() runs on Tester system AeSystem {
+						
+						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";
 						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
-						f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
+						v_cse1.start(f_AE_DMR_CRE_004(v_utRequest,v_request,v_action));
+						v_cse1.done;
 					}
 				 	
-					testcase TC_AE_DMR_CRE_004_MBS() runs on CseSimu system AeSystem {
+					testcase TC_AE_DMR_CRE_004_MBS() runs on Tester system AeSystem {
+						
+						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";
 						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
-						f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
+						v_cse1.start(f_AE_DMR_CRE_004(v_utRequest,v_request,v_action));
+						v_cse1.done;
 					}
 				 	
-					testcase TC_AE_DMR_CRE_004_MIA() runs on CseSimu system AeSystem {
+					testcase TC_AE_DMR_CRE_004_MIA() runs on Tester system AeSystem {
+						
+						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";
 						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
-						f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
+						v_cse1.start(f_AE_DMR_CRE_004(v_utRequest,v_request,v_action));
+						v_cse1.done;
 					}
 				 	
-					testcase TC_AE_DMR_CRE_004_OR() runs on CseSimu system AeSystem {
+					testcase TC_AE_DMR_CRE_004_OR() runs on Tester system AeSystem {
+						
+						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";
 						v_utRequest.requestPrimitive.primitiveContent.container.ontologyRef := "UNINITIALIZED";
 						v_request.primitiveContent.container.ontologyRef := complement("UNINITIALIZED");
-						f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
+						v_cse1.start(f_AE_DMR_CRE_004(v_utRequest,v_request,v_action));
+						v_cse1.done;
 					}
 					
-					testcase TC_AE_DMR_CRE_004_RN() runs on CseSimu system AeSystem {
+					testcase TC_AE_DMR_CRE_004_RN() runs on Tester system AeSystem {
+						
+						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";
 						v_utRequest.requestPrimitive.primitiveContent.container.resourceName := "UNINITIALIZED";
 						v_request.primitiveContent.container.resourceName := complement("UNINITIALIZED");
-						f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
+						v_cse1.start(f_AE_DMR_CRE_004(v_utRequest,v_request,v_action));
+						v_cse1.done;
 					}
 					
-					testcase TC_AE_DMR_CRE_004_ET() runs on CseSimu system AeSystem {
+					testcase TC_AE_DMR_CRE_004_ET() runs on Tester system AeSystem {
+						
+						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";
 						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
-						f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
+						v_cse1.start(f_AE_DMR_CRE_004(v_utRequest,v_request,v_action));
+						v_cse1.done;
 					}
 					
-					testcase TC_AE_DMR_CRE_004_LBL() runs on CseSimu system AeSystem {
+					testcase TC_AE_DMR_CRE_004_LBL() runs on Tester system AeSystem {
+						
+						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";
 						v_utRequest.requestPrimitive.primitiveContent.container.labels := {"UNINITIALIZED"};
 						v_request.primitiveContent.container.labels := complement({*,"UNINITIALIZED",*});
-						f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
+						v_cse1.start(f_AE_DMR_CRE_004(v_utRequest,v_request,v_action));
+						v_cse1.done;
 					}
 					
-					testcase TC_AE_DMR_CRE_004_CR() runs on CseSimu system AeSystem {
+					testcase TC_AE_DMR_CRE_004_CR() runs on Tester system AeSystem {
+						
+						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";
 						v_utRequest.requestPrimitive.primitiveContent.container.creator := "UNINITIALIZED";
 						v_request.primitiveContent.container.creator := complement("UNINITIALIZED");
-						f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
+						v_cse1.start(f_AE_DMR_CRE_004(v_utRequest,v_request,v_action));
+						v_cse1.done;
 					}
 	
 				 }//End of subgroup AE_DMR_CRE_004
@@ -849,7 +1029,9 @@ module OneM2M_Testcases_AE_Release_1 {
 					 * @desc Check that the IUT sends an UPDATE Request with the value of the attribute ATTRIBUTE_NAME of the AE resource 
 					 */
 	
-					testcase TC_AE_DMR_UPD_001_ET() runs on CseSimu system AeSystem {						
+					testcase TC_AE_DMR_UPD_001_ET() runs on Tester system AeSystem {
+						
+						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";
@@ -860,10 +1042,13 @@ module OneM2M_Testcases_AE_Release_1 {
 						v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentAeUpdateRequest;
 						v_expectedUpdateRequestAe.primitiveContent.aE.expirationTime := ?;
 												
-						f_AE_DMR_UPD_001(v_utRequest, v_action, v_expectedUpdateRequestAe);
+						v_cse1.start(f_AE_DMR_UPD_001(v_utRequest, v_action, v_expectedUpdateRequestAe));
+						v_cse1.done;
 					}
 					
-					testcase TC_AE_DMR_UPD_001_LBL() runs on CseSimu system AeSystem {						
+					testcase TC_AE_DMR_UPD_001_LBL() runs on Tester system AeSystem {
+						
+						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";
@@ -874,10 +1059,13 @@ module OneM2M_Testcases_AE_Release_1 {
 						v_expectedUpdateRequestAe.primitiveContent.aE.labels := complement({*,"UNINITIALIZED",*});
 					   
 						
-						f_AE_DMR_UPD_001(v_utRequest,v_action, v_expectedUpdateRequestAe);
+						v_cse1.start(f_AE_DMR_UPD_001(v_utRequest,v_action, v_expectedUpdateRequestAe));
+						v_cse1.done;
 					}
 	
-					testcase TC_AE_DMR_UPD_001_APN() runs on CseSimu system AeSystem {
+					testcase TC_AE_DMR_UPD_001_APN() runs on Tester system AeSystem {
+						
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						
 						var template RequestPrimitive v_expectedUpdateRequestAe;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateAe;
@@ -888,10 +1076,13 @@ module OneM2M_Testcases_AE_Release_1 {
 						v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentAeUpdateRequest;
 						v_expectedUpdateRequestAe.primitiveContent.aE.appName := complement("UNINITIALIZED");
 						
-						f_AE_DMR_UPD_001(v_utRequest,v_action, v_expectedUpdateRequestAe);
+						v_cse1.start(f_AE_DMR_UPD_001(v_utRequest,v_action, v_expectedUpdateRequestAe));
+						v_cse1.done;
 					}
 	
-					testcase TC_AE_DMR_UPD_001_POA() runs on CseSimu system AeSystem {
+					testcase TC_AE_DMR_UPD_001_POA() runs on Tester system AeSystem {
+						
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						
 						var template RequestPrimitive v_expectedUpdateRequestAe;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateAe;
@@ -902,10 +1093,13 @@ module OneM2M_Testcases_AE_Release_1 {
 						v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentAeUpdateRequest;
 						v_expectedUpdateRequestAe.primitiveContent.aE.pointOfAccess := complement({*,"UNINITIALIZED", *});
 						
-						f_AE_DMR_UPD_001(v_utRequest,v_action, v_expectedUpdateRequestAe);
+						v_cse1.start(f_AE_DMR_UPD_001(v_utRequest,v_action, v_expectedUpdateRequestAe));
+						v_cse1.done;
 					}
 	
-					testcase TC_AE_DMR_UPD_001_OR() runs on CseSimu system AeSystem {
+					testcase TC_AE_DMR_UPD_001_OR() runs on Tester system AeSystem {
+						
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						
 						var template RequestPrimitive v_expectedUpdateRequestAe;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateAe;
@@ -916,10 +1110,13 @@ module OneM2M_Testcases_AE_Release_1 {
 						v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentAeUpdateRequest;
 						v_expectedUpdateRequestAe.primitiveContent.aE.ontologyRef := complement("UNINITIALIZED");
 						
-						f_AE_DMR_UPD_001(v_utRequest,v_action, v_expectedUpdateRequestAe);
+						v_cse1.start(f_AE_DMR_UPD_001(v_utRequest,v_action, v_expectedUpdateRequestAe));
+						v_cse1.done;
 					}
 	
-					testcase TC_AE_DMR_UPD_001_NL() runs on CseSimu system AeSystem {
+					testcase TC_AE_DMR_UPD_001_NL() runs on Tester system AeSystem {
+						
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						
 						var template RequestPrimitive v_expectedUpdateRequestAe;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateAe;
@@ -930,10 +1127,13 @@ module OneM2M_Testcases_AE_Release_1 {
 						v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentAeUpdateRequest;
 						v_expectedUpdateRequestAe.primitiveContent.aE.nodeLink := complement("UNINITIALIZED");
 						
-						f_AE_DMR_UPD_001(v_utRequest,v_action, v_expectedUpdateRequestAe);
+						v_cse1.start(f_AE_DMR_UPD_001(v_utRequest,v_action, v_expectedUpdateRequestAe));
+						v_cse1.done;
 					}
 	
-					testcase TC_AE_DMR_UPD_001_RR() runs on CseSimu system AeSystem {
+					testcase TC_AE_DMR_UPD_001_RR() runs on Tester system AeSystem {
+						
+						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";
@@ -944,10 +1144,13 @@ module OneM2M_Testcases_AE_Release_1 {
 						v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentAeUpdateRequest;
 						v_expectedUpdateRequestAe.primitiveContent.aE.requestReachability := ?;//Check value other than "UNINITIALIZED", done by typing
 						
-						f_AE_DMR_UPD_001(v_utRequest,v_action, v_expectedUpdateRequestAe);
+						v_cse1.start(f_AE_DMR_UPD_001(v_utRequest,v_action, v_expectedUpdateRequestAe));
+						v_cse1.done;
 					}
 	
-					testcase TC_AE_DMR_UPD_001_CSZ() runs on CseSimu system AeSystem {
+					testcase TC_AE_DMR_UPD_001_CSZ() runs on Tester system AeSystem {
+						
+						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";
@@ -958,7 +1161,8 @@ module OneM2M_Testcases_AE_Release_1 {
 						v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentAeUpdateRequest;
 						v_expectedUpdateRequestAe.primitiveContent.aE.contentSerialization := ?;//Check value other than "UNINITIALIZED", done by typing
 						
-						f_AE_DMR_UPD_001(v_utRequest,v_action, v_expectedUpdateRequestAe);
+						v_cse1.start(f_AE_DMR_UPD_001(v_utRequest,v_action, v_expectedUpdateRequestAe));
+						v_cse1.done;
 					}
 	
 				}//End of subgroup AE_DMR_UPD_001
@@ -969,67 +1173,67 @@ module OneM2M_Testcases_AE_Release_1 {
 					 * @desc Check that the IUT sends an UPDATE Request with the value of the attribute ATTRIBUTE_NAME of the <container> resource
 					 */
 					
-					testcase TC_AE_DMR_UPD_002_ET() runs on CseSimu system AeSystem {
-						var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
+					testcase TC_AE_DMR_UPD_002_ET() runs on Tester system AeSystem {
 						
+						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";
-						v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_auxInteger);
 						v_utRequest.requestPrimitive.primitiveContent.container.expirationTime := "20301231T012345";
 						v_request.primitiveContent.container.expirationTime := ?;
-						f_AE_DMR_UPD_002(v_utRequest,v_request,v_action);
+						v_cse1.start(f_AE_DMR_UPD_002(v_utRequest,v_request,v_action));
+						v_cse1.done;
 					}
 					
-					testcase TC_AE_DMR_UPD_002_LBL() runs on CseSimu system AeSystem {
-						var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
+					testcase TC_AE_DMR_UPD_002_LBL() runs on Tester system AeSystem {
 						
+						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";
-						v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_auxInteger);
 						v_utRequest.requestPrimitive.primitiveContent.container.labels := {"UNINITIALIZED"};
 						v_request.primitiveContent.container.labels := complement({*,"UNINITIALIZED",*});
-						f_AE_DMR_UPD_002(v_utRequest,v_request,v_action);
+						v_cse1.start(f_AE_DMR_UPD_002(v_utRequest,v_request,v_action));
+						v_cse1.done;
 					}
 					
-					testcase TC_AE_DMR_UPD_002_MNI() runs on CseSimu system AeSystem {
-						var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
+					testcase TC_AE_DMR_UPD_002_MNI() runs on Tester system AeSystem {
 						
+						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";
-						v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_auxInteger);
 						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
-						f_AE_DMR_UPD_002(v_utRequest,v_request,v_action);
+						v_cse1.start(f_AE_DMR_UPD_002(v_utRequest,v_request,v_action));
+						v_cse1.done;
 					}
 					
-					testcase TC_AE_DMR_UPD_002_MBS() runs on CseSimu system AeSystem {
-						var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
+					testcase TC_AE_DMR_UPD_002_MBS() runs on Tester system AeSystem {
 						
+						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";
-						v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_auxInteger);
 						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
-						f_AE_DMR_UPD_002(v_utRequest,v_request,v_action);
+						v_cse1.start(f_AE_DMR_UPD_002(v_utRequest,v_request,v_action));
+						v_cse1.done;
 					}
 					
-					testcase TC_AE_DMR_UPD_002_MIA() runs on CseSimu system AeSystem {
-						var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
+					testcase TC_AE_DMR_UPD_002_MIA() runs on Tester system AeSystem {
+						
+						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";
-                        
-						v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_auxInteger);
-						v_utRequest.requestPrimitive.primitiveContent.container.maxInstanceAge := 1;
+                        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
-						f_AE_DMR_UPD_002(v_utRequest,v_request,v_action);
+						v_cse1.start(f_AE_DMR_UPD_002(v_utRequest,v_request,v_action));
+						v_cse1.done;
 					}
 
 				}//End of subgroup AE_DMR_UPD_002
@@ -1044,22 +1248,28 @@ module OneM2M_Testcases_AE_Release_1 {
 					 * @desc Check that the IUT sends a RETRIEVE Request on the TARGET_RESOURCE_ADDRESS to CSE
 					 */
 	
-					testcase TC_AE_DMR_RET_001_CB() runs on CseSimu system AeSystem {
-						var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentCSEBase(m_contentCreateCSEBase)), int5);
+					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_AE_DMR_RET_001(int5, f_getLocalResourceAddress(v_auxInteger),v_action);
+						v_cse1.start(f_AE_DMR_RET_001(int5, m_primitiveContentCSEBase(m_contentCreateCSEBase),v_action));
+						v_cse1.done;
 					}
 				 	
-					testcase TC_AE_DMR_RET_001_AE() runs on CseSimu system AeSystem {
-						var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
+					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_AE_DMR_RET_001(int2, f_getLocalResourceAddress(v_auxInteger),v_action);
+						v_cse1.start(f_AE_DMR_RET_001(int2, m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit)),v_action));
+						v_cse1.done;
 					}
 	
-					testcase TC_AE_DMR_RET_001_CNT() runs on CseSimu system AeSystem {
-						var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer())), int3);
+					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_AE_DMR_RET_001(int3, f_getLocalResourceAddress(v_auxInteger),v_action);
+						v_cse1.start(f_AE_DMR_RET_001(int3, m_primitiveContentContainer(m_contentCreateContainer()),v_action));
+						v_cse1.done;
 					}
 	
 				}//End of TC_AE_DMR_RET_001
@@ -1068,7 +1278,16 @@ module OneM2M_Testcases_AE_Release_1 {
 				 * @desc Check that the IUT sends a RETRIEVE Request of oldest virtual resource.
 				 */
 	
-				testcase TC_AE_DMR_RET_002() runs on CseSimu system AeSystem {
+				testcase TC_AE_DMR_RET_002() runs on Tester system AeSystem {
+						
+					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+					
+					v_cse1.start(f_AE_DMR_RET_002());
+					
+					v_cse1.done;
+				}
+
+				function f_AE_DMR_RET_002() runs on CseSimu {
 	
 					var integer v_auxInteger := -1;
 					var PrimitiveContent v_localResource;
@@ -1119,7 +1338,16 @@ module OneM2M_Testcases_AE_Release_1 {
 				 * @desc Check that the IUT sends a RETRIEVE Request of latest virtual resource.
 				 */
 	
-				testcase TC_AE_DMR_RET_003() runs on CseSimu system AeSystem {
+				testcase TC_AE_DMR_RET_003() runs on Tester system AeSystem {
+						
+					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+					
+					v_cse1.start(f_AE_DMR_RET_003());
+					
+					v_cse1.done;
+				}
+
+				function f_AE_DMR_RET_003() runs on CseSimu {
 	
 					var integer v_auxInteger := -1;
 					var PrimitiveContent v_localResource;
@@ -1170,7 +1398,16 @@ module OneM2M_Testcases_AE_Release_1 {
 				 * @desc Check that the IUT sends a <container> resource RETRIEVE Request to CSE
 				 */
 				
-				testcase TC_AE_DMR_RET_004() runs on CseSimu system AeSystem {
+				testcase TC_AE_DMR_RET_004() runs on Tester system AeSystem {
+						
+					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+					
+					v_cse1.start(f_AE_DMR_RET_004());
+					
+					v_cse1.done;
+				}
+
+				function f_AE_DMR_RET_004() runs on CseSimu {
 					
 					var integer v_auxInteger := -1;
 					var PrimitiveContent v_localResource;
@@ -1221,7 +1458,16 @@ module OneM2M_Testcases_AE_Release_1 {
 				 * @desc Check that the IUT sends a <contentInstance> resource RETRIEVE Request to CSE
 				 */
 
-				testcase TC_AE_DMR_RET_005 () runs on CseSimu system AeSystem {
+				testcase TC_AE_DMR_RET_005 () runs on Tester system AeSystem {
+						
+					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+					
+					v_cse1.start(f_AE_DMR_RET_005());
+					
+					v_cse1.done;
+				}
+
+				function f_AE_DMR_RET_005() runs on CseSimu {
 	
 					var integer v_auxInteger := -1;
 					var PrimitiveContent v_localResource;
@@ -1276,7 +1522,16 @@ module OneM2M_Testcases_AE_Release_1 {
 				 * @desc Check that the IUT sends a DELETE Request of oldest virtual resource.
 				 */
 
-				testcase TC_AE_DMR_DEL_001() runs on CseSimu system AeSystem {
+				testcase TC_AE_DMR_DEL_001() runs on Tester system AeSystem {
+						
+					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+					
+					v_cse1.start(f_AE_DMR_DEL_001());
+					
+					v_cse1.done;
+				}
+
+				function f_AE_DMR_DEL_001() runs on CseSimu {
 
 					var integer v_auxInteger := -1;
 					var PrimitiveContent v_localResource;
@@ -1327,7 +1582,16 @@ module OneM2M_Testcases_AE_Release_1 {
 				 * @desc Check that the IUT sends a DELETE Request of latest virtual resource.
 				 */
 
-				testcase TC_AE_DMR_DEL_002() runs on CseSimu system AeSystem {
+				testcase TC_AE_DMR_DEL_002() runs on Tester system AeSystem {
+						
+					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+					
+					v_cse1.start(f_AE_DMR_DEL_002());
+					
+					v_cse1.done;
+				}
+
+				function f_AE_DMR_DEL_002() runs on CseSimu {
 
 					var integer v_auxInteger := -1;
 					var PrimitiveContent v_localResource;
@@ -1378,7 +1642,16 @@ module OneM2M_Testcases_AE_Release_1 {
 				 * @desc Check that the IUT sends a <container> resource DELETE request to CSE
 				 */
 
-				testcase TC_AE_DMR_DEL_003() runs on CseSimu system AeSystem {
+				testcase TC_AE_DMR_DEL_003() runs on Tester system AeSystem {
+						
+					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+					
+					v_cse1.start(f_AE_DMR_DEL_003());
+					
+					v_cse1.done;
+				}
+
+				function f_AE_DMR_DEL_003() runs on CseSimu {
 	
 					var integer v_auxInteger := -1;
 					var PrimitiveContent v_localResource;
@@ -1429,7 +1702,16 @@ module OneM2M_Testcases_AE_Release_1 {
 				 * @desc Check that the IUT sends a <contentInstance> resource DELETE Request to CSE
 				 */
 
-				testcase TC_AE_DMR_DEL_004 () runs on CseSimu system AeSystem {
+				testcase TC_AE_DMR_DEL_004 () runs on Tester system AeSystem {
+						
+					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+					
+					v_cse1.start(f_AE_DMR_DEL_004());
+					
+					v_cse1.done;
+				}
+
+				function f_AE_DMR_DEL_004() runs on CseSimu {
 
 					var integer v_auxInteger := -1;
 					var PrimitiveContent v_localResource;
@@ -1489,7 +1771,16 @@ module OneM2M_Testcases_AE_Release_1 {
 				 * @desc Check that the IUT sends a subscription creation request
 				 */
 
-				testcase TC_AE_SUB_CRE_001() runs on CseSimu system AeSystem {
+				testcase TC_AE_SUB_CRE_001() runs on Tester system AeSystem {
+						
+					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+					
+					v_cse1.start(f_AE_SUB_CRE_001());
+					
+					v_cse1.done;
+				}
+
+				function f_AE_SUB_CRE_001() runs on CseSimu {
 				
 					//variables
 					var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
@@ -1497,12 +1788,10 @@ module OneM2M_Testcases_AE_Release_1 {
 					var ResponsePrimitive v_responsePrimitive;
 					var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid subscription creation request";
 				  	
-					var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
-					v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_auxInteger);
-
-					f_cf03Up();
+				  	f_cf03Up();
 
 					//send triggering primitive to SUT
+					v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress();
 					f_sendUtPrimitive(v_utRequest,v_action);
 				  	
 					//Test behavior
@@ -1537,128 +1826,122 @@ module OneM2M_Testcases_AE_Release_1 {
 					 * @desc Check that the IUT sends a subscription creation request with optional attribute ATTRIBUTE_NAME when it is triggered
 					 */
 				
-					testcase TC_AE_SUB_CRE_002_ACPI() runs on CseSimu system AeSystem {
+					testcase TC_AE_SUB_CRE_002_ACPI() runs on Tester system AeSystem {
+						
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						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";
-
-						var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
-						v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_auxInteger);
 						v_utRequest.requestPrimitive.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
 						v_utRequest.requestPrimitive.primitiveContent.subscription.accessControlPolicyIDs := {"UNINITIALIZED"};
-	
-						v_requestT.to_ := f_getLocalResourceAddress(v_auxInteger);
 						v_requestT.primitiveContent.subscription.notificationURI := complement({*,"UNINITIALIZED",*});
 						v_requestT.primitiveContent.subscription.accessControlPolicyIDs := ?;
 	
-						f_AE_SUB_CRE_002(v_utRequest, v_requestT, v_action);
+						v_cse1.start(f_AE_SUB_CRE_002(v_utRequest, v_requestT, v_action));
+						
+						v_cse1.stop;
 					}
 					
-					testcase TC_AE_SUB_CRE_002_ENC() runs on CseSimu system AeSystem {
+					testcase TC_AE_SUB_CRE_002_ENC() runs on Tester system AeSystem {
+						
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						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";
-						var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
-						v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_auxInteger);
 						v_utRequest.requestPrimitive.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
 						v_utRequest.requestPrimitive.primitiveContent.subscription.eventNotificationCriteria := m_eventNotificationCriteria();
 						v_utRequest.requestPrimitive.primitiveContent.subscription.eventNotificationCriteria.createdBefore := "20301231T012345";
 						v_utRequest.forcedFields := {{name := "createdBefore", value_ := "UNINITIALIZED"}};
-						
-						
-						v_requestT.to_ := f_getLocalResourceAddress(v_auxInteger);
 						v_requestT.primitiveContent.subscription.notificationURI := complement({*,"UNINITIALIZED",*});
 						v_requestT.primitiveContent.subscription.eventNotificationCriteria.createdBefore := ?;//Check value other than "UNINITIALIZED", done by typing
 	
-						f_AE_SUB_CRE_002(v_utRequest, v_requestT, v_action);
+						v_cse1.start(f_AE_SUB_CRE_002(v_utRequest, v_requestT, v_action));
+					
+						v_cse1.stop;
 					}
 					
-					testcase TC_AE_SUB_CRE_002_EXC() runs on CseSimu system AeSystem {
+					testcase TC_AE_SUB_CRE_002_EXC() runs on Tester system AeSystem {
+						
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						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";
 
-						var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
-						v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_auxInteger);
 						v_utRequest.requestPrimitive.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
 						v_utRequest.requestPrimitive.primitiveContent.subscription.expirationCounter := 1;
 						v_utRequest.forcedFields := {{name := "expirationCounter", value_ := "UNINITIALIZED"}};
-						
-						v_requestT.to_ := f_getLocalResourceAddress(v_auxInteger);
 						v_requestT.primitiveContent.subscription.notificationURI := complement({*,"UNINITIALIZED",*});
 						v_requestT.primitiveContent.subscription.expirationCounter := ?;//Check value other than "UNINITIALIZED", done by typing
 	
-						f_AE_SUB_CRE_002(v_utRequest, v_requestT, v_action);
+						v_cse1.start(f_AE_SUB_CRE_002(v_utRequest, v_requestT, v_action));
+						
+						v_cse1.stop;
 					}
 					
-					testcase TC_AE_SUB_CRE_002_NFU() runs on CseSimu system AeSystem {
+					testcase TC_AE_SUB_CRE_002_NFU() runs on Tester system AeSystem {
+						
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						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";
-
-						var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
-						v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_auxInteger);
 						v_utRequest.requestPrimitive.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
 						v_utRequest.requestPrimitive.primitiveContent.subscription.notificationForwardingURI := "UNINITIALIZED";
-	
-						v_requestT.to_ := f_getLocalResourceAddress(v_auxInteger);
 						v_requestT.primitiveContent.subscription.notificationURI := complement({*,"UNINITIALIZED",*});
 						v_requestT.primitiveContent.subscription.notificationForwardingURI := complement("UNINITIALIZED");
 	
-						f_AE_SUB_CRE_002(v_utRequest, v_requestT, v_action);
+						v_cse1.start(f_AE_SUB_CRE_002(v_utRequest, v_requestT, v_action));
+						
+						v_cse1.stop;
 					}
 					
-					testcase TC_AE_SUB_CRE_002_NCT() runs on CseSimu system AeSystem {
+					testcase TC_AE_SUB_CRE_002_NCT() runs on Tester system AeSystem {
+						
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						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";
-
-						var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
-						v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_auxInteger);
 						v_utRequest.requestPrimitive.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
 						v_utRequest.requestPrimitive.primitiveContent.subscription.notificationContentType := int1;
 						v_utRequest.forcedFields := {{name := "notificationContentType", value_ := "UNINITIALIZED"}};
-						
-						v_requestT.to_ := f_getLocalResourceAddress(v_auxInteger);
 						v_requestT.primitiveContent.subscription.notificationURI := complement({*,"UNINITIALIZED",*});
 						v_requestT.primitiveContent.subscription.notificationContentType := ?;//Check value other than "UNINITIALIZED", done by typing
 	
-						f_AE_SUB_CRE_002(v_utRequest, v_requestT, v_action);
+						v_cse1.start(f_AE_SUB_CRE_002(v_utRequest, v_requestT, v_action));
+						
+						v_cse1.stop;
 					}
 					 
-					testcase TC_AE_SUB_CRE_002_NEC() runs on CseSimu system AeSystem {
+					testcase TC_AE_SUB_CRE_002_NEC() runs on Tester system AeSystem {
+						
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						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";
-
-						var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
-						v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_auxInteger);
 						v_utRequest.requestPrimitive.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
 						v_utRequest.requestPrimitive.primitiveContent.subscription.notificationEventCat.alt_1 := 100;
 						v_utRequest.forcedFields := {{name := "alt_1", value_ := "UNINITIALIZED"}};
-						
-						v_requestT.to_ := f_getLocalResourceAddress(v_auxInteger);
 						v_requestT.primitiveContent.subscription.notificationURI := complement({*,"UNINITIALIZED",*});
 						v_requestT.primitiveContent.subscription.notificationEventCat.alt_1 := 100;//Check value other than "UNINITIALIZED", done by typing
 	
-						f_AE_SUB_CRE_002(v_utRequest, v_requestT, v_action);
+						v_cse1.start(f_AE_SUB_CRE_002(v_utRequest, v_requestT, v_action));
+						
+						v_cse1.stop;
 					}
 					
-					testcase TC_AE_SUB_CRE_002_SU() runs on CseSimu system AeSystem {
+					testcase TC_AE_SUB_CRE_002_SU() runs on Tester system AeSystem {
+						
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						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";
-
-						var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
-						v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_auxInteger);
 						v_utRequest.requestPrimitive.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
 						v_utRequest.requestPrimitive.primitiveContent.subscription.subscriberURI := "UNINITIALIZED";
-	
-						v_requestT.to_ := f_getLocalResourceAddress(v_auxInteger);
 						v_requestT.primitiveContent.subscription.notificationURI := complement({*,"UNINITIALIZED",*});
 						v_requestT.primitiveContent.subscription.subscriberURI := complement("UNINITIALIZED");
 	
-						f_AE_SUB_CRE_002(v_utRequest, v_requestT, v_action);
+						v_cse1.start(f_AE_SUB_CRE_002(v_utRequest, v_requestT, v_action));
+						
+						v_cse1.stop;
 					}
 
 				}//End AE_SUB_CRE_002
@@ -1671,21 +1954,33 @@ module OneM2M_Testcases_AE_Release_1 {
 				 * @desc Check that the IUT sends a Notify Response to the hosting CSE when receiving a Notify request containing a single notification
 				 */
 
-				testcase TC_AE_SUB_NTF_001() runs on CseSimu system AeSystem {
+				testcase TC_AE_SUB_NTF_001() runs on Tester system AeSystem {
+						
+					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+					
+					v_cse1.start(f_AE_SUB_NTF_001());
+					
+					v_cse1.done;
+				}
+
+				function f_AE_SUB_NTF_001() runs on CseSimu {
 
 					//variables
 					var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
 					var MsgIn v_request;
 					var ResponsePrimitive v_responsePrimitive;
+					var PrimitiveContent v_localResource;
+					var integer v_auxInteger := -1;
 					var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid AE Registration CREATE Request";
   	
-					var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
-					v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_auxInteger);
-
 					f_cf03Up();
 
 					//create Ae
+					v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))), vc_cSEBaseIndex, int2);
+					v_auxInteger := f_setLocalResource(v_localResource, int2);
+					v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress();
 					f_sendUtPrimitive(v_utRequest,v_action);
+
 					tc_ac.start;
 					alt{
 						[] mcaPortIn.receive(mw_request(mw_createAe)) -> value v_request {
@@ -1710,7 +2005,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					
 					//create Subscription
 					v_utRequest := m_utCreateSubscription;
-					v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress();
+					v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_auxInteger);
 					v_action := "Please, send a valid CREATE request for Subscription";
 					f_sendUtPrimitive(v_utRequest,v_action);
 					
@@ -1762,20 +2057,31 @@ module OneM2M_Testcases_AE_Release_1 {
 				 * @desc Check that the IUT sends a Notify Response to the hosting CSE when receiving a Notify request containing aggregated notifications
 				 */
 
-				testcase TC_AE_SUB_NTF_002() runs on CseSimu system AeSystem {
+				testcase TC_AE_SUB_NTF_002() runs on Tester system AeSystem {
+						
+					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+					
+					v_cse1.start(f_AE_SUB_NTF_002());
+					
+					v_cse1.done;
+				}
+
+				function f_AE_SUB_NTF_002() runs on CseSimu {
 
 					//variables
 					var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
 					var MsgIn v_request;
 					var ResponsePrimitive v_responsePrimitive;
+					var PrimitiveContent v_localResource;
+					var integer v_auxInteger := -1;
 					var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid AE Registration CREATE Request";
   	
-					var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
-					v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_auxInteger);
-
 					f_cf03Up();
 
 					//create Ae
+					v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))), vc_cSEBaseIndex, int2);
+					v_auxInteger := f_setLocalResource(v_localResource, int2);
+					v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress();
 					f_sendUtPrimitive(v_utRequest,v_action);
 					tc_ac.start;
 					alt{
@@ -1801,7 +2107,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					
 					//create Subscription
 					v_utRequest := m_utCreateSubscription;
-					v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress();
+					v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_auxInteger);
 					v_action := "Please, send a valid CREATE request for Subscription";
 					f_sendUtPrimitive(v_utRequest,v_action);