From 55da9d438e355bd92795c3e4af85c98f13bacf25 Mon Sep 17 00:00:00 2001
From: reinaortega <miguelangel.reinaortega@etsi.org>
Date: Mon, 9 Jul 2018 12:41:09 +0200
Subject: [PATCH] f_setProtocolBinding to be run on the corresponding component
 and not on the MTC

Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org>
---
 LibOneM2M/OneM2M_Functions.ttcn     |    9 +-
 OneM2M_Testcases_AE_Release_1.ttcn  |  263 ++++---
 OneM2M_Testcases_CSE_Release_1.ttcn | 1073 ++++++++++++++++++---------
 OneM2M_Testcases_CSE_Release_2.ttcn |  852 ++++++++++++++-------
 4 files changed, 1461 insertions(+), 736 deletions(-)

diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index f676280..a09f204 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,8 @@ module OneM2M_Functions {
 			vc_config := e_cf02;
 			vc_testSystemRole := e_ae;	
 			vc_cse1 := CseSimu.create("CSE1") alive;
-			f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+			vc_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+			vc_cse1.done;
 				
 			// Map
 			map(self:mcaPort, system:mcaPort);
@@ -132,7 +134,8 @@ module OneM2M_Functions {
 			vc_config := e_cf02CseSimuMaster;
 			vc_testSystemRole := e_cse;		
 			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_Testcases_AE_Release_1.ttcn b/OneM2M_Testcases_AE_Release_1.ttcn
index 674e1a2..9d0bdba 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());
 					
@@ -2164,7 +2244,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 2a548f5..770e116 100644
--- a/OneM2M_Testcases_CSE_Release_1.ttcn
+++ b/OneM2M_Testcases_CSE_Release_1.ttcn
@@ -93,7 +93,9 @@ 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.done;
                         
 						v_ae1.start(f_CSE_GEN_CRE_001(e_cseRelative));
 						v_ae1.done;
@@ -103,7 +105,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 +115,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 +134,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 +145,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 +156,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 +178,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 +189,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 +199,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 +218,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 +229,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 +240,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 +261,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 +271,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 +282,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 +301,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 +312,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 +323,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 +345,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 +356,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 +367,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 +386,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 +397,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 +408,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 +432,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 +502,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_CRE_002() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 					v_ae1.start(f_CSE_REG_CRE_002());
 			  	  	
@@ -537,7 +564,7 @@ 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.start(f_CSE_REG_CRE_003());
 			  	  	
@@ -555,7 +582,7 @@ 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.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,7 +666,8 @@ 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());
 			  	  	
@@ -711,7 +740,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 +798,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 +868,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 +941,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 +1021,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 +1105,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 +1177,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 +1187,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 +1198,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_REG_CRE_012_AE_POA() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, PX_AE1_ID_STEM);
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_create.primitiveContent.aE.pointOfAccess := {PX_AE1_ADDRESS};
 						v_ae1.start(f_CSE_REG_CRE_012(v_create));
 						v_ae1.done;
@@ -1180,7 +1218,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createRemoteCSEBase;	
 						const AttributeAux c_optionalAttribute := {"labels", omit};
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
                         						
 						v_createRequest.primitiveContent.remoteCSE.labels := {"MyLabel"};
 						
@@ -1194,7 +1233,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createRemoteCSEBase;	
 						const AttributeAux c_optionalAttribute := {"cseType", omit};
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 												
 						v_createRequest.primitiveContent.remoteCSE.cseType := int1;
 						
@@ -1207,7 +1247,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createRemoteCSEBase;	
 						const AttributeAux c_optionalAttribute := {"pointOfAccess", omit};
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 	
 						v_createRequest.primitiveContent.remoteCSE.pointOfAccess := {"http://" & PX_CSE1_ADDRESS & "/"};
 	
@@ -1221,7 +1262,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createRemoteCSEBase;	
 						const AttributeAux c_optionalAttribute := {"nodeLink", omit};
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 
 						v_createRequest.primitiveContent.remoteCSE.nodeLink := c_defaultNodeID;
 
@@ -1239,7 +1281,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 +1353,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 +1366,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 +1384,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 +1450,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 +1513,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 +1609,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 +1671,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 +1739,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 +1801,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 +1868,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 +1939,8 @@ 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 +1952,8 @@ 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,8 @@ 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 +1978,8 @@ 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 +1991,8 @@ 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 +2004,8 @@ 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 +2021,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 +2080,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						 var RequestPrimitive v_request;
 						 var template PrimitiveContent v_contentResponse;
 						 var Labels v_labels_1 := {"VALUE_1"};
