TCs to run always on Tester

Behaviours are executed on PTCs (AeSimu or CseSimu) and MTC controls PTC 's start and end (Done for CSE testing)

Signed-off-by: reinaortega miguelangel.reinaortega@etsi.org

OneM2M_Testcases_CSE_Release_1.ttcn

@@ -380,7 +380,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 				 * @desc Check that the IUT accepts a create request of <AE> resource with attributes multiplicity equals to 1 and provided preprovisioned SP_relative_ AE_ID.  
 				 * 
 				 */
-				testcase TC_CSE_REG_CRE_001() runs on AeSimu system CseSystem {
+				testcase TC_CSE_REG_CRE_001() runs on Tester system CseSystem {
+					
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+					
+					v_ae1.start(f_CSE_REG_CRE_001());
+		  	  	
+		  	  		v_ae1.done;
+		  	  		
+				}
+				
+				function f_CSE_REG_CRE_001() runs on AeSimu {
 		  	  	
 					var MsgIn v_response;
 					var RequestPrimitive v_request;
@@ -438,7 +448,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 				 * @desc Check that the IUT accepts a create request of <AE> resource with attributes multiplicity equals to 1 and provided preprovisioned AE_ID of AE-ID-Stem format.
 				 * 
 				 */
-				testcase TC_CSE_REG_CRE_002() runs on AeSimu system CseSystem {
+				testcase TC_CSE_REG_CRE_002() runs on Tester system CseSystem {
+					
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+					v_ae1.start(f_CSE_REG_CRE_002());
+			  	  	
+					v_ae1.done;
+			  	  		
+				}
+					
+				function f_CSE_REG_CRE_002() runs on AeSimu {
 		  	  	
 					var MsgIn v_response;
 					var RequestPrimitive v_request;
@@ -488,7 +508,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 				 * @desc Check that the IUT accepts a create request of <AE> resource with attributes multiplicity equals to 1 and provided preprovisioned SP_relative_AE_ID. 
 				 */
 				
-				testcase TC_CSE_REG_CRE_003() runs on CseSimu system CseSystem{
+				testcase TC_CSE_REG_CRE_003() runs on Tester system CseSystem {
+					
+					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						
+					v_cse1.start(f_CSE_REG_CRE_003());
+			  	  	
+					v_cse1.done;
+			  	  		
+				}
+					
+				function f_CSE_REG_CRE_003() runs on CseSimu {
 					
 					var integer v_remoteCseIndex := -1;
 					
@@ -507,7 +537,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 				 * @desc Check that the IUT rejects an AE registration (allowed App-ID, not allowed C-AE-ID-STEM provided by AE) 
 				 * 
 				 */
-				testcase TC_CSE_REG_CRE_004() runs on AeSimu system CseSystem {
+				testcase TC_CSE_REG_CRE_004() runs on Tester system CseSystem {
+					
+				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+					v_ae1.start(f_CSE_REG_CRE_004());
+			  	  	
+					v_ae1.done;
+			  	  		
+				}
+					
+				function f_CSE_REG_CRE_004() runs on AeSimu {
 		  	  	
 					var MsgIn v_response;
 					var RequestPrimitive v_request;
@@ -566,7 +606,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 				 * @desc Check that the IUT accepts an AE registration (allowed App-ID, S-AE-ID-STEM not provided by AE) 
 				 * 
 				 */
-				testcase TC_CSE_REG_CRE_005() runs on InCseSimu system CseSystem {
+				testcase TC_CSE_REG_CRE_005() runs on Tester system CseSystem {
+					
+					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						
+					v_cse1.start(f_CSE_REG_CRE_005());
+			  	  	
+					v_cse1.done;
+			  	  		
+				}
+					
+				function f_CSE_REG_CRE_005() runs on CseSimu {
 		  	  	
 		  	  		var MsgIn v_request;
 					var template RequestPrimitive v_requestPrimitive;
@@ -628,7 +678,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 				 * @desc Check that the IUT accepts a create request of <AE> resource with attributes multiplicity equals to 1 and provided character ‘S’ in AE_ID_Stem ask for a SP_relative_AE_ID 
 				 * 
 				 */
-				testcase TC_CSE_REG_CRE_006() runs on InCseSimu system CseSystem {
+				testcase TC_CSE_REG_CRE_006() runs on Tester system CseSystem {
+					
+					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+							
+					v_cse1.start(f_CSE_REG_CRE_006());
+				  	  	
+					v_cse1.done;
+				  	  		
+				}
+						
+				function f_CSE_REG_CRE_006() runs on CseSimu {
 
 					var RequestPrimitive v_request;
 					var integer v_cseBaseIndex := -1;
@@ -674,7 +734,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 				 * @desc Check that the IUT accepts a create request of <AE> resource with attributes multiplicity equals to 1 and provided character ‘S’ in AE_ID_Stem ask for a SP_relative_AE_ID 
 				 * 
 				 */
-				testcase TC_CSE_REG_CRE_007() runs on AeSimu system CseSystem{
+				testcase TC_CSE_REG_CRE_007() runs on Tester system CseSystem {
+					
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+					v_ae1.start(f_CSE_REG_CRE_007());
+			  	  	
+					v_ae1.done;
+			  	  		
+				}
+					
+				function f_CSE_REG_CRE_007() runs on AeSimu {
 
 					var MsgIn v_response;
 					var RequestPrimitive v_request;
@@ -732,7 +802,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 				 * @desc Check that the IUT accepts an AE re-registration (allowed M2M-SP-assigned AE-ID, S-AE-ID-STEM provided by AE), transfer request to the IN-CSE 
 				 * 
 				 */
-				testcase TC_CSE_REG_CRE_008() runs on InCseSimu system CseSystem {
+				testcase TC_CSE_REG_CRE_008() runs on Tester system CseSystem {
+					
+					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+							
+					v_cse1.start(f_CSE_REG_CRE_008());
+				  	  	
+					v_cse1.done;
+				  	  		
+				}
+						
+				function f_CSE_REG_CRE_008() runs on CseSimu {
 		  	  	
 					var RequestPrimitive v_request;
 					var integer v_cseBaseIndex := -1;
@@ -793,7 +873,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 				 * @desc Check that the IUT accepts an AE re-registration (allowed M2M-SP-assigned AE-ID, S-AE-ID-STEM provided by AE), communication between MN-CSE and IN-CSE
 				 *  
 				 */
-				testcase TC_CSE_REG_CRE_009() runs on MnCseSimu system CseSystem {
+				testcase TC_CSE_REG_CRE_009() runs on Tester system CseSystem {
+					
+					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+							
+					v_cse1.start(f_CSE_REG_CRE_009());
+				  	  	
+					v_cse1.done;
+				  	  		
+				}
+						
+				function f_CSE_REG_CRE_009() runs on CseSimu {
 		  	  	
 					var MsgIn v_response;
 					var RequestPrimitive v_request;
@@ -861,7 +951,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 				 * @desc Check that the IUT accepts an AE re-registration (allowed M2M-SP-assigned AE-ID, S-AE-ID-STEM provided by AE), transfer response to the AE
 				 * 
 				 */
-				testcase TC_CSE_REG_CRE_010() runs on AeSimu system CseSystem {
+				testcase TC_CSE_REG_CRE_010() runs on Tester system CseSystem {
+					
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+					v_ae1.start(f_CSE_REG_CRE_010());
+			  	  	
+					v_ae1.done;
+			  	  		
+				}
+					
+				function f_CSE_REG_CRE_010() runs on AeSimu {
 		  	  	
 					var MsgIn v_response;
 					var RequestPrimitive v_request;
@@ -933,7 +1033,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 				 * @desc Check that the IUT accepts a create request of <AE> resource with attributes multiplicity equals to 1 and asking an CSE relative AE_ID by indicating AE_ID_Stem with character ‘C’.  
 				 * 
 				 */
-				testcase TC_CSE_REG_CRE_011() runs on AeSimu system CseSystem {
+				testcase TC_CSE_REG_CRE_011() runs on Tester system CseSystem {
+					
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+					v_ae1.start(f_CSE_REG_CRE_011());
+			  	  	
+					v_ae1.done;
+			  	  		
+				}
+					
+				function f_CSE_REG_CRE_011() runs on AeSimu {
 
 					var MsgIn v_response;
 					var RequestPrimitive v_request;
@@ -1085,7 +1195,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 				 * @desc Check that the IUT rejects an AE registration (not allowed App-ID) 
 				 * 
 				 */
-				testcase TC_CSE_REG_CRE_016() runs on AeSimu system CseSystem {
+				testcase TC_CSE_REG_CRE_016() runs on Tester system CseSystem {
+					
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+							
+					v_ae1.start(f_CSE_REG_CRE_016());
+				  	  	
+					v_ae1.done;
+				  	  		
+				}
+						
+				function f_CSE_REG_CRE_016() runs on AeSimu {
 		  	  	
 					var MsgIn v_response;
 					var RequestPrimitive v_request;
@@ -1173,7 +1293,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 				 * @desc Check that the IUT accepts an create request of <remoteCSE> resource with attributes multiplicity equals to 1. 
 				 *  
 				 */
-				testcase TC_CSE_REG_CRE_018() runs on CseSimu system CseSystem {
+				testcase TC_CSE_REG_CRE_018() runs on Tester system CseSystem {
+						
+					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+							
+					v_cse1.start(f_CSE_REG_CRE_018());
+				  	  	
+					v_cse1.done;
+				  	  		
+				}
+						
+				function f_CSE_REG_CRE_018() runs on CseSimu {
 				
 					// Local variables
 					var MsgIn v_response;
@@ -1227,7 +1357,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 				 * @desc Check that the IUT accepts an create request of <remoteCSE> resource with attributes multiplicity equals to 1 without the preconfigured CSE-ID
 				 *
 				 */
-				testcase TC_CSE_REG_CRE_019() runs on CseSimu system CseSystem {
+				testcase TC_CSE_REG_CRE_019() runs on Tester system CseSystem {
+					
+					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+							
+					v_cse1.start(f_CSE_REG_CRE_019());
+				  	  	
+					v_cse1.done;
+				  	  		
+				}
+						
+				function f_CSE_REG_CRE_019() runs on CseSimu {
 				
 					// Local variables
 					var MsgIn v_response;
@@ -1278,7 +1418,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 				 * 
 				 */
 				 //TODO TO BE FINALIZED
-				testcase TC_CSE_REG_CRE_020() runs on AeSimu system CseSystem {
+				testcase TC_CSE_REG_CRE_020() runs on Tester system CseSystem {
+					
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+							
+					v_ae1.start(f_CSE_REG_CRE_020());
+				  	  	
+					v_ae1.done;
+				  	  		
+				}
+						
+				function f_CSE_REG_CRE_020() runs on AeSimu {
 
 					var MsgIn v_response;
 					var RequestPrimitive v_request;
@@ -1362,7 +1512,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 				 * @desc Check that the IUT rejects the create request of <CSEBase> resource.
 				 * 
 				 */
-				testcase TC_CSE_REG_CRE_021() runs on AeSimu system CseSystem {
+				testcase TC_CSE_REG_CRE_021() runs on Tester system CseSystem {
+					
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+							
+					v_ae1.start(f_CSE_REG_CRE_021());
+				  	  	
+					v_ae1.done;
+				  	  		
+				}
+						
+				function f_CSE_REG_CRE_021() runs on AeSimu {
     				
 					// Local variables
 					var MsgIn v_response;
@@ -1412,7 +1572,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 				 * @desc Check that the IUT accepts an AE registration (allowed App-ID, C-AE-ID-STEM not provided by AE)  
 				 * 
 				 */
-				testcase TC_CSE_REG_CRE_022() runs on AeSimu system CseSystem {				
+				testcase TC_CSE_REG_CRE_022() runs on Tester system CseSystem {
+					
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+							
+					v_ae1.start(f_CSE_REG_CRE_022());
+				  	  	
+					v_ae1.done;
+				  	  		
+				}
+						
+				function f_CSE_REG_CRE_022() runs on AeSimu {				
 					
 					var MsgIn v_response;
 					var RequestPrimitive v_request;
@@ -1468,7 +1638,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 				 * @desc Check that the IUT rejects registration of already registered AE (C-AE-ID-STEM provided by AE) 
 				 * 
 				 */
-				testcase TC_CSE_REG_CRE_023() runs on AeSimu system CseSystem {
+				testcase TC_CSE_REG_CRE_023() runs on Tester system CseSystem {
+					
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+							
+					v_ae1.start(f_CSE_REG_CRE_023());
+				  	  	
+					v_ae1.done;
+				  	  		
+				}
+						
+				function f_CSE_REG_CRE_023() runs on AeSimu {
 				  
 					var MsgIn v_response;
 					var RequestPrimitive v_request;
@@ -1518,7 +1698,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 				 * @desc Check that IUT sends a CSE registration request with attributes multiplicity equals to 1 
 				 * 
 				 */
-				testcase TC_CSE_REG_CRE_024() runs on CseSimu system CseSystem {
+				testcase TC_CSE_REG_CRE_024() runs on Tester system CseSystem {
+					
+					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+							
+					v_cse1.start(f_CSE_REG_CRE_024());
+				  	  	
+					v_cse1.done;
+				  	  		
+				}
+						
+				function f_CSE_REG_CRE_024() runs on CseSimu {
   
 					// Local variables
 					var ResponsePrimitive v_responsePrimitive;
@@ -1573,7 +1763,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 				 * @desc Check that IUT accepts a CSE registration request with attributes multiplicity equals to 1 
 				 * 
 				 */
-				testcase TC_CSE_REG_CRE_025() runs on CseSimu system CseSystem {
+				testcase TC_CSE_REG_CRE_025() runs on Tester system CseSystem {
+					
+					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+							
+					v_cse1.start(f_CSE_REG_CRE_025());
+				  	  	
+					v_cse1.done;
+				  	  		
+				}
+						
+				function f_CSE_REG_CRE_025() runs on CseSimu {
 	  
 					// Local variables
 					var MsgIn v_response;
@@ -1629,58 +1829,70 @@ module OneM2M_Testcases_CSE_Release_1 {
 				
 				group g_CSE_REG_CRE_026 {
 					
-					testcase TC_CSE_REG_CRE_026_RN() runs on CseSimu system CseSystem {
+					testcase TC_CSE_REG_CRE_026_RN() 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 resourceName";
 						v_utRequest.requestPrimitive.primitiveContent.remoteCSE.resourceName := "UNINITIALIZED";
 						v_request.primitiveContent.remoteCSE.resourceName := ?;
-						f_CSE_REG_CRE_026(v_utRequest,v_request,v_action);
+						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 {
+						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";
 						v_utRequest.requestPrimitive.primitiveContent.remoteCSE.expirationTime := "20301231T012345";
 						v_request.primitiveContent.remoteCSE.expirationTime := ?;
-						f_CSE_REG_CRE_026(v_utRequest,v_request,v_action);
+						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 {
+						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";
 						v_utRequest.requestPrimitive.primitiveContent.remoteCSE.labels := {"UNINITIALIZED"};
 						v_request.primitiveContent.remoteCSE.labels := ?;
-						f_CSE_REG_CRE_026(v_utRequest,v_request,v_action);
+						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 {
+						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";
 						v_utRequest.requestPrimitive.primitiveContent.remoteCSE.pointOfAccess := {"UNINITIALIZED"};
 						v_request.primitiveContent.remoteCSE.pointOfAccess := ?;
-						f_CSE_REG_CRE_026(v_utRequest,v_request,v_action);
+						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 {
+						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";
 						v_utRequest.requestPrimitive.primitiveContent.remoteCSE.nodeLink := "UNINITIALIZED";
 						v_request.primitiveContent.remoteCSE.nodeLink := ?;
-						f_CSE_REG_CRE_026(v_utRequest,v_request,v_action);
+						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 {
+						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";
 						v_utRequest.requestPrimitive.primitiveContent.remoteCSE.cseType := int1;//TODO It should be marked as "UNITIALIZED"
 						v_request.primitiveContent.remoteCSE.cseType := ?;
-						f_CSE_REG_CRE_026(v_utRequest,v_request,v_action);
+						v_cse1.start(f_CSE_REG_CRE_026(v_utRequest,v_request,v_action));
+						v_cse1.done;
 					}
 					
 				}
@@ -1689,7 +1901,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 				 * @desc Check that IUT accepts a CSE registration request with cseType attribute set to ‘MN_CSE’
 				 * 
 				 */
-				testcase TC_CSE_REG_CRE_027() runs on CseSimu system CseSystem {
+				testcase TC_CSE_REG_CRE_027() runs on Tester system CseSystem {
+					
+					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+							
+					v_cse1.start(f_CSE_REG_CRE_027());
+				  	  	
+					v_cse1.done;
+				  	  		
+				}
+						
+				function f_CSE_REG_CRE_027() runs on CseSimu {
 					//Local variables
 					var ResourceType v_resourceType := int16;	//remoteCSE	
 					var RequestPrimitive v_request;
@@ -1800,7 +2022,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 				 * @desc Check that the IUT accepts an retrieval request of <CSEBase> resource and responds with all  attributes that have multiplicity equals to 1.
 				 * 
 				 */
-				testcase TC_CSE_REG_RET_001() runs on AeSimu system CseSystem {
+				testcase TC_CSE_REG_RET_001() runs on Tester system CseSystem {
+					
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+								
+					v_ae1.start(f_CSE_REG_RET_001());
+					  	  	
+					v_ae1.done;
+					  	  		
+				}
+							
+				function f_CSE_REG_RET_001() runs on AeSimu {
     				
 					// Local variables
 					var MsgIn v_response;
@@ -1890,7 +2122,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 				 * 
 				 */
 				 
-				testcase TC_CSE_REG_RET_003() runs on AeSimu system CseSystem {
+				testcase TC_CSE_REG_RET_003() runs on Tester system CseSystem {
+					
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+									
+					v_ae1.start(f_CSE_REG_RET_003());
+						  	  	
+					v_ae1.done;
+						  	  		
+				}
+								
+				function f_CSE_REG_RET_003() runs on AeSimu {
 					// Local variables
 					var MsgIn v_response;
 					var integer v_aeIndex := -1;
@@ -2001,7 +2243,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 				 * @desc Check that the IUT accepts a retrieval request of <CSEBase> resource including the cseType attribute
 				 * 
 				 */
-				testcase TC_CSE_REG_RET_005() runs on AeSimu system CseSystem {
+				testcase TC_CSE_REG_RET_005() runs on Tester system CseSystem {
+					
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+									
+					v_ae1.start(f_CSE_REG_RET_005());
+						  	  	
+					v_ae1.done;
+						  	  		
+				}
+								
+				function f_CSE_REG_RET_005() runs on AeSimu {
     				
 					// Local variables
 					var MsgIn v_response;
@@ -2063,86 +2315,96 @@ module OneM2M_Testcases_CSE_Release_1 {
 				 * @desc Check that the IUT accepts a retrieval request of <remoteCSE> resource
 				 * 
 				 */
-				testcase TC_CSE_REG_RET_006() runs on CseSimu system CseSystem {
-				//Local variables
-				 //Local variables
-				 var MsgIn v_response;
-				 var RequestPrimitive v_request;
-				 var ResourceType v_resourceType := int16;	//remoteCSE
-				 var template PrimitiveContent v_contentResponse;
-				 		
-				 // Test control
-
-				 // Test component configuration
-				 f_cf04Up();
-
-				 // Test adapter configuration
-
-				 // Preamble
-				 if(PX_IN_CSE){
-				     vc_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSEBase);
-				    
-					 v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
- 
-					 mccPort.send(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");
-						 }
-					 }
-				    
-				 } else if (PX_MN_CSE) {
-					vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSEBase);
-					
-					v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
+				testcase TC_CSE_REG_RET_006() runs on Tester system CseSystem {
 					
-					mccPort.send(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");
+					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+							
+					v_cse1.start(f_CSE_REG_RET_006());
+				  	  	
+					v_cse1.done;
+				  	  		
+				}
+						
+				function f_CSE_REG_RET_006() runs on CseSimu {
+					//Local variables
+					 //Local variables
+					 var MsgIn v_response;
+					 var RequestPrimitive v_request;
+					 var ResourceType v_resourceType := int16;	//remoteCSE
+					 var template PrimitiveContent v_contentResponse;
+					 		
+					 // Test control
+	
+					 // Test component configuration
+					 f_cf04Up();
+	
+					 // Test adapter configuration
+	
+					 // Preamble
+					 if(PX_IN_CSE){
+					     vc_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSEBase);
+					    
+						 v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
+	 
+						 mccPort.send(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");
+							 }
 						 }
-						 [] tc_ac.timeout {
-							 setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
+					    
+					 } else if (PX_MN_CSE) {
+						vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSEBase);
+						
+						v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
+						
+						mccPort.send(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");
+							 }
 						 }
 					 }
-				 }
-
-				 // Postamble
-				 f_cse_postamble_deleteResourcesCSE();
-
-				 // Tear down
-				 f_cf04Down();
+	
+					 // Postamble
+					 f_cse_postamble_deleteResourcesCSE();
+	
+					 // Tear down
+					 f_cf04Down();
 				 
 				}//end TC_CSE_REG_RET_006
 				
@@ -2219,7 +2481,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 				 * @desc Check that the IUT accepts a retrieval request of <CSEBase> resource and responds with supportedResourceTypes attribute containing a list of the supported resources and pointOfAccess containing the list of physical addresses to be used by Registree to connect to this CSE (e.g. IP address, FQDN).
 				 * 
 				 */
-				testcase TC_CSE_REG_RET_008() runs on AeSimu system CseSystem {
+				testcase TC_CSE_REG_RET_008() runs on Tester system CseSystem {
+					
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+									
+					v_ae1.start(f_CSE_REG_RET_008());
+						  	  	
+					v_ae1.done;
+						  	  		
+				}
+								
+				function f_CSE_REG_RET_008() runs on AeSimu {
     				
 					// Local variables
 					var MsgIn v_response;
@@ -2288,7 +2560,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 				 * @desc Check that the IUT sends a <remoteCSE> retrieve request on TARGET_REMOTE_CSE_ADDRESS
 				 * 
 				 */
-				testcase TC_CSE_REG_RET_009() runs on CseSimu system CseSystem {
+				testcase TC_CSE_REG_RET_009() runs on Tester system CseSystem {
+					
+					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+								
+					v_cse1.start(f_CSE_REG_RET_009());
+					  	  	
+					v_cse1.done;
+					  	  		
+				}
+							
+				function f_CSE_REG_RET_009() runs on CseSimu {
 					//Local variables
 					 //Local variables
 					 var MsgIn v_response;
@@ -2342,7 +2624,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 				 * @desc Check that IUT accepts a <remoteCSE> retrieve request
 				 * 
 				 */
-				testcase TC_CSE_REG_RET_010() runs on CseSimu system CseSystem {
+				testcase TC_CSE_REG_RET_010() runs on Tester system CseSystem {
+						
+					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+								
+					v_cse1.start(f_CSE_REG_RET_010());
+					  	  	
+					v_cse1.done;
+					  	  		
+				}
+							
+				function f_CSE_REG_RET_010() runs on CseSimu {
 					 //Local variables
 					 var MsgIn v_response;
 					 var RequestPrimitive v_request;
@@ -2407,7 +2699,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 				 * @desc Check that the IUT rejects the update request of <CSEBase> resource.
 				 * 
 				 */
-				testcase TC_CSE_REG_UPD_001() runs on AeSimu system CseSystem {
+				testcase TC_CSE_REG_UPD_001() runs on Tester system CseSystem {
+					
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+									
+					v_ae1.start(f_CSE_REG_UPD_001());
+						  	  	
+					v_ae1.done;
+						  	  		
+				}
+								
+				function f_CSE_REG_UPD_001() runs on AeSimu {
 					// Local variables
 					var MsgIn v_response;
 					var RequestPrimitive v_request;
@@ -2584,7 +2886,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 				 * @desc Check that the IUT rejects the delete request of <CSEBase> resource.
 				 * 
 				 */
-				testcase TC_CSE_REG_DEL_001() runs on AeSimu system CseSystem {
+				testcase TC_CSE_REG_DEL_001() runs on Tester system CseSystem {
+					
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+									
+					v_ae1.start(f_CSE_REG_DEL_001());
+						  	  	
+					v_ae1.done;
+						  	  		
+				}
+								
+				function f_CSE_REG_DEL_001() runs on AeSimu {
 					// Local variables
 					var MsgIn v_response;
 					var RequestPrimitive v_request;
@@ -2630,7 +2942,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 				 * @desc Check that IUT accepts a <remoteCSE> delete request on TARGET_REMOTE_CSE_ADDRESS, and deletes the <remoteCSE> resource
 				 * 
 				 */
-				testcase TC_CSE_REG_DEL_002() runs on CseSimu system CseSystem {
+				testcase TC_CSE_REG_DEL_002() runs on Tester system CseSystem {
+					
+					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+								
+					v_cse1.start(f_CSE_REG_DEL_002());
+					  	  	
+					v_cse1.done;
+					  	  		
+				}
+							
+				function f_CSE_REG_DEL_002() runs on CseSimu {
 					//Local variables	
 					var RequestPrimitive v_request;
 					// Test control
@@ -2693,7 +3015,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 				 * @desc Check that the IUT accepts an AE de-registration
 				 * 
 				 */
-				testcase TC_CSE_REG_DEL_003() runs on AeSimu system CseSystem {
+				testcase TC_CSE_REG_DEL_003() runs on Tester system CseSystem {
+					
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+										
+					v_ae1.start(f_CSE_REG_DEL_003());
+							  	  	
+					v_ae1.done;
+							  	  		
+				}
+								
+				function f_CSE_REG_DEL_003() runs on AeSimu {
 					//Local variables
 					var RequestPrimitive v_request;
 					var integer v_aeIndex := -1;	
@@ -2743,7 +3075,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 				 * @desc Check that IUT sends a <remoteCSE> delete request on TARGET_REMOTE_CSE_ADDRESS
 				 * 
 				 */
-				testcase TC_CSE_REG_DEL_004() runs on CseSimu system CseSystem {
+				testcase TC_CSE_REG_DEL_004() runs on Tester system CseSystem {
+					
+					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+								
+					v_cse1.start(f_CSE_REG_DEL_004());
+					  	  	
+					v_cse1.done;
+					  	  		
+				}
+							
+				function f_CSE_REG_DEL_004() runs on CseSimu {
 					//Local variables	
 					var template UtTriggerPrimitive v_utRequest := m_utDelete;
 					var UtTriggerAckPrimitive v_trigger_response;
@@ -5226,7 +5568,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 				 * @desc Check that the IUT responds with an error when the AE tries to update an attribute of a TARGET_RESOURCE_ADDRESS resource when the resource does not exist
 				 * 
 				 */
-				testcase TC_CSE_DMR_UPD_005() runs on AeSimu system CseSystem {
+				testcase TC_CSE_DMR_UPD_005() runs on Tester system CseSystem {
+					
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+					v_ae1.start(f_CSE_DMR_UPD_005());
+			  	  	
+					v_ae1.done;
+			  	  		
+				}
+					
+				function f_CSE_DMR_UPD_005() runs on AeSimu {
 					//Local variables
 					var RequestPrimitive v_request;
 					var integer v_aeIndex := -1;
@@ -7750,7 +8102,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 				 * @desc Check that the IUT rejects the creation of the <subscription> resource when the target subscribed-to RESOURCE_TYPE resource is not subscribable. 
 				 *  
 				 */
-				testcase TC_CSE_SUB_CRE_001_SUB() runs on AeSimu system CseSystem {
+				testcase TC_CSE_SUB_CRE_001_SUB() runs on Tester system CseSystem {
+					
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+							
+					v_ae1.start(f_CSE_SUB_CRE_001_SUB());
+				  	  	
+					v_ae1.done;
+				  	  		
+				}
+						
+				function f_CSE_SUB_CRE_001_SUB() runs on AeSimu {
 					// Local variables
 					var MsgIn v_response;
 					var integer v_aeIndex := -1;
@@ -7813,7 +8175,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 
 				} // end TC_CSE_SUB_CRE_001_SUB
 				
-				testcase TC_CSE_SUB_CRE_001_CIN() runs on AeSimu system CseSystem {
+				testcase TC_CSE_SUB_CRE_001_CIN() runs on Tester system CseSystem {
+					
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+								
+					v_ae1.start(f_CSE_SUB_CRE_001_CIN());
+					  	  	
+					v_ae1.done;
+					  	  		
+				}
+							
+				function f_CSE_SUB_CRE_001_CIN() runs on AeSimu {
 					// Local variables
 					var MsgIn v_response;
 					var integer v_aeIndex := -1;
@@ -7880,7 +8252,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 				 * @desc Check that the IUT rejects the creation of the <subscription> resource when the originator does not have privileges for retrieving the subscribed-to resource.
 				 * 
 				 */
-				testcase TC_CSE_SUB_CRE_002() runs on AeSimu system CseSystem {
+				testcase TC_CSE_SUB_CRE_002() runs on Tester system CseSystem {
+					
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+								
+					v_ae1.start(f_CSE_SUB_CRE_002());
+					  	  	
+					v_ae1.done;
+					  	  		
+				}
+							
+				function f_CSE_SUB_CRE_002() runs on AeSimu {
 					// Local variables
 					var MsgIn v_response;
 					var integer v_aeIndex := -1;
@@ -7948,7 +8330,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 				 * @desc Check that the IUT rejects the creation of the <subscription> resource when the notificationURI is not the originator and the IUT cannot send the Notify request to the notificationURI
 				 * 
 				 */
-				testcase TC_CSE_SUB_CRE_003() runs on AeSimu system CseSystem {
+				testcase TC_CSE_SUB_CRE_003() runs on Tester system CseSystem {
+					
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+								
+					v_ae1.start(f_CSE_SUB_CRE_003());
+					  	  	
+					v_ae1.done;
+					  	  		
+				}
+							
+				function f_CSE_SUB_CRE_003() runs on AeSimu {
 					// Local variables
 					var MsgIn v_response;
 					var integer v_aeIndex := -1;
@@ -8010,7 +8402,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 				 * @desc Check that the IUT stores Originator ID in the notification creator attribute when a <SUBSCRIPTION> creation request which needs verification is received and the notificationURI is not the Originator.
 				 * 
 				 */
-				testcase TC_CSE_SUB_CRE_004() runs on AeSimu system CseSystem {
+				testcase TC_CSE_SUB_CRE_004() runs on Tester system CseSystem {
+					
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+								
+					v_ae1.start(f_CSE_SUB_CRE_004());
+					  	  	
+					v_ae1.done;
+					  	  		
+				}
+							
+				function f_CSE_SUB_CRE_004() runs on AeSimu {
 					//Local variables
 					 var template RequestPrimitive v_request := m_createSubscriptionBase;
 					 var RequestPrimitive v_notificationRequest;
@@ -8062,7 +8464,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 				 * @desc Check that the IUT sends a Notify request to the subscriber resource when eventType attribute is set to "Create_of_Direct_Child_Resource"  and an create operation has been performed on the subscribed-to resource
 				 * 
 				 */
-				testcase TC_CSE_SUB_CRE_005() runs on AeSimu system CseSystem {
+				testcase TC_CSE_SUB_CRE_005() runs on Tester system CseSystem {
+					
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+								
+					v_ae1.start(f_CSE_SUB_CRE_005());
+					  	  	
+					v_ae1.done;
+					  	  		
+				}
+							
+				function f_CSE_SUB_CRE_005() runs on AeSimu {
 					
 					// Local variables
 					var MsgIn v_response;
@@ -8135,7 +8547,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 				 * @desc Check that the IUT sends Notify request to the subscriber resource when an update operation has been performed on the subscribed-to resource
 				 * 
 				 */
-				testcase TC_CSE_SUB_UPD_001() runs on AeSimu system CseSystem {
+				testcase TC_CSE_SUB_UPD_001() runs on Tester system CseSystem {
+					
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+								
+					v_ae1.start(f_CSE_SUB_UPD_001());
+					  	  	
+					v_ae1.done;
+					  	  		
+				}
+							
+				function f_CSE_SUB_UPD_001() runs on AeSimu {
 					// Local variables
 					var MsgIn v_response;
 					var Labels v_labels_1:= {"VALUE_1"};
@@ -8211,7 +8633,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 				 * @desc Check that the IUT sends a Notify request to the AE2_RESOURCE_ADDRESS of the subscriberURI attribute when the SUBSCRIPTION_RESOURCE_ADDRESS <subscription> resource is deleted
 				 * 
 				 */
-				testcase TC_CSE_SUB_DEL_001() runs on AeSimu system CseSystem {
+				testcase TC_CSE_SUB_DEL_001() runs on Tester system CseSystem {
+					
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+									
+					v_ae1.start(f_CSE_SUB_DEL_001());
+						  	  	
+					v_ae1.done;
+						  	  		
+				}
+								
+				function f_CSE_SUB_DEL_001() runs on AeSimu {
 					// Local variables
 					var MsgIn v_response;
 					var integer v_aeIndex := -1;
@@ -8301,7 +8733,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 					 * @desc Check that the IUT accepts the creation of a accessControlPolicy resource with privileges attribute having multiple access control rules
 					 * 
 					 */
-					testcase TC_CSE_SEC_ACP_CRE_001() runs on AeSimu system CseSystem {
+					testcase TC_CSE_SEC_ACP_CRE_001() runs on Tester system CseSystem {
+					
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+									
+						v_ae1.start(f_CSE_SEC_ACP_CRE_001());
+						  	  	
+						v_ae1.done;
+						  	  		
+					}
+								
+					function f_CSE_SEC_ACP_CRE_001() runs on AeSimu {
 						// Local variables
 						var MsgIn v_response;
 						var integer v_aeIndex := -1;
@@ -8374,7 +8816,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 					/**
 					* @desc Check that the IUT accepts the creation of a  accessControlPolicy resource with selfPrivileges attribute having multiple access control rules
 					*/
-					testcase TC_CSE_SEC_ACP_CRE_002() runs on AeSimu system CseSystem {
+					testcase TC_CSE_SEC_ACP_CRE_002() runs on Tester system CseSystem {
+					
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+										
+						v_ae1.start(f_CSE_SEC_ACP_CRE_002());
+							  	  	
+						v_ae1.done;
+							  	  		
+					}
+									
+					function f_CSE_SEC_ACP_CRE_002() runs on AeSimu {
 						// Local variables
 						var MsgIn v_response;
 						var integer v_aeIndex := -1;
@@ -8448,7 +8900,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 					 * @desc Check that the IUT accepts the creation of a accessControlPolicy resource with privileges attribute having empty rules
 					 * 
 					 */
-					testcase TC_CSE_SEC_ACP_CRE_003() runs on AeSimu system CseSystem {
+					testcase TC_CSE_SEC_ACP_CRE_003() runs on Tester system CseSystem {
+					
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+										
+						v_ae1.start(f_CSE_SEC_ACP_CRE_003());
+							  	  	
+						v_ae1.done;
+							  	  		
+					}
+									
+					function f_CSE_SEC_ACP_CRE_003() runs on AeSimu {
 						// Local variables
 						var MsgIn v_response;
 						var integer v_acpIndex := -1;
@@ -8521,7 +8983,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 					 * @desc Check that the IUT responds with an error when the creation of a accessControlPolicy resource with selfPrivileges attribute having empty rules
 					 * 
 					 */
-					testcase TC_CSE_SEC_ACP_CRE_004() runs on AeSimu system CseSystem {
+					testcase TC_CSE_SEC_ACP_CRE_004() runs on Tester system CseSystem {
+					
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+										
+						v_ae1.start(f_CSE_SEC_ACP_CRE_004());
+							  	  	
+						v_ae1.done;
+							  	  		
+					}
+									
+					function f_CSE_SEC_ACP_CRE_004() runs on AeSimu {
 						// Local variables
 						var MsgIn v_response;
 						var integer v_acpIndex := -1;
@@ -8588,7 +9060,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 					 * @desc Check that the IUT updates successfully the accessControlPolicyIDs attribute of the <AE> resource when the AE has privileges for UPDATE operation in any selfPrivileges of the <accessControlPolicy> resources which this attribute originally indicates.
 					 * 
 					 */
-					testcase TC_CSE_SEC_ACP_UPD_001() runs on AeSimu system CseSystem {
+					testcase TC_CSE_SEC_ACP_UPD_001() runs on Tester system CseSystem {
+					
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+										
+						v_ae1.start(f_CSE_SEC_ACP_UPD_001());
+							  	  	
+						v_ae1.done;
+							  	  		
+					}
+									
+					function f_CSE_SEC_ACP_UPD_001() runs on AeSimu {
 						// Local variables
 						var MsgIn v_response;
 						var integer v_aeIndex := -1;
@@ -8671,7 +9153,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 					 * @desc Check that the IUT responds with an error when the AE tries an UPDATE operation on the accessControlPolicyIDs attribute without having privileges for such operation in any selfPrivileges of the <accessControlPolicy> resources which this attribute originally indicates.
 					 * 
 					 */
-					testcase TC_CSE_SEC_ACP_UPD_002() runs on AeSimu system CseSystem {
+					testcase TC_CSE_SEC_ACP_UPD_002() runs on Tester system CseSystem {
+					
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+										
+						v_ae1.start(f_CSE_SEC_ACP_UPD_002());
+							  	  	
+						v_ae1.done;
+							  	  		
+					}
+									
+					function f_CSE_SEC_ACP_UPD_002() runs on AeSimu {
 						// Local variables
 						var MsgIn v_response;
 						var integer v_aeIndex := -1;
@@ -9234,7 +9726,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 			 * @desc Check that the IUT returns successfully a list all discovered resource addresses
 			 * 
 			 */
-			testcase TC_CSE_DIS_001() runs on AeSimu system CseSystem {
+			testcase TC_CSE_DIS_001() runs on Tester system CseSystem {
+					
+				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+										
+				v_ae1.start(f_CSE_DIS_001());
+							  	  	
+				v_ae1.done;
+							  	  		
+			}
+									
+			function f_CSE_DIS_001() runs on AeSimu {
 				// Local variables
 				var integer v_aeIndex := -1;
 				var integer v_resourceIndex := -1;
@@ -9286,7 +9788,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 			 * @desc Check that the IUT returns successfully appropriate list of discovered resource when the filter criteria is provided in the request
 			 * 
 			 */
-			testcase TC_CSE_DIS_002() runs on AeSimu system CseSystem {
+			testcase TC_CSE_DIS_002() runs on Tester system CseSystem {
+					
+				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+											
+				v_ae1.start(f_CSE_DIS_002());
+								  	  	
+				v_ae1.done;
+								  	  		
+			}
+										
+			function f_CSE_DIS_002() runs on AeSimu {
 				// Local variables
 				var MsgIn v_response;
 				var integer v_aeIndex := -1;
@@ -9348,7 +9860,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 			 * @desc Check that the IUT returns the empty address list when no result matching with filter criteria is discovered
 			 * 
 			 */
-			testcase TC_CSE_DIS_003() runs on AeSimu system CseSystem {
+			testcase TC_CSE_DIS_003() runs on Tester system CseSystem {
+					
+				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+											
+				v_ae1.start(f_CSE_DIS_003());
+								  	  	
+				v_ae1.done;
+								  	  		
+			}
+										
+			function f_CSE_DIS_003() runs on AeSimu {
 				// Local variables
 				var MsgIn v_response;
 				var integer v_aeIndex := -1;
@@ -9409,7 +9931,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 			 * @desc Check that the IUT returns successfully a list of discovered resource addresses with Non-hierarchical addressing form when the Discovery Result Type is provided in the request
 			 *  
 			 */
-			testcase TC_CSE_DIS_004() runs on AeSimu system CseSystem {
+			testcase TC_CSE_DIS_004() runs on Tester system CseSystem {
+					
+				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+											
+				v_ae1.start(f_CSE_DIS_004());
+								  	  	
+				v_ae1.done;
+								  	  		
+			}
+										
+			function f_CSE_DIS_004() runs on AeSimu {
 				// Local variables
 				var MsgIn v_response;
 				var integer v_aeIndex := -1;
@@ -9470,7 +10002,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 			 * @desc Check that the IUT rejects the discovery requests to the resource TARGET_RESOURCE_ADDRESS when AE has no privilege to perform the discovery request for the resource TARGET_RESOURCE_ADDRESS
 			 * 
 			 */
-			testcase TC_CSE_DIS_005() runs on AeSimu system CseSystem {
+			testcase TC_CSE_DIS_005() runs on Tester system CseSystem {
+					
+				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+											
+				v_ae1.start(f_CSE_DIS_005());
+								  	  	
+				v_ae1.done;
+								  	  		
+			}
+										
+			function f_CSE_DIS_005() runs on AeSimu {
 				// Local variables
 				var integer v_aeIndex := -1;
 				var integer v_resourceIndex := -1;
@@ -9529,7 +10071,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 			 * @desc Check that the IUT responds with an error when the AE sends requests to discover the resource TARGET_RESOURCE_ADDRESS which does not exist in the Hosting CSE
 			 * 
 			 */
-			testcase TC_CSE_DIS_006() runs on AeSimu system CseSystem {
+			testcase TC_CSE_DIS_006() runs on Tester system CseSystem {
+					
+				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+											
+				v_ae1.start(f_CSE_DIS_006());
+								  	  	
+				v_ae1.done;
+								  	  		
+			}
+										
+			function f_CSE_DIS_006() runs on AeSimu {
 				// Local variables
 				var MsgIn v_response;
 				var integer v_aeIndex := -1;
@@ -9585,7 +10137,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 			 * @desc Check that the IUT responds the originator with an error when the originator sends a request including an invalid format of filter criteria to discover the resource TARGET_RESOURCE_ADDRESS 
 			 * 
 			 */
-			testcase TC_CSE_DIS_007() runs on AeSimu system CseSystem {
+			testcase TC_CSE_DIS_007() runs on Tester system CseSystem {
+					
+				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+											
+				v_ae1.start(f_CSE_DIS_007());
+								  	  	
+				v_ae1.done;
+								  	  		
+			}
+										
+			function f_CSE_DIS_007() runs on AeSimu {
 				// Local variables
 				var MsgIn v_response;
 				var integer v_aeIndex := -1;
@@ -9643,7 +10205,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				 * @desc Check that the IUT responds the originator with an error when the originator sends a request to discover the resource TARGET_RESOURCE_ADDRESS including two conflicted filter criteria of different type FILTER_CRITERIA_CONDITION_1 and FILTER_CRITERIA_CONDITION_2 (E.G. createBefore < createdAfter)
 				 * 
 				 */
-				testcase TC_CSE_DIS_008_CRB_CRA() runs on AeSimu system CseSystem {
+				testcase TC_CSE_DIS_008_CRB_CRA() runs on Tester system CseSystem {
 					
 					//Local variables
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
@@ -9658,7 +10220,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 				}
 					
-				testcase TC_CSE_DIS_008_MS_US() runs on AeSimu system CseSystem {
+				testcase TC_CSE_DIS_008_MS_US() runs on Tester system CseSystem {
 					
 					//Local variables
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
@@ -9673,7 +10235,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 	
 				}
 				
-				testcase TC_CSE_DIS_008_STS_STB() runs on AeSimu system CseSystem {
+				testcase TC_CSE_DIS_008_STS_STB() runs on Tester system CseSystem {
 					
 					//Local variables
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
@@ -9688,7 +10250,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 	
 				}
 				
-				testcase TC_CSE_DIS_008_EXB_EXA() runs on AeSimu system CseSystem {
+				testcase TC_CSE_DIS_008_EXB_EXA() runs on Tester system CseSystem {
 					
 					//Local variables
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
@@ -9709,7 +10271,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 			 * @desc Check that the IUT returns the empty address list when resources match the filter criteria but they do not include DISCOVERY permission
 			 * 
 			 */
-			testcase TC_CSE_DIS_009() runs on AeSimu system CseSystem {
+			testcase TC_CSE_DIS_009() runs on Tester system CseSystem {
+					
+				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+											
+				v_ae1.start(f_CSE_DIS_009());
+								  	  	
+				v_ae1.done;
+								  	  		
+			}
+										
+			function f_CSE_DIS_009() runs on AeSimu {
 				// Local variables
 				var MsgIn v_response;
 				var integer v_aeIndex := -1;
@@ -9783,7 +10355,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 				 * @desc Check that the IUT rejects the creation of the group resource when member ID exceed max number of members. 
 				 * 
 				 */
-				testcase TC_CSE_GMG_CRE_001() runs on AeSimu system CseSystem {
+				testcase TC_CSE_GMG_CRE_001() runs on Tester system CseSystem {
+					
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+											
+					v_ae1.start(f_CSE_GMG_CRE_001());
+								  	  	
+					v_ae1.done;
+								  	  		
+				}
+										
+				function f_CSE_GMG_CRE_001() runs on AeSimu {
 					// Local constants
 					const XSD.NonNegativeInteger c_maxNrOfMembers := 1;
 					
@@ -9860,7 +10442,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 				 * @desc Check that the IUT rejects the creation of the group resource when the memberType cannot be retrieved due to lack of privilege.
 				 * 
 				 */
-				testcase TC_CSE_GMG_CRE_002() runs on AeSimu system CseSystem {
+				testcase TC_CSE_GMG_CRE_002() runs on Tester system CseSystem {
+					
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+												
+					v_ae1.start(f_CSE_GMG_CRE_002());
+									  	  	
+					v_ae1.done;
+									  	  		
+				}
+											
+				function f_CSE_GMG_CRE_002() runs on AeSimu {
 					// Local variables
 					var MsgIn v_response;
 					var integer v_aeIndex := -1;
@@ -9934,7 +10526,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 				 * @desc Check that the IUT detects the presence of duplicate member IDs during the creation of the  <group> resource and removes the duplicate member IDs prior to creation of the <group> resource. 
 				 *
 				 */
-				testcase TC_CSE_GMG_CRE_003() runs on AeSimu system CseSystem {                    
+				testcase TC_CSE_GMG_CRE_003() runs on Tester system CseSystem {
+					
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+												
+					v_ae1.start(f_CSE_GMG_CRE_003());
+									  	  	
+					v_ae1.done;
+									  	  		
+				}
+											
+				function f_CSE_GMG_CRE_003() runs on AeSimu {                   
 					// Local variables
 					var MsgIn v_response;
 					var integer v_aeIndex := -1;
@@ -9991,7 +10593,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 				/**
 				 * @desc Check that the IUT validates the resource type during the creation of the  <group> resource when memberType attribute is not ‘mixed’. 
 				 */
-				testcase TC_CSE_GMG_CRE_004() runs on AeSimu system CseSystem {
+				testcase TC_CSE_GMG_CRE_004() runs on Tester system CseSystem {
+					
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+												
+					v_ae1.start(f_CSE_GMG_CRE_004());
+									  	  	
+					v_ae1.done;
+									  	  		
+				}
+											
+				function f_CSE_GMG_CRE_004() runs on AeSimu {
 					// Local variables
 					var MsgIn v_response;
 					var RequestPrimitive v_createRequest;
@@ -10048,7 +10660,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 				* @desc Check that the IUT handles unsuccessful validation of the resource type during the creation of the  <group> resource when memberType attribute is not ‘mixed’ and the consistencyStrategy attribute is SET_MIXED.
 				* 
 				*/
-				testcase TC_CSE_GMG_CRE_005() runs on AeSimu system CseSystem {
+				testcase TC_CSE_GMG_CRE_005() runs on Tester system CseSystem {
+					
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+												
+					v_ae1.start(f_CSE_GMG_CRE_005());
+									  	  	
+					v_ae1.done;
+									  	  		
+				}
+											
+				function f_CSE_GMG_CRE_005() runs on AeSimu {
 					//Local variables
 					var MsgIn v_response;
 					var RequestPrimitive v_createRequest;
@@ -10116,7 +10738,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 				* @desc Check that the IUT handles unsuccessful validation of the resource type during the creation of the  <group> resource when memberType attribute is not ‘mixed’ and the consistencyStrategy attribute is ABANDON_MEMBER,.
 				* 
 				*/
-				testcase TC_CSE_GMG_CRE_006() runs on AeSimu system CseSystem {
+				testcase TC_CSE_GMG_CRE_006() runs on Tester system CseSystem {
+					
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+												
+					v_ae1.start(f_CSE_GMG_CRE_006());
+									  	  	
+					v_ae1.done;
+									  	  		
+				}
+											
+				function f_CSE_GMG_CRE_006() runs on AeSimu {
 					//Local variables
 					var MsgIn v_response;
 					var RequestPrimitive v_createRequest;
@@ -10188,7 +10820,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 				 * @desc Check that the IUT handles unsuccessful validation of the resource type during the creation of the group resource when memberType attribute is not ‘mixed’ and the consistencyStrategy attribute is ABANDON_GROUP.
 				 * 
 				 */
-				testcase TC_CSE_GMG_CRE_007() runs on AeSimu system CseSystem {
+				testcase TC_CSE_GMG_CRE_007() runs on Tester system CseSystem {
+					
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+												
+					v_ae1.start(f_CSE_GMG_CRE_007());
+									  	  	
+					v_ae1.done;
+									  	  		
+				}
+											
+				function f_CSE_GMG_CRE_007() runs on AeSimu {
 					//Local variables
 					var MsgIn v_response;
 					var RequestPrimitive v_createRequest;
@@ -10249,7 +10891,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 				 * @desc Check that the IUT generates a request primitive for each resource in memberIDs with a relative address appended to fanOutPoint that includes a virtual resource.
 				 * 
 				 */
-				testcase TC_CSE_GMG_RET_001() runs on AeSimu system CseSystem {
+				testcase TC_CSE_GMG_RET_001() runs on Tester system CseSystem {
+					
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+												
+					v_ae1.start(f_CSE_GMG_RET_001());
+									  	  	
+					v_ae1.done;
+									  	  		
+				}
+											
+				function f_CSE_GMG_RET_001() runs on AeSimu {
 					//Local constants
 					const integer c_numberOfResponsePrimitive := 2;
 
@@ -10344,7 +10996,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 				* @desc Check that the IUT rejects the update of the  group resource when the memberType cannot be retrieved due to lack of privilege.
 				* 
 				*/
-				testcase TC_CSE_GMG_UPD_001() runs on AeSimu system CseSystem {
+				testcase TC_CSE_GMG_UPD_001() runs on Tester system CseSystem {
+					
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+												
+					v_ae1.start(f_CSE_GMG_UPD_001());
+									  	  	
+					v_ae1.done;
+									  	  		
+				}
+											
+				function f_CSE_GMG_UPD_001() runs on AeSimu {
 					// Local variables
 					var MsgIn v_response;
 					var integer v_aeIndex := -1;
@@ -10414,7 +11076,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 				* @desc Check that the IUT detects the presence of duplicate member IDs during an update of the  <group> resource and removes the duplicate member IDs prior to updating the <group> resource. 
 				*  
 				*/
-			  testcase TC_CSE_GMG_UPD_002() runs on AeSimu system CseSystem {
+			  testcase TC_CSE_GMG_UPD_002() runs on Tester system CseSystem {
+					
+				  var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+													
+				  v_ae1.start(f_CSE_GMG_UPD_002());
+										  	  	
+				  v_ae1.done;
+										  	  		
+			  }
+												
+			  function f_CSE_GMG_UPD_002() runs on AeSimu {
 					// Local variables
 					var MsgIn v_response;
 					var integer v_aeIndex := -1;
@@ -10498,7 +11170,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 				 * @desc Check that the IUT validates the resource type during an UPDATE of the  <group> resource when memberType attribute is not ‘mixed’. 
 				 * 
 				 */
-				testcase TC_CSE_GMG_UPD_003() runs on AeSimu system CseSystem {
+				testcase TC_CSE_GMG_UPD_003() runs on Tester system CseSystem {
+					
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+													
+					v_ae1.start(f_CSE_GMG_UPD_003());
+										  	  	
+					v_ae1.done;
+										  	  		
+				}
+												
+				function f_CSE_GMG_UPD_003() runs on AeSimu {
 					// Local variables
 					var MsgIn v_response;
 					var integer v_aeIndex := -1;
@@ -10574,7 +11256,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 				* @desc Check that the IUT handles unsuccessful validation of the resource type during an UPDATE of the <group> resource when memberType attribute is not ‘mixed’ and the consistencyStrategy attribute is SET_MIXED. 
 				* 
 				*/
-				testcase TC_CSE_GMG_UPD_004() runs on AeSimu system CseSystem {
+				testcase TC_CSE_GMG_UPD_004() runs on Tester system CseSystem {
+					
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+													
+					v_ae1.start(f_CSE_GMG_UPD_004());
+										  	  	
+					v_ae1.done;
+										  	  		
+				}
+												
+				function f_CSE_GMG_UPD_004() runs on AeSimu {
 					// Local variables
 					var MsgIn v_response;
 					var RequestPrimitive v_updateRequest := valueof(m_updateGroupBase);
@@ -10670,7 +11362,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 				 * @desc Check that the IUT handles unsuccessful validation of the resource type during an UPDATE of the group resource when memberType attribute is not ‘mixed’ and the consistencyStrategy attribute is ABANDON_MEMBER.
 				 * 
 				 */
-				testcase TC_CSE_GMG_UPD_005() runs on AeSimu system CseSystem {
+				testcase TC_CSE_GMG_UPD_005() runs on Tester system CseSystem {
+					
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+													
+					v_ae1.start(f_CSE_GMG_UPD_005());
+										  	  	
+					v_ae1.done;
+										  	  		
+				}
+												
+				function f_CSE_GMG_UPD_005() runs on AeSimu {
 					// Local variables
 					var MsgIn v_response;
 					var RequestPrimitive v_updateRequest := valueof(m_updateGroupBase);
@@ -10769,7 +11471,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 				 * @desc Check that the IUT handles unsuccessful validation of the resource type during the creation of the  group resource when memberType attribute is not ‘mixed’ and the consistencyStrategy attribute is ABANDON_GROUP.
 				 * 
 				 */
-				testcase TC_CSE_GMG_UPD_006() runs on AeSimu system CseSystem {
+				testcase TC_CSE_GMG_UPD_006() runs on Tester system CseSystem {
+					
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+													
+					v_ae1.start(f_CSE_GMG_UPD_006());
+										  	  	
+					v_ae1.done;
+										  	  		
+				}
+												
+				function f_CSE_GMG_UPD_006() runs on AeSimu {
 					// Local variables
 					var MsgIn v_response;
 					var RequestPrimitive v_updateRequest := valueof(m_updateGroupBase);
@@ -10830,8 +11542,18 @@ module OneM2M_Testcases_CSE_Release_1 {
 				* @desc Check that the IUT detects when the number of memberIDs exceeds the limitation of maxNrOfMembers.
 				*  
 				*/
-				testcase TC_CSE_GMG_UPD_007() runs on AeSimu system CseSystem
-				{
+				testcase TC_CSE_GMG_UPD_007() runs on Tester system CseSystem {
+					
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+													
+					v_ae1.start(f_CSE_GMG_UPD_007());
+										  	  	
+					v_ae1.done;
+										  	  		
+				}
+												
+				function f_CSE_GMG_UPD_007() runs on AeSimu {
+					
 					//Local constants
 					const integer c_maxNrOfMembers := 2;
                     
@@ -10912,7 +11634,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 				* @desc Check that the IUT detects when the value provided for maxNrOfMembers attribute is less than the value of the currentNrOfMembers attribute.
 				*  
 				*/
-				testcase TC_CSE_GMG_UPD_008() runs on AeSimu system CseSystem {
+				testcase TC_CSE_GMG_UPD_008() runs on Tester system CseSystem {
+					
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+													
+					v_ae1.start(f_CSE_GMG_UPD_008());
+										  	  	
+					v_ae1.done;
+										  	  		
+				}
+												
+				function f_CSE_GMG_UPD_008() runs on AeSimu {
 					// Local variables
 					var MsgIn v_response;
 					var RequestPrimitive v_updateRequest := valueof(m_updateGroupBase);
@@ -10984,8 +11716,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 				 * @desc Check that the IUT handles validation of the resource type during an UPDATE of the <group> resource when memberIDs contains a sub-group on a temporarily unreachable Hosting CSE.
 				 * 
 				 */
-				testcase TC_CSE_GMG_UPD_009() runs on AeSimu system CseSystem
-				{
+				testcase TC_CSE_GMG_UPD_009() runs on Tester system CseSystem {
+					
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+													
+					v_ae1.start(f_CSE_GMG_UPD_009());
+										  	  	
+					v_ae1.done;
+										  	  		
+				}
+												
+				function f_CSE_GMG_UPD_009() runs on AeSimu {
 					//Local constants
 					const integer c_maxNrOfMembers := 2;
 					const ResourceType c_ResourceTypeGroup := int9;  
@@ -11087,8 +11828,17 @@ module OneM2M_Testcases_CSE_Release_1 {
 				* @desc Check that the IUT handles validation of the resource type during an UPDATE of the group resource when memberIDs contains a sub-group on a  a previously unreachable Hosting CSE that has become reachable
 				* @verdict 
 				*/
-				testcase TC_CSE_GMG_UPD_010() runs on AeSimu system CseSystem
-				{
+				testcase TC_CSE_GMG_UPD_010() runs on Tester system CseSystem {
+					
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+													
+					v_ae1.start(f_CSE_GMG_UPD_010());
+										  	  	
+					v_ae1.done;
+										  	  		
+				}
+												
+				function f_CSE_GMG_UPD_010() runs on AeSimu {
 					//Local constants
 					const ResourceType c_ResourceTypeGroup := int9;  
 					const integer c_maxNrOfMembers := 2;