diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 8b83ce1cc91220505da93b035638aa8864b50bb6..17c19dfb45d6425a459a747c94a19f4f6bac311f 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -45,7 +45,8 @@ module OneM2M_Functions {
 			if(p_auxiliaryAe2Required) {
 				vc_auxiliaryAe2Up := p_auxiliaryAe2Required;
 				vc_ae2 := AeSimu.create("AE2") alive;
-				f_setProtocolBinding(PX_PROTOCOL_BINDING_AE2);
+				vc_ae2.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE2));
+				vc_ae2.done;
 				vc_ae2.start(f_cf01UpAe2());
 				vc_ae2.done;
 			}
@@ -81,7 +82,9 @@ module OneM2M_Functions {
 			vc_config := e_cf02;
 			vc_testSystemRole := e_ae;	
 			vc_cse1 := CseSimu.create("CSE1") alive;
-			f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+			vc_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+			vc_cse1.done;
+
 				
 			// Map
 			map(self:mcaPort, system:mcaPort);
@@ -134,7 +137,8 @@ module OneM2M_Functions {
 			vc_testSystemRole := e_cse;	
 			vc_cseType := p_cseType;
 			vc_ae1 := AeSimu.create("AE1") alive;
-			f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+			vc_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+			vc_ae1.done;
 			
 			//Initialization of local CSEBase
 			v_cSEBaseResource := f_generateLocalResource(-, -1, int5);
diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index 847fe7c1825440f6407ffa5f742385220f2c021a..f2a290474d744bb26cfd8cafd071a0736251e1a5 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -5194,7 +5194,8 @@ module OneM2M_PermutationFunctions {
 					var integer v_latestResourceIndex;
 					var ResponsePrimitive v_responsePrimitive;
 					var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
-			
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
 					v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
 		   
 					//Test control
@@ -5260,6 +5261,8 @@ module OneM2M_PermutationFunctions {
 					var integer v_latestResourceIndex;
 					var ResponsePrimitive v_responsePrimitive;
 					var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
 
 					v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
    
@@ -7193,7 +7196,9 @@ module OneM2M_PermutationFunctions {
 					var integer v_remoteCSEAnncIndex := -1;
 					var ResponsePrimitive v_responsePrimitive;
 					var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
+
 					//TODO var template RequestPrimitive v_remoteCSEAnnc := mw_createAccessControlPolicyAnnc;
    
 					// Test control
@@ -7295,7 +7300,8 @@ module OneM2M_PermutationFunctions {
 					var integer v_aEAnncIndex := -1;
 					var ResponsePrimitive v_responsePrimitive;
 					var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
 					v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
    
 					// Test control
@@ -7354,7 +7360,8 @@ module OneM2M_PermutationFunctions {
 					var integer v_aEAnncIndex := -1;
 					var ResponsePrimitive v_responsePrimitive;
 					var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
 					v_create.primitiveContent.container.announceTo := {PX_CSE1_ID};
    
 					// Test control
@@ -7413,7 +7420,8 @@ module OneM2M_PermutationFunctions {
 					var integer v_aEAnncIndex := -1;
 					var ResponsePrimitive v_responsePrimitive;
 					var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
 					v_create.primitiveContent.container.announceTo := {PX_CSE1_ID};
    
 					// Test control
@@ -7471,7 +7479,8 @@ module OneM2M_PermutationFunctions {
 					var integer v_aEAnncIndex := -1;
 					var ResponsePrimitive v_responsePrimitive;
 					var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
 					v_create.primitiveContent.container.announceTo := {PX_CSE1_ID};
    
 					// Test control
@@ -7535,7 +7544,8 @@ module OneM2M_PermutationFunctions {
 					var integer v_aEAnncIndex := -1;
 					var ResponsePrimitive v_responsePrimitive;
 					var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
 					v_create.primitiveContent.container.announceTo := {PX_CSE1_ID};
    
 					// Test control
@@ -7592,7 +7602,8 @@ module OneM2M_PermutationFunctions {
 					var integer v_aEAnncIndex := -1;
 					var ResponsePrimitive v_responsePrimitive;
 					var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
 					v_create.primitiveContent.container.announceTo := {PX_CSE1_ID};
    
 					// Test control
@@ -7769,7 +7780,8 @@ module OneM2M_PermutationFunctions {
 					var integer v_latestResourceIndex;
 					var ResponsePrimitive v_responsePrimitive;
 					var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
 		
 					v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
 	   
@@ -7836,7 +7848,8 @@ module OneM2M_PermutationFunctions {
 					var integer v_latestResourceIndex;
 					var ResponsePrimitive v_responsePrimitive;
 					var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
 		
 					v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
 	   
@@ -7963,7 +7976,8 @@ module OneM2M_PermutationFunctions {
 					var integer v_latestResourceIndex;
 					var ResponsePrimitive v_responsePrimitive;
 					var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
 
 					v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
    
@@ -8006,7 +8020,8 @@ module OneM2M_PermutationFunctions {
 					var integer v_latestResourceIndex;
 					var ResponsePrimitive v_responsePrimitive;
 					var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
 		
 					v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
 	   
@@ -8072,7 +8087,8 @@ module OneM2M_PermutationFunctions {
 					var integer v_latestResourceIndex;
 					var ResponsePrimitive v_responsePrimitive;
 					var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
 
 					v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
    
@@ -8132,7 +8148,8 @@ module OneM2M_PermutationFunctions {
 					var integer v_latestResourceIndex;
 					var ResponsePrimitive v_responsePrimitive;
 					var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
 
 					v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
    
@@ -8255,7 +8272,8 @@ module OneM2M_PermutationFunctions {
 					var integer v_latestResourceIndex;
 					var ResponsePrimitive v_responsePrimitive;
 					var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
 
 					v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
    
@@ -8321,7 +8339,8 @@ module OneM2M_PermutationFunctions {
 					var integer v_latestResourceIndex;
 					var ResponsePrimitive v_responsePrimitive;
 					var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
 
 					v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
    
@@ -8387,7 +8406,8 @@ module OneM2M_PermutationFunctions {
 					var integer v_latestResourceIndex;
 					var ResponsePrimitive v_responsePrimitive;
 					var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
 
 					v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
    
@@ -8452,7 +8472,8 @@ module OneM2M_PermutationFunctions {
 					var integer v_latestResourceIndex;
 					var ResponsePrimitive v_responsePrimitive;
 					var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
 
 					v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
    
@@ -8712,7 +8733,8 @@ module OneM2M_PermutationFunctions {
 					var integer v_aEAnncIndex := -1;
 					var ResponsePrimitive v_responsePrimitive;
 					var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
 					
 					v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
    
diff --git a/OneM2M_Testcases_AE_Release_1.ttcn b/OneM2M_Testcases_AE_Release_1.ttcn
index e370e4b93c85214005188e19d666ef83c37d93b9..ee3c3d4d9cb9bed6b0ea1261b937eed9706bbe3b 100644
--- a/OneM2M_Testcases_AE_Release_1.ttcn
+++ b/OneM2M_Testcases_AE_Release_1.ttcn
@@ -39,8 +39,8 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_CRE_001_CSR() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 												
 						// Test control
 						if(not(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE)) {
@@ -55,8 +55,8 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_CRE_001_SPR() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 												
 						// Test control
 						if(not(PICS_PRIMITIVE_SCOPE_SP_RELATIVE)) {
@@ -71,8 +71,8 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_CRE_001_ABS() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						
 						// Test control
 						if(not(PICS_PRIMITIVE_SCOPE_ABSOLUTE)) {
@@ -94,8 +94,8 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_CRE_002_CSR() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						
 						if(not(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE)) {
 							setverdict(inconc, __SCOPE__, ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
@@ -109,8 +109,8 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_CRE_002_SPR() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						
 						if(not(PICS_PRIMITIVE_SCOPE_SP_RELATIVE)) {
 							setverdict(inconc, __SCOPE__, ": Structured-SP-Relative-Resource-ID format support is required to run this test case");
@@ -124,7 +124,8 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_CRE_002_ABS() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						
 						if(not(PICS_PRIMITIVE_SCOPE_ABSOLUTE)) {
 							setverdict(inconc, __SCOPE__, ": Structured-Absolute-Resource-ID format support is required to run this test case");
@@ -150,7 +151,8 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_UPD_001_CSR() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						
 						// Test control
 						if(not(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE)) {
@@ -165,7 +167,8 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_UPD_001_SPR() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						
 					//Test control
 					if(not(PICS_PRIMITIVE_SCOPE_SP_RELATIVE)) {
@@ -180,7 +183,8 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_UPD_001_ABS() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_ABSOLUTE)) {
@@ -203,7 +207,8 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_UPD_002_CSR() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE)) {
@@ -218,7 +223,8 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_UPD_002_SPR() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_SP_RELATIVE)) {
@@ -233,7 +239,8 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_UPD_002_ABS() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_ABSOLUTE)) {
@@ -260,7 +267,8 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_RET_001_CSR() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						
 						// Test control
 						if(not(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE)) {
@@ -275,7 +283,8 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_RET_001_SPR() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_SP_RELATIVE)) {
@@ -290,7 +299,8 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_RET_001_ABS() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_ABSOLUTE)) {
@@ -313,7 +323,8 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_RET_002_CSR() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE)) {
@@ -328,7 +339,8 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_RET_002_SPR() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_SP_RELATIVE)) {
@@ -343,7 +355,8 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_RET_002_ABS() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_ABSOLUTE)) {
@@ -370,7 +383,8 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_DEL_001_CSR() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE)) {
@@ -385,7 +399,8 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_DEL_001_SPR() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_SP_RELATIVE)) {
@@ -400,7 +415,8 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_DEL_001_ABS() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_ABSOLUTE)) {
@@ -423,7 +439,8 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_DEL_002_CSR() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE)) {
@@ -438,7 +455,8 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_DEL_002_SPR() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_SP_RELATIVE)) {
@@ -453,7 +471,8 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_DEL_002_ABS() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_ABSOLUTE)) {
@@ -482,7 +501,8 @@ module OneM2M_Testcases_AE_Release_1 {
 				testcase TC_AE_REG_CRE_001() runs on Tester system AeSystem {
 						
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+					v_cse1.done;
 					
 					v_cse1.start(f_AE_REG_CRE_001());
 					
@@ -552,7 +572,8 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
 						var template RequestPrimitive v_createAe := mw_createAe;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute ResourceName";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.aE.resourceName := "UNINITIALIZED";
 						v_createAe.primitiveContent.aE.resourceName := complement("UNINITIALIZED");
 						v_cse1.start(f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action));
@@ -566,7 +587,8 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
 						var template RequestPrimitive v_createAe := mw_createAe;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute ExpirationTime";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.aE.expirationTime := "20301231T012345";
 						v_utRequest.forcedFields := {{name := "expirationTime", value_ := "UNINITIALIZED"}};
 						v_createAe.primitiveContent.aE.expirationTime := ?;//Check value other than "UNINITIALIZED", done by typing
@@ -581,7 +603,8 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
 						var template RequestPrimitive v_createAe := mw_createAe;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute Labels";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.aE.labels := {"UNINITIALIZED"};
 						v_createAe.primitiveContent.aE.labels := complement({*,"UNINITIALIZED",*});
 						v_cse1.start(f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action));
@@ -595,7 +618,8 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
 						var template RequestPrimitive v_createAe := mw_createAe;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute AppName";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.aE.appName := "UNINITIALIZED";
 						v_createAe.primitiveContent.aE.appName := complement("UNINITIALIZED");
 						v_cse1.start(f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action));
@@ -609,7 +633,8 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
 						var template RequestPrimitive v_createAe := mw_createAe;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute AppID";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.aE.app_ID := "UNINITIALIZED";
 						v_createAe.primitiveContent.aE.app_ID := complement("UNINITIALIZED");
 						v_cse1.start(f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action));
@@ -623,7 +648,8 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
 						var template RequestPrimitive v_createAe := mw_createAe;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute PointOfAccess";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.aE.pointOfAccess := {"UNINITIALIZED"};
 						v_createAe.primitiveContent.aE.pointOfAccess := complement({*,"UNINITIALIZED",*});
 						v_cse1.start(f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action));
@@ -637,7 +663,8 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
 						var template RequestPrimitive v_createAe := mw_createAe;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute OntologyRef";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.aE.ontologyRef := "UNINITIALIZED";
 						v_createAe.primitiveContent.aE.ontologyRef := complement("UNINITIALIZED");
 						v_cse1.start(f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action));
@@ -651,7 +678,8 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
 						var template RequestPrimitive v_createAe := mw_createAe;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute NodeLink";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.aE.nodeLink := "UNINITIALIZED";
 						v_createAe.primitiveContent.aE.nodeLink := complement("UNINITIALIZED");
 						v_cse1.start(f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action));
@@ -665,7 +693,8 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
 						var template RequestPrimitive v_createAe := mw_createAe;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute RequestReachability";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.aE.requestReachability := true;
 						v_utRequest.forcedFields := {{name := "requestReachability", value_ := "UNINITIALIZED"}};
 						v_createAe.primitiveContent.aE.requestReachability := ?;//Check value other than UNINITIALIZED, done by typing
@@ -680,7 +709,8 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
 						var template RequestPrimitive v_createAe := mw_createAe;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute ContentSerialization";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.aE.contentSerialization := {applicationxml};
 						v_utRequest.forcedFields := {{name := "contentSerialization", value_ := "UNINITIALIZED"}};
 						v_createAe.primitiveContent.aE.contentSerialization := ?;//Check value other than UNINITIALIZED, done by typing
@@ -701,7 +731,8 @@ module OneM2M_Testcases_AE_Release_1 {
 				testcase TC_AE_REG_DEL_001() runs on Tester system AeSystem {
 						
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+					v_cse1.done;
 					
 					v_cse1.start(f_AE_REG_DEL_001());
 					
@@ -768,7 +799,8 @@ module OneM2M_Testcases_AE_Release_1 {
 				testcase TC_AE_DMR_CRE_001() runs on Tester system AeSystem {
 						
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+					v_cse1.done;
 					
 					v_cse1.start(f_AE_DMR_CRE_001());
 					
@@ -828,7 +860,8 @@ module OneM2M_Testcases_AE_Release_1 {
 				testcase TC_AE_DMR_CRE_002() runs on Tester system AeSystem {
 						
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+					v_cse1.done;
 					
 					v_cse1.start(f_AE_DMR_CRE_002());
 					
@@ -901,7 +934,8 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContentInstance;
 						var template RequestPrimitive v_request := mw_createContentInstance;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute ContentInfo";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.contentInstance.contentInfo := "UNINITIALIZED";
 						v_request.primitiveContent.contentInstance.contentInfo := complement("UNINITIALIZED");
 						v_cse1.start(f_AE_DMR_CRE_003(v_utRequest,v_request,v_action));
@@ -914,7 +948,8 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContentInstance;
 						var template RequestPrimitive v_request := mw_createContentInstance;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute ResourceName";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.contentInstance.resourceName := "UNINITIALIZED";
 						v_request.primitiveContent.contentInstance.resourceName := complement("UNINITIALIZED");
 						v_cse1.start(f_AE_DMR_CRE_003(v_utRequest,v_request,v_action));
@@ -927,7 +962,8 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContentInstance;
 						var template RequestPrimitive v_request := mw_createContentInstance;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute ExpirationTime";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.contentInstance.expirationTime := "20301231T012345";
 						v_utRequest.forcedFields := {{name := "expirationTime", value_ := "UNINITIALIZED"}};
 						v_request.primitiveContent.contentInstance.expirationTime := ?;//Check value other than "UNINITIALIZED", done by typing
@@ -941,7 +977,8 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContentInstance;
 						var template RequestPrimitive v_request := mw_createContentInstance;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute Labels";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.contentInstance.labels := {"UNINITIALIZED"};
 						v_request.primitiveContent.contentInstance.labels := complement({*,"UNINITIALIZED",*});
 						v_cse1.start(f_AE_DMR_CRE_003(v_utRequest,v_request,v_action));
@@ -954,7 +991,8 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContentInstance;
 						var template RequestPrimitive v_request := mw_createContentInstance;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute Creator";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.contentInstance.creator := "UNINITIALIZED";
 						v_request.primitiveContent.contentInstance.creator := complement("UNINITIALIZED");
 						v_cse1.start(f_AE_DMR_CRE_003(v_utRequest,v_request,v_action));
@@ -977,7 +1015,8 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
 						var template RequestPrimitive v_request := mw_createContainer;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute AccessControlPolicyIDs";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.container.accessControlPolicyIDs := {"UNINITIALIZED"};
 						v_request.primitiveContent.container.accessControlPolicyIDs := complement({*,"UNINITIALIZED",*});
 						v_cse1.start(f_AE_DMR_CRE_004(v_utRequest,v_request,v_action));
@@ -990,7 +1029,8 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
 						var template RequestPrimitive v_request := mw_createContainer;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute MaxNrOfInstances";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.container.maxNrOfInstances := 1;
 						v_utRequest.forcedFields := {{name := "maxNrOfInstances", value_ := "UNINITIALIZED"}};
 						v_request.primitiveContent.container.maxNrOfInstances := ?;//Check value other than "UNINITIALIZED", done by typing
@@ -1004,7 +1044,8 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
 						var template RequestPrimitive v_request := mw_createContainer;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute MaxByteSize";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.container.maxByteSize := 1;
 						v_utRequest.forcedFields := {{name := "maxByteSize", value_ := "UNINITIALIZED"}};
 						v_request.primitiveContent.container.maxByteSize := ?;//Check value other than "UNINITIALIZED", done by typing
@@ -1018,7 +1059,8 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
 						var template RequestPrimitive v_request := mw_createContainer;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute MaxInstanceAge";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.container.maxInstanceAge := 1;
 						v_utRequest.forcedFields := {{name := "maxInstanceAge", value_ := "UNINITIALIZED"}};
 						v_request.primitiveContent.container.maxInstanceAge := ?;//Check value other than "UNINITIALIZED", done by typing
@@ -1032,7 +1074,8 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
 						var template RequestPrimitive v_request := mw_createContainer;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute OntologyRef";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.container.ontologyRef := "UNINITIALIZED";
 						v_request.primitiveContent.container.ontologyRef := complement("UNINITIALIZED");
 						v_cse1.start(f_AE_DMR_CRE_004(v_utRequest,v_request,v_action));
@@ -1045,7 +1088,8 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
 						var template RequestPrimitive v_request := mw_createContainer;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute ResourceName";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.container.resourceName := "UNINITIALIZED";
 						v_request.primitiveContent.container.resourceName := complement("UNINITIALIZED");
 						v_cse1.start(f_AE_DMR_CRE_004(v_utRequest,v_request,v_action));
@@ -1058,7 +1102,8 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
 						var template RequestPrimitive v_request := mw_createContainer;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute ExpirationTime";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.container.expirationTime := "20301231T012345";
 						v_utRequest.forcedFields := {{name := "expirationTime", value_ := "UNINITIALIZED"}};
 						v_request.primitiveContent.container.expirationTime := ?;//Check value other than "UNINITIALIZED", done by typing
@@ -1072,7 +1117,8 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
 						var template RequestPrimitive v_request := mw_createContainer;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute Labels";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.container.labels := {"UNINITIALIZED"};
 						v_request.primitiveContent.container.labels := complement({*,"UNINITIALIZED",*});
 						v_cse1.start(f_AE_DMR_CRE_004(v_utRequest,v_request,v_action));
@@ -1085,7 +1131,8 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
 						var template RequestPrimitive v_request := mw_createContainer;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute Creator";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.container.creator := "UNINITIALIZED";
 						v_request.primitiveContent.container.creator := complement("UNINITIALIZED");
 						v_cse1.start(f_AE_DMR_CRE_004(v_utRequest,v_request,v_action));
@@ -1112,7 +1159,8 @@ module OneM2M_Testcases_AE_Release_1 {
 						var universal charstring v_action := "Please, send a valid UPDATE Request for AE updating attribute expirationTime";
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateAe;
 						
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.aE.expirationTime := "20301231T012345";
 						
 						v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentAeUpdateRequest;
@@ -1129,7 +1177,8 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateAe;
 						var universal charstring v_action := "Please, send a valid UPDATE Request for AE updating attribute labels";
 						
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.aE.labels := {"UNINITIALIZED"};
 						
 						v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentAeUpdateRequest;
@@ -1148,7 +1197,8 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateAe;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute appName";
 						
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.aE.appName := "UNINITIALIZED";
 
 						v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentAeUpdateRequest;
@@ -1166,7 +1216,8 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateAe;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute pointOfAccess";
 						
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.aE.pointOfAccess := {"UNINITIALIZED"};
 
 						v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentAeUpdateRequest;
@@ -1183,7 +1234,8 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template RequestPrimitive v_expectedUpdateRequestAe;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateAe;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute ontologyRef";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.aE.ontologyRef := "UNINITIALIZED";
 
 						v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentAeUpdateRequest;
@@ -1200,7 +1252,8 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template RequestPrimitive v_expectedUpdateRequestAe;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateAe;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute nodeLink";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.aE.nodeLink := "UNINITIALIZED";
 
 						v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentAeUpdateRequest;
@@ -1216,7 +1269,8 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template RequestPrimitive v_expectedUpdateRequestAe;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateAe;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute requestReachability";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.aE.requestReachability := true;
 						v_utRequest.forcedFields := {{name := "requestReachability", value_ := "UNINITIALIZED"}};
 						
@@ -1233,7 +1287,8 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template RequestPrimitive v_expectedUpdateRequestAe;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateAe;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute contentSerialization";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.aE.contentSerialization := {applicationxml};
 						v_utRequest.forcedFields := {{name := "contentSerialization", value_ := "UNINITIALIZED"}};
 						
@@ -1258,7 +1313,8 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template RequestPrimitive v_request := mw_updateContainer;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute expirationTime";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.container.expirationTime := "20301231T012345";
 						v_request.primitiveContent.container.expirationTime := ?;
 						v_cse1.start(f_AE_DMR_UPD_002(v_utRequest,v_request,v_action));
@@ -1271,7 +1327,8 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template RequestPrimitive v_request := mw_updateContainer;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute labels";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.container.labels := {"UNINITIALIZED"};
 						v_request.primitiveContent.container.labels := complement({*,"UNINITIALIZED",*});
 						v_cse1.start(f_AE_DMR_UPD_002(v_utRequest,v_request,v_action));
@@ -1284,7 +1341,8 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template RequestPrimitive v_request := mw_updateContainer;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute maxNrOfInstances";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.container.maxNrOfInstances := 1;
 						v_utRequest.forcedFields := {{name := "maxNrOfInstances", value_ := "UNINITIALIZED"}};
 						v_request.primitiveContent.container.maxNrOfInstances := ?;//Check value other than "UNINITIALIZED", done by typing
@@ -1298,7 +1356,8 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template RequestPrimitive v_request := mw_updateContainer;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute maxByteSize";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.container.maxByteSize := 1;
 						v_utRequest.forcedFields := {{name := "maxByteSize", value_ := "UNINITIALIZED"}};
 						v_request.primitiveContent.container.maxByteSize := ?;//Check value other than "UNINITIALIZED", done by typing
@@ -1312,7 +1371,8 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template RequestPrimitive v_request := mw_updateContainer;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute maxInstanceAge";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
                         v_utRequest.requestPrimitive.primitiveContent.container.maxInstanceAge := 1;
 						v_utRequest.forcedFields := {{name := "maxInstanceAge", value_ := "UNINITIALIZED"}};
 						v_request.primitiveContent.container.maxInstanceAge := ?;//Check value other than "UNINITIALIZED", done by typing
@@ -1336,7 +1396,8 @@ module OneM2M_Testcases_AE_Release_1 {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for CSEBase";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_cse1.start(f_AE_DMR_RET_001(int5, m_primitiveContentCSEBase(m_contentCreateCSEBase),v_action));
 						v_cse1.done;
 					}
@@ -1345,7 +1406,8 @@ module OneM2M_Testcases_AE_Release_1 {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for AE";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_cse1.start(f_AE_DMR_RET_001(int2, m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit)),v_action));
 						v_cse1.done;
 					}
@@ -1354,7 +1416,8 @@ module OneM2M_Testcases_AE_Release_1 {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for Container";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_cse1.start(f_AE_DMR_RET_001(int3, m_primitiveContentContainer(m_contentCreateContainer()),v_action));
 						v_cse1.done;
 					}
@@ -1368,7 +1431,8 @@ module OneM2M_Testcases_AE_Release_1 {
 				testcase TC_AE_DMR_RET_002() runs on Tester system AeSystem {
 						
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+					v_cse1.done;
 					
 					v_cse1.start(f_AE_DMR_RET_002());
 					
@@ -1426,7 +1490,8 @@ module OneM2M_Testcases_AE_Release_1 {
 				testcase TC_AE_DMR_RET_003() runs on Tester system AeSystem {
 						
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+					v_cse1.done;
 					
 					v_cse1.start(f_AE_DMR_RET_003());
 					
@@ -1484,7 +1549,8 @@ module OneM2M_Testcases_AE_Release_1 {
 				testcase TC_AE_DMR_RET_004() runs on Tester system AeSystem {
 						
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+					v_cse1.done;
 					
 					v_cse1.start(f_AE_DMR_RET_004());
 					
@@ -1542,7 +1608,8 @@ module OneM2M_Testcases_AE_Release_1 {
 				testcase TC_AE_DMR_RET_005 () runs on Tester system AeSystem {
 						
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+					v_cse1.done;
 					
 					v_cse1.start(f_AE_DMR_RET_005());
 					
@@ -1604,7 +1671,8 @@ module OneM2M_Testcases_AE_Release_1 {
 				testcase TC_AE_DMR_DEL_001() runs on Tester system AeSystem {
 						
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+					v_cse1.done;
 					
 					v_cse1.start(f_AE_DMR_DEL_001());
 					
@@ -1665,7 +1733,8 @@ module OneM2M_Testcases_AE_Release_1 {
 				testcase TC_AE_DMR_DEL_002() runs on Tester system AeSystem {
 						
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+					v_cse1.done;
 					
 					v_cse1.start(f_AE_DMR_DEL_002());
 					
@@ -1726,7 +1795,8 @@ module OneM2M_Testcases_AE_Release_1 {
 				testcase TC_AE_DMR_DEL_003() runs on Tester system AeSystem {
 						
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+					v_cse1.done;
 					
 					v_cse1.start(f_AE_DMR_DEL_003());
 					
@@ -1787,7 +1857,8 @@ module OneM2M_Testcases_AE_Release_1 {
 				testcase TC_AE_DMR_DEL_004 () runs on Tester system AeSystem {
 						
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+					v_cse1.done;
 					
 					v_cse1.start(f_AE_DMR_DEL_004());
 					
@@ -1857,7 +1928,8 @@ module OneM2M_Testcases_AE_Release_1 {
 				testcase TC_AE_SUB_CRE_001() runs on Tester system AeSystem {
 						
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+					v_cse1.done;
 					
 					v_cse1.start(f_AE_SUB_CRE_001());
 					
@@ -1921,7 +1993,8 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
 						var template RequestPrimitive v_requestT := mw_createSubscription;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute accessControlPolicyIDs";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
 						v_utRequest.requestPrimitive.primitiveContent.subscription.accessControlPolicyIDs := {"UNINITIALIZED"};
 						v_requestT.primitiveContent.subscription.notificationURI := complement({*,"UNINITIALIZED",*});
@@ -1938,7 +2011,8 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
 						var template RequestPrimitive v_requestT := mw_createSubscription;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute createdBefore";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
 						v_utRequest.requestPrimitive.primitiveContent.subscription.eventNotificationCriteria := m_eventNotificationCriteria();
 						v_utRequest.requestPrimitive.primitiveContent.subscription.eventNotificationCriteria.createdBefore := "20301231T012345";
@@ -1957,7 +2031,8 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
 						var template RequestPrimitive v_requestT := mw_createSubscription;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute expirationCounter";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
 						v_utRequest.requestPrimitive.primitiveContent.subscription.expirationCounter := 1;
 						v_utRequest.forcedFields := {{name := "expirationCounter", value_ := "UNINITIALIZED"}};
@@ -1975,7 +2050,8 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
 						var template RequestPrimitive v_requestT := mw_createSubscription;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute notificationForwardingURI";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
 						v_utRequest.requestPrimitive.primitiveContent.subscription.notificationForwardingURI := "UNINITIALIZED";
 						v_requestT.primitiveContent.subscription.notificationURI := complement({*,"UNINITIALIZED",*});
@@ -1992,7 +2068,8 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
 						var template RequestPrimitive v_requestT := mw_createSubscription;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute notificationContentType";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
 						v_utRequest.requestPrimitive.primitiveContent.subscription.notificationContentType := int1;
 						v_utRequest.forcedFields := {{name := "notificationContentType", value_ := "UNINITIALIZED"}};
@@ -2010,7 +2087,8 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
 						var template RequestPrimitive v_requestT := mw_createSubscription;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute notificationEventCat";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
 						v_utRequest.requestPrimitive.primitiveContent.subscription.notificationEventCat.alt_1 := 100;
 						v_utRequest.forcedFields := {{name := "alt_1", value_ := "UNINITIALIZED"}};
@@ -2028,7 +2106,8 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
 						var template RequestPrimitive v_requestT := mw_createSubscription;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute subscriberURI";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
 						v_utRequest.requestPrimitive.primitiveContent.subscription.subscriberURI := "UNINITIALIZED";
 						v_requestT.primitiveContent.subscription.notificationURI := complement({*,"UNINITIALIZED",*});
@@ -2052,7 +2131,8 @@ module OneM2M_Testcases_AE_Release_1 {
 				testcase TC_AE_SUB_NTF_001() runs on Tester system AeSystem {
 						
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+					v_cse1.done;
 					
 					v_cse1.start(f_AE_SUB_NTF_001());
 					
@@ -2162,7 +2242,8 @@ module OneM2M_Testcases_AE_Release_1 {
 				testcase TC_AE_SUB_NTF_002() runs on Tester system AeSystem {
 						
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+					v_cse1.done;
 					
 					v_cse1.start(f_AE_SUB_NTF_002());
 					
diff --git a/OneM2M_Testcases_CSE_Release_1.ttcn b/OneM2M_Testcases_CSE_Release_1.ttcn
index 41bafcdd03ba886cdf5e5b0d562637275d39dde3..bcd248e470d8fc850593325ab4e2b83b5607d7b0 100644
--- a/OneM2M_Testcases_CSE_Release_1.ttcn
+++ b/OneM2M_Testcases_CSE_Release_1.ttcn
@@ -93,7 +93,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						                        
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                         
 						v_ae1.start(f_CSE_GEN_CRE_001(e_cseRelative));
 						v_ae1.done;
@@ -103,7 +104,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 						v_ae1.start(f_CSE_GEN_CRE_001(e_spRelative));
 						v_ae1.done;
@@ -112,7 +114,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_GEN_CRE_001_ABS() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                         
 						v_ae1.start(f_CSE_GEN_CRE_001(e_absolute));
 						v_ae1.done;
@@ -130,7 +133,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						                        
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                         
 						v_ae1.start(f_CSE_GEN_CRE_002(e_cseRelative));
 						v_ae1.done;
@@ -140,7 +144,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                         
 						v_ae1.start(f_CSE_GEN_CRE_002(e_spRelative));
 						v_ae1.done;
@@ -150,7 +155,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 							
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                         
 						v_ae1.start(f_CSE_GEN_CRE_002(e_absolute));
 						v_ae1.done;
@@ -171,7 +177,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						                        
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                         
 						v_ae1.start(f_CSE_GEN_RET_001(e_cseRelative));
 						v_ae1.done;
@@ -181,7 +188,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                         
 						v_ae1.start(f_CSE_GEN_RET_001(e_spRelative));
 						v_ae1.done;
@@ -190,7 +198,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_GEN_RET_001_ABS() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                         
 						v_ae1.start(f_CSE_GEN_RET_001(e_absolute));
 						v_ae1.done;
@@ -208,7 +217,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_GEN_RET_002_CSR() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                         
 						v_ae1.start(f_CSE_GEN_RET_002(e_cseRelative));
 						v_ae1.done;
@@ -218,7 +228,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                         
 						v_ae1.start(f_CSE_GEN_RET_002(e_spRelative));
 						v_ae1.done;
@@ -228,7 +239,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 							
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                         
 						v_ae1.start(f_CSE_GEN_RET_002(e_absolute));
 						v_ae1.done;
@@ -248,7 +260,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_GEN_UPD_001_CSR() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                         
 						v_ae1.start(f_CSE_GEN_UPD_001(e_cseRelative));
 						v_ae1.done;
@@ -257,7 +270,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_GEN_UPD_001_SPR() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                         
 						v_ae1.start(f_CSE_GEN_UPD_001(e_spRelative));
 						v_ae1.done;
@@ -267,7 +281,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 							
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                         
 						v_ae1.start(f_CSE_GEN_UPD_001(e_absolute));
 						v_ae1.done;
@@ -285,7 +300,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						                        
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                         
 						v_ae1.start(f_CSE_GEN_UPD_002(e_cseRelative));
 						v_ae1.done;
@@ -295,7 +311,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                         
 						v_ae1.start(f_CSE_GEN_UPD_002(e_spRelative));
 						v_ae1.done;
@@ -305,7 +322,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 							
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                         
 						v_ae1.start(f_CSE_GEN_UPD_002(e_absolute));
 						v_ae1.done;
@@ -326,7 +344,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						                        
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                         
 						v_ae1.start(f_CSE_GEN_DEL_001(e_cseRelative));
 						v_ae1.done;
@@ -336,7 +355,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                         
 						v_ae1.start(f_CSE_GEN_DEL_001(e_spRelative));
 						v_ae1.done;
@@ -346,7 +366,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 							
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                         
 						v_ae1.start(f_CSE_GEN_DEL_001(e_absolute));
 						v_ae1.done;
@@ -364,7 +385,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						                        
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                         
 						v_ae1.start(f_CSE_GEN_DEL_002(e_cseRelative));
 						v_ae1.done;
@@ -374,7 +396,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                         
 						v_ae1.start(f_CSE_GEN_DEL_002(e_spRelative));
 						v_ae1.done;
@@ -384,7 +407,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 							
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                         
 						v_ae1.start(f_CSE_GEN_DEL_002(e_absolute));
 						v_ae1.done;
@@ -407,7 +431,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_CRE_001() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 					
 					v_ae1.start(f_CSE_REG_CRE_001());
 		  	  	
@@ -476,7 +501,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_CRE_002() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 					v_ae1.start(f_CSE_REG_CRE_002());
 			  	  	
@@ -537,8 +563,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_CRE_003() runs on Tester system CseSystem {
 					
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
-						
+					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+					v_cse1.done;	
 					v_cse1.start(f_CSE_REG_CRE_003());
 			  	  	
 					v_cse1.done;
@@ -555,7 +581,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					//Preamble
 					v_remoteCseIndex := f_cse_registrationRemoteCse();
 					vc_ae1 := AeSimu.create("AE1") alive;
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+					vc_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					vc_ae1.done;
 					vc_ae1.start(f_cse_preamble_registerAe());
 					
 				
@@ -568,7 +595,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_CRE_004() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 					v_ae1.start(f_CSE_REG_CRE_004());
 			  	  	
@@ -638,11 +666,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_CRE_005() runs on Tester system CseSystem {
 					
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+					v_cse1.done;
 						
 					v_cse1.start(f_CSE_REG_CRE_005());
-			  	  	
-					v_cse1.done;
+			  	  	v_cse1.done;
 			  	  		
 				}
 					
@@ -711,7 +739,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_CRE_006() runs on Tester system CseSystem {
 					
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+					v_cse1.done;
 							
 					v_cse1.start(f_CSE_REG_CRE_006());
 				  	  	
@@ -768,7 +797,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_CRE_007() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
 						
 					v_ae1.start(f_CSE_REG_CRE_007());
 			  	  	
@@ -837,7 +867,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_CRE_008() runs on Tester system CseSystem {
 					
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+					v_cse1.done;
 							
 					v_cse1.start(f_CSE_REG_CRE_008());
 				  	  	
@@ -909,7 +940,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_CRE_009() runs on Tester system CseSystem {
 					
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+					v_cse1.done;
 							
 					v_cse1.start(f_CSE_REG_CRE_009());
 				  	  	
@@ -988,7 +1020,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_CRE_010() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 					v_ae1.start(f_CSE_REG_CRE_010());
 			  	  	
@@ -1071,7 +1104,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_CRE_011() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 					v_ae1.start(f_CSE_REG_CRE_011());
 			  	  	
@@ -1142,7 +1176,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_REG_CRE_012_AE_LBL() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, PX_AE1_ID_STEM);
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_create.primitiveContent.aE.labels := {"labels"};
 						v_ae1.start(f_CSE_REG_CRE_012(v_create));
 						v_ae1.done;
@@ -1151,7 +1186,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_REG_CRE_012_AE_APN() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, PX_AE1_ID_STEM);
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_create.primitiveContent.aE.appName := "AeAppName";
 						v_ae1.start(f_CSE_REG_CRE_012(v_create));
@@ -1161,7 +1197,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_REG_CRE_012_AE_POA() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, PX_AE1_ID_STEM);
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_create.primitiveContent.aE.pointOfAccess := {PX_AE1_ADDRESS};
 						v_ae1.start(f_CSE_REG_CRE_012(v_create));
 						v_ae1.done;
@@ -1180,8 +1217,9 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createRemoteCSEBase;	
 						const AttributeAux c_optionalAttribute := {"labels", omit};
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
-                        						
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+											
 						v_createRequest.primitiveContent.remoteCSE.labels := {"MyLabel"};
 						
 						v_cse1.start(f_CSE_REG_CRE_013(v_createRequest, c_optionalAttribute));
@@ -1194,8 +1232,9 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createRemoteCSEBase;	
 						const AttributeAux c_optionalAttribute := {"cseType", omit};
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
-												
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+											
 						v_createRequest.primitiveContent.remoteCSE.cseType := int1;
 						
 						v_cse1.start(f_CSE_REG_CRE_013(v_createRequest, c_optionalAttribute));
@@ -1207,7 +1246,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createRemoteCSEBase;	
 						const AttributeAux c_optionalAttribute := {"pointOfAccess", omit};
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 	
 						v_createRequest.primitiveContent.remoteCSE.pointOfAccess := {"http://" & PX_CSE1_ADDRESS & "/"};
 	
@@ -1221,8 +1260,9 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createRemoteCSEBase;	
 						const AttributeAux c_optionalAttribute := {"nodeLink", omit};
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
-
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+					
 						v_createRequest.primitiveContent.remoteCSE.nodeLink := c_defaultNodeID;
 
 						v_cse1.start(f_CSE_REG_CRE_013(v_createRequest, c_optionalAttribute));
@@ -1239,7 +1279,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_CRE_016() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 							
 					v_ae1.start(f_CSE_REG_CRE_016());
 				  	  	
@@ -1310,7 +1351,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template RequestPrimitive v_createRequest := m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM);
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.aE.app_ID := omit;	//Mandatory app_ID field is being set empty
 	
 						v_ae1.start(f_CSE_REG_CRE_017(v_createRequest));
@@ -1322,7 +1364,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM);
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.aE.requestReachability := omit;	//Mandatory requestReachability field is being set empty
 						
 						v_ae1.start(f_CSE_REG_CRE_017(v_createRequest));
@@ -1339,7 +1382,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_CRE_018() runs on Tester system CseSystem {
 						
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+					v_cse1.done;
 							
 					v_cse1.start(f_CSE_REG_CRE_018());
 				  	  	
@@ -1404,7 +1448,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_CRE_019() runs on Tester system CseSystem {
 					
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+					v_cse1.done;
 							
 					v_cse1.start(f_CSE_REG_CRE_019());
 				  	  	
@@ -1466,7 +1511,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_CRE_020() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 							
 					v_ae1.start(f_CSE_REG_CRE_020());
 				  	  	
@@ -1561,7 +1607,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_CRE_021() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 							
 					v_ae1.start(f_CSE_REG_CRE_021());
 				  	  	
@@ -1622,7 +1669,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_CRE_022() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 							
 					v_ae1.start(f_CSE_REG_CRE_022());
 				  	  	
@@ -1689,7 +1737,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_CRE_023() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 							
 					v_ae1.start(f_CSE_REG_CRE_023());
 				  	  	
@@ -1750,7 +1799,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_CRE_024() runs on Tester system CseSystem {
 					
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+					v_cse1.done;
 							
 					v_cse1.start(f_CSE_REG_CRE_024());
 				  	  	
@@ -1816,7 +1866,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_CRE_025() runs on Tester system CseSystem {
 					
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+					v_cse1.done;
 							
 					v_cse1.start(f_CSE_REG_CRE_025());
 				  	  	
@@ -1886,7 +1937,9 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
 						var template RequestPrimitive v_request := mw_createRemoteCSE;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a CSE registration request with optional attribute resourceName";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						
 						v_utRequest.requestPrimitive.primitiveContent.remoteCSE.resourceName := "UNINITIALIZED";
 						v_request.primitiveContent.remoteCSE.resourceName := ?;
 						v_cse1.start(f_CSE_REG_CRE_026(v_utRequest,v_request,v_action));
@@ -1898,7 +1951,9 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
 						var template RequestPrimitive v_request := mw_createRemoteCSE;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a CSE registration request with optional attribute expirationTime";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+					
 						v_utRequest.requestPrimitive.primitiveContent.remoteCSE.expirationTime := "20301231T012345";
 						v_request.primitiveContent.remoteCSE.expirationTime := ?;
 						v_cse1.start(f_CSE_REG_CRE_026(v_utRequest,v_request,v_action));
@@ -1910,7 +1965,9 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
 						var template RequestPrimitive v_request := mw_createRemoteCSE;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a CSE registration request with optional attribute labels";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+					
 						v_utRequest.requestPrimitive.primitiveContent.remoteCSE.labels := {"UNINITIALIZED"};
 						v_request.primitiveContent.remoteCSE.labels := ?;
 						v_cse1.start(f_CSE_REG_CRE_026(v_utRequest,v_request,v_action));
@@ -1922,7 +1979,9 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
 						var template RequestPrimitive v_request := mw_createRemoteCSE;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a CSE registration request with optional attribute pointOfAccess";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						
 						v_utRequest.requestPrimitive.primitiveContent.remoteCSE.pointOfAccess := {"UNINITIALIZED"};
 						v_request.primitiveContent.remoteCSE.pointOfAccess := ?;
 						v_cse1.start(f_CSE_REG_CRE_026(v_utRequest,v_request,v_action));
@@ -1934,7 +1993,9 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
 						var template RequestPrimitive v_request := mw_createRemoteCSE;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a CSE registration request with optional attribute nodeLink";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						
 						v_utRequest.requestPrimitive.primitiveContent.remoteCSE.nodeLink := "UNINITIALIZED";
 						v_request.primitiveContent.remoteCSE.nodeLink := ?;
 						v_cse1.start(f_CSE_REG_CRE_026(v_utRequest,v_request,v_action));
@@ -1946,7 +2007,9 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
 						var template RequestPrimitive v_request := mw_createRemoteCSE;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a CSE registration request with optional attribute cseType";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						
 						v_utRequest.requestPrimitive.primitiveContent.remoteCSE.cseType := int1;//TODO It should be marked as "UNITIALIZED"
 						v_request.primitiveContent.remoteCSE.cseType := ?;
 						v_cse1.start(f_CSE_REG_CRE_026(v_utRequest,v_request,v_action));
@@ -1962,7 +2025,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_CRE_027() runs on Tester system CseSystem {
 					
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+					v_cse1.done;
 							
 					v_cse1.start(f_CSE_REG_CRE_027());
 				  	  	
@@ -2020,7 +2084,9 @@ module OneM2M_Testcases_CSE_Release_1 {
 						 var RequestPrimitive v_request;
 						 var template PrimitiveContent v_contentResponse;
 						 var Labels v_labels_1 := {"VALUE_1"};
-						 f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						 v_cse1.done;
+						 
 						 v_request := valueof(m_createRemoteCSEBase);
 						 v_request.primitiveContent.remoteCSE.cseType := int2;	//MN_CSE
 						 v_request.primitiveContent.remoteCSE.labels := v_labels_1;
@@ -2040,7 +2106,9 @@ module OneM2M_Testcases_CSE_Release_1 {
 						
 						 var RequestPrimitive v_request;
 						 var template PrimitiveContent v_contentResponse;
-						 f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						 v_cse1.done;
+						 
 						 v_request := valueof(m_createRemoteCSEBase);
 						 v_request.primitiveContent.remoteCSE.cseType := int2;	//MN_CSE
 						 v_request.primitiveContent.remoteCSE.pointOfAccess := {"http://" & PX_CSE1_ADDRESS & "/"};
@@ -2060,8 +2128,10 @@ module OneM2M_Testcases_CSE_Release_1 {
 						
 						 var RequestPrimitive v_request;
 						 var template PrimitiveContent v_contentResponse;
-						 f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
-						 v_request := valueof(m_createRemoteCSEBase);
+						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						 v_cse1.done;
+					 	 
+					 	 v_request := valueof(m_createRemoteCSEBase);
 						 v_request.primitiveContent.remoteCSE.cseType := int2;	//MN_CSE
 						 v_request.primitiveContent.remoteCSE.nodeLink := c_defaultNodeID;
 	
@@ -2087,7 +2157,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_RET_001() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 								
 					v_ae1.start(f_CSE_REG_RET_001());
 					  	  	
@@ -2159,7 +2230,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.cSEBase := mw_contentCSEBase_rc1;
 						v_contentResponse.cSEBase.cseType := ?;
 						    
@@ -2171,7 +2243,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						//Local variables
 						 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						 var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						 v_contentResponse.cSEBase := mw_contentCSEBase_rc1;
 						 v_contentResponse.cSEBase.nodeLink := ?;
 	    
@@ -2189,7 +2262,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_RET_003() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);			
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;			
 					v_ae1.start(f_CSE_REG_RET_003());
 						  	  	
 					v_ae1.done;
@@ -2262,7 +2336,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.aE.labels := v_labels_1;
 	
 						v_contentResponse.aE := mw_contentAeBase;
@@ -2278,7 +2353,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						
 						 var template RequestPrimitive v_createRequest := m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM);
 						 var template PrimitiveContent v_contentResponse;
-						 f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						 v_createRequest.primitiveContent.aE.appName := "AeAppName";
 
 						 v_contentResponse.aE := mw_contentAeBase;
@@ -2293,7 +2369,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						 var template RequestPrimitive v_createRequest := m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM);
 						 var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						 v_createRequest.primitiveContent.aE.pointOfAccess := {PX_AE1_ADDRESS};
 
 						 v_contentResponse.aE := mw_contentAeBase;
@@ -2312,7 +2389,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_RET_005() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);			
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;			
 					v_ae1.start(f_CSE_REG_RET_005());
 						  	  	
 					v_ae1.done;
@@ -2395,7 +2473,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_RET_006() runs on Tester system CseSystem {
 					
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+					v_cse1.done;
 							
 					v_cse1.start(f_CSE_REG_RET_006());
 				  	  	
@@ -2499,7 +2578,9 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var Labels v_labels_1 := {"VALUE_1"};
 						var template RequestPrimitive v_createRequest := m_createRemoteCSEBase;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						
 						v_createRequest.primitiveContent.remoteCSE.labels := v_labels_1;
 
 						v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
@@ -2515,7 +2596,9 @@ module OneM2M_Testcases_CSE_Release_1 {
 						
 						var template RequestPrimitive v_createRequest := m_createRemoteCSEBase;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						
 						v_createRequest.primitiveContent.remoteCSE.cseType := int1;
 
 						v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
@@ -2531,7 +2614,9 @@ module OneM2M_Testcases_CSE_Release_1 {
 						
 						var template RequestPrimitive v_createRequest := m_createRemoteCSEBase;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						
 						v_createRequest.primitiveContent.remoteCSE.pointOfAccess := {"http://" & PX_CSE1_ADDRESS & "/"};
 
 						v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
@@ -2547,7 +2632,9 @@ module OneM2M_Testcases_CSE_Release_1 {
 						
 						var template RequestPrimitive v_createRequest := m_createRemoteCSEBase;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+					
 						v_createRequest.primitiveContent.remoteCSE.nodeLink := c_defaultNodeID;
 
 						v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
@@ -2566,7 +2653,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_RET_008() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 									
 					v_ae1.start(f_CSE_REG_RET_008());
 						  	  	
@@ -2646,7 +2734,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_RET_009() runs on Tester system CseSystem {
 					
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+					v_cse1.done;
 								
 					v_cse1.start(f_CSE_REG_RET_009());
 					  	  	
@@ -2711,7 +2800,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_RET_010() runs on Tester system CseSystem {
 						
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+					v_cse1.done;
 								
 					v_cse1.start(f_CSE_REG_RET_010());
 					  	  	
@@ -2787,7 +2877,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_UPD_001() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 									
 					v_ae1.start(f_CSE_REG_UPD_001());
 						  	  	
@@ -2852,8 +2943,9 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;	
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
-    						
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						
 						v_updateRequest.primitiveContent.remoteCSE.labels := {"MyLabel"};
 	
 						v_cse1.start(f_CSE_REG_UPD_002(v_updateRequest));
@@ -2865,8 +2957,9 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;	
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
-    					
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+					
 						v_updateRequest.primitiveContent.remoteCSE.pointOfAccess := {"http://" & PX_CSE1_ADDRESS & "/"};
 	
 						v_cse1.start(f_CSE_REG_UPD_002(v_updateRequest));
@@ -2878,8 +2971,9 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;	
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
-    						
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						
 						v_updateRequest.primitiveContent.remoteCSE.nodeLink := c_defaultNodeID;
 	
 						v_cse1.start(f_CSE_REG_UPD_002(v_updateRequest));
@@ -2900,8 +2994,9 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;	
 						var AttributeList c_optionalAttribute;
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
-			
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+					
 						v_updateRequest.primitiveContent.remoteCSE.labels := {"MyLabel"};
 						c_optionalAttribute := {"labels"};
 
@@ -2915,8 +3010,9 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;	
 						var AttributeList c_optionalAttribute;
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
-		
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+					
 						v_updateRequest.primitiveContent.remoteCSE.pointOfAccess := {"http://" & PX_CSE1_ADDRESS & "/"};
 						c_optionalAttribute := {"pointofAccess"};
 
@@ -2930,8 +3026,9 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;	
 						var AttributeList c_optionalAttribute;
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
-			
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+					
 						v_updateRequest.primitiveContent.remoteCSE.nodeLink := c_defaultNodeID;
 						c_optionalAttribute := {"nodeLink"};
 
@@ -2945,8 +3042,9 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;	
 						var AttributeList c_optionalAttribute;
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
-			
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+					
 						v_updateRequest.primitiveContent.remoteCSE.expirationTime := "20301231T012345";
 						c_optionalAttribute := {"expirationTime"};
 	
@@ -2960,8 +3058,9 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;	
 						var AttributeList c_optionalAttribute;
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
-	
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+					
 						v_updateRequest.primitiveContent.remoteCSE.requestReachability := true;
 						c_optionalAttribute := {"requestReachability"};
 	
@@ -2983,7 +3082,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_DEL_001() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 									
 					v_ae1.start(f_CSE_REG_DEL_001());
 						  	  	
@@ -3040,7 +3140,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_DEL_002() runs on Tester system CseSystem {
 					
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+					v_cse1.done;
 								
 					v_cse1.start(f_CSE_REG_DEL_002());
 					  	  	
@@ -3114,7 +3215,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_DEL_003() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 										
 					v_ae1.start(f_CSE_REG_DEL_003());
 							  	  	
@@ -3175,7 +3277,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_DEL_004() runs on Tester system CseSystem {
 					
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+					v_cse1.done;
 								
 					v_cse1.start(f_CSE_REG_DEL_004());
 					  	  	
@@ -3252,7 +3355,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_createRequest.primitiveContent.container.resourceName := omit;
 						v_ae1.start(f_CSE_DMR_CRE_001(int3, v_createRequest, -)); //Container
@@ -3271,7 +3375,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_createRequest.primitiveContent.container.resourceName := omit;
 						v_ae1.start(f_CSE_DMR_CRE_001(int3, v_createRequest, m_createAeAux(omit,omit)));//Container
@@ -3293,7 +3398,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_createRequest.primitiveContent.container.resourceName := omit;
 
@@ -3315,7 +3421,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_createRequest.primitiveContent.group_.resourceName := omit;
 
@@ -3337,7 +3444,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_createRequest.primitiveContent.group_.resourceName := omit;
 
@@ -3359,7 +3467,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createAcpBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_createRequest.primitiveContent.accessControlPolicy.resourceName := omit;
 
@@ -3381,7 +3490,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createAcpBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_createRequest.primitiveContent.accessControlPolicy.resourceName := omit;
 
@@ -3403,7 +3513,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_createRequest.primitiveContent.subscription.resourceName := omit;
 						v_ae1.start(f_CSE_DMR_CRE_001(int23, v_createRequest, -));//Subscription
@@ -3424,7 +3535,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_createRequest.primitiveContent.subscription.resourceName := omit;
 						v_ae1.start(f_CSE_DMR_CRE_001(int23, v_createRequest, m_createAeAux(omit,omit)));//Subscription
@@ -3445,7 +3557,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_createRequest.primitiveContent.subscription.resourceName := omit;
 						v_ae1.start(f_CSE_DMR_CRE_001(int23, v_createRequest, m_createContainerBase));//Subscription
@@ -3466,7 +3579,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_createRequest.primitiveContent.subscription.resourceName := omit;
 						v_ae1.start(f_CSE_DMR_CRE_001(int23, v_createRequest, m_createAcpBase));//Subscription
@@ -3486,8 +3600,9 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
-						
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+					
 						v_createRequest.primitiveContent.subscription.resourceName := omit;
 						v_cse1.start(f_CSE_DMR_CRE_001_cseSimu(int23, v_createRequest));//Subscription
 						v_cse1.done;
@@ -3506,7 +3621,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_createRequest.primitiveContent.contentInstance.resourceName := omit;
 						v_ae1.start(f_CSE_DMR_CRE_001(int4, v_createRequest, m_createContainerBase));//ContentInstance
@@ -3535,7 +3651,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 			
 						v_ae1.start(f_CSE_DMR_CRE_002(int3, m_createContainerBase));//container
 						v_ae1.done;
@@ -3558,7 +3675,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 			
 						v_ae1.start(f_CSE_DMR_CRE_002(int9, m_createGroupBase));//group
 						v_ae1.done;
@@ -3580,7 +3698,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 			
 						v_ae1.start(f_CSE_DMR_CRE_002(int1, m_createAcpBase ));//accessControlPolicy
 						v_ae1.done;
@@ -3602,7 +3721,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 			
 						v_ae1.start(f_CSE_DMR_CRE_002(int23, m_createSubscriptionBase));//Subscription
 						v_ae1.done;
@@ -3631,7 +3751,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_CRE_003_CNT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 						v_ae1.start(f_CSE_DMR_CRE_003(int3, m_createContainerBase));//container
 						v_ae1.done;
@@ -3641,7 +3762,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 						v_ae1.start(f_CSE_DMR_CRE_003(int9, m_createGroupBase));//group
 						v_ae1.done;
@@ -3651,7 +3773,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
                         
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 						v_ae1.start(f_CSE_DMR_CRE_003(int1, m_createAcpBase));//accessControlPolicy
 						v_ae1.done;
@@ -3661,7 +3784,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
                         
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 						v_ae1.start(f_CSE_DMR_CRE_003(int23, m_createSubscriptionBase));//Subscription
 						v_ae1.done;
@@ -3679,7 +3803,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
                         
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 						v_ae1.start(f_CSE_DMR_CRE_004(int3, m_createContainerBase));//container
 						v_ae1.done;
@@ -3689,7 +3814,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 						v_ae1.start(f_CSE_DMR_CRE_004(int9, m_createGroupBase));//group
 						v_ae1.done;
@@ -3699,7 +3825,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
                         
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 						v_ae1.start(f_CSE_DMR_CRE_004(int1, m_createAcpBase));//accessControlPolicy
 						v_ae1.done;
@@ -3709,7 +3836,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
                         
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 						v_ae1.start(f_CSE_DMR_CRE_004(int23, m_createSubscriptionBase));//Subscription
 						v_ae1.done;
@@ -3728,7 +3856,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createContainerBaseInvalid;
 						var AttributeAux v_invalidAttribute;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 												
 						v_createRequest.primitiveContent.container_update_invalid.maxNrOfInstances := -1;
 						v_invalidAttribute := {name := "maxNrOfInstances", value_ := "-1"};
@@ -3742,7 +3871,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createContainerBaseInvalid;
 						var AttributeAux v_invalidAttribute;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_createRequest.primitiveContent.container_update_invalid.maxByteSize := -1;
 						v_invalidAttribute := {name := "maxByteSize", value_ := "-1"};
@@ -3757,7 +3887,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createContainerBaseInvalid;
 						var AttributeAux v_invalidAttribute;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_createRequest.primitiveContent.container_update_invalid.maxInstanceAge := -1;
 						v_invalidAttribute := {name := "maxInstanceAge", value_ := "-1"};
@@ -3780,7 +3911,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_ae1.start(f_CSE_DMR_CRE_006(int3, v_createRequest));		
 						v_ae1.done;
@@ -3799,7 +3931,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_ae1.start(f_CSE_DMR_CRE_006(int3, v_createRequest));
 						v_ae1.done;
@@ -3819,7 +3952,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 												
 						v_ae1.start(f_CSE_DMR_CRE_006(int3, v_createRequest));
 						v_ae1.done;
@@ -4219,7 +4353,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						const AttributeList c_optionalAttribute := {"accessControlPolicyIDs"};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.container.accessControlPolicyIDs := {"NotInitialized"};
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int3, v_createRequest, c_optionalAttribute));			
@@ -4231,7 +4366,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						const AttributeList c_optionalAttribute := {"labels"};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.container.labels := {"MyLabel"};
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int3, v_createRequest, c_optionalAttribute));
@@ -4244,7 +4380,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						const AttributeList c_optionalAttribute := {"maxNrOfInstances"};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.container.maxNrOfInstances := 0;
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int3, v_createRequest, c_optionalAttribute));
@@ -4257,7 +4394,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						const AttributeList c_optionalAttribute := {"maxByteSize"};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.container.maxByteSize := 0;
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int3, v_createRequest, c_optionalAttribute));
@@ -4270,7 +4408,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						const AttributeList c_optionalAttribute := {"maxInstanceAge"};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.container.maxInstanceAge := 0;
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int3, v_createRequest, c_optionalAttribute));
@@ -4283,7 +4422,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AttributeList v_optionalAttribute := {"creator"};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.container.creator := "NullValue";
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int3, v_createRequest, v_optionalAttribute));
@@ -4296,7 +4436,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
 						const AttributeList c_optionalAttribute := {"labels"};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.contentInstance.labels := {"MyLabel"};
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int4, v_createRequest, c_optionalAttribute));
@@ -4309,7 +4450,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
 						var AttributeList v_optionalAttribute := {"creator"};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.contentInstance.creator := "NullValue";
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int4, v_createRequest, v_optionalAttribute));
@@ -4322,7 +4464,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
 						const AttributeList c_optionalAttribute := {"contentInfo"};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.contentInstance.contentInfo := "MyContentInfo";
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int4, v_createRequest, c_optionalAttribute));
@@ -4335,7 +4478,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createAcpBase;
 						const AttributeList c_optionalAttribute := {"labels"};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.accessControlPolicy.labels := {"MyLabel"};
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int1, v_createRequest, c_optionalAttribute));
@@ -4348,7 +4492,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"accessControlPolicyIDs"};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.accessControlPolicyIDs := {"NotInitialized"};
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));			
@@ -4360,7 +4505,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"labels"};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.labels := {"MyLabel"};
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
@@ -4373,7 +4519,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var AttributeList v_optionalAttribute := {"creator"};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.creator := "NullValue";
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, v_optionalAttribute));
@@ -4458,7 +4605,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						const integer c_maxByteSize := 512;	
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_parentResourceRequest.primitiveContent.container.maxByteSize := c_maxByteSize;
 						
 						v_ae1.start(f_CSE_DMR_CRE_014(int3, v_parentResourceRequest, int4, v_childResourceRequest));		
@@ -4484,7 +4632,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var ResponsePrimitive v_responsePrimitive;
 						var template PrimitiveContent v_contentResponse;
 						v_contentResponse.container := mw_contentContainer_rc1;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1); 
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done; 
 						v_ae1.start(f_CSE_DMR_RET_001(int3, m_createContainerBase, v_contentResponse));//Container
 						v_ae1.done;
 						
@@ -4495,7 +4644,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var ResponsePrimitive v_responsePrimitive;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.group_ := mw_contentGroup_rc1;
                         
 						v_ae1.start(f_CSE_DMR_RET_001(int9, m_createGroupBase, v_contentResponse));//Group
@@ -4508,7 +4658,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var ResponsePrimitive v_responsePrimitive;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.accessControlPolicy := mw_contentAcp_rc1;
 							
 						v_ae1.start(f_CSE_DMR_RET_001(int1, m_createAcpBase, v_contentResponse));//AccessControlPolicy
@@ -4524,7 +4675,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template PrimitiveContent v_contentResponse;
 					
 						v_contentResponse.subscription := mw_contentSubscription_rc1;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_DMR_RET_001(int23, m_createSubscriptionBase, v_contentResponse));//Subscription
 						v_ae1.done;
 					
@@ -4536,7 +4688,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						
 						var ResponsePrimitive v_responsePrimitive;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.contentInstance := mw_contentContentInstance_rc1;
 	
 						v_ae1.start(f_CSE_DMR_RET_001(int4, m_createContentInstanceBase, v_contentResponse));//ContentInstance
@@ -4556,7 +4709,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_RET_003_CNT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                         
 						v_ae1.start(f_CSE_DMR_RET_003(int3, m_createContainerBase));//Container
 						v_ae1.done;
@@ -4565,7 +4719,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_RET_003_GRP() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_ae1.start(f_CSE_DMR_RET_003(int9, m_createGroupBase));//Group
 						v_ae1.done;
@@ -4576,7 +4731,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template RequestPrimitive v_requestPrimitive := m_createAcpBase;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_requestPrimitive.primitiveContent.accessControlPolicy.selfPrivileges.accessControlRule_list[0].accessControlOperations := int61;
 						
 						v_ae1.start(f_CSE_DMR_RET_003(int1, v_requestPrimitive));//AccessControlPolicy
@@ -4586,7 +4742,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_RET_003_SUB() runs on Tester system CseSystem {
 							// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 	
 						v_ae1.start(f_CSE_DMR_RET_003(int23, m_createSubscriptionBase));//Subscription
 						v_ae1.done;
@@ -4744,7 +4901,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.accessControlPolicy := mw_contentAcp_rc1;
 							
 						v_ae1.start(f_CSE_DMR_RET_013(int1, m_createAcpBase, v_contentResponse));//AccessControlPolicy
@@ -4756,7 +4914,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.aE := mw_contentAeBase;
 							
 						v_ae1.start(f_CSE_DMR_RET_013(int2, m_createAe(PX_APP_ID,-,PX_AE1_ID_STEM), v_contentResponse));//AE
@@ -4768,7 +4927,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.container := mw_contentContainer_rc1;
 						    
 						v_ae1.start(f_CSE_DMR_RET_013(int3, m_createContainerBase, v_contentResponse));//Container
@@ -4780,7 +4940,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.group_ := mw_contentGroup_rc1;
                         
 						v_ae1.start(f_CSE_DMR_RET_013(int9, m_createGroupBase, v_contentResponse));//Group
@@ -4792,7 +4953,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
 							
 						v_ae1.start(f_CSE_DMR_RET_013(int16, m_createRemoteCSEBase, v_contentResponse));//RemoteCSE
@@ -4804,7 +4966,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.subscription := mw_contentSubscription_rc1;
 						
 						v_ae1.start(f_CSE_DMR_RET_013(int23, m_createSubscriptionBase, v_contentResponse));//Subscription
@@ -4825,7 +4988,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template RequestPrimitive v_requestPrimitive := m_createAcpBase;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_requestPrimitive.primitiveContent.accessControlPolicy.selfPrivileges.accessControlRule_list[0].accessControlOperations := int61;
 						
 						v_ae1.start(f_CSE_DMR_RET_014(int1, v_requestPrimitive));//AccessControlPolicy
@@ -4835,7 +4999,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_RET_014_AE() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 	
 						v_ae1.start(f_CSE_DMR_RET_014(int2, m_createAe(PX_APP_ID,-,PX_AE1_ID_STEM)));//AE
 						v_ae1.done;
@@ -4844,7 +5009,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_RET_014_CNT() runs on Tester system CseSystem {
 						// Local variables
  						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                         
 						v_ae1.start(f_CSE_DMR_RET_014(int3, m_createContainerBase));//Container
 						v_ae1.done;
@@ -4853,7 +5019,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_RET_014_CSR() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 		
 						v_ae1.start(f_CSE_DMR_RET_014(int16, m_createRemoteCSEBase));//RemoteCSE
 						v_ae1.done;
@@ -4863,7 +5030,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_RET_014_GRP() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_ae1.start(f_CSE_DMR_RET_014(int9, m_createGroupBase));//Group
 						v_ae1.done;
@@ -4872,7 +5040,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_RET_014_SUB() runs on AeSimu system CseSystem {
 							// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 	
 						v_ae1.start(f_CSE_DMR_RET_014(int23, m_createSubscriptionBase));//Subscription
 						v_ae1.done;
@@ -4899,7 +5068,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.container.labels := v_labels_1;
 						v_updateRequest.primitiveContent.container.labels := v_labels_2;
 						
@@ -4939,7 +5109,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.group_.labels := v_labels_1;
 						v_updateRequest.primitiveContent.group_.labels := v_labels_2;
 
@@ -4979,7 +5150,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.accessControlPolicy.labels := v_labels_1;
 						v_updateRequest.primitiveContent.accessControlPolicy.labels := v_labels_2;
 
@@ -5019,7 +5191,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.labels := v_labels_1;
 						v_updateRequest.primitiveContent.subscription.labels := v_labels_2;
 
@@ -5066,7 +5239,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.container.labels := v_labels_1;
                         
 						v_ae1.start(f_CSE_DMR_UPD_002(int3, m_createContainerBase, v_updateRequest));//Container
@@ -5103,7 +5277,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.group_.labels := v_labels_1;
 						
 						v_ae1.start(f_CSE_DMR_UPD_002(int9, m_createGroupBase, v_updateRequest));//Group
@@ -5140,7 +5315,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.accessControlPolicy.labels := v_labels_1;
 							
 						v_ae1.start(f_CSE_DMR_UPD_002(int1, m_createAcpBase,v_updateRequest));//AccessControlPolicy
@@ -5177,7 +5353,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.subscription.labels := v_labels_1;
 						
 						v_ae1.start(f_CSE_DMR_UPD_002(int23, m_createSubscriptionBase,v_updateRequest));//Subscription
@@ -5225,7 +5402,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.container.labels := v_labels_1;
 						v_updateRequest.primitiveContent.container.labels := v_labels_2;
 						
@@ -5272,7 +5450,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.group_.labels := v_labels_1;
 						v_updateRequest.primitiveContent.group_.labels := v_labels_2;
 						
@@ -5317,7 +5496,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createAcpBase;
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.accessControlPolicy.labels := v_labels_1;
 						v_updateRequest.primitiveContent.accessControlPolicy.labels := v_labels_2;
 						
@@ -5362,7 +5542,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.labels := v_labels_1;
 						v_updateRequest.primitiveContent.subscription.labels := v_labels_2;
 						
@@ -5414,7 +5595,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var ResponsePrimitive v_responsePrimitive;
 						var AttributeAux_list v_nullFields;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.container.labels := v_labels_1;//Attribute 3
 						v_updateRequest.primitiveContent.container.expirationTime := "20301231T012345";//Attribute 1
 						v_updateRequest.primitiveContent.container.maxNrOfInstances := 5;//Attribute 2
@@ -5477,7 +5659,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);					
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;					
 						v_createRequest.primitiveContent.group_.labels := v_labels_1;//Attribute 3
 						v_updateRequest.primitiveContent.group_.expirationTime := "20301231T012345";//Attribute 1
 						v_updateRequest.primitiveContent.group_.groupName:= v_groupName_1;//Attribute 2
@@ -5540,7 +5723,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.accessControlPolicy.labels := v_labels_1;//Attribute 3
 						v_createRequest.primitiveContent.accessControlPolicy.privileges.accessControlRule_list := {};//Attribute 2
 						v_updateRequest.primitiveContent.accessControlPolicy.selfPrivileges := v_selfprivileges_2; //Attribute 1
@@ -5603,7 +5787,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.accessControlPolicy.labels := v_labels_1;//Attribute 3
 						v_updateRequest.primitiveContent.accessControlPolicy.privileges := v_privileges_2; //Attribute 1
 						v_updateRequest.primitiveContent.accessControlPolicy.announceTo := {f_getAnnouncementTargetPoA()};//Attribute 2
@@ -5663,7 +5848,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.expirationCounter := 10;//Attribute 3
 						v_updateRequest.primitiveContent.subscription.expirationTime := "20301231T012345";//Attribute 1
 						v_updateRequest.primitiveContent.subscription.labels := v_labels_1;//Attribute 2
@@ -5723,7 +5909,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_DMR_UPD_005() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 					v_ae1.start(f_CSE_DMR_UPD_005());
 			  	  	
@@ -5805,7 +5992,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var Labels v_labels_1 := {"VALUE_1"};
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.container.labels := v_labels_1;
 						
 						v_ae1.start(f_CSE_DMR_UPD_006(int3, m_createContainerBase, v_updateRequest));//Container
@@ -5828,7 +6016,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var Labels v_labels_1 := {"VALUE_1"};
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.group_.labels := v_labels_1;
 						
 						v_ae1.start(f_CSE_DMR_UPD_006(int9, m_createGroupBase, v_updateRequest));//Group
@@ -5852,7 +6041,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 						var template RequestPrimitive v_requestPrimitive := m_createAcpBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_requestPrimitive.primitiveContent.accessControlPolicy.selfPrivileges.accessControlRule_list[0].accessControlOperations := int59;
 
 						v_updateRequest.primitiveContent.accessControlPolicy.labels := v_labels_1;
@@ -5877,7 +6067,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var Labels v_labels_1 := {"VALUE_1"};
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.subscription.labels := v_labels_1;
 								
 						v_ae1.start(f_CSE_DMR_UPD_006(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
@@ -5908,7 +6099,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var Timestamp v_creationTime := "21001231T012345";
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent := {container_update_invalid := m_contentUpdateContainer_invalid};
 						v_updateRequest.primitiveContent.container_update_invalid.creationTime := v_creationTime;
 						
@@ -5932,7 +6124,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var Timestamp v_creationTime := "21001231T012345";
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent := {group_update_invalid := m_contentUpdateGroup_invalid};
 						v_updateRequest.primitiveContent.group_update_invalid.creationTime := v_creationTime;
 						
@@ -5956,7 +6149,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var Timestamp v_creationTime := "21001231T012345";
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent := {aCP_update_invalid := m_contentUpdateAcp_invalid};
 						v_updateRequest.primitiveContent.aCP_update_invalid.creationTime := v_creationTime;
 								
@@ -5980,7 +6174,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var Timestamp v_creationTime := "21001231T012345";
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent := {subscription_update_invalid := m_contentUpdateSubscription_invalid};
 						v_updateRequest.primitiveContent.subscription_update_invalid.creationTime := v_creationTime;
 								
@@ -6013,7 +6208,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 						var AttributeAux_list v_nullFields;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_nullFields := {{"maxNrOfMembers", omit}};
 						
 						v_updateRequest.primitiveContent.group_.maxNrOfMembers := 1;
@@ -6039,7 +6235,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 						var AttributeAux_list v_nullFields;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_nullFields := {{"selfPrivileges", omit}};
 						
 						v_updateRequest.primitiveContent.accessControlPolicy.selfPrivileges := v_selfPrivileges;
@@ -6064,7 +6261,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var AttributeAux_list v_nullFields;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_nullFields := {{"notificationURI", omit}};
 						
 						v_updateRequest.primitiveContent.subscription.notificationURI := {"NullTarget"};
@@ -6097,7 +6295,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var XSD.PositiveInteger v_expirationCounter := 1;
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent := {container_update_invalid := m_contentUpdateContainer_invalid};
 
 						v_updateRequest.primitiveContent.container_update_invalid.expirationCounter := v_expirationCounter;
@@ -6112,7 +6311,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var XSD.PositiveInteger v_expirationCounter := 1;
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent := {group_update_invalid := m_contentUpdateGroup_invalid};
 	
 						v_updateRequest.primitiveContent.group_update_invalid.expirationCounter := v_expirationCounter;
@@ -6127,7 +6327,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var XSD.PositiveInteger v_expirationCounter := 1;
 						var template RequestPrimitive v_createRequest := m_createAcpBase;
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent := {aCP_update_invalid := m_contentUpdateAcp_invalid};
 	
 						v_updateRequest.primitiveContent.aCP_update_invalid.expirationCounter := v_expirationCounter;
@@ -6142,7 +6343,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var XSD.NonNegativeInteger v_maxNrOfInstances := 5;
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent := {subscription_update_invalid := m_contentUpdateSubscription_invalid};
 	
 						v_updateRequest.primitiveContent.subscription_update_invalid.maxNrOfInstances := v_maxNrOfInstances;
@@ -6463,7 +6665,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createAcpBase;
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 						var ResponsePrimitive v_responsePrimitive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.accessControlPolicy.labels := v_labels_1;
 						v_updateRequest.primitiveContent.accessControlPolicy.labels := v_labels_2;
 
@@ -6494,7 +6697,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.container.accessControlPolicyIDs := v_accessControlPolicyIDs_1;
 						v_updateRequest.primitiveContent.container.accessControlPolicyIDs := v_accessControlPolicyIDs_2;
 
@@ -6524,7 +6728,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 		
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.container.labels := v_labels_1;
 						v_updateRequest.primitiveContent.container.labels := v_labels_2;
 		
@@ -6554,7 +6759,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 	
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.container.maxByteSize := v_maxByteSize_1;
 						v_updateRequest.primitiveContent.container.maxByteSize := v_maxByteSize_2;
 	
@@ -6584,7 +6790,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.container.maxInstanceAge := v_maxInstanceAge_1;
 						v_updateRequest.primitiveContent.container.maxInstanceAge := v_maxInstanceAge_2;
 
@@ -6614,7 +6821,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 	
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.container.maxNrOfInstances := v_maxNrOfInstances_1;
 						v_updateRequest.primitiveContent.container.maxNrOfInstances := v_maxNrOfInstances_2;
 	
@@ -6643,7 +6851,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.accessControlPolicyIDs := v_accessControlPolicyIDs_1;
 						v_updateRequest.primitiveContent.subscription.accessControlPolicyIDs := v_accessControlPolicyIDs_2;
 
@@ -6673,7 +6882,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.labels := v_labels_1;
 						v_updateRequest.primitiveContent.subscription.labels := v_labels_2;
 
@@ -6709,7 +6919,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					   	var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;
 					   	var ResponsePrimitive v_responsePrimitive;
 					   	var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 					   v_updateRequest.primitiveContent.remoteCSE.labels := v_labels;
 	
 					   v_ae1.start(f_CSE_DMR_UPD_015(int16, m_createRemoteCSEBase, v_updateRequest));//Remote CSE
@@ -6743,7 +6954,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					   var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;
 					   var ResponsePrimitive v_responsePrimitive;
 					   var PrimitiveContent v_primitiveContentRetrieveResource;
-					   f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+					   v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 					   v_updateRequest.primitiveContent.remoteCSE.pointOfAccess := v_poaList;
 
 					   v_ae1.start(f_CSE_DMR_UPD_015(int16, m_createRemoteCSEBase, v_updateRequest));//Remote CSE
@@ -6777,7 +6989,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					   	var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;
 					   	var ResponsePrimitive v_responsePrimitive;
 					   	var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 					   v_updateRequest.primitiveContent.remoteCSE.nodeLink := v_nodeLink;
 
 					   v_ae1.start(f_CSE_DMR_UPD_015(int16, m_createRemoteCSEBase, v_updateRequest));//Remote CSE
@@ -6811,7 +7024,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateAeBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.aE.labels := v_labels;
 						
 						v_ae1.start(f_CSE_DMR_UPD_015(int2, m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM), v_updateRequest));//AE
@@ -6845,7 +7059,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var RequestPrimitive v_updateRequestPrimitive;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_DMR_UPD_015(int2, m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM), v_updateRequest, true));//AE
 						v_ae1.done;
 						
@@ -6879,7 +7094,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateAeBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.aE.appName := v_appName;
 						v_ae1.start(f_CSE_DMR_UPD_015(int2, m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM), v_updateRequest));//AE
 						v_ae1.done;
@@ -6912,7 +7128,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateAeBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.aE.pointOfAccess := v_poaList;
 						v_ae1.start(f_CSE_DMR_UPD_015(int2, m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM), v_updateRequest));//AE
 						v_ae1.done;
@@ -6945,7 +7162,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.container.labels := v_labels;
 						
 						v_ae1.start(f_CSE_DMR_UPD_015(int3, m_createContainerBase, v_updateRequest));//Container
@@ -6979,7 +7197,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var RequestPrimitive v_updateRequestPrimitive;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_DMR_UPD_015(int3, m_createContainerBase, v_updateRequest, true));//Container
 						v_ae1.done;
 						
@@ -7013,7 +7232,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.container.maxNrOfInstances := v_maxNrOfInstances;
 						
 						v_ae1.start(f_CSE_DMR_UPD_015(int3, m_createContainerBase, v_updateRequest));//Container
@@ -7047,7 +7267,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.container.maxByteSize := v_maxByteSize;
 						
 						v_ae1.start(f_CSE_DMR_UPD_015(int3, m_createContainerBase, v_updateRequest));//Container
@@ -7081,7 +7302,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.container.maxInstanceAge := v_maxInstanceAge;
 						
 						v_ae1.start(f_CSE_DMR_UPD_015(int3, m_createContainerBase, v_updateRequest));//Container
@@ -7115,7 +7337,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.accessControlPolicy.labels := v_labels;
 						
 						v_ae1.start(f_CSE_DMR_UPD_015(int1, m_createAcpBase, v_updateRequest));//AccessControlPolicy
@@ -7149,7 +7372,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var RequestPrimitive v_updateRequestPrimitive;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest, true));//Subscription
 						v_ae1.done;
 						
@@ -7183,7 +7407,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.subscription.labels := v_labels;
 						v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
 						v_ae1.done;
@@ -7216,7 +7441,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.group_.labels := v_labels;
 						v_ae1.start(f_CSE_DMR_UPD_015(int9, m_createGroupBase, v_updateRequest));//Group
 						v_ae1.done;
@@ -7249,7 +7475,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var RequestPrimitive v_updateRequestPrimitive;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_DMR_UPD_015(int9, m_createGroupBase, v_updateRequest, true));//Group
 						v_ae1.done;
 						
@@ -7283,7 +7510,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.group_.membersAccessControlPolicyIDs := v_membersAccessControlPolicyIDs;
 						v_ae1.start(f_CSE_DMR_UPD_015(int9, m_createGroupBase, v_updateRequest));//Group
 						v_ae1.done;
@@ -7316,7 +7544,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.group_.groupName := v_groupName;
 						v_ae1.start(f_CSE_DMR_UPD_015(int9, m_createGroupBase, v_updateRequest));//Group
 						v_ae1.done;
@@ -7356,7 +7585,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.remoteCSE.expirationTime := v_expirationTime;
 						
 						v_ae1.start(f_CSE_DMR_UPD_016(int16, m_createRemoteCSEBase, v_updateRequest));//Remote CSE
@@ -7390,7 +7620,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.remoteCSE.requestReachability := v_requestReachability;
 						
 						v_ae1.start(f_CSE_DMR_UPD_016(int16, m_createRemoteCSEBase, v_updateRequest));//Remote CSE
@@ -7422,7 +7653,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateAeBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.aE.expirationTime := v_expirationTime;
 						
 						v_ae1.start(f_CSE_DMR_UPD_016(int2, m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM), v_updateRequest));//AE
@@ -7456,7 +7688,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateAeBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.aE.requestReachability := v_requestReachability;
 
 						v_ae1.start(f_CSE_DMR_UPD_016(int2, m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM), v_updateRequest));//AE
@@ -7490,7 +7723,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.container.expirationTime := v_expirationTime;
 						
 						v_ae1.start(f_CSE_DMR_UPD_016(int3, m_createContainerBase, v_updateRequest));//Container
@@ -7524,7 +7758,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.accessControlPolicy.expirationTime := v_expirationTime;
 						
 						v_ae1.start(f_CSE_DMR_UPD_016(int1, m_createAcpBase, v_updateRequest));//AccessControlPolicy
@@ -7558,7 +7793,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.accessControlPolicy.privileges := v_privileges_1;
 						v_ae1.start(f_CSE_DMR_UPD_016(int1, m_createAcpBase, v_updateRequest));//AccessControlPolicy
 						v_ae1.done;
@@ -7591,7 +7827,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.accessControlPolicy.selfPrivileges := v_privileges_1;
 						v_ae1.start(f_CSE_DMR_UPD_016(int1, m_createAcpBase, v_updateRequest));//AccessControlPolicy
 						v_ae1.done;
@@ -7624,7 +7861,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.subscription.expirationTime := v_expirationTime;
 						
 						v_ae1.start(f_CSE_DMR_UPD_016(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
@@ -7659,7 +7897,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);					
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;					
 						v_updateRequest.primitiveContent.subscription.notificationURI := v_notificationURI;
 						
 						v_ae1.start(f_CSE_DMR_UPD_016(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
@@ -7693,7 +7932,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.subscription.notificationContentType := v_notificationContentType;
 						
 						v_ae1.start(f_CSE_DMR_UPD_016(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
@@ -7727,7 +7967,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.group_.expirationTime := v_expirationTime;
 						
 						v_ae1.start(f_CSE_DMR_UPD_016(int9, m_createGroupBase, v_updateRequest));//Group
@@ -7761,7 +8002,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.group_.maxNrOfMembers := v_maxNrOfMembers;
 						
 						v_ae1.start(f_CSE_DMR_UPD_016(int9, m_createGroupBase, v_updateRequest));//Group
@@ -7795,7 +8037,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.group_.memberIDs := v_memberIDs;
 						
 						v_ae1.start(f_CSE_DMR_UPD_016(int9, m_createGroupBase, v_updateRequest));//Group
@@ -7838,7 +8081,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_DEL_001_CNT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                 		
 						v_ae1.start(f_CSE_DMR_DEL_001(int3, m_createContainerBase));//Container
 						v_ae1.done;
@@ -7851,7 +8095,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_DEL_001_GRP() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                 		
 						v_ae1.start(f_CSE_DMR_DEL_001(int9, m_createGroupBase));//Group
 						v_ae1.done;
@@ -7860,7 +8105,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_DEL_001_ACP() runs on Tester system CseSystem {
 						// Local variables
  						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                 
 						v_ae1.start(f_CSE_DMR_DEL_001(int1, m_createAcpBase));//AccessControlPolicy
 						v_ae1.done;
@@ -7869,7 +8115,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_DEL_001_SUB() runs on Tester system CseSystem {
 							// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                 
 						v_ae1.start(f_CSE_DMR_DEL_001(int23, m_createSubscriptionBase));//Subscription
 						v_ae1.done;
@@ -7878,7 +8125,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_DEL_001_CIN() runs on AeSimu system CseSystem {
 							// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                 
 						v_ae1.start(f_CSE_DMR_DEL_001(int4, m_createContentInstanceBase));//ContentInstance
 						v_ae1.done;
@@ -7895,7 +8143,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_DEL_002_CNT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                 		
 						v_ae1.start(f_CSE_DMR_DEL_002(int3, m_createContainerBase));//Container
 						v_ae1.done;
@@ -7904,7 +8153,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_DEL_002_GRP() runs on Tester system CseSystem {
 						// Local variables
  						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                 		
 						v_ae1.start(f_CSE_DMR_DEL_002(int9, m_createGroupBase));//Group
 						v_ae1.done;
@@ -7913,7 +8163,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_DEL_002_ACP() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                 
 						v_ae1.start(f_CSE_DMR_DEL_002(int1, m_createAcpBase));//AccessControlPolicy
 						v_ae1.done;
@@ -7922,7 +8173,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_DEL_002_SUB() runs on Tester system CseSystem {
 							// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                 
 						v_ae1.start(f_CSE_DMR_DEL_002(int23, m_createSubscriptionBase));//Subscription
 						v_ae1.done;
@@ -8267,7 +8519,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_SUB_CRE_001_SUB() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 							
 					v_ae1.start(f_CSE_SUB_CRE_001_SUB());
 				  	  	
@@ -8341,7 +8594,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_SUB_CRE_001_CIN() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 								
 					v_ae1.start(f_CSE_SUB_CRE_001_CIN());
 					  	  	
@@ -8419,7 +8673,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_SUB_CRE_002() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 								
 					v_ae1.start(f_CSE_SUB_CRE_002());
 					  	  	
@@ -8498,7 +8753,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_SUB_CRE_003() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 								
 					v_ae1.start(f_CSE_SUB_CRE_003());
 					  	  	
@@ -8571,7 +8827,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_SUB_CRE_004() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 								
 					v_ae1.start(f_CSE_SUB_CRE_004());
 					  	  	
@@ -8634,7 +8891,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_SUB_CRE_005() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 								
 					v_ae1.start(f_CSE_SUB_CRE_005());
 					  	  	
@@ -8718,7 +8976,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_SUB_UPD_001() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 								
 					v_ae1.start(f_CSE_SUB_UPD_001());
 					  	  	
@@ -8805,7 +9064,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_SUB_DEL_001() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 									
 					v_ae1.start(f_CSE_SUB_DEL_001());
 						  	  	
@@ -8906,7 +9166,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_SEC_ACP_CRE_001() runs on Tester system CseSystem {
 					
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 									
 						v_ae1.start(f_CSE_SEC_ACP_CRE_001());
 						  	  	
@@ -8990,7 +9251,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_SEC_ACP_CRE_002() runs on Tester system CseSystem {
 					
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 										
 						v_ae1.start(f_CSE_SEC_ACP_CRE_002());
 							  	  	
@@ -9075,7 +9337,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_SEC_ACP_CRE_003() runs on Tester system CseSystem {
 					
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 										
 						v_ae1.start(f_CSE_SEC_ACP_CRE_003());
 							  	  	
@@ -9159,7 +9422,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_SEC_ACP_CRE_004() runs on Tester system CseSystem {
 					
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 										
 						v_ae1.start(f_CSE_SEC_ACP_CRE_004());
 							  	  	
@@ -9237,7 +9501,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_SEC_ACP_UPD_001() runs on Tester system CseSystem {
 					
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 										
 						v_ae1.start(f_CSE_SEC_ACP_UPD_001());
 							  	  	
@@ -9330,7 +9595,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_SEC_ACP_UPD_002() runs on Tester system CseSystem {
 					
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 										
 						v_ae1.start(f_CSE_SEC_ACP_UPD_002());
 							  	  	
@@ -9428,7 +9694,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						 */
 						testcase TC_CSE_SEC_ACP_001_CRE() runs on Tester system CseSystem { //Create
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_001(m_createContainerBase));	
 							v_ae1.done;
@@ -9438,7 +9705,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 							var template RequestPrimitive v_updateRequest := m_updateAeBase;
 							var Labels v_labels_1:= {"VALUE_1"};
-							f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+							v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 							v_updateRequest.primitiveContent.aE.labels := v_labels_1;
 
 							v_ae1.start(f_CSE_SEC_ACP_001(v_updateRequest));	
@@ -9447,7 +9715,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 	
 						testcase TC_CSE_SEC_ACP_001_RET() runs on Tester system CseSystem { //Retrieve
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_001(m_retrieve("Temporary", "Temporary")));	
 							v_ae1.done;
@@ -9455,7 +9724,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 	
 						testcase TC_CSE_SEC_ACP_001_DEL() runs on Tester system CseSystem { //Delete
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_001(m_delete("Temporary", "Temporary")));	
 							v_ae1.done;
@@ -9471,7 +9741,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						 */
 						testcase TC_CSE_SEC_ACP_002_CRE() runs on Tester system CseSystem { //Create
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_002(m_createContainerBase, int2001));	
 							v_ae1.done;
@@ -9483,14 +9754,16 @@ module OneM2M_Testcases_CSE_Release_1 {
 							var template RequestPrimitive v_updateRequest := m_updateAeBase;
 							var Labels v_labels_1:= {"VALUE_1"};
 							v_updateRequest.primitiveContent.aE.labels := v_labels_1;
-							f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+							v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 							v_ae1.start(f_CSE_SEC_ACP_002(v_updateRequest, int2004));	
 							v_ae1.done;
 						}//end TC_CSE_SEC_ACP_002_UPD
 	
 						testcase TC_CSE_SEC_ACP_002_RET() runs on Tester system CseSystem { //Retrieve
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-							f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+							v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_002(m_retrieve("Temporary", "Temporary"), int2000));	
 							v_ae1.done;
@@ -9498,7 +9771,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 	
 						testcase TC_CSE_SEC_ACP_002_DEL() runs on Tester system CseSystem { //Delete
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_002(m_delete("Temporary", "Temporary"), int2002));	
 							v_ae1.done;
@@ -9514,7 +9788,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						 */
 						testcase TC_CSE_SEC_ACP_003_CRE() runs on Tester system CseSystem { //Create
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_003(m_createContainerBase, int2001));	
 							v_ae1.done;
@@ -9525,7 +9800,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						
 							var template RequestPrimitive v_updateRequest := m_updateAeBase;
 							var Labels v_labels_1:= {"VALUE_1"};
-							f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+							v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 							v_updateRequest.primitiveContent.aE.labels := v_labels_1;
 
 							v_ae1.start(f_CSE_SEC_ACP_003(v_updateRequest, int2004));	
@@ -9534,7 +9810,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						
 						testcase TC_CSE_SEC_ACP_003_RET() runs on Tester system CseSystem { //Retrieve
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_003(m_retrieve("Temporary", "Temporary"), int2000));	
 							v_ae1.done;
@@ -9542,7 +9819,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						
 						testcase TC_CSE_SEC_ACP_003_DEL() runs on Tester system CseSystem { //Delete
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_003(m_delete("Temporary", "Temporary"), int2002));	
 							v_ae1.done;
@@ -9558,7 +9836,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						 */
 						testcase TC_CSE_SEC_ACP_004_CRE() runs on Tester system CseSystem { //Create
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_004(m_createContainerBase, int2001));	
 							v_ae1.done;
@@ -9569,7 +9848,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						
 							var template RequestPrimitive v_updateRequest := m_updateAeBase;
 							var Labels v_labels_1:= {"VALUE_1"};
-							f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+							v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 							v_updateRequest.primitiveContent.aE.labels := v_labels_1;
 
 							v_ae1.start(f_CSE_SEC_ACP_004(v_updateRequest, int2004));	
@@ -9578,7 +9858,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 		
 						testcase TC_CSE_SEC_ACP_004_RET() runs on Tester system CseSystem { //Retrieve
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_004(m_retrieve("Temporary", "Temporary"), int2000));	
 							v_ae1.done;
@@ -9586,7 +9867,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 		
 						testcase TC_CSE_SEC_ACP_004_DEL() runs on Tester system CseSystem { //Delete
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_004(m_delete("Temporary", "Temporary"), int2002));	
 							v_ae1.done;
@@ -9602,7 +9884,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						 */
 						testcase TC_CSE_SEC_ACP_005_CRE() runs on Tester system CseSystem { //Create
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_005(m_createContainerBase, int2001));	
 							v_ae1.done;
@@ -9614,14 +9897,16 @@ module OneM2M_Testcases_CSE_Release_1 {
 							var template RequestPrimitive v_updateRequest := m_updateAeBase;
 							var Labels v_labels_1:= {"VALUE_1"};
 							v_updateRequest.primitiveContent.aE.labels := v_labels_1;
-							f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+							v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 							v_ae1.start(f_CSE_SEC_ACP_005(v_updateRequest, int2004));	
 							v_ae1.done;
 						}//end TC_CSE_SEC_ACP_005_UPD
 		
 						testcase TC_CSE_SEC_ACP_005_RET() runs on Tester system CseSystem { //Retrieve
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_005(m_retrieve("Temporary", "Temporary"), int2000));	
 							v_ae1.done;
@@ -9629,7 +9914,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 		
 						testcase TC_CSE_SEC_ACP_005_DEL() runs on Tester system CseSystem { //Delete
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_005(m_delete("Temporary", "Temporary"), int2002));	
 							v_ae1.done;
@@ -9646,7 +9932,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						testcase TC_CSE_SEC_ACP_006_CRE() runs on Tester system CseSystem { //Create
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
-							f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+							v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 							v_ae1.start(f_CSE_SEC_ACP_006(m_createContainerBase, int2001));	
 							v_ae1.done;
 						}//end TC_CSE_SEC_ACP_006_CRE
@@ -9657,14 +9944,16 @@ module OneM2M_Testcases_CSE_Release_1 {
 							var template RequestPrimitive v_updateRequest := m_updateAeBase;
 							var Labels v_labels_1:= {"VALUE_1"};
 							v_updateRequest.primitiveContent.aE.labels := v_labels_1;
-							f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+							v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 							v_ae1.start(f_CSE_SEC_ACP_006(v_updateRequest, int2004));	
 							v_ae1.done;
 						}//end TC_CSE_SEC_ACP_006_UPD
 		
 						testcase TC_CSE_SEC_ACP_006_RET() runs on Tester system CseSystem { //Retrieve
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_006(m_retrieve("Temporary", "Temporary"), int2000));	
 							v_ae1.done;
@@ -9672,7 +9961,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 		
 						testcase TC_CSE_SEC_ACP_006_DEL() runs on Tester system CseSystem { //Delete
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_006(m_delete("Temporary", "Temporary"), int2002));	
 							v_ae1.done;
@@ -9688,7 +9978,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						 */
 						testcase TC_CSE_SEC_ACP_007_CRE() runs on Tester system CseSystem { //Create
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_007(m_createContainerBase, int2001));	
 							v_ae1.done;
@@ -9700,14 +9991,16 @@ module OneM2M_Testcases_CSE_Release_1 {
 							var template RequestPrimitive v_updateRequest := m_updateAeBase;
 							var Labels v_labels_1:= {"VALUE_1"};
 							v_updateRequest.primitiveContent.aE.labels := v_labels_1;
-							f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+							v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 							v_ae1.start(f_CSE_SEC_ACP_007(v_updateRequest, int2004));	
 							v_ae1.done;
 						}//end TC_CSE_SEC_ACP_007_UPD
 		
 						testcase TC_CSE_SEC_ACP_007_RET() runs on Tester system CseSystem { //Retrieve
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_007(m_retrieve("Temporary", "Temporary"), int2000));	
 							v_ae1.done;
@@ -9715,7 +10008,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 		
 						testcase TC_CSE_SEC_ACP_007_DEL() runs on Tester system CseSystem { //Delete
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_007(m_delete("Temporary", "Temporary"), int2002));	
 							v_ae1.done;
@@ -9731,7 +10025,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						 */
 						testcase TC_CSE_SEC_ACP_008_CRE() runs on Tester system CseSystem { //Create
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_008(m_createContainerBase, int2001));	
 							v_ae1.done;
@@ -9743,14 +10038,16 @@ module OneM2M_Testcases_CSE_Release_1 {
 							var template RequestPrimitive v_updateRequest := m_updateAeBase;
 							var Labels v_labels_1:= {"VALUE_1"};
 							v_updateRequest.primitiveContent.aE.labels := v_labels_1;
-							f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+							v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 							v_ae1.start(f_CSE_SEC_ACP_008(v_updateRequest, int2004));	
 							v_ae1.done;
 						}//end TC_CSE_SEC_ACP_008_UPD
 		
 						testcase TC_CSE_SEC_ACP_008_RET() runs on Tester system CseSystem { //Retrieve
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_008(m_retrieve("Temporary", "Temporary"), int2000));	
 							v_ae1.done;
@@ -9758,7 +10055,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 		
 						testcase TC_CSE_SEC_ACP_008_DEL() runs on Tester system CseSystem { //Delete
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_008(m_delete("Temporary", "Temporary"), int2002));	
 							v_ae1.done;
@@ -9774,7 +10072,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						 */
 						testcase TC_CSE_SEC_ACP_009_CRE() runs on Tester system CseSystem { //Create
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_009(m_createContainerBase, int2001));	
 							v_ae1.done;
@@ -9786,14 +10085,16 @@ module OneM2M_Testcases_CSE_Release_1 {
 							var template RequestPrimitive v_updateRequest := m_updateAeBase;
 							var Labels v_labels_1:= {"VALUE_1"};
 							v_updateRequest.primitiveContent.aE.labels := v_labels_1;
-							f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+							v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 							v_ae1.start(f_CSE_SEC_ACP_009(v_updateRequest, int2004));	
 							v_ae1.done;
 						}//end TC_CSE_SEC_ACP_009_UPD
 		
 						testcase TC_CSE_SEC_ACP_009_RET() runs on Tester system CseSystem { //Retrieve
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_009(m_retrieve("Temporary", "Temporary"), int2000));	
 							v_ae1.done;
@@ -9801,7 +10102,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 		
 						testcase TC_CSE_SEC_ACP_009_DEL() runs on Tester system CseSystem { //Delete
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_009(m_delete("Temporary", "Temporary"), int2002));	
 							v_ae1.done;
@@ -9817,7 +10119,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						 */
 						testcase TC_CSE_SEC_ACP_010_CRE() runs on Tester system CseSystem { //Create
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_010(m_createContainerBase, int2001));	
 							v_ae1.done;
@@ -9829,14 +10132,16 @@ module OneM2M_Testcases_CSE_Release_1 {
 							var template RequestPrimitive v_updateRequest := m_updateAeBase;
 							var Labels v_labels_1:= {"VALUE_1"};
 							v_updateRequest.primitiveContent.aE.labels := v_labels_1;
-							f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+							v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 							v_ae1.start(f_CSE_SEC_ACP_010(v_updateRequest, int2004));	
 							v_ae1.done;
 						}//end TC_CSE_SEC_ACP_010_UPD
 		
 						testcase TC_CSE_SEC_ACP_010_RET() runs on Tester system CseSystem { //Retrieve
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-							f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+							v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_010(m_retrieve("Temporary", "Temporary"), int2000));	
 							v_ae1.done;
@@ -9844,7 +10149,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 		
 						testcase TC_CSE_SEC_ACP_010_DEL() runs on Tester system CseSystem { //Delete
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_010(m_delete("Temporary", "Temporary"), int2002));	
 							v_ae1.done;
@@ -9860,7 +10166,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						 */
 						testcase TC_CSE_SEC_ACP_011_CRE() runs on Tester system CseSystem { //Create
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_011(m_createContainerBase, int2001));	
 							v_ae1.done;
@@ -9872,14 +10179,16 @@ module OneM2M_Testcases_CSE_Release_1 {
 							var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 							var Labels v_labels_1:= {"VALUE_1"};
 							v_updateRequest.primitiveContent.container.labels := v_labels_1;
-							f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+							v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 							v_ae1.start(f_CSE_SEC_ACP_011(v_updateRequest, int2004));	
 							v_ae1.done;
 						}//end TC_CSE_SEC_ACP_011_UPD
 	
 						testcase TC_CSE_SEC_ACP_011_RET() runs on Tester system CseSystem { //Retrieve
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_011(m_retrieve("Temporary", "Temporary"), int2000));	
 							v_ae1.done;
@@ -9887,7 +10196,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 	
 						testcase TC_CSE_SEC_ACP_011_DEL() runs on Tester system CseSystem { //Delete
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_011(m_delete("Temporary", "Temporary"), int2002));	
 							v_ae1.done;
@@ -9903,7 +10213,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						 */
 						testcase TC_CSE_SEC_ACP_012_CRE() runs on Tester system CseSystem { //Create
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_012(m_createContainerBase, int62));	
 							v_ae1.done;
@@ -9915,14 +10226,16 @@ module OneM2M_Testcases_CSE_Release_1 {
 							var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 							var Labels v_labels_1:= {"VALUE_1"};
 							v_updateRequest.primitiveContent.container.labels := v_labels_1;
-							f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+							v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 							v_ae1.start(f_CSE_SEC_ACP_012(v_updateRequest, int59));
 							v_ae1.done;
 						}//end TC_CSE_SEC_ACP_012_UPD
 	
 						testcase TC_CSE_SEC_ACP_012_RET() runs on Tester system CseSystem { //Retrieve
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_012(m_retrieve("Temporary", "Temporary"), int61));
 							v_ae1.done;
@@ -9930,7 +10243,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 	
 						testcase TC_CSE_SEC_ACP_012_DEL() runs on Tester system CseSystem { //Delete
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 							v_ae1.start(f_CSE_SEC_ACP_012(m_delete("Temporary", "Temporary"), int55));
 							v_ae1.done;
@@ -9953,7 +10267,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 			testcase TC_CSE_DIS_001() runs on Tester system CseSystem {
 					
 				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 										
 				v_ae1.start(f_CSE_DIS_001());
 							  	  	
@@ -10016,7 +10331,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 			testcase TC_CSE_DIS_002() runs on Tester system CseSystem {
 					
 				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 											
 				v_ae1.start(f_CSE_DIS_002());
 								  	  	
@@ -10089,7 +10405,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 			testcase TC_CSE_DIS_003() runs on Tester system CseSystem {
 					
 				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 											
 				v_ae1.start(f_CSE_DIS_003());
 								  	  	
@@ -10161,7 +10478,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 			testcase TC_CSE_DIS_004() runs on Tester system CseSystem {
 					
 				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 											
 				v_ae1.start(f_CSE_DIS_004());
 								  	  	
@@ -10233,7 +10551,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 			testcase TC_CSE_DIS_005() runs on Tester system CseSystem {
 					
 				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 											
 				v_ae1.start(f_CSE_DIS_005());
 								  	  	
@@ -10303,7 +10622,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 			testcase TC_CSE_DIS_006() runs on Tester system CseSystem {
 					
 				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 											
 				v_ae1.start(f_CSE_DIS_006());
 								  	  	
@@ -10370,7 +10690,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 			testcase TC_CSE_DIS_007() runs on Tester system CseSystem {
 					
 				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 											
 				v_ae1.start(f_CSE_DIS_007());
 								  	  	
@@ -10442,7 +10763,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 					var FilterCriteria v_filterCriteria := valueof(m_filterCriteria);
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 					v_filterCriteria.createdBefore := "20171231T012345";
 					v_filterCriteria.createdAfter := "20181231T012345";
 					v_filterCriteria.filterUsage := int1;
@@ -10458,7 +10780,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 					var FilterCriteria v_filterCriteria := valueof(m_filterCriteria);
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 					v_filterCriteria.unmodifiedSince := "20171231T012345";
 					v_filterCriteria.modifiedSince := "20181231T012345";
 					v_filterCriteria.filterUsage := int1;
@@ -10474,7 +10797,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 					var FilterCriteria v_filterCriteria := valueof(m_filterCriteria);
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 					v_filterCriteria.stateTagSmaller := 1;
 					v_filterCriteria.stateTagBigger := 2;
 					v_filterCriteria.filterUsage := int1;
@@ -10490,7 +10814,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 					var FilterCriteria v_filterCriteria := valueof(m_filterCriteria);
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 					v_filterCriteria.expireBefore := "20171231T012345";
 					v_filterCriteria.expireAfter := "20181231T012345";
 					v_filterCriteria.filterUsage := int1;
@@ -10509,7 +10834,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 			testcase TC_CSE_DIS_009() runs on Tester system CseSystem {
 					
 				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 											
 				v_ae1.start(f_CSE_DIS_009());
 								  	  	
@@ -10594,7 +10920,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_GMG_CRE_001() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 											
 					v_ae1.start(f_CSE_GMG_CRE_001());
 								  	  	
@@ -10682,7 +11009,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_GMG_CRE_002() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 												
 					v_ae1.start(f_CSE_GMG_CRE_002());
 									  	  	
@@ -10767,7 +11095,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_GMG_CRE_003() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 												
 					v_ae1.start(f_CSE_GMG_CRE_003());
 									  	  	
@@ -10835,7 +11164,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_GMG_CRE_004() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 												
 					v_ae1.start(f_CSE_GMG_CRE_004());
 									  	  	
@@ -10903,7 +11233,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_GMG_CRE_005() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 												
 					v_ae1.start(f_CSE_GMG_CRE_005());
 									  	  	
@@ -10982,7 +11313,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_GMG_CRE_006() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 												
 					v_ae1.start(f_CSE_GMG_CRE_006());
 									  	  	
@@ -11065,7 +11397,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_GMG_CRE_007() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 												
 					v_ae1.start(f_CSE_GMG_CRE_007());
 									  	  	
@@ -11137,7 +11470,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_GMG_RET_001() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 												
 					v_ae1.start(f_CSE_GMG_RET_001());
 									  	  	
@@ -11243,7 +11577,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_GMG_UPD_001() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 												
 					v_ae1.start(f_CSE_GMG_UPD_001());
 									  	  	
@@ -11324,7 +11659,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 			  testcase TC_CSE_GMG_UPD_002() runs on Tester system CseSystem {
 					
 				  var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 													
 				  v_ae1.start(f_CSE_GMG_UPD_002());
 										  	  	
@@ -11419,7 +11755,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_GMG_UPD_003() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 													
 					v_ae1.start(f_CSE_GMG_UPD_003());
 										  	  	
@@ -11506,7 +11843,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_GMG_UPD_004() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 													
 					v_ae1.start(f_CSE_GMG_UPD_004());
 										  	  	
@@ -11613,7 +11951,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_GMG_UPD_005() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 													
 					v_ae1.start(f_CSE_GMG_UPD_005());
 										  	  	
@@ -11723,7 +12062,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_GMG_UPD_006() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 													
 					v_ae1.start(f_CSE_GMG_UPD_006());
 										  	  	
@@ -11795,7 +12135,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_GMG_UPD_007() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 													
 					v_ae1.start(f_CSE_GMG_UPD_007());
 										  	  	
@@ -11888,7 +12229,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_GMG_UPD_008() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 													
 					v_ae1.start(f_CSE_GMG_UPD_008());
 										  	  	
@@ -11971,7 +12313,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_GMG_UPD_009() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 													
 					v_ae1.start(f_CSE_GMG_UPD_009());
 										  	  	
@@ -12084,7 +12427,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_GMG_UPD_010() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 													
 					v_ae1.start(f_CSE_GMG_UPD_010());
 										  	  	
@@ -12182,7 +12526,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					 */
 					testcase TC_CSE_GMG_001_CRE() runs on Tester system CseSystem { //Create
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 						v_ae1.start(f_CSE_GMG_001(m_createContainerBase, int2001));
 						v_ae1.done;
@@ -12194,14 +12539,16 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var Labels v_labels_1:= {"VALUE_1"};
 						v_updateRequest.primitiveContent.container.labels := v_labels_1;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_GMG_001(v_updateRequest, int2004));
 						v_ae1.done;
 					}//end TC_CSE_GMG_001_UPD
 	
 					testcase TC_CSE_GMG_001_RET() runs on Tester system CseSystem { //Retrieve
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_ae1.start(f_CSE_GMG_001(m_retrieve("Temporary", "Temporary"), int2000));
 						v_ae1.done;
@@ -12209,7 +12556,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 	
 					testcase TC_CSE_GMG_001_DEL() runs on Tester system CseSystem { //Delete
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 						v_ae1.start(f_CSE_GMG_001(m_delete("Temporary", "Temporary"), int2002));	
 						v_ae1.done;
@@ -12225,7 +12573,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					 */
 					testcase TC_CSE_GMG_002_CRE() runs on Tester system CseSystem { //Create
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 						v_ae1.start(f_CSE_GMG_002(m_createContainerBase, int62));	//c_RUDNDi
 						v_ae1.done;
@@ -12237,14 +12586,16 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var Labels v_labels_1:= {"VALUE_1"};
 						v_updateRequest.primitiveContent.container.labels := v_labels_1;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_GMG_002(v_updateRequest, int59));//c_CRDNDi
 						v_ae1.done;
 					}//end TC_CSE_GMG_002_UPD
 	
 					testcase TC_CSE_GMG_002_RET() runs on Tester system CseSystem { //Retrieve
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 						v_ae1.start(f_CSE_GMG_002(m_retrieve("Temporary", "Temporary"), int61));//c_CUDNDi
 						v_ae1.done;
@@ -12252,7 +12603,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 	
 					testcase TC_CSE_GMG_002_DEL() runs on Tester system CseSystem { //Delete
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 						v_ae1.start(f_CSE_GMG_002(m_delete("Temporary", "Temporary"), int55)); //c_CRUNDi	
 						v_ae1.done;
@@ -12268,7 +12620,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					 */
 					testcase TC_CSE_GMG_003_CRE() runs on Tester system CseSystem { //Create
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 						v_ae1.start(f_CSE_GMG_003(m_createContainerBase, int2001));
 						v_ae1.done;
@@ -12280,14 +12633,16 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var Labels v_labels_1:= {"VALUE_1"};
 						v_updateRequest.primitiveContent.container.labels := v_labels_1;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_GMG_003(v_updateRequest, int2004));
 						v_ae1.done;
 					}//end TC_CSE_GMG_003_UPD
 	
 					testcase TC_CSE_GMG_003_RET() runs on Tester system CseSystem { //Retrieve
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 						v_ae1.start(f_CSE_GMG_003(m_retrieve("Temporary", "Temporary"), int2000));
 						v_ae1.done;
@@ -12295,7 +12650,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 	
 					testcase TC_CSE_GMG_003_DEL() runs on Tester system CseSystem { //Delete
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 						v_ae1.start(f_CSE_GMG_003(m_delete("Temporary", "Temporary"), int2002));	
 						v_ae1.done;
@@ -12311,7 +12667,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					 */
 					testcase TC_CSE_GMG_004_CRE() runs on Tester system CseSystem { //Create
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 						v_ae1.start(f_CSE_GMG_004(m_createContainerBase, int62));	//c_RUDNDi
 						v_ae1.done;
@@ -12323,14 +12680,16 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var Labels v_labels_1:= {"VALUE_1"};
 						v_updateRequest.primitiveContent.container.labels := v_labels_1;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_GMG_004(v_updateRequest, int59));//c_CRDNDi
 						v_ae1.done;
 					}//end TC_CSE_GMG_004_UPD
 	
 					testcase TC_CSE_GMG_004_RET() runs on Tester system CseSystem { //Retrieve
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 						v_ae1.start(f_CSE_GMG_004(m_retrieve("Temporary", "Temporary"), int61));//c_CUDNDi
 						v_ae1.done;
@@ -12338,7 +12697,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 	
 					testcase TC_CSE_GMG_004_DEL() runs on Tester system CseSystem { //Delete
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 						v_ae1.start(f_CSE_GMG_004(m_delete("Temporary", "Temporary"), int55)); //c_CRUNDi	
 						v_ae1.done;
@@ -12357,7 +12717,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						
 						var template PrimitiveContent v_contentResponse;
 						v_contentResponse.container := mw_contentContainer_rc1;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_GMG_005(m_createContainerBase, v_contentResponse, int2001));
 						v_ae1.done;
 					}//end TC_CSE_GMG_005_CRE
@@ -12368,7 +12729,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var template PrimitiveContent v_contentResponse;
 						var Labels v_labels_1:= {"VALUE_1"};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.container := mw_contentContainerBase;
 						v_contentResponse.container.labels := ?;
 						v_updateRequest.primitiveContent.container.labels := v_labels_1;
@@ -12381,7 +12743,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.container := mw_contentContainerBase;
 						
 						v_ae1.start(f_CSE_GMG_005(m_retrieve("Temporary", "Temporary"), v_contentResponse, int2000));
@@ -12392,7 +12755,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
 						v_contentResponse.container := mw_contentContainerBase;// TODO see with wath should it be matched
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_GMG_005(m_delete("Temporary", "Temporary"), v_contentResponse, int2002));	
 						v_ae1.done;
 					}//end TC_CSE_GMG_005_DEL
@@ -12409,7 +12773,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.container := mw_contentContainer_rc1;
 						
 						v_ae1.start(f_CSE_GMG_006(m_createContainerBase, v_contentResponse, int2001));
@@ -12421,7 +12786,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var template PrimitiveContent v_contentResponse;
 						var Labels v_labels_1:= {"VALUE_1"};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.container := mw_contentContainerBase;
 						v_contentResponse.container.labels := ?;
 						v_updateRequest.primitiveContent.container.labels := v_labels_1;
@@ -12434,7 +12800,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.container := mw_contentContainerBase;
 						
 						v_ae1.start(f_CSE_GMG_006(m_retrieve("Temporary", "Temporary"), v_contentResponse, int2000));
@@ -12445,7 +12812,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.container := mw_contentContainerBase;// TODO see with wath should it be matched
 						
 						v_ae1.start(f_CSE_GMG_006(m_delete("Temporary", "Temporary"), v_contentResponse, int2002));	
diff --git a/OneM2M_Testcases_CSE_Release_2.ttcn b/OneM2M_Testcases_CSE_Release_2.ttcn
index 42a47928f9abd54efa405f08f282216fa6eccdb8..d2a17631e1c58f9d8ad9ab45cd45a236993c03b2 100644
--- a/OneM2M_Testcases_CSE_Release_2.ttcn
+++ b/OneM2M_Testcases_CSE_Release_2.ttcn
@@ -109,7 +109,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_REG_CRE_012_AE_NL() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_create.primitiveContent.aE.nodeLink := "http://127.0.0.1/";
 						v_ae1.start(f_CSE_REG_CRE_012(v_create));
 						v_ae1.done;
@@ -118,7 +119,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_REG_CRE_012_AE_OR() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_create.primitiveContent.aE.ontologyRef := "MyOntologyRef";
 						v_ae1.start(f_CSE_REG_CRE_012(v_create));
 						v_ae1.done;
@@ -232,7 +234,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 						
 						 var RequestPrimitive v_request;
 						 var template PrimitiveContent v_contentResponse;
-						 f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						v_cse1.done;
 						 v_request := valueof(m_createRemoteCSEBase);
 						 v_request.primitiveContent.remoteCSE.cseType := int2;	//MN_CSE
 						 v_request.primitiveContent.remoteCSE.resourceName := c_defaultRemoteCSEResourceName;
@@ -252,7 +256,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						
 						 var RequestPrimitive v_request;
 						 var template PrimitiveContent v_contentResponse;
-						 f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						 v_request := valueof(m_createRemoteCSEBase);
 						 v_request.primitiveContent.remoteCSE.cseType := int2;	//MN_CSE
 						 v_request.primitiveContent.remoteCSE.expirationTime := "20301231T012345";
@@ -286,7 +291,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						
 						 var template RequestPrimitive v_createRequest := m_createAe(PX_APP_ID);
 						 var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						 v_createRequest.primitiveContent.aE.nodeLink := "http://127.0.0.1/";
 
 						 v_contentResponse.aE := mw_contentAeBase;
@@ -302,7 +308,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						
 						 var template RequestPrimitive v_createRequest := m_createAe(PX_APP_ID);
 						 var template PrimitiveContent v_contentResponse;
-						 f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						 v_createRequest.primitiveContent.aE.contentSerialization := {applicationxml};
 
 						 v_contentResponse.aE := mw_contentAeBase;
@@ -330,7 +337,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;	
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
     						
 						v_updateRequest.primitiveContent.remoteCSE.expirationTime := "20301231T012345";
 	
@@ -343,7 +351,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;	
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 
 						v_updateRequest.primitiveContent.remoteCSE.requestReachability := true;
 
@@ -381,7 +390,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createScheduleBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_createRequest.primitiveContent.schedule.resourceName := omit;
 						v_ae1.start(f_CSE_DMR_CRE_001(int18, v_createRequest, -));//Schedule
@@ -402,7 +412,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createScheduleBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_createRequest.primitiveContent.schedule.resourceName := omit;
 						v_ae1.start(f_CSE_DMR_CRE_001(int18, v_createRequest, m_createAeAux(omit,omit)));//Schedule
@@ -423,7 +434,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createScheduleBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_createRequest.primitiveContent.schedule.resourceName := omit;
 						v_ae1.start(f_CSE_DMR_CRE_001(int18, v_createRequest, m_createSubscriptionBase));//Schedule
@@ -444,7 +456,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createPollingChannelBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						
 						v_createRequest.primitiveContent.pollingChannel.resourceName := omit;
@@ -467,7 +480,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_createRequest.primitiveContent.subscription.resourceName := omit;
 						v_ae1.start(f_CSE_DMR_CRE_001(int23, v_createRequest, m_createScheduleBase));//Subscription
@@ -487,7 +501,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_createRequest.primitiveContent.subscription.resourceName := omit;
 						v_ae1.start(f_CSE_DMR_CRE_001(int23, v_createRequest, m_createGroupBase));//Subscription
@@ -580,7 +595,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createNodeBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						 
 						v_createRequest.primitiveContent.node.resourceName := omit;
 
@@ -600,7 +616,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createMgmtCmdBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_createRequest.primitiveContent.mgmtCmd.resourceName := omit;
 						v_ae1.start(f_CSE_DMR_CRE_001(int12, v_createRequest, -));//Management Command
@@ -619,7 +636,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createLocationPolicyBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_createRequest.primitiveContent.locationPolicy.resourceName := omit;
 						v_ae1.start(f_CSE_DMR_CRE_001(int10, v_createRequest, -));//Location Policy
@@ -638,7 +656,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createStatsConfigBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_createRequest.primitiveContent.statsConfig.resourceName := omit;
 						v_ae1.start(f_CSE_DMR_CRE_001(int22, v_createRequest, -));//Stats Config
@@ -656,7 +675,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createStatsCollectBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						 
 						v_createRequest.primitiveContent.statsCollect.resourceName := omit;
 						
@@ -676,7 +696,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createM2mServiceSubscriptionProfileBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_createRequest.primitiveContent.m2mServiceSubscriptionProfile.resourceName := omit;
 						v_ae1.start(f_CSE_DMR_CRE_001(int11, v_createRequest, -));//Subscription Profile
@@ -695,7 +716,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createServiceSubscribedAppRuleBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						 
 						v_createRequest.primitiveContent.serviceSubscribedAppRule.resourceName := omit;
 						v_ae1.start(f_CSE_DMR_CRE_001(int19, v_createRequest, -));//Service Subscribed App
@@ -811,7 +833,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 			
 						v_ae1.start(f_CSE_DMR_CRE_002(int18, m_createScheduleBase));//Schedule
 						v_ae1.done;
@@ -833,7 +856,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 			
 						v_ae1.start(f_CSE_DMR_CRE_002(int15, m_createPollingChannelBase));//Pollingchannel
 						v_ae1.done;
@@ -881,7 +905,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_CRE_003_SCH() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 						v_ae1.start(f_CSE_DMR_CRE_003(int18, m_createScheduleBase));//Schedule
 						v_ae1.done;
@@ -890,7 +915,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_CRE_003_PCH() runs on Tester system CseSystem {
 						// Local variables                        
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 						v_ae1.start(f_CSE_DMR_CRE_003(int15, m_createPollingChannelBase));//Pollingchannel
 						v_ae1.done;
@@ -916,7 +942,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 						v_ae1.start(f_CSE_DMR_CRE_004(int18, m_createScheduleBase));//Schedule
 						v_ae1.done;
@@ -926,7 +953,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
                         
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 						v_ae1.start(f_CSE_DMR_CRE_004(int15, m_createPollingChannelBase));//Pollingchannel
 						v_ae1.done;
@@ -1145,7 +1173,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						const AttributeList c_optionalAttribute := {"expirationTime"};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.container.expirationTime := "20301231T012345";
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int3, v_createRequest, c_optionalAttribute));
@@ -1159,7 +1188,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						
 						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
 						const AttributeList c_optionalAttribute := {"expirationTime"};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.contentInstance.expirationTime := "20301231T012345";
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int4, v_createRequest, c_optionalAttribute));			
@@ -1172,7 +1202,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
 						const AttributeList c_optionalAttribute := {"ontologyRef"};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.contentInstance.ontologyRef := "MyOntologyRef";
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int4, v_createRequest, c_optionalAttribute));
@@ -1186,7 +1217,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						
 						var template RequestPrimitive v_createRequest := m_createAcpBase;
 						const AttributeList c_optionalAttribute := {"expirationTime"};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.accessControlPolicy.expirationTime := "20301231T012345";
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int1, v_createRequest, c_optionalAttribute));
@@ -1200,7 +1232,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"expirationTime"};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.expirationTime := "20301231T012345";
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
@@ -1214,7 +1247,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"eventNotificationCriteria"};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.eventNotificationCriteria := valueof(m_eventNotificationCriteria({int1}, -));
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
@@ -1228,7 +1262,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"expirationCounter"};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.expirationCounter := 1;
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
@@ -1242,7 +1277,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"groupID"};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.groupID := "MyGroupID";
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
@@ -1256,7 +1292,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"notificationForwardingURI"};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.notificationForwardingURI := "MyForwardingURI";
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
@@ -1270,7 +1307,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"batchNotify"};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.batchNotify := {0, "PT1S"};
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
@@ -1283,7 +1321,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"rateLimit"};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.rateLimit := {0, omit};
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
@@ -1297,7 +1336,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"preSubscriptionNotify"};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.preSubscriptionNotify := 1;
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
@@ -1311,7 +1351,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"pendingNotification"};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.pendingNotification := int1;
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));			
@@ -1324,7 +1365,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"notificationStoragePriority"};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.notificationStoragePriority := 1;
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
@@ -1338,7 +1380,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"latestNotify"};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.latestNotify := true;
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
@@ -1352,7 +1395,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"notificationContentType"};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.notificationContentType := int1;
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
@@ -1366,7 +1410,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"notificationEventCat"};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.notificationEventCat := {alt_1 := 100};
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
@@ -1380,7 +1425,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"subscriberURI"};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.subscriberURI := "NotInitialized";
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
@@ -1650,7 +1696,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_CRE_015_CNT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						                        
 						v_ae1.start(f_CSE_DMR_CRE_015(int3, m_createContainerBase));//Container
 						v_ae1.done;
@@ -1660,7 +1707,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						                        
 						v_ae1.start(f_CSE_DMR_CRE_015(int9, m_createGroupBase));//Group
 						v_ae1.done;
@@ -1670,7 +1718,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 							
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						                        
 						v_ae1.start(f_CSE_DMR_CRE_015(int1, m_createAcpBase));//AccessControlPolicy
 						v_ae1.done;
@@ -1680,7 +1729,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 							
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						                        
 						v_ae1.start(f_CSE_DMR_CRE_015(int18, m_createScheduleBase));//Schedule
 						v_ae1.done;
@@ -1690,7 +1740,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 							
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						                        
 						v_ae1.start(f_CSE_DMR_CRE_015(int15, m_createPollingChannelBase));//PollingChannel
 						v_ae1.done;
@@ -1700,7 +1751,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						                        
 						v_ae1.start(f_CSE_DMR_CRE_015(int23, m_createSubscriptionBase));//Subscription
 						v_ae1.done;
@@ -1718,7 +1770,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var template PrimitiveContent v_contentResponse;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 					
 						v_contentResponse.uRI := mw_contentContainer_rc2;
 					                        
@@ -1730,7 +1783,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var template PrimitiveContent v_contentResponse;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 					
 						v_contentResponse.uRI := mw_contentGroup_rc2;
 					
@@ -1742,7 +1796,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var template PrimitiveContent v_contentResponse;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 											
 						v_contentResponse.uRI := mw_contentAcp_rc2;
 						
@@ -1754,7 +1809,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var template PrimitiveContent v_contentResponse;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 											
 						v_contentResponse.uRI := mw_contentSchedule_rc2;
 						
@@ -1766,7 +1822,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var template PrimitiveContent v_contentResponse;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 											
 						v_contentResponse.uRI := mw_contentPollingChannel_rc2;
 						
@@ -1778,7 +1835,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var template PrimitiveContent v_contentResponse;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 											
 						v_contentResponse.uRI := mw_contentSubscription_rc2;
 
@@ -1809,7 +1867,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var template PrimitiveContent v_contentResponse;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 					
 						v_contentResponse.resource := mw_contentContainer_rc3;
 					                        
@@ -1821,7 +1880,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var template PrimitiveContent v_contentResponse;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 					
 						v_contentResponse.resource := mw_contentGroup_rc3;
 					
@@ -1833,7 +1893,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var template PrimitiveContent v_contentResponse;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 					
 						v_contentResponse.resource := mw_contentAcp_rc3;
 						
@@ -1845,7 +1906,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var template PrimitiveContent v_contentResponse;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 					
 						v_contentResponse.resource := mw_contentSchedule_rc3;
 						
@@ -1857,7 +1919,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var template PrimitiveContent v_contentResponse;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 					
 						v_contentResponse.resource := mw_contentPollingChannel_rc3;
 						
@@ -1869,7 +1932,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var template PrimitiveContent v_contentResponse;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 					
 						v_contentResponse.resource := mw_contentSubscription_rc3;
 
@@ -1973,7 +2037,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template RequestPrimitive v_createRequest := m_createAcpBase;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.accessControlPolicy.announceTo := {f_getAnnouncementTargetPoA()};
 						                    
 						v_ae1.start(f_CSE_DMR_CRE_020(int1, v_createRequest, mw_createAccessControlPolicyAnnc));//AccessControlPolicy
@@ -1985,7 +2050,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.container.announceTo := {f_getAnnouncementTargetPoA()};
 					
 						v_ae1.start(f_CSE_DMR_CRE_020(int3, v_createRequest, mw_createContainerAnncBase));//Container
@@ -1996,7 +2062,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.contentInstance.announceTo := {f_getAnnouncementTargetPoA()};
 						
 						v_ae1.start(f_CSE_DMR_CRE_020(int4, v_createRequest, mw_createContentInstanceAnncBase));//ContentInstance
@@ -2008,7 +2075,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.group_.announceTo := {f_getAnnouncementTargetPoA()};
 						
 						v_ae1.start(f_CSE_DMR_CRE_020(int9, v_createRequest, mw_createGroupAnncBase));//Group
@@ -2020,7 +2088,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template RequestPrimitive v_createRequest := m_createLocationPolicy(int1, omit, omit, omit, omit);
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.locationPolicy.announceTo := {f_getAnnouncementTargetPoA()};
 						
 						v_ae1.start(f_CSE_DMR_CRE_020(int10, v_createRequest, mw_createLocationPolicyAnncBase));//LocationPolicy
@@ -2032,7 +2101,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template RequestPrimitive v_createRequest := m_createMgmtObjBase;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.mgmtResource.announceTo := {f_getAnnouncementTargetPoA()};
 
 						v_ae1.start(f_CSE_DMR_CRE_020(int13, v_createRequest, mw_createMgmtObjAnncBase));//MgmtObj
@@ -2044,7 +2114,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template RequestPrimitive v_createRequest := m_createNodeBase;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.node.announceTo := {f_getAnnouncementTargetPoA()};
 						
 						v_ae1.start(f_CSE_DMR_CRE_020(int14, v_createRequest, mw_createNodeAnnc));//Node
@@ -2056,7 +2127,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template RequestPrimitive v_createRequest := m_createScheduleBase;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.schedule.announceTo := {f_getAnnouncementTargetPoA()};
 
 						v_ae1.start(f_CSE_DMR_CRE_020(int18, v_createRequest, mw_createScheduleAnncBase));//Schedule
@@ -2100,7 +2172,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var RequestPrimitive v_requestPrimitive;
 						var XSD.NonNegativeInteger v_maxByteSize := 512;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.container.maxByteSize := v_maxByteSize;						
 						v_createRequest.primitiveContent.container.announcedAttribute := {"mbs"};
@@ -2130,7 +2203,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
 						var RequestPrimitive v_requestPrimitive;
 						var XSD.NonNegativeInteger v_contentSize := 512;			
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.contentInstance.contentSize := v_contentSize;						
 						v_createRequest.primitiveContent.contentInstance.announcedAttribute := {"cs"};
@@ -2160,7 +2234,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
 						var RequestPrimitive v_requestPrimitive;
 						var XSD.PositiveInteger v_maxNrOfMembers := 10;						
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.group_.maxNrOfMembers := v_maxNrOfMembers;
 						v_createRequest.primitiveContent.group_.announcedAttribute := {"mnm"};	
@@ -2190,7 +2265,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createLocationPolicy(int1, omit, omit, omit, omit);
 						var RequestPrimitive v_requestPrimitive;
 						var LocationSource v_locationSource := int1;//Network-based
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.locationPolicy.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.locationPolicy.locationSource := v_locationSource;
 						v_createRequest.primitiveContent.locationPolicy.announcedAttribute := {"los"};
@@ -2220,7 +2296,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createMgmtObjBase;
 						var RequestPrimitive v_requestPrimitive;
 						var XSD.String description := "Description of mgmtObj";
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.mgmtResource.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.mgmtResource.description := description;			
 						v_createRequest.primitiveContent.mgmtResource.announcedAttribute := {"dc"};
@@ -2249,7 +2326,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						
 						var template RequestPrimitive v_createRequest := m_createNodeBase;
 						var RequestPrimitive v_requestPrimitive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.node.announceTo := {f_getAnnouncementTargetPoA()};
 						
 						//TODO node to be done. hostedCSELink attribute (OA) to be added!!!
@@ -2265,7 +2343,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createScheduleBase;
 						var RequestPrimitive v_requestPrimitive;
 						var ScheduleEntries v_scheduleElement := {{"0 0 0,1,2 1 1 * *"}};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.schedule.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.schedule.scheduleElement := v_scheduleElement;
 						v_createRequest.primitiveContent.schedule.announcedAttribute := {"se"};
@@ -2364,7 +2443,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						
 						var ResponsePrimitive v_responsePrimitive;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.schedule := mw_contentSchedule_rc1;
 						
 						v_ae1.start(f_CSE_DMR_RET_001(int18, m_createScheduleBase, v_contentResponse));//Schedule
@@ -2378,7 +2458,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						
 						var ResponsePrimitive v_responsePrimitive;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.pollingChannel := mw_contentPollingChannelBase;
 						
 						v_ae1.start(f_CSE_DMR_RET_001(int15, m_createPollingChannelBase, v_contentResponse));//PollingChannel
@@ -2410,7 +2491,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_002() runs on Tester system CseSystem {
 					
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 													
 						v_ae1.start(f_CSE_DMR_RET_002());
 										  	  	
@@ -2487,7 +2569,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_003_SCH() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 	
 						v_ae1.start(f_CSE_DMR_RET_003(int18, m_createScheduleBase));//Schedule
 						v_ae1.done;
@@ -2496,7 +2579,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_003_PCH() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 	
 						v_ae1.start(f_CSE_DMR_RET_003(int15, m_createPollingChannelBase));//PollingChannel
 						v_ae1.done;
@@ -2523,7 +2607,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.container := m_contentContainer_allOmit;
 						v_contentResponse.container.parentID := ?;
                         
@@ -2536,7 +2621,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.group_ := m_contentGroup_allOmit;
 						v_contentResponse.group_.parentID := ?;
 												
@@ -2549,7 +2635,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.accessControlPolicy := m_contentAcp_allOmit;
 						v_contentResponse.accessControlPolicy.parentID := ?;
 							
@@ -2561,7 +2648,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var template PrimitiveContent v_contentResponse;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 					
 						v_contentResponse.schedule := m_contentSchedule_allOmit;
 						v_contentResponse.schedule.parentID := ?;
@@ -2574,7 +2662,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var template PrimitiveContent v_contentResponse;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 					
 						v_contentResponse.pollingChannel := m_contentPollingChannel_allOmit;
 						v_contentResponse.pollingChannel.parentID := ?;
@@ -2587,7 +2676,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var template PrimitiveContent v_contentResponse;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 					
 						v_contentResponse.subscription := m_contentSubscription_allOmit;
 						v_contentResponse.subscription.parentID := ?;
@@ -2621,7 +2711,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.container := m_contentContainer_allOmit;
 						v_contentResponse.container.parentID := ?;
 						                       
@@ -2634,7 +2725,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.group_ := m_contentGroup_allOmit;
 						v_contentResponse.group_.parentID := ?;
 																		
@@ -2647,7 +2739,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 					
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.accessControlPolicy := m_contentAcp_allOmit;
 						v_contentResponse.accessControlPolicy.parentID := ?;
 							
@@ -2659,7 +2752,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.schedule := m_contentSchedule_allOmit;
 						v_contentResponse.schedule.parentID := ?;
 								
@@ -2671,7 +2765,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.pollingChannel := m_contentPollingChannel_allOmit;
 						v_contentResponse.pollingChannel.parentID := ?;
 								
@@ -2684,7 +2779,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.subscription := m_contentSubscription_allOmit;
 						v_contentResponse.subscription.parentID := ?;
 								
@@ -2718,7 +2814,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.container := m_contentContainer_allOmit;
 						v_contentResponse.container.parentID := ?;
 						v_contentResponse.container.creationTime := ?;
@@ -2732,7 +2829,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.group_ := m_contentGroup_allOmit;
 						v_contentResponse.group_.parentID := ?;
 						v_contentResponse.group_.creationTime := ?;
@@ -2746,7 +2844,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.accessControlPolicy := m_contentAcp_allOmit;
 						v_contentResponse.accessControlPolicy.parentID := ?;
 						v_contentResponse.accessControlPolicy.creationTime := ?;
@@ -2760,7 +2859,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.schedule := m_contentSchedule_allOmit;
 						v_contentResponse.schedule.parentID := ?;
 						v_contentResponse.schedule.creationTime := ?;
@@ -2774,7 +2874,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 					
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.pollingChannel := m_contentPollingChannel_allOmit;
 						v_contentResponse.pollingChannel.parentID := ?;
 						v_contentResponse.pollingChannel.creationTime := ?;
@@ -2788,7 +2889,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.subscription := m_contentSubscription_allOmit;
 						v_contentResponse.subscription.parentID := ?;
 						v_contentResponse.subscription.creationTime := ?;
@@ -2822,7 +2924,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_007_CNT_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                         
 						v_ae1.start(f_CSE_DMR_RET_007(int3, m_createContainerBase));//Container
 						v_ae1.done;
@@ -2831,7 +2934,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_007_GRP_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_ae1.start(f_CSE_DMR_RET_007(int9, m_createGroupBase));//Group
 						v_ae1.done;
@@ -2840,7 +2944,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_007_ACP_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 	
 						v_ae1.start(f_CSE_DMR_RET_007(int1, m_createAcpBase));//AccessControlPolicy
 						v_ae1.done;
@@ -2849,7 +2954,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_007_SCH_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 	
 						v_ae1.start(f_CSE_DMR_RET_007(int18, m_createScheduleBase));//Schedule
 						v_ae1.done;
@@ -2858,7 +2964,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_007_PCH_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 	
 						v_ae1.start(f_CSE_DMR_RET_007(int15, m_createPollingChannelBase));//PollingChannel
 						v_ae1.done;
@@ -2867,7 +2974,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_007_SUB_LBL() runs on AeSimu system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 	
 						v_ae1.start(f_CSE_DMR_RET_007(int23, m_createSubscriptionBase));//Subscription
 						v_ae1.done;
@@ -2892,7 +3000,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_008_CNT_AT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                         
 						v_ae1.start(f_CSE_DMR_RET_008(int3, m_createContainerBase));//Container
 						v_ae1.done;
@@ -2901,7 +3010,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_008_GRP_AT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_ae1.start(f_CSE_DMR_RET_008(int9, m_createGroupBase));//Group
 						v_ae1.done;
@@ -2910,7 +3020,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_008_ACP_AT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 	
 						v_ae1.start(f_CSE_DMR_RET_008(int1, m_createAcpBase));//AccessControlPolicy
 						v_ae1.done;
@@ -2919,7 +3030,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_008_SCH_AT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 	
 						v_ae1.start(f_CSE_DMR_RET_008(int18, m_createScheduleBase));//Schedule
 						v_ae1.done;
@@ -2928,7 +3040,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_008_PCH_AT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 	
 						v_ae1.start(f_CSE_DMR_RET_008(int15, m_createPollingChannelBase));//PollingChannel
 						v_ae1.done;
@@ -2937,7 +3050,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_008_SUB_AT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 	
 						v_ae1.start(f_CSE_DMR_RET_008(int23, m_createSubscriptionBase));//Subscription
 						v_ae1.done;
@@ -2962,7 +3076,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_009() runs on Tester system CseSystem {
 					
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 														
 						v_ae1.start(f_CSE_DMR_RET_009());
 											  	  	
@@ -3028,7 +3143,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_011() runs on Tester system CseSystem {
 					
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 														
 						v_ae1.start(f_CSE_DMR_RET_011());
 											  	  	
@@ -3096,7 +3212,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.schedule := mw_contentSchedule_rc1;
 						
 						v_ae1.start(f_CSE_DMR_RET_013(int18, m_createScheduleBase, v_contentResponse));//Schedule
@@ -3127,7 +3244,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_014_SCH() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 	
 						v_ae1.start(f_CSE_DMR_RET_014(int18, m_createScheduleBase));//Schedule
 						v_ae1.done;
@@ -3154,7 +3272,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 					
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.accessControlPolicy := m_contentAcp_allOmit;
 						v_contentResponse.accessControlPolicy.parentID := ?;
 							
@@ -3167,7 +3286,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.aE := m_contentAe_allOmit;
 						v_contentResponse.aE.parentID := ?;
 							
@@ -3180,7 +3300,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.container := m_contentContainer_allOmit;
 						v_contentResponse.container.parentID := ?;
                         
@@ -3193,7 +3314,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.group_ := m_contentGroup_allOmit;
 						v_contentResponse.group_.parentID := ?;
 												
@@ -3206,7 +3328,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.remoteCSE := m_contentRemoteCSE_allOmit;
 						v_contentResponse.remoteCSE.parentID := ?;
 		
@@ -3218,7 +3341,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.schedule := m_contentSchedule_allOmit;
 						v_contentResponse.schedule.parentID := ?;
 							
@@ -3231,7 +3355,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.subscription := m_contentSubscription_allOmit;
 						v_contentResponse.subscription.parentID := ?;
 							
@@ -3264,7 +3389,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.accessControlPolicy := m_contentAcp_allOmit;
 						v_contentResponse.accessControlPolicy.parentID := ?;
 							
@@ -3277,7 +3403,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 					
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.aE := m_contentAe_allOmit;
 						v_contentResponse.aE.parentID := ?;
 								
@@ -3290,7 +3417,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.container := m_contentContainer_allOmit;
 						v_contentResponse.container.parentID := ?;
 						                       
@@ -3303,7 +3431,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.group_ := m_contentGroup_allOmit;
 						v_contentResponse.group_.parentID := ?;
 																		
@@ -3316,7 +3445,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.remoteCSE := m_contentRemoteCSE_allOmit;
 						v_contentResponse.remoteCSE.parentID := ?;
 								
@@ -3328,7 +3458,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.schedule := m_contentSchedule_allOmit;
 						v_contentResponse.schedule.parentID := ?;
 								
@@ -3341,7 +3472,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 					
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.subscription := m_contentSubscription_allOmit;
 						v_contentResponse.subscription.parentID := ?;
 								
@@ -3374,7 +3506,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.accessControlPolicy := m_contentAcp_allOmit;
 						v_contentResponse.accessControlPolicy.parentID := ?;
 						v_contentResponse.accessControlPolicy.creationTime := ?;
@@ -3388,7 +3521,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.aE := m_contentAe_allOmit;
 						v_contentResponse.aE.parentID := ?;
 						v_contentResponse.aE.creationTime := ?;
@@ -3402,7 +3536,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_contentResponse.container := m_contentContainer_allOmit;
 						v_contentResponse.container.parentID := ?;
@@ -3415,7 +3550,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					/*testcase TC_CSE_DMR_RET_017_DLV() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						var template PrimitiveContent v_contentResponse;
 					
 						v_contentResponse.delivery := m_contentDelivery_allOmit;
@@ -3431,7 +3567,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.group_ := m_contentGroup_allOmit;
 						v_contentResponse.group_.parentID := ?;
 						v_contentResponse.group_.creationTime := ?;
@@ -3445,7 +3582,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.locationPolicy := m_contentLocationPolicy_allOmit;
 						v_contentResponse.locationPolicy.parentID := ?;
 						v_contentResponse.locationPolicy.creationTime := ?;
@@ -3459,7 +3597,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 					
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.mgmtCmd := m_contentMgmtCmd_allOmit;
 						v_contentResponse.mgmtCmd.parentID := ?;
 						v_contentResponse.mgmtCmd.creationTime := ?;
@@ -3473,7 +3612,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.node := m_contentNode_allOmit;
 						v_contentResponse.node.parentID := ?;
 						v_contentResponse.node.creationTime := ?;
@@ -3487,7 +3627,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.remoteCSE := m_contentRemoteCSE_allOmit;
 						v_contentResponse.remoteCSE.parentID := ?;
 						v_contentResponse.remoteCSE.creationTime := ?;
@@ -3501,7 +3642,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 					
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.schedule := m_contentSchedule_allOmit;
 						v_contentResponse.schedule.parentID := ?;
 						v_contentResponse.schedule.creationTime := ?;
@@ -3515,7 +3657,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.statsCollect := m_contentStatsCollect_allOmit;
 						v_contentResponse.statsCollect.parentID := ?;
 						v_contentResponse.statsCollect.creationTime := ?;
@@ -3529,7 +3672,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.statsConfig := m_contentStatsConfig_allOmit;
 						v_contentResponse.statsConfig.parentID := ?;
 						v_contentResponse.statsConfig.creationTime := ?;
@@ -3543,7 +3687,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.subscription := m_contentSubscription_allOmit;
 						v_contentResponse.subscription.parentID := ?;
 						v_contentResponse.subscription.creationTime := ?;
@@ -3576,7 +3721,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_018_ACP_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 	
 						v_ae1.start(f_CSE_DMR_RET_018(int1, m_createAcpBase));//AccessControlPolicy
 						v_ae1.done;
@@ -3585,7 +3731,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_018_AE_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 	
 						v_ae1.start(f_CSE_DMR_RET_018(int2, m_createAe(PX_APP_ID)));//AE
 						v_ae1.done;
@@ -3594,7 +3741,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_018_CNT_LBL() runs on Tester system CseSystem {
 						// Local variables
  						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                         
 						v_ae1.start(f_CSE_DMR_RET_018(int3, m_createContainerBase));//Container
 						v_ae1.done;
@@ -3603,7 +3751,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_018_GRP_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_ae1.start(f_CSE_DMR_RET_018(int9, m_createGroupBase));//Group
 						v_ae1.done;
@@ -3612,7 +3761,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_018_CSR_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 						v_ae1.start(f_CSE_DMR_RET_018(int16, m_createRemoteCSEBase));//RemoteCSE
 						v_ae1.done;
@@ -3621,7 +3771,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_018_SCH_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 	
 						v_ae1.start(f_CSE_DMR_RET_018(int18, m_createScheduleBase));//Schedule
 						v_ae1.done;
@@ -3630,7 +3781,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_018_SUB_LBL() runs on AeSimu system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 	
 						v_ae1.start(f_CSE_DMR_RET_018(int23, m_createSubscriptionBase));//Subscription
 						v_ae1.done;
@@ -3655,7 +3807,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_019_ACP_LBL_AT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 	
 						v_ae1.start(f_CSE_DMR_RET_019(int1, m_createAcpBase));//AccessControlPolicy
 						v_ae1.done;
@@ -3664,7 +3817,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_019_AE_LBL_AT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 	
 						v_ae1.start(f_CSE_DMR_RET_019(int2, m_createAe(PX_APP_ID)));//AE
 						v_ae1.done;
@@ -3673,7 +3827,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_019_CNT_LBL_AT() runs on Tester system CseSystem {
 						// Local variables
  						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                         
 						v_ae1.start(f_CSE_DMR_RET_019(int3, m_createContainerBase));//Container
 						v_ae1.done;
@@ -3682,7 +3837,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_019_GRP_LBL_AT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 						v_ae1.start(f_CSE_DMR_RET_019(int9, m_createGroupBase));//Group
 						v_ae1.done;
@@ -3691,7 +3847,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_019_CSR_LBL_AT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 
 						v_ae1.start(f_CSE_DMR_RET_019(int16, m_createRemoteCSEBase));//RemoteCSE
 						v_ae1.done;
@@ -3700,7 +3857,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_019_SCH_LBL_AT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 	
 						v_ae1.start(f_CSE_DMR_RET_019(int18, m_createScheduleBase));//Schedule
 						v_ae1.done;
@@ -3709,7 +3867,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_019_SUB_LBL_AT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 	
 						v_ae1.start(f_CSE_DMR_RET_019(int23, m_createSubscriptionBase));//Subscription
 						v_ae1.done;
@@ -3734,7 +3893,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_020_RCN_0() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_DMR_RET_020(int3, m_createContainerBase, int0));//ResultContent = 0 (nothing)
 						v_ae1.done;
 					}
@@ -3742,7 +3902,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_020_RCN_2() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_DMR_RET_020(int3, m_createContainerBase, int2));//ResultContent = 2 (hierarchical address)
 						v_ae1.done;
 					}
@@ -3750,7 +3911,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_020_RCN_3() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_DMR_RET_020(int3, m_createContainerBase, int3));//ResultContent = 3 (attributes and hierarchichal address)
 						v_ae1.done;
 					}
@@ -3768,7 +3930,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.container := mw_contentContainer_rc1;
 		                        
 						v_ae1.start(f_CSE_DMR_RET_021(int3, m_createContainerBase, v_contentResponse, int3, m_createContainerBase));//Container
@@ -3780,7 +3943,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.group_ := mw_contentGroup_rc1;
 		
 						v_ae1.start(f_CSE_DMR_RET_021(int9, m_createGroupBase, v_contentResponse, int23, m_createSubscriptionBase));//Group
@@ -3792,7 +3956,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.accessControlPolicy := mw_contentAcp_rc1;
 			
 						v_ae1.start(f_CSE_DMR_RET_021(int1, m_createAcpBase,v_contentResponse, int23, m_createSubscriptionBase));//AccessControlPolicy
@@ -3804,7 +3969,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.schedule := mw_contentSchedule_rc1;
 			
 						v_ae1.start(f_CSE_DMR_RET_021(int18, m_createScheduleBase, v_contentResponse, int23, m_createSubscriptionBase));//Schedule 
@@ -3816,7 +3982,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.pollingChannel := mw_contentPollingChannelBase;
 			
 						v_ae1.start(f_CSE_DMR_RET_021(int15, m_createPollingChannelBase, v_contentResponse, omit, omit));//PollingChannel
@@ -3828,7 +3995,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.subscription := mw_contentSubscription_rc1;
 
 						v_ae1.start(f_CSE_DMR_RET_021(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase));//Subscription
@@ -3859,7 +4027,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.container := mw_contentContainer_rc4;
 		                        
 						v_ae1.start(f_CSE_DMR_RET_022(int3, m_createContainerBase, v_contentResponse, int3, m_createContainerBase));//Container
@@ -3871,7 +4040,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.group_ := mw_contentGroup_rc4;
 		
 						v_ae1.start(f_CSE_DMR_RET_022(int9, m_createGroupBase, v_contentResponse, int23, m_createSubscriptionBase));//Group
@@ -3883,7 +4053,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.accessControlPolicy := mw_contentAcp_rc4;
 			
 						v_ae1.start(f_CSE_DMR_RET_022(int1, m_createAcpBase,v_contentResponse, int23, m_createSubscriptionBase));//AccessControlPolicy
@@ -3895,7 +4066,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.schedule := mw_contentSchedule_rc4;
 			
 						v_ae1.start(f_CSE_DMR_RET_022(int18, m_createScheduleBase, v_contentResponse, int23, m_createSubscriptionBase));//Schedule
@@ -3907,7 +4079,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.pollingChannel := mw_contentPollingChannelBase;
 			
 						v_ae1.start(f_CSE_DMR_RET_022(int15, m_createPollingChannelBase, v_contentResponse, omit, omit));//PollingChannel
@@ -3919,7 +4092,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.subscription := mw_contentSubscription_rc4;
 
 						v_ae1.start(f_CSE_DMR_RET_022(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase));//Subscription
@@ -3950,7 +4124,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.container := mw_contentContainer_rc5;
 		                        
 						v_ae1.start(f_CSE_DMR_RET_023(int3, m_createContainerBase, v_contentResponse, int3, m_createContainerBase));//Container
@@ -3962,7 +4137,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.group_ := mw_contentGroup_rc5;
 		
 						v_ae1.start(f_CSE_DMR_RET_023(int9, m_createGroupBase, v_contentResponse, int23, m_createSubscriptionBase));//Group
@@ -3974,7 +4150,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.accessControlPolicy := mw_contentAcp_rc5;
 			
 						v_ae1.start(f_CSE_DMR_RET_023(int1, m_createAcpBase,v_contentResponse, int23, m_createSubscriptionBase));//AccessControlPolicy
@@ -3986,7 +4163,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.schedule := mw_contentSchedule_rc5;
 			
 						v_ae1.start(f_CSE_DMR_RET_023(int18, m_createScheduleBase, v_contentResponse, int23, m_createSubscriptionBase));//Schedule 
@@ -3997,7 +4175,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.pollingChannel := mw_contentPollingChannelBase;
 			
 						v_ae1.start(f_CSE_DMR_RET_023(int15, m_createPollingChannelBase, v_contentResponse, omit, omit));//PollingChannel
@@ -4008,7 +4187,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.subscription := mw_contentSubscription_rc5;
 
 						v_ae1.start(f_CSE_DMR_RET_023(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase));//Subscription
@@ -4038,7 +4218,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.container := mw_contentContainer_rc6;
 		                        
 						v_ae1.start(f_CSE_DMR_RET_024(int3, m_createContainerBase, v_contentResponse, int3, m_createContainerBase));//Container
@@ -4049,7 +4230,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.group_ := mw_contentGroup_rc6;
 		
 						v_ae1.start(f_CSE_DMR_RET_024(int9, m_createGroupBase, v_contentResponse, int23, m_createSubscriptionBase));//Group
@@ -4060,7 +4242,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.accessControlPolicy := mw_contentAcp_rc6;
 			
 						v_ae1.start(f_CSE_DMR_RET_024(int1, m_createAcpBase,v_contentResponse, int23, m_createSubscriptionBase));//AccessControlPolicy
@@ -4071,7 +4254,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.schedule := mw_contentSchedule_rc6;
 			
 						v_ae1.start(f_CSE_DMR_RET_024(int18, m_createScheduleBase, v_contentResponse, int23, m_createSubscriptionBase));//Schedule
@@ -4082,7 +4266,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.pollingChannel := mw_contentPollingChannelBase;
 			
 						v_ae1.start(f_CSE_DMR_RET_024(int15, m_createPollingChannelBase, v_contentResponse, omit, omit));//PollingChannel
@@ -4093,7 +4278,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.subscription := mw_contentSubscription_rc6;
 
 						v_ae1.start(f_CSE_DMR_RET_024(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase));//Subscription
@@ -4123,7 +4309,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.container := mw_contentContainer_rc8;
 		                        
 						v_ae1.start(f_CSE_DMR_RET_025(int3, m_createContainerBase, v_contentResponse, int3, m_createContainerBase));//Container
@@ -4134,7 +4321,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.group_ := mw_contentGroup_rc8;
 		
 						v_ae1.start(f_CSE_DMR_RET_025(int9, m_createGroupBase, v_contentResponse, int23, m_createSubscriptionBase));//Group
@@ -4145,7 +4333,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.accessControlPolicy := mw_contentAcp_rc8;
 			
 						v_ae1.start(f_CSE_DMR_RET_025(int1, m_createAcpBase,v_contentResponse, int23, m_createSubscriptionBase));//AccessControlPolicy
@@ -4156,7 +4345,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.schedule := mw_contentSchedule_rc8;
 			
 						v_ae1.start(f_CSE_DMR_RET_025(int18, m_createScheduleBase, v_contentResponse, int23, m_createSubscriptionBase));//Schedule 
@@ -4167,7 +4357,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.pollingChannel := mw_contentPollingChannelBase;
 			
 						v_ae1.start(f_CSE_DMR_RET_025(int15, m_createPollingChannelBase, v_contentResponse, omit, omit));//PollingChannel
@@ -4178,7 +4369,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_contentResponse.subscription := mw_contentSubscription_rc8;
 
 						v_ae1.start(f_CSE_DMR_RET_025(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase));//Subscription
@@ -4216,7 +4408,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.schedule.labels := v_labels_1;
 						v_updateRequest.primitiveContent.schedule.labels := v_labels_2;
 
@@ -4257,7 +4450,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.pollingChannel.labels := v_labels_1;
 						v_updateRequest.primitiveContent.pollingChannel.labels := v_labels_2;
 
@@ -4341,7 +4535,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.schedule.labels := v_labels_1;
 						
 						v_ae1.start(f_CSE_DMR_UPD_002(int18, m_createScheduleBase,v_updateRequest));//Schedule
@@ -4378,7 +4573,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.pollingChannel.labels := v_labels_1;
 						
 						v_ae1.start(f_CSE_DMR_UPD_002(int15, m_createPollingChannelBase,v_updateRequest));//PollingChannel
@@ -4461,7 +4657,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createScheduleBase;
 						var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.schedule.labels := v_labels_1;
 						v_updateRequest.primitiveContent.schedule.labels := v_labels_2;
 						
@@ -4505,7 +4702,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createPollingChannelBase;
 						var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.pollingChannel.labels := v_labels_1;
 						v_updateRequest.primitiveContent.pollingChannel.labels := v_labels_2;
 						
@@ -4601,7 +4799,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.schedule.scheduleElement := {{"0 0 0,1,2 1 1 * *"}};//Attribute 1
 						v_updateRequest.primitiveContent.schedule.scheduleElement := {{"1 1 1,2 1 1 * *"}}; //Attribute 1
 						v_updateRequest.primitiveContent.schedule.announceTo := {f_getAnnouncementTargetPoA()};//Attribute 2
@@ -4662,7 +4861,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.pollingChannel.labels := v_labels_1;//Attribute 3
 						//No Attribute 1
 						//v_updateRequest.primitiveContent.pollingChannel.accessControlPolicyIDs := v_acp;//Attribute 2 TODO Find another alternative for Attribute 2
@@ -4775,7 +4975,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var Labels v_labels_1 := {"VALUE_1"};
 						var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.schedule.labels := v_labels_1;
 										
 						v_ae1.start(f_CSE_DMR_UPD_006(int18, m_createScheduleBase, v_updateRequest));//Schedule
@@ -4798,7 +4999,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var Labels v_labels_1 := {"VALUE_1"};
 						var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.pollingChannel.labels := v_labels_1;
 							
 						v_ae1.start(f_CSE_DMR_UPD_006(int15, m_createPollingChannelBase, v_updateRequest));//PollingChannel
@@ -4855,7 +5057,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var Timestamp v_creationTime := "21001231T012345";
 						var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent := {schedule_update_invalid := m_contentUpdateSchedule_invalid};
 						v_updateRequest.primitiveContent.schedule_update_invalid.creationTime := v_creationTime;
 										
@@ -4879,7 +5082,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var Timestamp v_creationTime := "21001231T012345";
 						var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent := {pollingChannel_update_invalid := m_contentUpdatePollingChannel_invalid};
 						v_updateRequest.primitiveContent.pollingChannel_update_invalid.creationTime := v_creationTime;
 							
@@ -4936,7 +5140,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
 						var AttributeAux_list v_nullFields;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_nullFields := {{"expirationTime", omit}};
 						
 						v_updateRequest.primitiveContent.schedule.expirationTime := v_expirationTime;
@@ -4962,7 +5167,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
 						var AttributeAux_list v_nullFields;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_nullFields := {{"expirationTime", omit}};
 						
 						v_updateRequest.primitiveContent.pollingChannel.expirationTime := v_expirationTime;
@@ -4995,7 +5201,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var XSD.PositiveInteger v_expirationCounter := 1;
 						var template RequestPrimitive v_createRequest := m_createScheduleBase;
 						var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent := {schedule_update_invalid := m_contentUpdateSchedule_invalid};
 
 						v_updateRequest.primitiveContent.schedule_update_invalid.expirationCounter := v_expirationCounter;
@@ -5010,7 +5217,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var XSD.PositiveInteger v_expirationCounter := 1;
 						var template RequestPrimitive v_createRequest := m_createPollingChannelBase;
 						var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent := {pollingChannel_update_invalid := m_contentUpdatePollingChannel_invalid};
 						
 						v_updateRequest.primitiveContent.pollingChannel_update_invalid.expirationCounter := v_expirationCounter;
@@ -5168,7 +5376,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createAcpBase;
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 						var ResponsePrimitive v_responsePrimitive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.accessControlPolicy.expirationTime := v_expirationTime_1;
 						v_updateRequest.primitiveContent.accessControlPolicy.expirationTime := v_expirationTime_2;
 
@@ -5199,7 +5408,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.container.expirationTime := v_expirationTime_1;
 						v_updateRequest.primitiveContent.container.expirationTime := v_expirationTime_2;
 
@@ -5229,7 +5439,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 	
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.container.ontologyRef := v_ontologyRef_1;
 						v_updateRequest.primitiveContent.container.ontologyRef := v_ontologyRef_2;
 	
@@ -5258,7 +5469,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.accessControlPolicyIDs := v_accessControlPolicyIDs_1;
 						v_updateRequest.primitiveContent.subscription.accessControlPolicyIDs := v_accessControlPolicyIDs_2;
 
@@ -5288,7 +5500,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.batchNotify := v_batchNotify_1;
 						v_updateRequest.primitiveContent.subscription.batchNotify := v_batchNotify_2;
 
@@ -5319,7 +5532,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.eventNotificationCriteria := v_eventNotificationCriteria_1;
 						v_updateRequest.primitiveContent.subscription.eventNotificationCriteria := v_eventNotificationCriteria_2;
 
@@ -5350,7 +5564,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.expirationTime := v_expirationTime_1;
 						v_updateRequest.primitiveContent.subscription.expirationTime := v_expirationTime_2;
 
@@ -5381,7 +5596,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.expirationCounter := v_expirationCounter_1;
 						v_updateRequest.primitiveContent.subscription.expirationCounter := v_expirationCounter_2;
 
@@ -5412,7 +5628,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.groupID := v_groupID_1;
 						v_updateRequest.primitiveContent.subscription.groupID := v_groupID_2;
 
@@ -5443,7 +5660,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.latestNotify := v_latestNotify_1;
 						v_updateRequest.primitiveContent.subscription.latestNotify := v_latestNotify_2;
 
@@ -5474,7 +5692,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.notificationContentType := v_notificationContentType_1;
 						v_updateRequest.primitiveContent.subscription.notificationContentType := v_notificationContentType_2;
 
@@ -5505,7 +5724,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.notificationEventCat := v_notificationEventCat_1;
 						v_updateRequest.primitiveContent.subscription.notificationEventCat := v_notificationEventCat_2;
 
@@ -5536,7 +5756,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.notificationForwardingURI := v_notificationForwardingURI_1;
 						v_updateRequest.primitiveContent.subscription.notificationForwardingURI := v_notificationForwardingURI_2;
 
@@ -5567,7 +5788,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.notificationStoragePriority := v_notificationStoragePriority_1;
 						v_updateRequest.primitiveContent.subscription.notificationStoragePriority := v_notificationStoragePriority_2;
 
@@ -5598,7 +5820,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.pendingNotification := v_pendingNotification_1;
 						v_updateRequest.primitiveContent.subscription.pendingNotification := v_pendingNotification_2;
 
@@ -5629,7 +5852,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.subscription.rateLimit := v_rateLimit_1;
 						v_updateRequest.primitiveContent.subscription.rateLimit := v_rateLimit_2;
 
@@ -5945,7 +6169,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updateNodeBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.node.labels := v_labels;
 						
 						v_ae1.start(f_CSE_DMR_UPD_015(int9, m_createNodeBase, v_updateRequest));//Node
@@ -5981,7 +6206,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 						
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_DMR_UPD_015(int9, m_createNodeBase, v_updateRequest, true));//Node
 						v_ae1.done;
 						
@@ -6021,7 +6247,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updateAeBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.aE.ontologyRef := v_ontoLogyRef;
 						v_ae1.start(f_CSE_DMR_UPD_015(int2, m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM), v_updateRequest));//AE
 						v_ae1.done;
@@ -6055,7 +6282,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.container.ontologyRef := v_ontoLogyRef;
 						
 						v_ae1.start(f_CSE_DMR_UPD_015(int3, m_createContainerBase, v_updateRequest));//Container
@@ -6090,7 +6318,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.container.locationID := v_locationID;
 						
 						v_ae1.start(f_CSE_DMR_UPD_015(int3, m_createContainerBase, v_updateRequest));//Container
@@ -6125,7 +6354,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.subscription.eventNotificationCriteria:=v_eventNotificationCriteria ;
 						v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
 						v_ae1.done;
@@ -6159,7 +6389,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.subscription.expirationCounter:=v_expirationCounter;
 						v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
 						v_ae1.done;
@@ -6193,7 +6424,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.subscription.groupID:=v_groupID;
 						v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
 						v_ae1.done;
@@ -6227,7 +6459,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.subscription.notificationForwardingURI:=v_notificationForwardingURI;
 						v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
 						v_ae1.done;
@@ -6261,7 +6494,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.subscription.batchNotify:=v_batchNotify;
 						v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
 						v_ae1.done;
@@ -6295,7 +6529,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.subscription.rateLimit:=v_rateLimit;
 						v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
 						v_ae1.done;
@@ -6329,7 +6564,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.subscription.pendingNotification:=v_pendingNotification;
 						v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
 						v_ae1.done;
@@ -6363,7 +6599,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.subscription.notificationStoragePriority:=v_notificationStoragePriority;
 						v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
 						v_ae1.done;
@@ -6397,7 +6634,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.subscription.latestNotify:=v_latestNotify;
 						v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
 						v_ae1.done;
@@ -6431,7 +6669,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 						
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.subscription.notificationEventCat:=v_eventCat;
 						v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
 						v_ae1.done;						 
@@ -6790,7 +7029,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updateNodeBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.node.expirationTime := v_expirationTime;
 						
 						v_ae1.start(f_CSE_DMR_UPD_016(int9, m_createNodeBase, v_updateRequest));//Node
@@ -6825,7 +7065,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var XSD.Token v_targetId := "TARGET-ID";
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.node.nodeID := v_targetId;
 						
 						v_ae1.start(f_CSE_DMR_UPD_016(int9, m_createNodeBase, v_updateRequest));//Node
@@ -7072,7 +7313,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_DEL_001_SCH() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                 
 						v_ae1.start(f_CSE_DMR_DEL_001(int18, m_createScheduleBase));//Schedule
 						v_ae1.done;
@@ -7081,7 +7323,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_DEL_001_PCH() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                 
 						v_ae1.start(f_CSE_DMR_DEL_001(int15, m_createPollingChannelBase));//PollingChannel
 						v_ae1.done;
@@ -7114,7 +7357,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_DEL_002_SCH() runs on Tester system CseSystem {
 						// Local variables
   						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                 
 						v_ae1.start(f_CSE_DMR_DEL_002(int18, m_createScheduleBase));//Schedule
 						v_ae1.done;
@@ -7123,7 +7367,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_DEL_002_PCH() runs on Tester system CseSystem {
 						// Local variables
  						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                 
 						v_ae1.start(f_CSE_DMR_DEL_002(int15, m_createPollingChannelBase));//PollingChannel
 						v_ae1.done;
@@ -7148,7 +7393,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_DEL_003() runs on Tester system CseSystem {
 					
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 														
 						v_ae1.start(f_CSE_DMR_DEL_003());
 											  	  	
@@ -7219,7 +7465,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_DEL_004_CNT() runs on Tester system CseSystem {
 						// Local variables
  						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                 		
 						v_ae1.start(f_CSE_DMR_DEL_004(int3, m_createContainerBase, int3, m_createContainerBase));//Container
 						v_ae1.done;
@@ -7228,7 +7475,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_DEL_004_GRP() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                 		
 						v_ae1.start(f_CSE_DMR_DEL_004(int9, m_createGroupBase, int23, m_createSubscriptionBase));//Group
 						v_ae1.done;
@@ -7237,7 +7485,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_DEL_004_ACP() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                 
 						v_ae1.start(f_CSE_DMR_DEL_004(int1, m_createAcpBase, int23, m_createSubscriptionBase));//AccessControlPolicy
 						v_ae1.done;
@@ -7246,7 +7495,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_DEL_004_SCH() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                 
 						v_ae1.start(f_CSE_DMR_DEL_004(int18, m_createScheduleBase, int23, m_createSubscriptionBase));//Schedule
 						v_ae1.done;
@@ -7255,7 +7505,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_DEL_004_SUB() runs on Tester system CseSystem {
 							// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
                 
 						v_ae1.start(f_CSE_DMR_DEL_004(int23, m_createSubscriptionBase, int18, m_createScheduleBase));//Subscription
 						v_ae1.done;
@@ -7356,7 +7607,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_DEL_008() runs on Tester system CseSystem {
 					
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 														
 						v_ae1.start(f_CSE_DMR_DEL_008());
 											  	  	
@@ -7425,7 +7677,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_DEL_010() runs on Tester system CseSystem {
 					
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 														
 						v_ae1.start(f_CSE_DMR_DEL_010());
 											  	  	
@@ -7495,7 +7748,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 			 testcase TC_CSE_LOC_001() runs on Tester system CseSystem {
 					
 				 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 																
 				 v_ae1.start(f_CSE_LOC_001());
 													  	  	
@@ -7564,7 +7818,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 			testcase TC_CSE_LOC_002() runs on Tester system CseSystem {
 					
 				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 																	
 				v_ae1.start(f_CSE_LOC_002());
 														  	  	
@@ -7640,7 +7895,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 			testcase TC_CSE_LOC_003() runs on Tester system CseSystem {
 					
 				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 																	
 				v_ae1.start(f_CSE_LOC_003());
 														  	  	
@@ -7721,7 +7977,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 			testcase TC_CSE_LOC_004() runs on Tester system CseSystem {
 					
 				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 																	
 				v_ae1.start(f_CSE_LOC_004());
 														  	  	
@@ -7793,7 +8050,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 			testcase TC_CSE_LOC_005() runs on Tester system CseSystem {
 					
 				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 																	
 				v_ae1.start(f_CSE_LOC_005());
 														  	  	
@@ -7866,7 +8124,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 			testcase TC_CSE_LOC_006() runs on Tester system CseSystem {
 					
 				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 																	
 				v_ae1.start(f_CSE_LOC_006());
 														  	  	
@@ -7943,7 +8202,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 			testcase TC_CSE_LOC_007() runs on Tester system CseSystem {
 					
 				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 																	
 				v_ae1.start(f_CSE_LOC_007());
 														  	  	
@@ -8022,7 +8282,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 			testcase TC_CSE_LOC_008() runs on Tester system CseSystem {
 					
 				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 																	
 				v_ae1.start(f_CSE_LOC_008());
 														  	  	
@@ -8100,7 +8361,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 			testcase TC_CSE_LOC_009_01() runs on Tester system CseSystem {
 					
 				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 																	
 				v_ae1.start(f_CSE_LOC_009_01());
 														  	  	
@@ -8175,7 +8437,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 			testcase TC_CSE_LOC_BV_009_02() runs on Tester system CseSystem {
 					
 				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 																	
 				v_ae1.start(f_CSE_LOC_009_02());
 														  	  	
@@ -8249,7 +8512,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 			testcase TC_CSE_LOC_009_03() runs on Tester system CseSystem {
 					
 				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 																	
 				v_ae1.start(f_CSE_LOC_009_03());
 														  	  	
@@ -8337,7 +8601,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 			testcase TC_CSE_LOC_012() runs on Tester system CseSystem {
 					
 				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 																	
 				v_ae1.start(f_CSE_LOC_012());
 														  	  	
@@ -8408,7 +8673,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 			testcase TC_CSE_LOC_013() runs on Tester system CseSystem {
 					
 				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 																	
 				v_ae1.start(f_CSE_LOC_013());
 														  	  	
@@ -8539,7 +8805,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 				testcase TC_CSE_SUB_NTF_001() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 														
 					v_ae1.start(f_CSE_SUB_NTF_001());
 											  	  	
@@ -8615,7 +8882,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 				testcase TC_CSE_SUB_NTF_002() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 															
 					v_ae1.start(f_CSE_SUB_NTF_002());
 												  	  	
@@ -8691,7 +8959,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 				testcase TC_CSE_SUB_NTF_003() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 															
 					v_ae1.start(f_CSE_SUB_NTF_003());
 												  	  	
@@ -8776,7 +9045,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 				testcase TC_CSE_SUB_UPD_002() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 															
 					v_ae1.start(f_CSE_SUB_UPD_002());
 												  	  	
@@ -8864,7 +9134,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 				testcase TC_CSE_SUB_UPD_003() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 																
 					v_ae1.start(f_CSE_SUB_UPD_003());
 													  	  	
@@ -8948,7 +9219,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 				testcase TC_CSE_SUB_UPD_004() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 																
 					v_ae1.start(f_CSE_SUB_UPD_004());
 													  	  	
@@ -9043,7 +9315,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 				testcase TC_CSE_SUB_UPD_005() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 																
 					v_ae1.start(f_CSE_SUB_UPD_005());
 													  	  	
@@ -9130,7 +9403,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 				testcase TC_CSE_SUB_UPD_006() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 																
 					v_ae1.start(f_CSE_SUB_UPD_006());
 													  	  	
@@ -9214,7 +9488,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 				testcase TC_CSE_SUB_UPD_007() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 																
 					v_ae1.start(f_CSE_SUB_UPD_007());
 													  	  	
@@ -9287,7 +9562,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 				testcase TC_CSE_SUB_UPD_008() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 																
 					v_ae1.start(f_CSE_SUB_UPD_008());
 													  	  	
@@ -9364,7 +9640,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 				testcase TC_CSE_SUB_UPD_009() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 																
 					v_ae1.start(f_CSE_SUB_UPD_009());
 													  	  	
@@ -9456,7 +9733,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 				testcase TC_CSE_SUB_DEL_002() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 																
 					v_ae1.start(f_CSE_SUB_DEL_002());
 													  	  	
@@ -9540,7 +9818,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 				testcase TC_CSE_SUB_DEL_003() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 																
 					v_ae1.start(f_CSE_SUB_DEL_003());
 													  	  	
@@ -9656,7 +9935,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
                   
 						v_ae1.start(f_CSE_ANNC_001(int1, v_createRequestAnnc, omit, v_updateRequest));//AccessControlPolicy
@@ -9669,7 +9949,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						
 						var template RequestPrimitive v_createRequest := m_createAcpBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
   
 						v_ae1.start(f_CSE_ANNC_001(int1, v_createRequestAnnc, v_createRequest, omit));//AccessControlPolicy
@@ -9682,7 +9963,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
   
 						v_ae1.start(f_CSE_ANNC_001(int3, v_createRequestAnnc, omit, v_updateRequest));//Container
@@ -9695,7 +9977,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
   
 						v_ae1.start(f_CSE_ANNC_001(int3, v_createRequestAnnc, v_createRequest, omit));//Container
@@ -9708,7 +9991,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
   
 						v_ae1.start(f_CSE_ANNC_001(int9, v_createRequestAnnc, omit, v_updateRequest));//Group
@@ -9721,7 +10005,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
   
 						v_ae1.start(f_CSE_ANNC_001(int9, v_createRequestAnnc, v_createRequest, omit));//Group
@@ -9734,7 +10019,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						
 						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnncBase;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};
   
 						v_ae1.start(f_CSE_ANNC_001(int4, v_createRequestAnnc, v_createRequest, omit));//ContentInstance
@@ -9795,7 +10081,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
 											
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);	
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;	
 						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
 						
 						v_ae1.start(f_CSE_ANNC_CRE_001(int3, v_createRequestAnnc, v_createRequest));//Container
@@ -9816,7 +10103,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
   
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_updateRequest.primitiveContent.accessControlPolicy.announceTo := {f_getAnnouncementTargetPoA()};
   
 						v_cse1.start(f_CSE_ANNC_CRE_002(int1, v_createRequestAnnc, v_updateRequest));//AccessControlPolicy
@@ -9829,7 +10117,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
   
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_updateRequest.primitiveContent.container.announceTo := {f_getAnnouncementTargetPoA()};
   
 						v_cse1.start(f_CSE_ANNC_CRE_002(int3, v_createRequestAnnc, v_updateRequest));//Container
@@ -9842,7 +10131,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
   
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_updateRequest.primitiveContent.group_.announceTo := {f_getAnnouncementTargetPoA()};
   
 						v_cse1.start(f_CSE_ANNC_CRE_002(int9, v_createRequestAnnc, v_updateRequest));//Group
@@ -9874,7 +10164,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnnc;
 							
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};
 	
 						v_ae1.start(f_CSE_ANNC_CRE_003(int4, v_createRequestAnnc, v_createRequest));//ContentInstance
@@ -9896,7 +10187,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createAcpBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
   
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
   
 						v_cse1.start(f_CSE_ANNC_CRE_004_CseSimu(int1, v_createRequestAnnc, v_createRequest));//AccessControlPolicy
@@ -9909,7 +10201,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
   
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
   
 						v_cse1.start(f_CSE_ANNC_CRE_004_CseSimu(int3, v_createRequestAnnc, v_createRequest));//Container
@@ -9922,7 +10215,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnnc;
   
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};
   
 						v_cse1.start(f_CSE_ANNC_CRE_004_CseSimu(int4, v_createRequestAnnc, v_createRequest));//ContentInstance
@@ -9935,7 +10229,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
   
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
   
 						v_cse1.start(f_CSE_ANNC_CRE_004_CseSimu(int9, v_createRequestAnnc, v_createRequest));//Group
@@ -9968,7 +10263,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createAcpBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
 	  
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						 v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
 	  
 						 v_cse1.start(f_CSE_ANNC_CRE_005_CseSimu(int1, v_createRequestAnnc, v_createRequest));//AccessControlPolicy
@@ -9981,7 +10277,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createContainerBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
   
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						 v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
   
 						 v_cse1.start(f_CSE_ANNC_CRE_005_CseSimu(int3, v_createRequestAnnc, v_createRequest));//Container
@@ -9994,7 +10291,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnnc;
   
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						 v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};
   
 						 v_cse1.start(f_CSE_ANNC_CRE_005_CseSimu(int4, v_createRequestAnnc, v_createRequest));//ContentInstance
@@ -10008,7 +10306,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createGroupBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
   
-						 f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						 v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
   
 						 v_cse1.start(f_CSE_ANNC_CRE_005_CseSimu(int9, v_createRequestAnnc, v_createRequest));//Group
@@ -10053,7 +10352,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createAcpBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
   
-						 f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						 v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
   
 						 v_cse1.start(f_CSE_ANNC_CRE_006_CseSimu(int1, v_createRequestAnnc, v_createRequest));//AccessControlPolicy
@@ -10066,7 +10366,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createContainerBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
   
-						 f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						 v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
   
 						 v_cse1.start(f_CSE_ANNC_CRE_006_CseSimu(int3, v_createRequestAnnc, v_createRequest));//Container
@@ -10079,7 +10380,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnnc;
   
-						 f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						 v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};
   
 						 v_cse1.start(f_CSE_ANNC_CRE_006_CseSimu(int4, v_createRequestAnnc, v_createRequest));//ContentInstance
@@ -10093,7 +10395,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createGroupBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
   
-						 f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						 v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
   
 						 v_cse1.start(f_CSE_ANNC_CRE_006_CseSimu(int9, v_createRequestAnnc, v_createRequest));//Group
@@ -10138,7 +10441,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createAcpBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
 	  
-						 f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						 v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
 	  
 						 v_cse1.start(f_CSE_ANNC_CRE_007_CseSimu(int1, v_createRequestAnnc, v_createRequest));//AccessControlPolicy
@@ -10151,7 +10455,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createContainerBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
 	  
-						 f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						 v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
 	  
 						 v_cse1.start(f_CSE_ANNC_CRE_007_CseSimu(int3, v_createRequestAnnc, v_createRequest));//Container
@@ -10164,7 +10469,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnnc;
 	  
-						 f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						 v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};
 	  
 						 v_cse1.start(f_CSE_ANNC_CRE_007_CseSimu(int4, v_createRequestAnnc, v_createRequest));//ContentInstance
@@ -10178,7 +10484,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createGroupBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
 	  
-						 f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						 v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
 	  
 						 v_cse1.start(f_CSE_ANNC_CRE_007_CseSimu(int9, v_createRequestAnnc, v_createRequest));//Group
@@ -10191,7 +10498,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
   
-						 f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						 v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
 						 v_createRequest.primitiveContent.accessControlPolicy.announcedAttribute := {"mbs"};
   
@@ -10204,7 +10512,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						 var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnncBase;
-  
+						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						 
 						 v_createRequest.primitiveContent.timeSeriesInstance.announceTo := {PX_CSE1_ID};
   
 						 v_cse1.start(f_CSE_ANNC_CRE_007_CseSimu(int30, v_createRequestAnnc, v_createRequest));//TimeSeriesInstance
@@ -10225,7 +10535,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createContainerBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
   
-						 f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						 v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
 						 v_createRequest.primitiveContent.container.announcedAttribute := {"mbs"};
   
@@ -10239,7 +10550,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnnc;
   
-						 f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						 v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};
 						 v_createRequest.primitiveContent.contentInstance.announcedAttribute := {"cnf"};
   
@@ -10253,7 +10565,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createGroupBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
   
-						 f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						 v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
 						 v_createRequest.primitiveContent.group_.announcedAttribute := {"mt"};
   
@@ -10267,7 +10580,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						 var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
-  
+						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						 
 						 v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
 						 v_createRequest.primitiveContent.timeSeries.announcedAttribute := {"mbs"};
   
@@ -10302,7 +10617,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createContainerBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
 	  
-						 f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						 v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
 						 v_createRequest.primitiveContent.container.labels := {"MyLabel"};
 	  
@@ -10326,7 +10642,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createAcpBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
   
-						 f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						 v_ae1.start(f_CSE_ANNC_RET_001(int1, v_createRequestAnnc, v_createRequest));//AccessControlPolicy
 						 v_ae1.done;
 					}
@@ -10337,7 +10654,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createContainerBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
 	  
-						 f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						 v_ae1.start(f_CSE_ANNC_RET_001(int3, v_createRequestAnnc, v_createRequest));//Container
 						 v_ae1.done;
 					}
@@ -10348,7 +10666,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnnc;
   
-						 f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						 v_ae1.start(f_CSE_ANNC_RET_001(int4, v_createRequestAnnc, v_createRequest));//ContentInstance
 						 v_ae1.done;
 					}
@@ -10359,7 +10678,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createGroupBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
   
-						 f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						 v_ae1.start(f_CSE_ANNC_RET_001(int9, v_createRequestAnnc, v_createRequest));//Group
 						 v_ae1.done;
 					}
@@ -10398,7 +10718,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createAcpBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
   
-						 f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						 v_ae1.start(f_CSE_ANNC_RET_002(int1, v_createRequestAnnc, v_createRequest));//AccessControlPolicy
 						 v_ae1.done;
 					}
@@ -10409,7 +10730,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createContainerBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
 	  
-						 f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						 v_ae1.start(f_CSE_ANNC_RET_002(int3, v_createRequestAnnc, v_createRequest));//Container
 						 v_ae1.done;
 					}
@@ -10420,7 +10742,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnnc;
   
-						 f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						 v_ae1.start(f_CSE_ANNC_RET_002(int4, v_createRequestAnnc, v_createRequest));//ContentInstance
 						 v_ae1.done;
 					}
@@ -10431,7 +10754,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createGroupBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
   
-						 f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						 v_ae1.start(f_CSE_ANNC_RET_002(int9, v_createRequestAnnc, v_createRequest));//Group
 						 v_ae1.done;
 					}
@@ -10475,7 +10799,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;	
 			
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_updateRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};					
 			
 						v_cse1.start(f_CSE_ANNC_UPD_001(int1, v_createRequest, v_createRequestAnnc, v_updateRequest));//AccessControlPolicy
@@ -10489,7 +10814,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;	
 			
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_updateRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
   
 						v_cse1.start(f_CSE_ANNC_UPD_001(int3, v_createRequest, v_createRequestAnnc, v_updateRequest));//Container
@@ -10503,7 +10829,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;	
 			
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_updateRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
   
 						v_cse1.start(f_CSE_ANNC_UPD_001(int9, v_createRequest, v_createRequestAnnc, v_updateRequest));//Group
@@ -10516,7 +10843,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;	
-
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						
 						v_updateRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
   
 						v_cse1.start(f_CSE_ANNC_UPD_001(int29, v_createRequest, v_createRequestAnnc, v_updateRequest));//TimeSeries
@@ -10540,7 +10869,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AttributeAux_list v_nullFields;
 						var ListOfURIs v_announceTo := {"To be deleted"};
 
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};		
 						
 						v_updateRequest.primitiveContent.accessControlPolicy.announceTo := v_announceTo;
@@ -10559,7 +10889,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AttributeAux_list v_nullFields;
 						var ListOfURIs v_announceTo := {"To be deleted"};
 
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
 						
 						v_updateRequest.primitiveContent.container.announceTo := v_announceTo;
@@ -10578,7 +10909,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AttributeAux_list v_nullFields;
 						var ListOfURIs v_announceTo := {"To be deleted"};
 
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
 						
 						v_updateRequest.primitiveContent.group_.announceTo := v_announceTo;
@@ -10596,7 +10928,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;	
 						var AttributeAux_list v_nullFields;
 						var ListOfURIs v_announceTo := {"To be deleted"};
-
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						
 						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
 	
 						v_updateRequest.primitiveContent.timeSeries.announceTo := v_announceTo;
@@ -10625,7 +10959,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ListOfURIs v_announceTo := {"To be deleted"};
 						var PrimitiveContent v_primitiveContentRetrieveResource;
   
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
 						
 						v_updateRequest.primitiveContent.accessControlPolicy.announceTo := v_announceTo;
@@ -10667,7 +11002,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ListOfURIs v_announceTo := {"To be deleted"};
 						var PrimitiveContent v_primitiveContentRetrieveResource;
   
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
 						
 						v_updateRequest.primitiveContent.container.announceTo := v_announceTo;
@@ -10709,7 +11045,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ListOfURIs v_announceTo := {"To be deleted"};
 						var PrimitiveContent v_primitiveContentRetrieveResource;
   
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
 						
 						v_updateRequest.primitiveContent.group_.announceTo := v_announceTo;
@@ -10794,7 +11131,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;	
 
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_updateRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
 						v_updateRequest.primitiveContent.accessControlPolicy.announcedAttribute := {"ToBeDeleted"};
 						v_updateRequest.primitiveContent.accessControlPolicy.parentID := PX_CSE1_ID;			
@@ -10810,7 +11148,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_updateRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
 						v_updateRequest.primitiveContent.container.announcedAttribute := {"ToBeDeleted"};
 						v_updateRequest.primitiveContent.container.parentID := PX_CSE1_ID;
@@ -10826,7 +11165,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;	
 
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_updateRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
 						v_updateRequest.primitiveContent.group_.announcedAttribute := {"ToBeDeleted"};
 						v_updateRequest.primitiveContent.group_.parentID := PX_CSE1_ID;
@@ -10841,7 +11181,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;	
-
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						
 						v_updateRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
 						v_updateRequest.primitiveContent.timeSeries.announcedAttribute := {"ToBeDeleted"};
 						v_updateRequest.primitiveContent.timeSeries.parentID := PX_CSE1_ID;
@@ -10869,7 +11211,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AttributeAux_list v_nullFields;
 						var Labels v_labels_2 := {"To be deleted"};	
 
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.container.labels := v_labels_1;
 						
@@ -10907,7 +11250,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 						
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_updateRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
 						
 						v_cse1.start(f_CSE_ANNC_UPD_006(int1, v_createRequest, v_createRequestAnnc, v_updateRequest));//AccessControlPolicy
@@ -10921,7 +11265,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 	
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_updateRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
 	
 						v_cse1.start(f_CSE_ANNC_UPD_006(int3, v_createRequest, v_createRequestAnnc, v_updateRequest));//Container
@@ -10935,7 +11280,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_updateRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
 
 						v_cse1.start(f_CSE_ANNC_UPD_006(int9, v_createRequest, v_createRequestAnnc, v_updateRequest));//Group
@@ -10948,7 +11294,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
-
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						
 						v_updateRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
 
 						v_cse1.start(f_CSE_ANNC_UPD_006(int29, v_createRequest, v_createRequestAnnc, v_updateRequest));//TimeSeries
@@ -10969,7 +11317,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 	
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_updateRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
 	
 						v_cse1.start(f_CSE_ANNC_UPD_007(int1, v_createRequest, v_createRequestAnnc, v_updateRequest));//AccessControlPolicy
@@ -10983,7 +11332,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_updateRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
 
 						v_cse1.start(f_CSE_ANNC_UPD_007(int3, v_createRequest, v_createRequestAnnc, v_updateRequest));//Container
@@ -10997,7 +11347,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_updateRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
 
 						v_cse1.start(f_CSE_ANNC_UPD_007(int9, v_createRequest, v_createRequestAnnc, v_updateRequest));//Group
@@ -11010,7 +11361,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
-
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_updateRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
 
 						v_cse1.start(f_CSE_ANNC_UPD_007(int29, v_createRequest, v_createRequestAnnc, v_updateRequest));//TimeSeries
@@ -11036,7 +11388,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 						var XSD.NonNegativeInteger v_maxByteSize := 512;
   
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.container.maxByteSize := v_maxByteSize;
 						v_createRequest.primitiveContent.container.announcedAttribute := v_announcedAttribute;
@@ -11083,7 +11436,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 						var MemberType v_memberType := int3;
   
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.group_.memberType := v_memberType;
 						v_createRequest.primitiveContent.group_.announcedAttribute := v_announcedAttribute;
@@ -11180,7 +11534,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequestAnnc := mw_updateContainerAnnc;
 						var XSD.NonNegativeInteger v_maxByteSize := 512;
 
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.container.maxByteSize := v_maxByteSize;	
 						
@@ -11203,7 +11558,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequestAnnc := mw_updateGroupAnnc;
 						var MemberType v_memberType := int3;
 
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.group_.memberType := v_memberType;
 						
@@ -11225,7 +11581,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;	
 						var template RequestPrimitive v_updateRequestAnnc := mw_updateTimeSeriesAnnc;
 						var XSD.NonNegativeInteger v_maxByteSize := 512;
-
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						
 						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize;	
 	
@@ -11257,7 +11615,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var Timestamp v_expirationTime_1 := "21001231T012345";
 						var Timestamp v_expirationTime_2 := "21101231T012345";
 
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.accessControlPolicy.expirationTime := v_expirationTime_1;	
 
@@ -11281,7 +11640,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var Timestamp v_expirationTime_1 := "21001231T012345";
 						var Timestamp v_expirationTime_2 := "21101231T012345";
 
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.container.expirationTime := v_expirationTime_1;	
 		
@@ -11305,7 +11665,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var Timestamp v_expirationTime_1 := "21001231T012345";
 						var Timestamp v_expirationTime_2 := "21101231T012345";
 
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.group_.expirationTime := v_expirationTime_1;
 		
@@ -11328,7 +11689,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequestAnnc := mw_updateTimeSeriesAnnc;
 						var Timestamp v_expirationTime_1 := "21001231T012345";
 						var Timestamp v_expirationTime_2 := "21101231T012345";
-
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						
 						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.timeSeries.expirationTime := v_expirationTime_1;
 
@@ -11360,7 +11723,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var XSD.NonNegativeInteger v_maxByteSize_1 := 512;
 						var XSD.NonNegativeInteger v_maxByteSize_2 := 1024;
 
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.container.maxByteSize := v_maxByteSize_1;
 						v_createRequest.primitiveContent.container.announcedAttribute := {"mbs"};	
@@ -11385,7 +11749,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var MemberType v_memberType_1 := int3;
 						var MemberType v_memberType_2 := int4;
 
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.group_.memberType := v_memberType_1;
 						v_createRequest.primitiveContent.group_.announcedAttribute := {"mt"};
@@ -11409,7 +11774,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequestAnnc := mw_updateTimeSeriesAnnc;
 						var XSD.NonNegativeInteger v_maxByteSize_1 := 512;
 						var XSD.NonNegativeInteger v_maxByteSize_2 := 1024;
-
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						
 						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize_1;
 						v_createRequest.primitiveContent.timeSeries.announcedAttribute := {"mbs"};	
@@ -11444,7 +11811,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AttributeAux_list v_nullFields;
 						var ListOfNCNames v_announcedAttribute := {"ToBeDeleted"};
 
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.container.maxByteSize := v_maxByteSize;
 						v_createRequest.primitiveContent.container.announcedAttribute := {"mbs"};	
@@ -11483,7 +11851,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AttributeAux_list v_nullFields;
 						var ListOfNCNames v_announcedAttribute := {"ToBeDeleted"};
 
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.group_.memberType := v_memberType;
 						v_createRequest.primitiveContent.group_.announcedAttribute := {"mt"};
@@ -11520,7 +11889,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var XSD.NonNegativeInteger v_maxByteSize := 512;
 						var AttributeAux_list v_nullFields;
 						var ListOfNCNames v_announcedAttribute := {"ToBeDeleted"};
-
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						
 						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize;
 						v_createRequest.primitiveContent.timeSeries.announcedAttribute := {"mbs"};	
@@ -11567,7 +11938,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 						var XSD.NonNegativeInteger v_maxByteSize := 512;
 	  
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.container.maxByteSize := v_maxByteSize;
 						v_createRequest.primitiveContent.container.announcedAttribute := {"mbs"};
@@ -11612,7 +11984,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 						var MemberType v_memberType := int3;
 	  
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.group_.memberType := v_memberType;
 						v_createRequest.primitiveContent.group_.announcedAttribute := {"mt"};
@@ -11704,7 +12077,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;	
 						var ResponsePrimitive v_responsePrimitive;	
 						 
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
   
 						v_ae1.start(f_CSE_ANNC_UPD_014(int3, v_createRequestAnnc, v_createRequest, v_updateRequest));//Container
@@ -11738,7 +12112,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createAcpBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
   
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
   
 						v_ae1.start(f_CSE_ANNC_DEL_001(int1, v_createRequestAnnc, v_createRequest));//AccessControlPolicy
@@ -11751,7 +12126,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
   
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
   
 						v_ae1.start(f_CSE_ANNC_DEL_001(int3, v_createRequestAnnc, v_createRequest));//Container
@@ -11764,7 +12140,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
   
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
   
 						v_ae1.start(f_CSE_ANNC_DEL_001(int9, v_createRequestAnnc, v_createRequest));//Group
@@ -11797,7 +12174,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createAcpBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
   
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
   
 						v_cse1.start(f_CSE_ANNC_DEL_002(int1, v_createRequestAnnc, v_createRequest));//AccessControlPolicy
@@ -11810,7 +12188,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
   
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
   
 						v_cse1.start(f_CSE_ANNC_DEL_002(int3, v_createRequestAnnc, v_createRequest));//Container
@@ -11823,7 +12202,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
   
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
   
 						v_cse1.start(f_CSE_ANNC_DEL_002(int9, v_createRequestAnnc, v_createRequest));//Group
@@ -11835,7 +12215,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
-  
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						
 						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
   
 						v_cse1.start(f_CSE_ANNC_DEL_002(int29, v_createRequestAnnc, v_createRequest));//TimeSeries
@@ -11857,7 +12239,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 										
-				f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+				v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 				v_ae1.start(f_CSE_PCH_001());
 							  	  	
 				v_ae1.done;
@@ -11932,7 +12315,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 										
-				f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+				v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 				v_ae1.start(f_CSE_PCH_002());
 							  	  	
 				v_ae1.done;
@@ -12007,7 +12391,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 							
-				f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+				v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 				v_ae1.start(f_CSE_PCH_003());
 				v_ae1.done;
 				  	  		
@@ -12079,7 +12464,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 		
 				var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 				
-				f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+				v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 				v_cse1.start(f_CSE_PCH_004());
 				v_cse1.done;
 			}
@@ -12170,7 +12556,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 				var integer v_aeIndex2 := -1;
 				var template RequestPrimitive v_createRequest := m_createPollingChannelBase;
 				
-				f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+				v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 				v_request := f_getCreateRequestPrimitive(int15, v_createRequest, v_aeIndex1);
 				v_request.to_ := f_getResourceAddress(v_aeIndex2);
 				
@@ -12187,7 +12574,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 				 var integer v_aeIndex2 := -1;
 				 var template RequestPrimitive v_createRequest := m_createPollingChannelBase;
 	
-				 f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+				 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 				 v_request := f_getCreateRequestPrimitive(int15, v_createRequest, v_aeIndex1);
 				 
 				 v_request := valueof(m_retrievePollingRequest(f_getResourceAddress(v_aeIndex1), f_getOriginator(v_aeIndex1)));
@@ -12205,7 +12593,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 				  var integer v_aeIndex2 := -1;
 				  var template RequestPrimitive v_createRequest := m_createPollingChannelBase;
 
-				  f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+				  v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 				  v_request := f_getCreateRequestPrimitive(int15, v_createRequest, v_aeIndex1);
 				  
  
@@ -12226,7 +12615,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 				var integer v_aeIndex2 := -1;
 				var template RequestPrimitive v_createRequest := m_createPollingChannelBase;
 
-				f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+				v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 				v_request := f_getCreateRequestPrimitive(int15, v_createRequest, v_aeIndex1);
 				
  
@@ -12287,8 +12677,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 		 testcase TC_CSE_PCH_006() runs on Tester system CseSystem {
 	
 			 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-				
-			 f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+			 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+			
 			 v_cse1.start(f_CSE_PCH_006());
 			 v_cse1.done;
 		 }
@@ -12361,7 +12752,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 				
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_NBR_SYN_001(m_createContainerBase, -)); //Create Container
 						v_ae1.done;
 				
@@ -12374,7 +12766,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var Labels v_labels_1 := {"VALUE_1"};
 				
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.container.labels := v_labels_1;
 				
 						v_ae1.start(f_CSE_NBR_SYN_001(m_updateContainerBase, m_createContainerBase)); //Update Container
@@ -12387,7 +12780,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 				
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_NBR_SYN_001(m_retrieve("NotInitialized", "NotInitialized"), m_createContainerBase)); //Retrieve Container
 						v_ae1.done;
 		
@@ -12398,7 +12792,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 				
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_NBR_SYN_001(m_delete("NotInitialized", "NotInitialized"), m_createContainerBase)); //Delete Container
 						v_ae1.done;
 
@@ -12417,7 +12812,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_NBR_SYN_002(m_createContainerBase, -)); //Create Container
 						v_ae1.done;
 
@@ -12430,7 +12826,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var Labels v_labels_1 := {"VALUE_1"};
 				
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.container.labels := v_labels_1;
 
 						v_ae1.start(f_CSE_NBR_SYN_002(m_updateContainerBase, m_createContainerBase)); //Update Container
@@ -12443,7 +12840,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_NBR_SYN_002(m_retrieve("NotInitialized", "NotInitialized"), m_createContainerBase)); //Retrieve Container
 						v_ae1.done;
 
@@ -12454,7 +12852,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_NBR_SYN_002(m_delete("NotInitialized", "NotInitialized"), m_createContainerBase)); //Delete Container
 						v_ae1.done;
 
@@ -12473,7 +12872,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_NBR_SYN_003(m_createContainerBase, -, int1)); //Create Container
 						v_ae1.done;
 
@@ -12486,7 +12886,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var Labels v_labels_1 := {"VALUE_1"};
 				
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.container.labels := v_labels_1;
 
 						v_ae1.start(f_CSE_NBR_SYN_003(m_updateContainerBase, m_createContainerBase, int3)); //Update Container
@@ -12499,7 +12900,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_NBR_SYN_003(m_retrieve("NotInitialized", "NotInitialized"), m_createContainerBase, int2)); //Retrieve Container
 						v_ae1.done;
 
@@ -12510,7 +12912,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_NBR_SYN_003(m_delete("NotInitialized", "NotInitialized"), m_createContainerBase, int4)); //Delete Container
 						v_ae1.done;
 
@@ -12532,7 +12935,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_NBR_ASY_001(m_createContainerBase, -)); //Create Container
 						v_ae1.done;
 
@@ -12545,7 +12949,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var Labels v_labels_1 := {"VALUE_1"};
 				
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.container.labels := v_labels_1;
 
 						v_ae1.start(f_CSE_NBR_ASY_001(m_updateContainerBase, m_createContainerBase)); //Update Container
@@ -12558,7 +12963,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_NBR_ASY_001(m_retrieve("NotInitialized", "NotInitialized"), m_createContainerBase)); //Retrieve Container
 						v_ae1.done;
 
@@ -12569,7 +12975,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_NBR_ASY_001(m_delete("NotInitialized", "NotInitialized"), m_createContainerBase)); //Delete Container
 						v_ae1.done;
 
@@ -12588,7 +12995,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_NBR_ASY_002(m_createContainerBase, -)); //Create Container
 						v_ae1.done;
 
@@ -12601,7 +13009,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var Labels v_labels_1 := {"VALUE_1"};
 				
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.container.labels := v_labels_1;
 
 						v_ae1.start(f_CSE_NBR_ASY_002(m_updateContainerBase, m_createContainerBase)); //Update Container
@@ -12614,7 +13023,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_NBR_ASY_002(m_retrieve("NotInitialized", "NotInitialized"), m_createContainerBase)); //Retrieve Container
 						v_ae1.done;
 
@@ -12625,7 +13035,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_NBR_ASY_002(m_delete("NotInitialized", "NotInitialized"), m_createContainerBase)); //Delete Container
 						v_ae1.done;
 
@@ -12644,7 +13055,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_NBR_ASY_003(m_createContainerBase, -, int2001)); //Create Container
 						v_ae1.done;
 
@@ -12657,7 +13069,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var Labels v_labels_1 := {"VALUE_1"};
 
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.container.labels := v_labels_1;
 
 						v_ae1.start(f_CSE_NBR_ASY_003(m_updateContainerBase, m_createContainerBase, int2004)); //Update Container
@@ -12670,7 +13083,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_NBR_ASY_003(m_retrieve("NotInitialized", "NotInitialized"), m_createContainerBase, int2000)); //Retrieve Container
 						v_ae1.done;
 
@@ -12681,7 +13095,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_NBR_ASY_003(m_delete("NotInitialized", "NotInitialized"), m_createContainerBase, int2002)); //Delete Container
 						v_ae1.done;
 
@@ -12700,7 +13115,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_NBR_ASY_004(m_createContainerBase, -)); //Create Container
 						v_ae1.done;
 
@@ -12713,7 +13129,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var Labels v_labels_1 := {"VALUE_1"};
 
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_updateRequest.primitiveContent.container.labels := v_labels_1;
 
 						v_ae1.start(f_CSE_NBR_ASY_004(m_updateContainerBase, m_createContainerBase)); //Update Container
@@ -12726,7 +13143,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_NBR_ASY_004(m_retrieve("NotInitialized", "NotInitialized"), m_createContainerBase)); //Retrieve Container
 						v_ae1.done;
 
@@ -12737,7 +13155,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_ae1.start(f_CSE_NBR_ASY_004(m_delete("NotInitialized", "NotInitialized"), m_createContainerBase)); //Delete Container
 						v_ae1.done;
 
@@ -12760,7 +13179,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 					
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 					v_ae1.start(f_CSE_TS_001());
 		  	  	
 					v_ae1.done;
@@ -12839,7 +13259,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 					
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 					v_ae1.start(f_CSE_TS_002());
 		  	  	
 					v_ae1.done;
@@ -12979,7 +13400,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 	
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 											
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 					v_ae1.start(f_CSE_TS_003());
 								  	  	
 					v_ae1.done;
@@ -13046,7 +13468,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 							
-					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 					v_ae1.start(f_CSE_TS_004());
 				  	  	
 					v_ae1.done;