-						 f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						 v_request := valueof(m_createRemoteCSEBase);
 						 v_request.primitiveContent.remoteCSE.cseType := int2;	//MN_CSE
 						 v_request.primitiveContent.remoteCSE.labels := v_labels_1;
@@ -2040,7 +2101,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						
 						 var RequestPrimitive v_request;
 						 var template PrimitiveContent v_contentResponse;
-						 f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						 v_request := valueof(m_createRemoteCSEBase);
 						 v_request.primitiveContent.remoteCSE.cseType := int2;	//MN_CSE
 						 v_request.primitiveContent.remoteCSE.pointOfAccess := {"http://" & PX_CSE1_ADDRESS & "/"};
@@ -2060,7 +2122,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						
 						 var RequestPrimitive v_request;
 						 var template PrimitiveContent v_contentResponse;
-						 f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						 v_request := valueof(m_createRemoteCSEBase);
 						 v_request.primitiveContent.remoteCSE.cseType := int2;	//MN_CSE
 						 v_request.primitiveContent.remoteCSE.nodeLink := c_defaultNodeID;
@@ -2087,7 +2150,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 +2223,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 +2236,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 +2255,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 +2329,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 +2346,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 +2362,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 +2382,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 +2466,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 +2571,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var Labels v_labels_1 := {"VALUE_1"};
 						var template RequestPrimitive v_createRequest := m_createRemoteCSEBase;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_createRequest.primitiveContent.remoteCSE.labels := v_labels_1;
 
 						v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
@@ -2515,7 +2588,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						
 						var template RequestPrimitive v_createRequest := m_createRemoteCSEBase;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_createRequest.primitiveContent.remoteCSE.cseType := int1;
 
 						v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
@@ -2531,7 +2605,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						
 						var template RequestPrimitive v_createRequest := m_createRemoteCSEBase;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_createRequest.primitiveContent.remoteCSE.pointOfAccess := {"http://" & PX_CSE1_ADDRESS & "/"};
 
 						v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
@@ -2547,7 +2622,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						
 						var template RequestPrimitive v_createRequest := m_createRemoteCSEBase;
 						var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						v_createRequest.primitiveContent.remoteCSE.nodeLink := c_defaultNodeID;
 
 						v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
@@ -2566,7 +2642,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 +2723,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 +2789,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 +2866,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,7 +2932,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;	
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
     						
 						v_updateRequest.primitiveContent.remoteCSE.labels := {"MyLabel"};
 	
@@ -2865,7 +2946,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;	
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
     					
 						v_updateRequest.primitiveContent.remoteCSE.pointOfAccess := {"http://" & PX_CSE1_ADDRESS & "/"};
 	
@@ -2878,7 +2960,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;	
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
     						
 						v_updateRequest.primitiveContent.remoteCSE.nodeLink := c_defaultNodeID;
 	
@@ -2900,7 +2983,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;	
 						var AttributeList c_optionalAttribute;
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 			
 						v_updateRequest.primitiveContent.remoteCSE.labels := {"MyLabel"};
 						c_optionalAttribute := {"labels"};
@@ -2915,7 +2999,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;	
 						var AttributeList c_optionalAttribute;
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 		
 						v_updateRequest.primitiveContent.remoteCSE.pointOfAccess := {"http://" & PX_CSE1_ADDRESS & "/"};
 						c_optionalAttribute := {"pointofAccess"};
@@ -2930,7 +3015,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;	
 						var AttributeList c_optionalAttribute;
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 			
 						v_updateRequest.primitiveContent.remoteCSE.nodeLink := c_defaultNodeID;
 						c_optionalAttribute := {"nodeLink"};
@@ -2945,7 +3031,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;	
 						var AttributeList c_optionalAttribute;
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 			
 						v_updateRequest.primitiveContent.remoteCSE.expirationTime := "20301231T012345";
 						c_optionalAttribute := {"expirationTime"};
@@ -2960,7 +3047,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;	
 						var AttributeList c_optionalAttribute;
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 	
 						v_updateRequest.primitiveContent.remoteCSE.requestReachability := true;
 						c_optionalAttribute := {"requestReachability"};
@@ -2983,7 +3071,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 +3129,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 +3204,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 +3266,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 +3344,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 +3364,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 +3387,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 +3410,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 +3433,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 +3456,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 +3479,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 +3502,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 +3524,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 +3546,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 +3568,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,7 +3589,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						
 						v_createRequest.primitiveContent.subscription.resourceName := omit;
 						v_cse1.start(f_CSE_DMR_CRE_001_cseSimu(int23, v_createRequest));//Subscription
@@ -3506,7 +3610,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 +3640,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 +3664,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 +3687,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 +3710,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 +3740,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 +3751,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 +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(int1, m_createAcpBase));//accessControlPolicy
 						v_ae1.done;
@@ -3661,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(int23, m_createSubscriptionBase));//Subscription
 						v_ae1.done;
@@ -3679,7 +3792,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 +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(int9, m_createGroupBase));//group
 						v_ae1.done;
@@ -3699,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(int1, m_createAcpBase));//accessControlPolicy
 						v_ae1.done;
@@ -3709,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(int23, m_createSubscriptionBase));//Subscription
 						v_ae1.done;
@@ -3728,7 +3845,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 +3860,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 +3876,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 +3900,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 +3920,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 +3941,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 +4342,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 +4355,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 +4369,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 +4383,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 +4397,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 +4411,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 +4425,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 +4439,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 +4453,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 +4467,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 +4481,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 +4494,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 +4508,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 +4594,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 +4621,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 +4633,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 +4647,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 +4664,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 +4677,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 +4698,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 +4708,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 +4720,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 +4731,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 +4890,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 +4903,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 +4916,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 +4929,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 +4942,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 +4955,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 +4977,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 +4988,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 +4998,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 +5008,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 +5019,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 +5029,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 +5057,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 +5098,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 +5139,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 +5180,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 +5228,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 +5266,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 +5304,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 +5342,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 +5391,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 +5439,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 +5485,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 +5531,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 +5584,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 +5648,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 +5712,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 +5776,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 +5837,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 +5898,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 +5981,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 +6005,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 +6030,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 +6056,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 +6088,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 +6113,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 +6138,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 +6163,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 +6197,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 +6224,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 +6250,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 +6284,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 +6300,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 +6316,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 +6332,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;
@@ -6464,7 +6655,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;
 
@@ -6495,7 +6687,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;
 
@@ -6525,7 +6718,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;
 		
@@ -6555,7 +6749,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;
 	
@@ -6585,7 +6780,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;
 
@@ -6615,7 +6811,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;
 	
@@ -6644,7 +6841,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;
 
@@ -6674,7 +6872,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;
 
@@ -6710,7 +6909,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
@@ -6744,7 +6944,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
@@ -6778,7 +6979,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
@@ -6812,7 +7014,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
@@ -6846,7 +7049,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;
 						
@@ -6880,7 +7084,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;
@@ -6913,7 +7118,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;
@@ -6946,7 +7152,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
@@ -6980,7 +7187,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;
 						
@@ -7014,7 +7222,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
@@ -7048,7 +7257,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
@@ -7082,7 +7292,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
@@ -7116,7 +7327,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
@@ -7150,7 +7362,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;
 						
@@ -7184,7 +7397,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;
@@ -7217,7 +7431,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;
@@ -7250,7 +7465,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;
 						
@@ -7284,7 +7500,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;
@@ -7317,7 +7534,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;
@@ -7357,7 +7575,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
@@ -7391,7 +7610,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
@@ -7423,7 +7643,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
@@ -7457,7 +7678,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
@@ -7491,7 +7713,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
@@ -7525,7 +7748,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
@@ -7559,7 +7783,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;
@@ -7592,7 +7817,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;
@@ -7625,7 +7851,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
@@ -7660,7 +7887,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
@@ -7694,7 +7922,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
@@ -7728,7 +7957,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
@@ -7762,7 +7992,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
@@ -7796,7 +8027,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
@@ -7839,7 +8071,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;
@@ -7852,7 +8085,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;
@@ -7861,7 +8095,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;
@@ -7870,7 +8105,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;
@@ -7879,7 +8115,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;
@@ -7896,7 +8133,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;
@@ -7905,7 +8143,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;
@@ -7914,7 +8153,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;
@@ -7923,7 +8163,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;
@@ -8268,7 +8509,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());
 				  	  	
@@ -8342,7 +8584,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());
 					  	  	
@@ -8420,7 +8663,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());
 					  	  	
@@ -8499,7 +8743,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());
 					  	  	
@@ -8572,7 +8817,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());
 					  	  	
@@ -8635,7 +8881,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());
 					  	  	
@@ -8719,7 +8966,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());
 					  	  	
@@ -8806,7 +9054,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());
 						  	  	
@@ -8907,7 +9156,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());
 						  	  	
@@ -8991,7 +9241,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());
 							  	  	
@@ -9076,7 +9327,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());
 							  	  	
@@ -9160,7 +9412,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());
 							  	  	
@@ -9238,7 +9491,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());
 							  	  	
@@ -9332,7 +9586,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());
 							  	  	
@@ -9431,7 +9686,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;
@@ -9441,7 +9697,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));	
@@ -9450,7 +9707,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;
@@ -9458,7 +9716,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;
@@ -9474,7 +9733,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;
@@ -9486,14 +9746,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;
@@ -9501,7 +9763,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;
@@ -9517,7 +9780,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;
@@ -9528,7 +9792,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));	
@@ -9537,7 +9802,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;
@@ -9545,7 +9811,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;
@@ -9561,7 +9828,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;
@@ -9572,7 +9840,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));	
@@ -9581,7 +9850,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;
@@ -9589,7 +9859,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;
@@ -9605,7 +9876,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;
@@ -9617,14 +9889,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;
@@ -9632,7 +9906,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;
@@ -9649,7 +9924,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
@@ -9660,14 +9936,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;
@@ -9675,7 +9953,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;
@@ -9691,7 +9970,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;
@@ -9703,14 +9983,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;
@@ -9718,7 +10000,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;
@@ -9734,7 +10017,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;
@@ -9746,14 +10030,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;
@@ -9761,7 +10047,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;
@@ -9777,7 +10064,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;
@@ -9789,14 +10077,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;
@@ -9804,7 +10094,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;
@@ -9820,7 +10111,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;
@@ -9832,14 +10124,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;
@@ -9847,7 +10141,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;
@@ -9863,7 +10158,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;
@@ -9875,14 +10171,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;
@@ -9890,7 +10188,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;
@@ -9906,7 +10205,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;
@@ -9918,14 +10218,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;
@@ -9933,7 +10235,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;
@@ -9956,7 +10259,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());
 							  	  	
@@ -10019,7 +10323,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());
 								  	  	
@@ -10092,7 +10397,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());
 								  	  	
@@ -10164,7 +10470,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());
 								  	  	
@@ -10236,7 +10543,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());
 								  	  	
@@ -10306,7 +10614,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());
 								  	  	
@@ -10373,7 +10682,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());
 								  	  	
@@ -10445,7 +10755,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;
@@ -10461,7 +10772,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;
@@ -10477,7 +10789,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;
@@ -10493,7 +10806,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;
@@ -10512,7 +10826,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());
 								  	  	
@@ -10597,7 +10912,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());
 								  	  	
@@ -10685,7 +11001,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());
 									  	  	
@@ -10770,7 +11087,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());
 									  	  	
@@ -10838,7 +11156,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());
 									  	  	
@@ -10906,7 +11225,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());
 									  	  	
@@ -10985,7 +11305,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());
 									  	  	
@@ -11068,7 +11389,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());
 									  	  	
@@ -11140,7 +11462,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());
 									  	  	
@@ -11246,7 +11569,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());
 									  	  	
@@ -11327,7 +11651,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());
 										  	  	
@@ -11422,7 +11747,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());
 										  	  	
@@ -11509,7 +11835,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());
 										  	  	
@@ -11616,7 +11943,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());
 										  	  	
@@ -11726,7 +12054,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());
 										  	  	
@@ -11798,7 +12127,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());
 										  	  	
@@ -11891,7 +12221,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());
 										  	  	
@@ -11974,7 +12305,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());
 										  	  	
@@ -12087,7 +12419,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());
 										  	  	
@@ -12185,7 +12518,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;
@@ -12197,14 +12531,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;
@@ -12212,7 +12548,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;
@@ -12228,7 +12565,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;
@@ -12240,14 +12578,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;
@@ -12255,7 +12595,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;
@@ -12271,7 +12612,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;
@@ -12283,14 +12625,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;
@@ -12298,7 +12642,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;
@@ -12314,7 +12659,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;
@@ -12326,14 +12672,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;
@@ -12341,7 +12689,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;
@@ -12360,7 +12709,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
@@ -12371,7 +12721,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;
@@ -12384,7 +12735,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));
@@ -12395,7 +12747,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
@@ -12412,7 +12765,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));
@@ -12424,7 +12778,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;
@@ -12437,7 +12792,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));
@@ -12448,7 +12804,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 24c3fea..516e6f1 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,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						
 						 var RequestPrimitive v_request;
 						 var template PrimitiveContent v_contentResponse;
-						 f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						 v_request := valueof(m_createRemoteCSEBase);
 						 v_request.primitiveContent.remoteCSE.cseType := int2;	//MN_CSE
 						 v_request.primitiveContent.remoteCSE.resourceName := c_defaultRemoteCSEResourceName;
@@ -252,7 +255,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						
 						 var RequestPrimitive v_request;
 						 var template PrimitiveContent v_contentResponse;
-						 f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						 v_request := valueof(m_createRemoteCSEBase);
 						 v_request.primitiveContent.remoteCSE.cseType := int2;	//MN_CSE
 						 v_request.primitiveContent.remoteCSE.expirationTime := "20301231T012345";
@@ -286,7 +290,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						
 						 var template RequestPrimitive v_createRequest := m_createAe(PX_APP_ID);
 						 var template PrimitiveContent v_contentResponse;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						 v_createRequest.primitiveContent.aE.nodeLink := "http://127.0.0.1/";
 
 						 v_contentResponse.aE := mw_contentAeBase;
@@ -302,7 +307,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						
 						 var template RequestPrimitive v_createRequest := m_createAe(PX_APP_ID);
 						 var template PrimitiveContent v_contentResponse;
-						 f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						 v_createRequest.primitiveContent.aE.contentSerialization := {applicationxml};
 
 						 v_contentResponse.aE := mw_contentAeBase;
@@ -330,7 +336,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;	
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
     						
 						v_updateRequest.primitiveContent.remoteCSE.expirationTime := "20301231T012345";
 	
@@ -343,7 +350,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;	
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 
 						v_updateRequest.primitiveContent.remoteCSE.requestReachability := true;
 
@@ -381,7 +389,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 +411,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 +433,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 +455,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 +479,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 +500,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
@@ -507,7 +521,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;
 
@@ -529,7 +544,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
@@ -550,7 +566,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
@@ -571,7 +588,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
@@ -591,7 +609,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;
 						
@@ -613,7 +632,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
@@ -634,7 +654,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
@@ -662,7 +683,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;
@@ -683,7 +705,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;
@@ -712,7 +735,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;
@@ -721,7 +745,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_003(int15, m_createPollingChannelBase));//Pollingchannel
 						v_ae1.done;
@@ -739,7 +764,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;
@@ -748,7 +774,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;
@@ -768,7 +795,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));
@@ -782,7 +810,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));			
@@ -795,7 +824,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));
@@ -809,7 +839,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));
@@ -823,7 +854,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));
@@ -837,7 +869,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));
@@ -851,7 +884,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));
@@ -865,7 +899,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));
@@ -879,7 +914,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));
@@ -893,7 +929,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));
@@ -906,7 +943,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));
@@ -920,7 +958,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));
@@ -934,7 +973,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));			
@@ -947,7 +987,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));
@@ -961,7 +1002,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));
@@ -975,7 +1017,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));
@@ -989,7 +1032,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));
@@ -1003,7 +1047,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));
@@ -1022,7 +1067,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;
@@ -1032,7 +1078,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;
@@ -1042,7 +1089,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;
@@ -1052,7 +1100,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;
@@ -1062,7 +1111,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;
@@ -1072,7 +1122,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;
@@ -1090,7 +1141,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;
 					                        
@@ -1102,7 +1154,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;
 					
@@ -1114,7 +1167,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;
 						
@@ -1126,7 +1180,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;
 						
@@ -1138,7 +1193,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;
 						
@@ -1150,7 +1206,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;
 
@@ -1170,7 +1227,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;
 					                        
@@ -1182,7 +1240,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;
 					
@@ -1194,7 +1253,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;
 						
@@ -1206,7 +1266,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;
 						
@@ -1218,7 +1279,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;
 						
@@ -1230,7 +1292,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;
 
@@ -1252,7 +1315,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
@@ -1264,7 +1328,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
@@ -1275,7 +1340,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
@@ -1287,7 +1353,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
@@ -1299,7 +1366,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
@@ -1311,7 +1379,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
@@ -1323,7 +1392,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
@@ -1335,7 +1405,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
@@ -1357,7 +1428,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var RequestPrimitive v_requestPrimitive;
 						var XSD.NonNegativeInteger maxByteSize := 512;		//Correct value? Shall be indicated in TP?
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						//v_createRequest.primitiveContent.container.announceTo := {f_getAnnouncementTargetPoA()};
 						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.container.maxByteSize := maxByteSize;						
@@ -1388,7 +1460,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
 						var RequestPrimitive v_requestPrimitive;
 						var XSD.NonNegativeInteger v_contentSize := 512;			//Correct value? Shall be indicated in TP?
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						//v_createRequest.primitiveContent.contentInstance.announceTo := {f_getAnnouncementTargetPoA()};
 						v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.contentInstance.contentSize := v_contentSize;						
@@ -1419,7 +1492,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
 						var RequestPrimitive v_requestPrimitive;
 						var XSD.PositiveInteger maxNrOfMembers := 10;						//Correct value? Shall be indicated in TP?
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.group_.announceTo := {f_getAnnouncementTargetPoA()};
 						v_createRequest.primitiveContent.group_.maxNrOfMembers := maxNrOfMembers;
 						v_createRequest.primitiveContent.group_.announcedAttribute := {"maxNrOfMembers"};	//Correct value? Shall be indicated in TP?
@@ -1449,7 +1523,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 locationSource := int1;//Network-based		//Correct value? Shall be indicated in TP?
-						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_createRequest.primitiveContent.locationPolicy.locationSource := locationSource;
 						v_createRequest.primitiveContent.locationPolicy.announcedAttribute := {"locationSource"};		//Correct value? Shall be indicated in TP?
@@ -1479,7 +1554,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";	//Correct value? Shall be indicated in TP?
-						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_createRequest.primitiveContent.mgmtResource.description := description;			
 						v_createRequest.primitiveContent.mgmtResource.announcedAttribute := {"description"};			//Correct value? Shall be indicated in TP?
@@ -1508,7 +1584,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!!!
@@ -1524,7 +1601,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createScheduleBase;
 						var RequestPrimitive v_requestPrimitive;
 						var ScheduleEntries scheduleElement := {{"0 0 0,1,2 1 1 *"}};
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						v_createRequest.primitiveContent.schedule.announceTo := {f_getAnnouncementTargetPoA()};
 						v_createRequest.primitiveContent.schedule.scheduleElement := scheduleElement;			//Correct value? Shall be indicated in TP?
 						v_createRequest.primitiveContent.schedule.announcedAttribute := {"scheduleElement"};			//Correct value? Shall be indicated in TP?
@@ -1565,7 +1643,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
@@ -1579,7 +1658,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
@@ -1598,7 +1678,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());
 										  	  	
@@ -1675,7 +1756,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;
@@ -1684,7 +1766,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;
@@ -1703,7 +1786,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 := ?;
                         
@@ -1716,7 +1800,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 := ?;
 												
@@ -1729,7 +1814,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 := ?;
 							
@@ -1741,7 +1827,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 := ?;
@@ -1754,7 +1841,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 := ?;
@@ -1767,7 +1855,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 := ?;
@@ -1789,7 +1878,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 := ?;
 						                       
@@ -1802,7 +1892,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 := ?;
 																		
@@ -1815,7 +1906,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 := ?;
 							
@@ -1827,7 +1919,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 := ?;
 								
@@ -1839,7 +1932,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 := ?;
 								
@@ -1852,7 +1946,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 := ?;
 								
@@ -1874,7 +1969,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 := ?;
@@ -1888,7 +1984,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 := ?;
@@ -1902,7 +1999,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 := ?;
@@ -1916,7 +2014,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 := ?;
@@ -1930,7 +2029,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 := ?;
@@ -1944,7 +2044,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 := ?;
@@ -1965,7 +2066,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;
@@ -1974,7 +2076,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;
@@ -1983,7 +2086,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;
@@ -1992,7 +2096,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;
@@ -2001,7 +2106,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;
@@ -2010,7 +2116,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;
@@ -2027,7 +2134,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;
@@ -2036,7 +2144,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;
@@ -2045,7 +2154,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;
@@ -2054,7 +2164,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;
@@ -2063,7 +2174,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;
@@ -2072,7 +2184,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;
@@ -2089,7 +2202,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());
 											  	  	
@@ -2155,7 +2269,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());
 											  	  	
@@ -2223,7 +2338,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
@@ -2242,7 +2358,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;
@@ -2261,7 +2378,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 := ?;
 							
@@ -2274,7 +2392,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 := ?;
 							
@@ -2287,7 +2406,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 := ?;
                         
@@ -2300,7 +2420,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 := ?;
 												
@@ -2313,7 +2434,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 := ?;
 		
@@ -2325,7 +2447,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 := ?;
 							
@@ -2338,7 +2461,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 := ?;
 							
@@ -2359,7 +2483,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 := ?;
 							
@@ -2372,7 +2497,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 := ?;
 								
@@ -2385,7 +2511,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 := ?;
 						                       
@@ -2398,7 +2525,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 := ?;
 																		
@@ -2411,7 +2539,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 := ?;
 								
@@ -2423,7 +2552,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 := ?;
 								
@@ -2436,7 +2566,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 := ?;
 								
@@ -2457,7 +2588,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 := ?;
@@ -2471,7 +2603,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 := ?;
@@ -2485,7 +2618,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 := ?;
@@ -2498,7 +2632,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;
@@ -2514,7 +2649,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 := ?;
@@ -2528,7 +2664,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 := ?;
@@ -2542,7 +2679,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 := ?;
@@ -2556,7 +2694,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 := ?;
@@ -2570,7 +2709,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 := ?;
@@ -2584,7 +2724,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 := ?;
@@ -2598,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.statsCollect := m_contentStatsCollect_allOmit;
 						v_contentResponse.statsCollect.parentID := ?;
 						v_contentResponse.statsCollect.creationTime := ?;
@@ -2612,7 +2754,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 := ?;
@@ -2626,7 +2769,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 := ?;
@@ -2646,7 +2790,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;
@@ -2655,7 +2800,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;
@@ -2664,7 +2810,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;
@@ -2673,7 +2820,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;
@@ -2682,7 +2830,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;
@@ -2691,7 +2840,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;
@@ -2700,7 +2850,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;
@@ -2717,7 +2868,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;
@@ -2726,7 +2878,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;
@@ -2735,7 +2888,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;
@@ -2744,7 +2898,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;
@@ -2753,7 +2908,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;
@@ -2762,7 +2918,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;
@@ -2771,7 +2928,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;
@@ -2788,7 +2946,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;
 					}
@@ -2796,7 +2955,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;
 					}
@@ -2804,7 +2964,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;
 					}
@@ -2822,7 +2983,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
@@ -2834,7 +2996,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
@@ -2846,7 +3009,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
@@ -2858,7 +3022,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 
@@ -2870,7 +3035,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
@@ -2882,7 +3048,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
@@ -2902,7 +3069,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
@@ -2914,7 +3082,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
@@ -2926,7 +3095,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
@@ -2938,7 +3108,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
@@ -2950,7 +3121,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
@@ -2962,7 +3134,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
@@ -2982,7 +3155,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
@@ -2994,7 +3168,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
@@ -3006,7 +3181,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
@@ -3018,7 +3194,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 
@@ -3029,7 +3206,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
@@ -3040,7 +3218,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
@@ -3059,7 +3238,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
@@ -3070,7 +3250,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
@@ -3081,7 +3262,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
@@ -3092,7 +3274,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
@@ -3103,7 +3286,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
@@ -3114,7 +3298,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
@@ -3133,7 +3318,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
@@ -3144,7 +3330,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
@@ -3155,7 +3342,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
@@ -3166,7 +3354,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 
@@ -3177,7 +3366,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
@@ -3188,7 +3378,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
@@ -3215,7 +3406,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;
 
@@ -3256,7 +3448,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;
 
@@ -3301,7 +3494,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
@@ -3338,7 +3532,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
@@ -3385,7 +3580,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;
 						
@@ -3429,7 +3625,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;
 						
@@ -3481,7 +3678,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
@@ -3542,7 +3740,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
@@ -3596,7 +3795,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
@@ -3619,7 +3819,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
@@ -3652,7 +3853,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;
 										
@@ -3676,7 +3878,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;
 							
@@ -3709,7 +3912,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;
@@ -3735,7 +3939,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;
@@ -3768,7 +3973,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;
@@ -3783,7 +3989,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;
@@ -3808,7 +4015,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;
 
@@ -3839,7 +4047,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;
 
@@ -3869,7 +4078,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;
 	
@@ -3898,7 +4108,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;
 
@@ -3928,7 +4139,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;
 
@@ -3959,7 +4171,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;
 
@@ -3990,7 +4203,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;
 
@@ -4021,7 +4235,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;
 
@@ -4052,7 +4267,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;
 
@@ -4083,7 +4299,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;
 
@@ -4114,7 +4331,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;
 
@@ -4145,7 +4363,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;
 
@@ -4176,7 +4395,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;
 
@@ -4207,7 +4427,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;
 
@@ -4238,7 +4459,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;
 
@@ -4269,7 +4491,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;
 
@@ -4305,7 +4528,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
@@ -4341,7 +4565,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;
 						
@@ -4381,7 +4606,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;
@@ -4415,7 +4641,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
@@ -4450,7 +4677,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
@@ -4485,7 +4713,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;
@@ -4519,7 +4748,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;
@@ -4553,7 +4783,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;
@@ -4587,7 +4818,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;
@@ -4621,7 +4853,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;
@@ -4655,7 +4888,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;
@@ -4689,7 +4923,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;
@@ -4723,7 +4958,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;
@@ -4757,7 +4993,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;
@@ -4832,7 +5069,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
@@ -4867,7 +5105,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
@@ -4910,7 +5149,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;
@@ -4919,7 +5159,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;
@@ -4936,7 +5177,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;
@@ -4945,7 +5187,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;
@@ -4962,7 +5205,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());
 											  	  	
@@ -5033,7 +5277,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;
@@ -5042,7 +5287,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;
@@ -5051,7 +5297,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;
@@ -5060,7 +5307,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;
@@ -5076,7 +5324,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;
@@ -5093,7 +5342,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());
 											  	  	
@@ -5162,7 +5412,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());
 											  	  	
@@ -5232,7 +5483,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());
 													  	  	
@@ -5301,7 +5553,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());
 														  	  	
@@ -5377,7 +5630,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());
 														  	  	
@@ -5458,7 +5712,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());
 														  	  	
@@ -5530,7 +5785,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());
 														  	  	
@@ -5603,7 +5859,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());
 														  	  	
@@ -5680,7 +5937,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());
 														  	  	
@@ -5759,7 +6017,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());
 														  	  	
@@ -5837,7 +6096,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());
 														  	  	
@@ -5912,7 +6172,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());
 														  	  	
@@ -5986,7 +6247,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());
 														  	  	
@@ -6074,7 +6336,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());
 														  	  	
@@ -6145,7 +6408,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());
 														  	  	
@@ -6230,7 +6494,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());
 											  	  	
@@ -6306,7 +6571,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());
 												  	  	
@@ -6382,7 +6648,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());
 												  	  	
@@ -6469,7 +6736,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());
 												  	  	
@@ -6557,7 +6825,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());
 													  	  	
@@ -6641,7 +6910,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());
 													  	  	
@@ -6737,7 +7007,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());
 													  	  	
@@ -6825,7 +7096,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());
 													  	  	
@@ -6909,7 +7181,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());
 													  	  	
@@ -6985,7 +7258,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());
 													  	  	
@@ -7065,7 +7339,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());
 													  	  	
@@ -7157,7 +7432,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());
 													  	  	
@@ -7241,7 +7517,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());
 													  	  	
@@ -7353,7 +7630,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 := {f_getAnnouncementTargetPoA()};
                   
 						v_ae1.start(f_CSE_ANNC_001(int1, v_createRequestAnnc, omit, v_updateRequest));//AccessControlPolicy
@@ -7366,7 +7644,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 := {f_getAnnouncementTargetPoA()};
   
 						v_ae1.start(f_CSE_ANNC_001(int1, v_createRequestAnnc, v_createRequest, omit));//AccessControlPolicy
@@ -7379,7 +7658,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 := {f_getAnnouncementTargetPoA()};
   
 						v_ae1.start(f_CSE_ANNC_001(int3, v_createRequestAnnc, omit, v_updateRequest));//Container
@@ -7392,7 +7672,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 := {f_getAnnouncementTargetPoA()};
   
 						v_ae1.start(f_CSE_ANNC_001(int3, v_createRequestAnnc, v_createRequest, omit));//Container
@@ -7405,7 +7686,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 := {f_getAnnouncementTargetPoA()};
   
 						v_ae1.start(f_CSE_ANNC_001(int9, v_createRequestAnnc, omit, v_updateRequest));//Group
@@ -7418,7 +7700,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 := {f_getAnnouncementTargetPoA()};
   
 						v_ae1.start(f_CSE_ANNC_001(int9, v_createRequestAnnc, v_createRequest, omit));//Group
@@ -7431,7 +7714,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 := {f_getAnnouncementTargetPoA()};
   
 						v_ae1.start(f_CSE_ANNC_001(int4, v_createRequestAnnc, v_createRequest, omit));//ContentInstance
-- 
GitLab