diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 8b83ce1cc91220505da93b035638aa8864b50bb6..99d366efea2c6be403b1d49c664130d5b9be491f 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -2918,11 +2918,11 @@ module OneM2M_Functions {
 						v_modifiedResource := f_generateLocalResource(v_rp.primitiveContent, v_parentIndex, v_rp.resourceType);
 						v_resourceIndex := f_setLocalResource(v_modifiedResource, int2, v_parentIndex);
 						if(v_resourceIndex != -1) {
-							mcaPortIn.send(m_response(m_responsePrimitive_content(int2001, v_rp.requestIdentifier, v_modifiedResource)));
+							mcaPortIn.send(f_getMsgOutPrimitive(m_response(m_responsePrimitive_content(int2001, v_rp.requestIdentifier, v_modifiedResource))));
 							setverdict(pass, __SCOPE__&":INFO: Polling Channel created successfuly");
 						}
 						else {
-							mcaPortIn.send(m_response(m_responsePrimitive(int5000, v_request.primitive.requestPrimitive.requestIdentifier)));
+							mcaPortIn.send(f_getMsgOutPrimitive(m_response(m_responsePrimitive(int5000, v_request.primitive.requestPrimitive.requestIdentifier))));
 							setverdict(inconc, __SCOPE__&":INFO: Polling Channel creation failed");
 						}					
 					}
diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index 847fe7c1825440f6407ffa5f742385220f2c021a..24f5f5dc3d566bd366f2753a35e552c6eb27c828 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -2336,7 +2336,7 @@ module OneM2M_PermutationFunctions {
 						// Test Body
 						v_request := f_getCreateRequestPrimitive(p_resourceTypeChild, p_requestPrimitiveChild2, v_parentIndex);	////Child2
 
-						mcaPort.send(m_request(v_request));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
@@ -2398,7 +2398,7 @@ module OneM2M_PermutationFunctions {
 	
 						v_request := f_getCreateRequestPrimitive(p_resourceTypeChild, p_requestPrimitiveChild2, v_parentIndex);	//Child2
 	
-						mcaPort.send(m_request(v_request));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
@@ -2547,7 +2547,7 @@ module OneM2M_PermutationFunctions {
 						// Test Body
 						v_request := f_getCreateRequestPrimitive(p_resourceTypeChild, p_requestPrimitiveChild, v_parentIndex);
 	
-						mcaPort.send(m_request(v_request));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int5207))) -> value v_response {
@@ -4861,7 +4861,7 @@ module OneM2M_PermutationFunctions {
 						
 						f_cse_updateResource(p_resourceType, v_resourceIndex, p_updateRequestPrimitive);
 					
-						mcaPort.send(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)))));
 					
 						tc_ac.start;
 						alt {
@@ -4912,7 +4912,7 @@ module OneM2M_PermutationFunctions {
 						//Test Body
 						v_request := f_getUpdateRequestPrimitive(p_resourceTypeChild, v_childIndex, p_updateRequestPrimitive);
 
-						mcaPort.send(m_request(v_request));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) -> value v_response {
@@ -5195,6 +5195,7 @@ module OneM2M_PermutationFunctions {
 					var ResponsePrimitive v_responsePrimitive;
 					var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
 			
+					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 					v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
 		   
 					//Test control
@@ -5261,6 +5262,7 @@ module OneM2M_PermutationFunctions {
 					var ResponsePrimitive v_responsePrimitive;
 					var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
 
+					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 					v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
    
 					//Test control
@@ -5297,7 +5299,7 @@ module OneM2M_PermutationFunctions {
 							v_responsePrimitive := valueof(m_responsePrimitive(int2004,v_request.primitive.requestPrimitive.requestIdentifier));
 							v_responsePrimitive.from_ := PX_CSE1_ID;
 							v_responsePrimitive.to_ := v_request.primitive.requestPrimitive.from_;
-							mccPortIn.send(m_response(v_responsePrimitive));			
+							mccPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));			
 						}
 						[] tc_ac.timeout {
 							setverdict(fail, __SCOPE__ & ":ERROR:  No announcement received");
@@ -5565,7 +5567,7 @@ module OneM2M_PermutationFunctions {
 						v_childResourceIndex := f_cse_createResource(p_resourceTypeChild, p_requestPrimitiveChild, v_resourceIndex); 
 				
 						// Test Body
-						mcaPort.send(m_request(m_delete(f_getResourceAddress(v_childResourceIndex), f_getOriginator(v_childResourceIndex))));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(m_delete(f_getResourceAddress(v_childResourceIndex), f_getOriginator(v_childResourceIndex)))));
 					
 						tc_ac.start;
 						alt {
@@ -6249,7 +6251,7 @@ module OneM2M_PermutationFunctions {
 					v_request := f_getCreateRequestPrimitive(int23, v_createSubscriptionRequest, v_childResourceIndex);//Subscription under child
 	
 					// Test Body
-					mcaPort.send(m_request(v_request));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int5203))) -> value v_response {
@@ -8794,7 +8796,7 @@ module OneM2M_PermutationFunctions {
 				v_resourceIndex := f_cse_createResource(int15, m_createPollingChannelBase, v_aeIndex);
 	
 				v_request := valueof(m_retrievePollingRequest(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
-				mcaPort.send(m_request(v_request));
+				mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 	
 				v_requestNotify := valueof(m_notify(f_getResourceAddress(v_aeIndex)));
 	
@@ -8858,7 +8860,7 @@ module OneM2M_PermutationFunctions {
 				vc_cse1.start(f_cse_notifyProcedure_notify(v_requestNotify));
 	
 				v_request := valueof(m_retrievePollingRequest(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
-				mcaPort.send(m_request(v_request));
+				mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 					
 				tc_ac.start;
 				alt {
@@ -8915,7 +8917,7 @@ module OneM2M_PermutationFunctions {
 				 v_resourceIndex := f_cse_createResource(int15, m_createPollingChannelBase, v_aeIndex);
 	 
 				v_request := valueof(m_retrievePollingRequest(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
-				mcaPort.send(m_request(v_request));
+				mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 	
 				v_requestNotify := valueof(m_notify(f_getResourceAddress(v_aeIndex)));
 				vc_cse1.start(f_cse_notifyProcedure_notify(v_requestNotify));
@@ -8943,7 +8945,7 @@ module OneM2M_PermutationFunctions {
 					}
 				 }
 	 
-				mcaPort.send(m_request(v_requestNotify));
+				mcaPort.send(f_getMsgOutPrimitive(m_request(v_requestNotify)));
 	
 				//Postamble
 				f_cse_postamble_deleteResources();
@@ -8998,7 +9000,7 @@ module OneM2M_PermutationFunctions {
 						//Put in the primitiveContent a Notify request (req2) (simulated) from another node CSE
 						v_request_req2 := valueof(m_notify(f_getResourceAddress(vc_remoteCseIndex)));
 						v_response_rsp1.primitiveContent := { requestPrimitive := v_request_req2 };
-						mccPortIn.send(m_response(v_response_rsp1));
+						mccPortIn.send(f_getMsgOutPrimitive(m_response(v_response_rsp1)));
 				   }
 				   [] tc_ac.timeout {
 					   setverdict(inconc, __SCOPE__&":INFO: No request received for creating resource type Polling Channel");
@@ -9054,7 +9056,7 @@ module OneM2M_PermutationFunctions {
 				p_aeIndex2 := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);//c_CRDNDi);
 	
 				//v_resourceIndex := f_cse_createResource(int15, m_createPollingChannelBase, v_aeIndex);
-				mcaPort.send(m_request(p_requestprimitive));
+				mcaPort.send(f_getMsgOutPrimitive(m_request(p_requestprimitive)));
 				tc_ac.start;
 				alt {
 					[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) {
@@ -9096,7 +9098,7 @@ module OneM2M_PermutationFunctions {
 				 v_requestNotify := valueof(m_notify(f_getResourceAddress(v_aeIndex)));	
 				 v_request.from_ := PX_CSE1_ID;
 
-				 mccPort.send(m_request(v_request));
+				 mccPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 				 tc_ac.start;
 				 alt {
 					 [] mccPort.receive(mw_response(mw_responsePrimitive(int4108))) -> value vc_response {
diff --git a/OneM2M_Testcases_CSE_Release_2.ttcn b/OneM2M_Testcases_CSE_Release_2.ttcn
index 427f40c40946ba867ec73f03cf71afbd5562effb..c6845d73311f16fe2f3c6588ae48137c9cd20fdc 100644
--- a/OneM2M_Testcases_CSE_Release_2.ttcn
+++ b/OneM2M_Testcases_CSE_Release_2.ttcn
@@ -286,7 +286,7 @@ 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);
+						 f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						 v_createRequest.primitiveContent.aE.nodeLink := "http://127.0.0.1/";
 
 						 v_contentResponse.aE := mw_contentAeBase;
@@ -509,6 +509,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var RequestPrimitive v_createAEAnnc := m_createAEAnnc(omit, omit, omit, PX_CSE1_ID);
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 	
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_createRequest.primitiveContent.timeSeries.resourceName := omit;
 						v_cse1.start(f_CSE_DMR_CRE_001_cseSimu(int23, v_createRequest, int10002, v_createAEAnnc));//Subscription
 						v_cse1.done;	 
@@ -527,6 +528,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var RequestPrimitive v_createAEAnnc := m_createAEAnnc(omit, omit, omit, PX_CSE1_ID);
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_createRequest.primitiveContent.container.resourceName := omit;
 						v_cse1.start(f_CSE_DMR_CRE_001_cseSimu(int3, v_createRequest, int10002, v_createAEAnnc));//Container
 						v_cse1.done;	 
@@ -546,6 +548,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var RequestPrimitive v_createAEAnnc := m_createAEAnnc(omit, omit, omit, PX_CSE1_ID);
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_createRequest.primitiveContent.group_.resourceName := omit;
 						v_cse1.start(f_CSE_DMR_CRE_001_cseSimu(int9, v_createRequest, int10002, v_createAEAnnc));//Group
 						v_cse1.done;
@@ -564,6 +567,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var RequestPrimitive v_createAEAnnc := m_createAEAnnc(omit, omit, omit, PX_CSE1_ID);
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_createRequest.primitiveContent.accessControlPolicy.resourceName := omit;
 						v_cse1.start(f_CSE_DMR_CRE_001_cseSimu(int1, v_createRequest, int10002, v_createAEAnnc));//Access Control Policy
 						v_cse1.done;
@@ -733,6 +737,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;	
 	
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.timeSeries.resourceName := omit;
 
 						v_ae1.start(f_CSE_DMR_CRE_001(int29, v_createRequest, m_createAeAux(omit,omit)));//TimeSeries
@@ -752,6 +757,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ResponsePrimitive v_responsePrimitive;
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 	
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_createRequest.primitiveContent.timeSeries.resourceName := omit;
 						v_cse1.start(f_CSE_DMR_CRE_001_cseSimu(int29, v_createRequest, -, -));//TimeSeries
 						v_cse1.done;	 
@@ -770,6 +776,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var RequestPrimitive v_createAEAnnc := m_createAEAnnc(omit, omit, omit, PX_CSE1_ID);
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_createRequest.primitiveContent.timeSeries.resourceName := omit;
 						v_cse1.start(f_CSE_DMR_CRE_001_cseSimu(int29, v_createRequest, int10002, v_createAEAnnc));//TimeSeries
 						v_cse1.done;
@@ -787,6 +794,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 	
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.timeSeriesInstance.resourceName := omit;
 						v_ae1.start(f_CSE_DMR_CRE_001(int30, v_createRequest, m_createTimeSeriesBase));//TimeSeriesInstance
 						v_ae1.done;	 
@@ -856,6 +864,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_ae1.start(f_CSE_DMR_CRE_002(int29, m_createTimeSeriesBase));//TimeSeries
 						v_ae1.done;	 
 							
@@ -899,6 +908,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_CRE_003_TS() runs on Tester system CseSystem {
 						// Local variables    
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 						v_ae1.start(f_CSE_DMR_CRE_003(int29, m_createTimeSeriesBase));//TimeSeries
 						v_ae1.done;
@@ -937,6 +947,7 @@ module OneM2M_Testcases_CSE_Release_2 {
     
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_ae1.start(f_CSE_DMR_CRE_004(int29, m_createTimeSeriesBase));//TimeSeries
 						v_ae1.done;
 					}
@@ -955,6 +966,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 		
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_ae1.start(f_CSE_DMR_CRE_006(int3, v_createRequest));		
 						v_ae1.done;		 
 														
@@ -971,6 +983,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 		
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_ae1.start(f_CSE_DMR_CRE_006(int3, v_createRequest));
 						v_ae1.done;
 																				
@@ -988,6 +1001,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 								
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_ae1.start(f_CSE_DMR_CRE_006(int3, v_createRequest));
 						v_ae1.done;		 
 														
@@ -1004,6 +1018,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_ae1.start(f_CSE_DMR_CRE_006(int29, v_createRequest));		
 						v_ae1.done;		 
 									
@@ -1020,6 +1035,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_ae1.start(f_CSE_DMR_CRE_006(int29, v_createRequest));
 						v_ae1.done;
 															
@@ -1037,6 +1053,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 			
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_ae1.start(f_CSE_DMR_CRE_006(int29, v_createRequest));
 						v_ae1.done;		 
 									
@@ -1063,6 +1080,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						const integer c_maxNumberOfInstances := 1;	
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequestContainer.primitiveContent.container.maxNrOfInstances := c_maxNumberOfInstances;
 						v_createRequestContentInstance2.primitiveContent.contentInstance.resourceName := c_defaultContentInstanceResourceName & "2";	//Resource 2
 
@@ -1078,6 +1096,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						const integer c_maxNumberOfInstances := 1;	
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequestTimeSeries.primitiveContent.timeSeries.maxNrOfInstances := c_maxNumberOfInstances;
 						v_createRequestTimeSeriesInstance2.primitiveContent.timeSeriesInstance.resourceName := c_defaultTimeSeriesInstanceResourceName & "2";	//Resource 2
 
@@ -1103,6 +1122,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						const XSD.String c_primitiveContent2 := "Content2";		
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 		
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequestContainer.primitiveContent.container.maxByteSize := c_maxByteSize;
 						v_createRequestContentInstance1.primitiveContent.contentInstance.content := c_primitiveContent1;	//ContentInstance 1
 						v_createRequestContentInstance2.primitiveContent.contentInstance.content := c_primitiveContent2;	//ContentInstance 2
@@ -1122,6 +1142,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						const XSD.String c_primitiveContent2 := "Content2";		
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequestTimeSeries.primitiveContent.container.maxByteSize := c_maxByteSize;
 						v_createRequestTimeSeriesInstance1.primitiveContent.timeSeriesInstance.content := c_primitiveContent1;	//ContentInstance 1
 						v_createRequestTimeSeriesInstance2.primitiveContent.timeSeriesInstance.content := c_primitiveContent2;	//ContentInstance 2
@@ -1141,10 +1162,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 					 */
 					testcase TC_CSE_DMR_CRE_012_CNT_ET() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						const AttributeList c_optionalAttribute := {"expirationTime"};
+						
 						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.container.expirationTime := "20301231T012345";
 						
@@ -1155,10 +1176,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_CRE_012_CIN_ET() runs on Tester system CseSystem {//TODO
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
 						const AttributeList c_optionalAttribute := {"expirationTime"};
+						
 						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.contentInstance.expirationTime := "20301231T012345";
 						
@@ -1168,10 +1189,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_CRE_012_CIN_OR() runs on Tester system CseSystem {//TODO
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-					
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;					
 						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
 						const AttributeList c_optionalAttribute := {"ontologyRef"};
+						
 						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.contentInstance.ontologyRef := "MyOntologyRef";
 						
@@ -1182,10 +1203,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_CRE_012_ACP_ET() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createAcpBase;
 						const AttributeList c_optionalAttribute := {"expirationTime"};
+						
 						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.accessControlPolicy.expirationTime := "20301231T012345";
 						
@@ -1196,10 +1217,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_CRE_012_SUB_ET() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"expirationTime"};
+						
 						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.subscription.expirationTime := "20301231T012345";
 						
@@ -1210,10 +1231,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_CRE_012_SUB_ENC() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"eventNotificationCriteria"};
+						
 						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.subscription.eventNotificationCriteria := valueof(m_eventNotificationCriteria({int1}, -));
 						
@@ -1224,10 +1245,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_CRE_012_SUB_EXC() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"expirationCounter"};
+						
 						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.subscription.expirationCounter := 1;
 						
@@ -1238,10 +1259,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_CRE_012_SUB_GPI() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"groupID"};
+						
 						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.subscription.groupID := "MyGroupID";
 						
@@ -1252,10 +1273,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_CRE_012_SUB_NFU() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"notificationForwardingURI"};
+						
 						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.subscription.notificationForwardingURI := "MyForwardingURI";
 						
@@ -1266,10 +1287,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_CRE_012_SUB_BN() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"batchNotify"};
+						
 						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.subscription.batchNotify := {0, "PT1S"};
 						
@@ -1279,10 +1300,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_CRE_012_SUB_RL() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"rateLimit"};
+						
 						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.subscription.rateLimit := {0, omit};
 						
@@ -1293,10 +1314,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_CRE_012_SUB_PSN() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"preSubscriptionNotify"};
+						
 						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.subscription.preSubscriptionNotify := 1;
 						
@@ -1307,10 +1328,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_CRE_012_SUB_PN() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"pendingNotification"};
+						
 						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.subscription.pendingNotification := int1;
 						
@@ -1320,10 +1341,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_CRE_012_SUB_NSP() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"notificationStoragePriority"};
+						
 						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.subscription.notificationStoragePriority := 1;
 						
@@ -1334,10 +1355,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_CRE_012_SUB_LN() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"latestNotify"};
+						
 						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.subscription.latestNotify := true;
 						
@@ -1348,10 +1369,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_CRE_012_SUB_NCT() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"notificationContentType"};
+						
 						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.subscription.notificationContentType := int1;
 						
@@ -1362,10 +1383,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_CRE_012_SUB_NEC() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"notificationEventCat"};
+						
 						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.subscription.notificationEventCat := {alt_1 := 100};
 						
@@ -1376,10 +1397,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_CRE_012_SUB_SU() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"subscriberURI"};
+						
 						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.subscription.subscriberURI := "NotInitialized";
 						
@@ -1394,6 +1415,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						const AttributeList c_optionalAttribute := {"accessControlPolicyIDs"};
 	
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.timeSeries.accessControlPolicyIDs := {"NotInitialized"};
 	
 						v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, c_optionalAttribute));			
@@ -1406,6 +1428,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						const AttributeList c_optionalAttribute := {"expirationTime"};
 	
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.timeSeries.expirationTime := "20301231T012345";
 	
 						v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, c_optionalAttribute));
@@ -1419,6 +1442,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						const AttributeList c_optionalAttribute := {"labels"};
 	
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.timeSeries.labels := {"MyLabel"};
 	
 						v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, c_optionalAttribute));
@@ -1432,6 +1456,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						var AttributeList v_optionalAttribute := {"creator"};
 	
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.timeSeries.creator := "NullValue";
 	
 						v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, v_optionalAttribute));
@@ -1445,6 +1470,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						const AttributeList c_optionalAttribute := {"maxNrOfInstances"};
 	
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.timeSeries.maxNrOfInstances := 0;
 	
 						v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, c_optionalAttribute));
@@ -1458,6 +1484,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						const AttributeList c_optionalAttribute := {"maxByteSize"};
 	
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.timeSeries.maxByteSize := 0;
 	
 						v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, c_optionalAttribute));
@@ -1471,6 +1498,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						const AttributeList c_optionalAttribute := {"maxInstanceAge"};
 	
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.timeSeries.maxInstanceAge := 0;
 	
 						v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, c_optionalAttribute));
@@ -1484,6 +1512,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						const AttributeList c_optionalAttribute := {"periodicInterval"};
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.timeSeries.periodicInterval := 0;
 
 						v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, c_optionalAttribute));
@@ -1497,6 +1526,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						const AttributeList c_optionalAttribute := {"missingDataDetect"};
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.timeSeries.missingDataDetect := true;
 
 						v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, c_optionalAttribute));
@@ -1510,6 +1540,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						const AttributeList c_optionalAttribute := {"missingDataMaxNr"};
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.timeSeries.missingDataMaxNr := 0;
 
 						v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, c_optionalAttribute));
@@ -1523,6 +1554,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						const AttributeList c_optionalAttribute := {"missingDataDetectTimer"};
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.timeSeries.missingDataDetectTimer := 0;
 
 						v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, c_optionalAttribute));
@@ -1536,6 +1568,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						const AttributeList c_optionalAttribute := {"ontologyRef"};
 	
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.timeSeries.ontologyRef := "MyOntologyRef";
 	
 						v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, c_optionalAttribute));
@@ -1549,6 +1582,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
 						const AttributeList c_optionalAttribute := {"expirationTime"};
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.timeSeriesInstance.expirationTime := "20301231T012345";
 
 						v_ae1.start(f_CSE_DMR_CRE_012(int30, v_createRequest, c_optionalAttribute));
@@ -1562,6 +1596,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
 						const AttributeList c_optionalAttribute := {"labels"};
 	
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.timeSeriesInstance.labels := {"MyLabel"};
 	
 						v_ae1.start(f_CSE_DMR_CRE_012(int30, v_createRequest, c_optionalAttribute));
@@ -1575,6 +1610,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
 						const AttributeList c_optionalAttribute := {"labels"};
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.timeSeriesInstance.sequenceNr := 0;
 
 						v_ae1.start(f_CSE_DMR_CRE_012(int30, v_createRequest, c_optionalAttribute));
@@ -1597,6 +1633,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						const integer c_maxByteSize := 1;		
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 		
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequestContainer.primitiveContent.container.maxByteSize := c_maxByteSize;
 
 						v_ae1.start(f_CSE_DMR_CRE_013(int3, v_createRequestContainer, int4, v_createRequestContentInstance));//ContentInstance under Container
@@ -1610,6 +1647,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						const integer c_maxByteSize := 1;		
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequestTimeSeries.primitiveContent.timeSeries.maxByteSize := c_maxByteSize;
 
 						v_ae1.start(f_CSE_DMR_CRE_013(int29, v_createRequestTimeSeries, int30, v_createRequestTimeSeriesInstance));//TimeSeriesInstance under TimeSeries
@@ -1632,6 +1670,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						const integer c_maxByteSize := 512;	
 		
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_parentResourceRequest.primitiveContent.timeSeries.maxByteSize := c_maxByteSize;
 		
 						v_ae1.start(f_CSE_DMR_CRE_014(int29, v_parentResourceRequest, int30, v_childResourceRequest));		
@@ -1882,6 +1921,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template PrimitiveContent v_contentResponse;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.resource := mw_contentTimeSeries_rc3;
 
 						v_ae1.start(f_CSE_DMR_CRE_017(int29, m_createTimeSeriesBase, v_contentResponse));//TimeSeries
@@ -1898,6 +1938,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ResponsePrimitive v_responsePrimitive;
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 	
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_createRequest.primitiveContent.containerAnnc.resourceName := omit;
 						v_cse1.start(f_CSE_DMR_CRE_019(int10003, v_createRequest));//ContainerAnnc
 						v_cse1.done;
@@ -1915,6 +1956,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ResponsePrimitive v_responsePrimitive;
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_createRequest.primitiveContent.groupAnnc.resourceName := omit;
 						v_cse1.start(f_CSE_DMR_CRE_019(int10009, v_createRequest));//GroupAnnc
 						v_cse1.done;
@@ -1932,6 +1974,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ResponsePrimitive v_responsePrimitive;
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_createRequest.primitiveContent.accessControlPolicyAnnc.resourceName := omit;
 						v_cse1.start(f_CSE_DMR_CRE_019(int10001, v_createRequest));//AccessControlPolicyAnnc
 						v_cse1.done;
@@ -1949,6 +1992,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ResponsePrimitive v_responsePrimitive;
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_createRequest.primitiveContent.timeSeriesAnnc.resourceName := omit;
 						v_cse1.start(f_CSE_DMR_CRE_019(int10029, v_createRequest));//TimeSeriesAnnc
 						v_cse1.done;
@@ -1970,9 +2014,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 					 */
 					testcase TC_CSE_DMR_CRE_020_ACP() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createAcpBase;
+						
 						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.accessControlPolicy.announceTo := {f_getAnnouncementTargetPoA()};
 						                    
@@ -1982,9 +2026,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 
 					testcase TC_CSE_DMR_CRE_020_CNT() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
+						
 						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.container.announceTo := {f_getAnnouncementTargetPoA()};
 					
@@ -1996,6 +2040,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
+						
 						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.contentInstance.announceTo := {f_getAnnouncementTargetPoA()};
 						
@@ -2005,9 +2050,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 				
 					testcase TC_CSE_DMR_CRE_020_GRP() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
+						
 						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.group_.announceTo := {f_getAnnouncementTargetPoA()};
 						
@@ -2017,9 +2062,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_CRE_020_LCP() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createLocationPolicy(int1, omit, omit, omit, omit);
+						
 						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.locationPolicy.announceTo := {f_getAnnouncementTargetPoA()};
 						
@@ -2029,9 +2074,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_CRE_020_MGO() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createMgmtObjBase;
+						
 						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.mgmtResource.announceTo := {f_getAnnouncementTargetPoA()};
 
@@ -2041,9 +2086,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_CRE_020_NOD() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createNodeBase;
+						
 						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.node.announceTo := {f_getAnnouncementTargetPoA()};
 						
@@ -2053,9 +2098,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_CRE_020_SCH() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createScheduleBase;
+						
 						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.schedule.announceTo := {f_getAnnouncementTargetPoA()};
 
@@ -2068,6 +2113,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 	
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.timeSeries.announceTo := {f_getAnnouncementTargetPoA()};
 	
 						v_ae1.start(f_CSE_DMR_CRE_020(int29, v_createRequest, mw_createTimeSeriesAnncBase));//TimeSeries
@@ -2079,6 +2125,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.timeSeriesInstance.announceTo := {f_getAnnouncementTargetPoA()};
 
 						v_ae1.start(f_CSE_DMR_CRE_020(int30, v_createRequest, mw_createTimeSeriesInstanceAnncBase));//TimeSeriesInstance
@@ -2095,11 +2142,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 					 */
 					testcase TC_CSE_DMR_CRE_021_CNT() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var RequestPrimitive v_requestPrimitive;
 						var XSD.NonNegativeInteger v_maxByteSize := 512;
+						
 						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.container.maxByteSize := v_maxByteSize;						
@@ -2125,11 +2172,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 	
 					testcase TC_CSE_DMR_CRE_021_CIN() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
 						var RequestPrimitive v_requestPrimitive;
-						var XSD.NonNegativeInteger v_contentSize := 512;			
+						var XSD.NonNegativeInteger v_contentSize := 512;	
+						
 						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.contentInstance.contentSize := v_contentSize;						
@@ -2155,11 +2202,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 
 					testcase TC_CSE_DMR_CRE_021_GRP() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
 						var RequestPrimitive v_requestPrimitive;
-						var XSD.PositiveInteger v_maxNrOfMembers := 10;						
+						var XSD.PositiveInteger v_maxNrOfMembers := 10;			
+						
 						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.group_.maxNrOfMembers := v_maxNrOfMembers;
@@ -2185,11 +2232,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 	
 					testcase TC_CSE_DMR_CRE_021_LCP() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createLocationPolicy(int1, omit, omit, omit, omit);
 						var RequestPrimitive v_requestPrimitive;
 						var LocationSource v_locationSource := int1;//Network-based
+						
 						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.locationPolicy.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.locationPolicy.locationSource := v_locationSource;
@@ -2215,11 +2262,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 	
 					testcase TC_CSE_DMR_CRE_021_MGO() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createMgmtObjBase;
 						var RequestPrimitive v_requestPrimitive;
 						var XSD.String description := "Description of mgmtObj";
+						
 						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.mgmtResource.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.mgmtResource.description := description;			
@@ -2245,10 +2292,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 	
 					testcase TC_CSE_DMR_CRE_021_NOD() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createNodeBase;
 						var RequestPrimitive v_requestPrimitive;
+						
 						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.node.announceTo := {f_getAnnouncementTargetPoA()};
 						
@@ -2260,11 +2307,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 	
 					testcase TC_CSE_DMR_CRE_021_SCH() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template RequestPrimitive v_createRequest := m_createScheduleBase;
 						var RequestPrimitive v_requestPrimitive;
 						var ScheduleEntries v_scheduleElement := {{"0 0 0,1,2 1 1 * *"}};
+						
 						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.schedule.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.schedule.scheduleElement := v_scheduleElement;
@@ -2295,6 +2342,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var RequestPrimitive v_requestPrimitive;
 						var XSD.NonNegativeInteger v_maxByteSize := 512;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize;						
 						v_createRequest.primitiveContent.timeSeries.announcedAttribute := {"mbs"};
@@ -2324,6 +2372,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var RequestPrimitive v_requestPrimitive;
 						var XSD.NonNegativeInteger v_sequenceNr := 8;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.timeSeriesInstance.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.timeSeriesInstance.sequenceNr := v_sequenceNr;						
 						v_createRequest.primitiveContent.timeSeriesInstance.announcedAttribute := {"snr"};
@@ -2360,10 +2409,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 					 */
 					testcase TC_CSE_DMR_RET_001_SCH() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var ResponsePrimitive v_responsePrimitive;
 						var template PrimitiveContent v_contentResponse;
+						
 						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.schedule := mw_contentSchedule_rc1;
 						
@@ -2374,10 +2423,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_RET_001_PCH() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var ResponsePrimitive v_responsePrimitive;
 						var template PrimitiveContent v_contentResponse;
+						
 						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.pollingChannel := mw_contentPollingChannelBase;
 						
@@ -2392,6 +2441,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ResponsePrimitive v_responsePrimitive;
 						var template PrimitiveContent v_contentResponse;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.timeSeries := mw_contentTimeSeries_rc1;
 
 						v_ae1.start(f_CSE_DMR_RET_001(int29, m_createTimeSeriesBase, v_contentResponse));//TimeSeries
@@ -2487,8 +2537,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);
-	
+						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);	
 						v_ae1.start(f_CSE_DMR_RET_003(int18, m_createScheduleBase));//Schedule
 						v_ae1.done;
 					}
@@ -2496,8 +2546,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);
-	
+						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);	
 						v_ae1.start(f_CSE_DMR_RET_003(int15, m_createPollingChannelBase));//PollingChannel
 						v_ae1.done;
 					}
@@ -2506,6 +2556,7 @@ 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_CSE_DMR_RET_003(int29, m_createTimeSeriesBase));//TimeSeries
 						v_ae1.done;
 					}
@@ -2520,9 +2571,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 					 */
 					testcase TC_CSE_DMR_RET_004_CNT() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template PrimitiveContent v_contentResponse;
+						
 						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.container := m_contentContainer_allOmit;
 						v_contentResponse.container.parentID := ?;
@@ -2533,9 +2584,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 
 					testcase TC_CSE_DMR_RET_004_GRP() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template PrimitiveContent v_contentResponse;
+						
 						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.group_ := m_contentGroup_allOmit;
 						v_contentResponse.group_.parentID := ?;
@@ -2546,9 +2597,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_RET_004_ACP() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template PrimitiveContent v_contentResponse;
+						
 						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.accessControlPolicy := m_contentAcp_allOmit;
 						v_contentResponse.accessControlPolicy.parentID := ?;
@@ -2561,8 +2612,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);
-					
+						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);					
 						v_contentResponse.schedule := m_contentSchedule_allOmit;
 						v_contentResponse.schedule.parentID := ?;
 							
@@ -2574,8 +2625,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);
-					
+						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);					
 						v_contentResponse.pollingChannel := m_contentPollingChannel_allOmit;
 						v_contentResponse.pollingChannel.parentID := ?;
 							
@@ -2587,8 +2638,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);
-					
+						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);					
 						v_contentResponse.subscription := m_contentSubscription_allOmit;
 						v_contentResponse.subscription.parentID := ?;
 							
@@ -2601,6 +2652,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template PrimitiveContent v_contentResponse;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.timeSeries := m_contentTimeSeries_allOmit;
 						v_contentResponse.timeSeries.parentID := ?;
 		
@@ -2618,9 +2670,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 					 */
 					testcase TC_CSE_DMR_RET_005_CNT() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template PrimitiveContent v_contentResponse;
+						
 						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.container := m_contentContainer_allOmit;
 						v_contentResponse.container.parentID := ?;
@@ -2631,9 +2683,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 
 					testcase TC_CSE_DMR_RET_005_GRP() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template PrimitiveContent v_contentResponse;
+						
 						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.group_ := m_contentGroup_allOmit;
 						v_contentResponse.group_.parentID := ?;
@@ -2644,9 +2696,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_RET_005_ACP() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-					
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;					
 						var template PrimitiveContent v_contentResponse;
+						
 						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.accessControlPolicy := m_contentAcp_allOmit;
 						v_contentResponse.accessControlPolicy.parentID := ?;
@@ -2659,6 +2711,7 @@ 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_contentResponse.schedule := m_contentSchedule_allOmit;
 						v_contentResponse.schedule.parentID := ?;
@@ -2671,6 +2724,7 @@ 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_contentResponse.pollingChannel := m_contentPollingChannel_allOmit;
 						v_contentResponse.pollingChannel.parentID := ?;
@@ -2681,9 +2735,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_RET_005_SUB() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template PrimitiveContent v_contentResponse;
+						
 						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.subscription := m_contentSubscription_allOmit;
 						v_contentResponse.subscription.parentID := ?;
@@ -2697,6 +2751,7 @@ 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_contentResponse.timeSeries := m_contentTimeSeries_allOmit;
 						v_contentResponse.timeSeries.parentID := ?;
 			
@@ -2715,9 +2770,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 					 */
 					testcase TC_CSE_DMR_RET_006_CNT() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template PrimitiveContent v_contentResponse;
+						
 						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.container := m_contentContainer_allOmit;
 						v_contentResponse.container.parentID := ?;
@@ -2729,9 +2784,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 
 					testcase TC_CSE_DMR_RET_006_GRP() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template PrimitiveContent v_contentResponse;
+						
 						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.group_ := m_contentGroup_allOmit;
 						v_contentResponse.group_.parentID := ?;
@@ -2743,9 +2798,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_RET_006_ACP() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template PrimitiveContent v_contentResponse;
+						
 						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.accessControlPolicy := m_contentAcp_allOmit;
 						v_contentResponse.accessControlPolicy.parentID := ?;
@@ -2757,9 +2812,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 				
 					testcase TC_CSE_DMR_RET_006_SCH() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template PrimitiveContent v_contentResponse;
+						
 						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.schedule := m_contentSchedule_allOmit;
 						v_contentResponse.schedule.parentID := ?;
@@ -2771,9 +2826,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_RET_006_PCH() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-					
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;					
 						var template PrimitiveContent v_contentResponse;
+						
 						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.pollingChannel := m_contentPollingChannel_allOmit;
 						v_contentResponse.pollingChannel.parentID := ?;
@@ -2785,9 +2840,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_RET_006_SUB() runs on Tester system CseSystem {
 						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var template PrimitiveContent v_contentResponse;
+						
 						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.subscription := m_contentSubscription_allOmit;
 						v_contentResponse.subscription.parentID := ?;
@@ -2802,6 +2857,7 @@ 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_contentResponse.timeSeries := m_contentTimeSeries_allOmit;
 						v_contentResponse.timeSeries.parentID := ?;
 						v_contentResponse.timeSeries.creationTime := ?;
@@ -2822,8 +2878,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);
-                        
+						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);                        
 						v_ae1.start(f_CSE_DMR_RET_007(int3, m_createContainerBase));//Container
 						v_ae1.done;
 					}
@@ -2831,8 +2887,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);
 						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);						
 						v_ae1.start(f_CSE_DMR_RET_007(int9, m_createGroupBase));//Group
 						v_ae1.done;
 					}
@@ -2840,8 +2896,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);
-	
+						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);	
 						v_ae1.start(f_CSE_DMR_RET_007(int1, m_createAcpBase));//AccessControlPolicy
 						v_ae1.done;
 					}
@@ -2849,8 +2905,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);
-	
+						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);	
 						v_ae1.start(f_CSE_DMR_RET_007(int18, m_createScheduleBase));//Schedule
 						v_ae1.done;
 					}
@@ -2858,8 +2914,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);
-	
+						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);	
 						v_ae1.start(f_CSE_DMR_RET_007(int15, m_createPollingChannelBase));//PollingChannel
 						v_ae1.done;
 					}
@@ -2867,8 +2923,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);
-	
+						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);	
 						v_ae1.start(f_CSE_DMR_RET_007(int23, m_createSubscriptionBase));//Subscription
 						v_ae1.done;
 					}
@@ -2877,6 +2933,7 @@ 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_CSE_DMR_RET_007(int29, m_createSubscriptionBase));//TimeSeries
 						v_ae1.done;
 					}
@@ -2947,6 +3004,7 @@ 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_CSE_DMR_RET_008(int29, m_createTimeSeriesBase));//TimeSeries
 						v_ae1.done;
 					}
@@ -3109,6 +3167,7 @@ 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_contentResponse.timeSeries := mw_contentTimeSeries_rc1;
 	
 						v_ae1.start(f_CSE_DMR_RET_013(int29, m_createTimeSeriesBase, v_contentResponse));//TimeSeries
@@ -3137,6 +3196,7 @@ 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_CSE_DMR_RET_014(int29, m_createTimeSeriesBase));//TimeSeries
 						v_ae1.done;
 					}
@@ -3244,6 +3304,7 @@ 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_contentResponse.timeSeries := m_contentTimeSeries_allOmit;
 						v_contentResponse.timeSeries.parentID := ?;
 		
@@ -3354,6 +3415,7 @@ 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_contentResponse.timeSeries := m_contentTimeSeries_allOmit;
 						v_contentResponse.timeSeries.parentID := ?;
 			
@@ -3557,6 +3619,7 @@ 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_contentResponse.timeSeries := m_contentTimeSeries_allOmit;
 						v_contentResponse.timeSeries.parentID := ?;
 						v_contentResponse.timeSeries.creationTime := ?;
@@ -3640,6 +3703,7 @@ 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_CSE_DMR_RET_018(int29, m_createTimeSeriesBase));//TimeSeries
 						v_ae1.done;
 					}
@@ -3719,6 +3783,7 @@ 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_CSE_DMR_RET_019(int29, m_createTimeSeriesBase));//TimeSeries
 						v_ae1.done;
 					}
@@ -3840,6 +3905,7 @@ 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_contentResponse.timeSeries := mw_contentTimeSeries_rc1;
 
 						v_ae1.start(f_CSE_DMR_RET_021(int29, m_createTimeSeriesBase, v_contentResponse, int23, m_createSubscriptionBase));//TimeSeries
@@ -3931,6 +3997,7 @@ 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_contentResponse.timeSeries := mw_contentTimeSeries_rc4;
 
 						v_ae1.start(f_CSE_DMR_RET_022(int29, m_createTimeSeriesBase, v_contentResponse, int23, m_createSubscriptionBase));//TimeSeries
@@ -4020,6 +4087,7 @@ 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_contentResponse.timeSeries := mw_contentTimeSeries_rc5;
 
 						v_ae1.start(f_CSE_DMR_RET_023(int29, m_createTimeSeriesBase, v_contentResponse, int23, m_createSubscriptionBase));//TimeSeries
@@ -4105,6 +4173,7 @@ 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_contentResponse.timeSeries := mw_contentTimeSeries_rc6;
 
 						v_ae1.start(f_CSE_DMR_RET_024(int29, m_createTimeSeriesBase, v_contentResponse, int23, m_createSubscriptionBase));//TimeSeries
@@ -4190,6 +4259,7 @@ 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_contentResponse.timeSeries := mw_contentTimeSeries_rc8;
 
 						v_ae1.start(f_CSE_DMR_RET_025(int29, m_createTimeSeriesBase, v_contentResponse, int23, m_createSubscriptionBase));//TimeSeries
@@ -4297,6 +4367,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.timeSeries.labels := v_labels_1;
 						v_updateRequest.primitiveContent.timeSeries.labels := v_labels_2;
 
@@ -4415,6 +4486,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.timeSeries.labels := v_labels_1;
 	
 						v_ae1.start(f_CSE_DMR_UPD_002(int29, m_createTimeSeriesBase,v_updateRequest));//TimeSeries
@@ -4550,6 +4622,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.timeSeries.labels := v_labels_1;
 						v_updateRequest.primitiveContent.timeSeries.labels := v_labels_2;
 	
@@ -4713,6 +4786,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AttributeAux_list v_nullFields;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.timeSeries.labels := v_labels_1;//Attribute 3
 						v_updateRequest.primitiveContent.timeSeries.expirationTime := "20301231T012345";//Attribute 1
 						v_updateRequest.primitiveContent.timeSeries.maxNrOfInstances := 5;//Attribute 2
@@ -4823,6 +4897,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.timeSeries.labels := v_labels_1;
 		
 						v_ae1.start(f_CSE_DMR_UPD_006(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
@@ -4904,6 +4979,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent := {timeSeries_update_invalid := m_contentUpdateTimeSeries_invalid};
 						v_updateRequest.primitiveContent.timeSeries_update_invalid.creationTime := v_creationTime;
 		
@@ -5026,6 +5102,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent := {timeSeries_update_invalid := m_contentUpdateTimeSeries_invalid};
 	
 						v_updateRequest.primitiveContent.timeSeries_update_invalid.expirationCounter := v_expirationCounter;
@@ -5050,6 +5127,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var Labels v_labels_1:= {"VALUE_1"};
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.container.labels := v_labels_1;
 		
 						v_ae1.start(f_CSE_DMR_UPD_010(int3, v_createRequest, v_updateRequest));//Container
@@ -5076,6 +5154,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var Labels v_labels_1:= {"VALUE_1"};
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.timeSeries.labels := v_labels_1;
 		
 						v_ae1.start(f_CSE_DMR_UPD_010(int29, v_createRequest, v_updateRequest));//TimeSeries
@@ -5111,6 +5190,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createChildRequest := m_createContentInstanceBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 		
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.contentInstance.labels := v_labels;
 
 						v_ae1.start(f_CSE_DMR_UPD_011(int3, v_createParentRequest, int4, v_createChildRequest, v_updateRequest));//ContentInstance under Container
@@ -5136,6 +5216,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createChildRequest := m_createTimeSeriesInstanceBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 		
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.timeSeriesInstance.labels := v_labels;
 
 						v_ae1.start(f_CSE_DMR_UPD_011(int29, v_createParentRequest, int30, v_createChildRequest, v_updateRequest));//TimeSeriesInstance under TimeSeries
@@ -5660,6 +5741,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
 						var ResponsePrimitive v_responsePrimitive;
 	
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.timeSeries.accessControlPolicyIDs := v_accessControlPolicyIDs_1;
 						v_updateRequest.primitiveContent.timeSeries.accessControlPolicyIDs := v_accessControlPolicyIDs_2;
 	
@@ -5688,6 +5770,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
 						var ResponsePrimitive v_responsePrimitive;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.timeSeries.labels := v_labels_1;
 						v_updateRequest.primitiveContent.timeSeries.labels := v_labels_2;
 
@@ -5713,10 +5796,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var XSD.NonNegativeInteger v_maxByteSize_1 := 256;
 						var XSD.NonNegativeInteger v_maxByteSize_2 := 512;
 						var ResponsePrimitive v_responsePrimitive;
-
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize_1;
 						v_updateRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize_2;
 
@@ -5741,10 +5824,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var XSD.NonNegativeInteger v_maxInstanceAge_1 := 60;
 						var XSD.NonNegativeInteger v_maxInstanceAge_2 := 120;
 						var ResponsePrimitive v_responsePrimitive;
-
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.timeSeries.maxInstanceAge := v_maxInstanceAge_1;
 						v_updateRequest.primitiveContent.timeSeries.maxInstanceAge := v_maxInstanceAge_2;
 
@@ -5773,6 +5856,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.timeSeries.maxNrOfInstances := v_maxNrOfInstances_1;
 						v_updateRequest.primitiveContent.timeSeries.maxNrOfInstances := v_maxNrOfInstances_2;
 
@@ -5801,6 +5885,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.timeSeries.periodicInterval := v_periodicInterval_1;
 						v_updateRequest.primitiveContent.timeSeries.periodicInterval := v_periodicInterval_2;
 
@@ -5829,6 +5914,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
 	
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.timeSeries.missingDataDetect := v_missingDataDetect_1;
 						v_updateRequest.primitiveContent.timeSeries.missingDataDetect := v_missingDataDetect_2;
 	
@@ -5857,6 +5943,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.timeSeries.missingDataMaxNr := v_missingDataMaxNr_1;
 						v_updateRequest.primitiveContent.timeSeries.missingDataMaxNr := v_missingDataMaxNr_2;
 
@@ -5885,6 +5972,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.timeSeries.missingDataDetectTimer := v_missingDataDetectTimer_1;
 						v_updateRequest.primitiveContent.timeSeries.missingDataDetectTimer := v_missingDataDetectTimer_2;
 
@@ -5913,6 +6001,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.timeSeries.ontologyRef := v_ontologyRef_1;
 						v_updateRequest.primitiveContent.timeSeries.ontologyRef := v_ontologyRef_2;
 
@@ -6463,6 +6552,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 	
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest, true));//TimeSeries
 						v_ae1.done;	 
 
@@ -6495,6 +6585,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 	
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.timeSeries.labels := v_labels;
 	
 						v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
@@ -6527,6 +6618,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 	
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.timeSeries.maxNrOfInstances := v_maxNrOfInstances;
 	
 						v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
@@ -6559,6 +6651,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 	
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize;
 	
 						v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
@@ -6591,6 +6684,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 	
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.timeSeries.maxInstanceAge := v_maxInstanceAge;
 	
 						v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
@@ -6623,6 +6717,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.timeSeries.periodicInterval := v_periodicInterval;
 
 						v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
@@ -6655,6 +6750,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.timeSeries.missingDataDetect := v_missingDataDetect;
 
 						v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
@@ -6687,6 +6783,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.timeSeries.missingDataMaxNr := v_missingDataMaxNr;
 
 						v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
@@ -6719,6 +6816,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.timeSeries.missingDataDetectTimer := v_missingDataDetectTimer;
 
 						v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
@@ -6751,6 +6849,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 	
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.timeSeries.ontologyRef := v_ontoLogyRef;
 	
 						v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
@@ -6860,6 +6959,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 	
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.timeSeries.expirationTime := v_expirationTime;
 	
 						v_ae1.start(f_CSE_DMR_UPD_016(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
@@ -6899,6 +6999,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;	
 			
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};					
 			
 						v_cse1.start(f_CSE_DMR_UPD_017(int1, v_createRequest, v_createRequestAnnc, v_updateRequest));//AccessControlPolicy
@@ -6912,6 +7013,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;	
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
   
 						v_cse1.start(f_CSE_DMR_UPD_017(int3, v_createRequest, v_createRequestAnnc, v_updateRequest));//Container
@@ -6925,6 +7027,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;	
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
   
 						v_cse1.start(f_CSE_DMR_UPD_017(int9, v_createRequest, v_createRequestAnnc, v_updateRequest));//Group
@@ -6938,6 +7041,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequestAnnc := mw_createScheduleAnncBase;
 						var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.schedule.announceTo := {PX_CSE1_ID};
   
 						v_cse1.start(f_CSE_DMR_UPD_017(int18, v_createRequest, v_createRequestAnnc, v_updateRequest));//Schedule
@@ -6951,6 +7055,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
   
 						v_cse1.start(f_CSE_DMR_UPD_017(int29, v_createRequest, v_createRequestAnnc, v_updateRequest));//TimeSeries
@@ -6964,6 +7069,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnncBase;
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesInstanceBase;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.timeSeriesInstance.announceTo := {PX_CSE1_ID};
   
 						v_cse1.start(f_CSE_DMR_UPD_017(int29, v_createRequest, v_createRequestAnnc, v_updateRequest));//TimeSeriesInstance
@@ -6983,6 +7089,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequestAnnc := mw_updateContainerAnnc;
 						var XSD.NonNegativeInteger v_maxByteSize := 512;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.container.maxByteSize := v_maxByteSize;	
 	
@@ -7005,6 +7112,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequestAnnc := mw_updateGroupAnnc;
 						var MemberType v_memberType := int3;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.group_.memberType := v_memberType;
 	
@@ -7026,6 +7134,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;	
 						var template RequestPrimitive v_updateRequestAnnc := mw_updateGroupAnnc;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.schedule.announceTo := {PX_CSE1_ID};
 						v_createRequestAnnc.primitiveContent.scheduleAnnc.scheduleElement := {{"0 0 0,1,2 1 1 * *"}};//Attribute 1
 
@@ -7045,6 +7154,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequestAnnc := mw_updateTimeSeriesAnnc;
 						var XSD.NonNegativeInteger v_maxByteSize := 512;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize;	
 
@@ -7091,6 +7201,7 @@ 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_CSE_DMR_DEL_001(int29, m_createTimeSeriesBase));//TimeSeries
 						v_ae1.done;
 					};
@@ -7099,6 +7210,7 @@ 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_CSE_DMR_DEL_001(int30, m_createTimeSeriesInstanceBase));//TimeSeriesInstance
 						v_ae1.done;
 					};
@@ -7133,6 +7245,7 @@ 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_CSE_DMR_DEL_002(int29, m_createTimeSeriesBase));//TimeSeries
 						v_ae1.done;
 					};
@@ -7265,6 +7378,7 @@ 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_CSE_DMR_DEL_004(int29, m_createTimeSeriesBase, int23, m_createSubscriptionBase));//TimeSeries
 						v_ae1.done;
 					};	
@@ -7282,6 +7396,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 		
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_ae1.start(f_CSE_DMR_DEL_005(int3, m_createContainerBase, int3, m_createContainerBase));//Container
 						v_ae1.done;
 						
@@ -7303,6 +7418,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 		
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_ae1.start(f_CSE_DMR_DEL_005(int29, m_createTimeSeriesBase, int30, m_createTimeSeriesInstanceBase));//TimeSeries
 						v_ae1.done;
 						
@@ -7331,6 +7447,7 @@ 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_CSE_DMR_DEL_006(int3, m_createContainerBase, int4, m_createContentInstanceBase));//ContentInstance under Container
 						v_ae1.done;
 	
@@ -7340,7 +7457,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
-						v_ae1.start(f_CSE_DMR_DEL_006(int29, m_createTimeSeriesBase, int30, m_createTimeSeriesInstanceBase));//TimeSeriesInstance under TimeSeries
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						_ae1.start(f_CSE_DMR_DEL_006(int29, m_createTimeSeriesBase, int30, m_createTimeSeriesInstanceBase));//TimeSeriesInstance under TimeSeries
 						v_ae1.done;
 						
 					};
@@ -7495,7 +7613,7 @@ 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);
+				f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 																
 				 v_ae1.start(f_CSE_LOC_001());
 													  	  	
@@ -7564,7 +7682,7 @@ 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);
+				f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 																	
 				v_ae1.start(f_CSE_LOC_002());
 														  	  	
@@ -7640,7 +7758,7 @@ 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);
+				f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 																	
 				v_ae1.start(f_CSE_LOC_003());
 														  	  	
@@ -7721,7 +7839,7 @@ 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);
+				f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 																	
 				v_ae1.start(f_CSE_LOC_004());
 														  	  	
@@ -7793,7 +7911,7 @@ 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);
+				f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 																	
 				v_ae1.start(f_CSE_LOC_005());
 														  	  	
@@ -7866,7 +7984,7 @@ 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);
+				f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 																	
 				v_ae1.start(f_CSE_LOC_006());
 														  	  	
@@ -7943,7 +8061,7 @@ 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);
+				f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 																	
 				v_ae1.start(f_CSE_LOC_007());
 														  	  	
@@ -8022,7 +8140,7 @@ 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);
+				f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 																	
 				v_ae1.start(f_CSE_LOC_008());
 														  	  	
@@ -8100,7 +8218,7 @@ 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);
+				f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 																	
 				v_ae1.start(f_CSE_LOC_009_01());
 														  	  	
@@ -8175,7 +8293,7 @@ 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);
+				f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 																	
 				v_ae1.start(f_CSE_LOC_009_02());
 														  	  	
@@ -8249,7 +8367,7 @@ 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);
+				f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 																	
 				v_ae1.start(f_CSE_LOC_009_03());
 														  	  	
@@ -8337,7 +8455,7 @@ 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);
+				f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 																	
 				v_ae1.start(f_CSE_LOC_012());
 														  	  	
@@ -8408,7 +8526,7 @@ 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);
+				f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 																	
 				v_ae1.start(f_CSE_LOC_013());
 														  	  	
@@ -8496,6 +8614,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						const XSD.String c_content := "Random Value";	
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_childResourceRequest.primitiveContent.contentInstance.content := "Random Value";
 
 						v_ae1.start(f_CSE_SUB_CRE_001(int3, v_parentResourceRequest, int4, v_childResourceRequest));		
@@ -8508,6 +8627,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_ae1.start(f_CSE_SUB_CRE_001(int23, v_parentResourceRequest, int23, v_parentResourceRequest));		
 						v_ae1.done;
 					}
@@ -8520,6 +8640,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						const XSD.String c_content := "Random Value";	
 	
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_childResourceRequest.primitiveContent.timeSeriesInstance.content := "Random Value";
 	
 						v_ae1.start(f_CSE_SUB_CRE_001(int29, v_parentResourceRequest, int30, v_childResourceRequest));		
@@ -8539,7 +8660,7 @@ 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);
+					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 														
 					v_ae1.start(f_CSE_SUB_NTF_001());
 											  	  	
@@ -8615,7 +8736,7 @@ 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);
+					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 															
 					v_ae1.start(f_CSE_SUB_NTF_002());
 												  	  	
@@ -8691,7 +8812,7 @@ 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);
+					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 															
 					v_ae1.start(f_CSE_SUB_NTF_003());
 												  	  	
@@ -8776,7 +8897,7 @@ 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);
+					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 															
 					v_ae1.start(f_CSE_SUB_UPD_002());
 												  	  	
@@ -8864,7 +8985,7 @@ 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);
+					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 																
 					v_ae1.start(f_CSE_SUB_UPD_003());
 													  	  	
@@ -8948,7 +9069,7 @@ 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);
+					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 																
 					v_ae1.start(f_CSE_SUB_UPD_004());
 													  	  	
@@ -9043,7 +9164,7 @@ 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);
+					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 																
 					v_ae1.start(f_CSE_SUB_UPD_005());
 													  	  	
@@ -9130,7 +9251,7 @@ 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);
+					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 																
 					v_ae1.start(f_CSE_SUB_UPD_006());
 													  	  	
@@ -9214,7 +9335,7 @@ 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);
+					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 																
 					v_ae1.start(f_CSE_SUB_UPD_007());
 													  	  	
@@ -9287,7 +9408,7 @@ 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);
+					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 																
 					v_ae1.start(f_CSE_SUB_UPD_008());
 													  	  	
@@ -9364,7 +9485,7 @@ 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);
+					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 																
 					v_ae1.start(f_CSE_SUB_UPD_009());
 													  	  	
@@ -9456,7 +9577,7 @@ 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);
+					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 																
 					v_ae1.start(f_CSE_SUB_DEL_002());
 													  	  	
@@ -9540,7 +9661,7 @@ 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);
+					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 																
 					v_ae1.start(f_CSE_SUB_DEL_003());
 													  	  	
@@ -9743,6 +9864,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
   
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
   
 						v_ae1.start(f_CSE_ANNC_001(int29, v_createRequestAnnc, omit, v_updateRequest));//TimeSeries
@@ -9755,6 +9877,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
   
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
   
 						v_ae1.start(f_CSE_ANNC_001(int29, v_createRequestAnnc, v_createRequest, omit));//TimeSeries
@@ -9767,6 +9890,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnncBase;
   
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.timeSeriesInstance.announceTo := {PX_CSE1_ID};
   
 						v_ae1.start(f_CSE_ANNC_001(int30, v_createRequestAnnc, v_createRequest, omit));//TimeSeriesInstance
@@ -9843,6 +9967,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
   
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.timeSeries.announceTo := {f_getAnnouncementTargetPoA()};
   
 						v_cse1.start(f_CSE_ANNC_CRE_002(int29, v_createRequestAnnc, v_updateRequest));//TimeSeries
@@ -9928,6 +10053,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
   
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
   
 						v_cse1.start(f_CSE_ANNC_CRE_004_CseSimu(int29, v_createRequestAnnc, v_createRequest));//TimeSeries
@@ -9944,7 +10070,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createAcpBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
 	  
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						 f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						 v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
 	  
 						 v_cse1.start(f_CSE_ANNC_CRE_005_CseSimu(int1, v_createRequestAnnc, v_createRequest));//AccessControlPolicy
@@ -9957,7 +10083,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createContainerBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
   
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						 f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						 v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
   
 						 v_cse1.start(f_CSE_ANNC_CRE_005_CseSimu(int3, v_createRequestAnnc, v_createRequest));//Container
@@ -9970,7 +10096,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnnc;
   
-						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						 f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						 v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};
   
 						 v_cse1.start(f_CSE_ANNC_CRE_005_CseSimu(int4, v_createRequestAnnc, v_createRequest));//ContentInstance
@@ -9997,6 +10123,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
   
+						 f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						 v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
   
 						 v_cse1.start(f_CSE_ANNC_CRE_005_CseSimu(int29, v_createRequestAnnc, v_createRequest));//TimeSeries
@@ -10009,6 +10136,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnncBase;
   
+						 f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						 v_createRequest.primitiveContent.timeSeriesInstance.announceTo := {PX_CSE1_ID};
   
 						 v_cse1.start(f_CSE_ANNC_CRE_005_CseSimu(int30, v_createRequestAnnc, v_createRequest));//TimeSeriesInstance
@@ -10078,6 +10206,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
 	  
+						 f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						 v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
 	  
 						 v_cse1.start(f_CSE_ANNC_CRE_006_CseSimu(int29, v_createRequestAnnc, v_createRequest));//TimeSeries
@@ -10090,6 +10219,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnncBase;
   
+						 f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						 v_createRequest.primitiveContent.timeSeriesInstance.announceTo := {PX_CSE1_ID};
   
 						 v_cse1.start(f_CSE_ANNC_CRE_006_CseSimu(int30, v_createRequestAnnc, v_createRequest));//TimeSeriesInstance
@@ -10173,6 +10303,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnncBase;
   
+						 f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						 v_createRequest.primitiveContent.timeSeriesInstance.announceTo := {PX_CSE1_ID};
   
 						 v_cse1.start(f_CSE_ANNC_CRE_007_CseSimu(int30, v_createRequestAnnc, v_createRequest));//TimeSeriesInstance
@@ -10232,6 +10363,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
   
+						 f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						 v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
 						 v_createRequest.primitiveContent.timeSeries.announcedAttribute := {"mbs"};
   
@@ -10245,6 +10377,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnncBase;
 	  
+						 f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						 v_createRequest.primitiveContent.timeSeriesInstance.announceTo := {PX_CSE1_ID};
 						 v_createRequest.primitiveContent.timeSeriesInstance.announcedAttribute := {"cs"};
 	  
@@ -10326,6 +10459,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
   
+						 f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						 v_ae1.start(f_CSE_ANNC_RET_001(int29, v_createRequestAnnc, v_createRequest));//TimeSeries
 						 v_ae1.done;
 					}
@@ -10336,6 +10470,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnncBase;
   
+						 f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						 v_ae1.start(f_CSE_ANNC_RET_001(int30, v_createRequestAnnc, v_createRequest));//TimeSeriesInstance
 						 v_ae1.done;
 					}
@@ -10394,6 +10529,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
 	  
+						 f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						 v_ae1.start(f_CSE_ANNC_RET_002(int29, v_createRequestAnnc, v_createRequest));//TimeSeries
 						 v_ae1.done;
 					}
@@ -10404,6 +10540,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnncBase;
   
+						 f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						 v_ae1.start(f_CSE_ANNC_RET_002(int30, v_createRequestAnnc, v_createRequest));//TimeSeriesInstance
 						 v_ae1.done;
 					}
@@ -10465,6 +10602,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;	
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_updateRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
   
 						v_cse1.start(f_CSE_ANNC_UPD_001(int29, v_createRequest, v_createRequestAnnc, v_updateRequest));//TimeSeries
@@ -10541,6 +10679,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AttributeAux_list v_nullFields;
 						var ListOfURIs v_announceTo := {"To be deleted"};
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
 	
 						v_updateRequest.primitiveContent.timeSeries.announceTo := v_announceTo;
@@ -10690,6 +10829,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ListOfURIs v_announceTo := {"To be deleted"};
 						var PrimitiveContent v_primitiveContentRetrieveResource;
   
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
 	
 						v_updateRequest.primitiveContent.timeSeries.announceTo := v_announceTo;
@@ -10778,6 +10918,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;	
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_updateRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
 						v_updateRequest.primitiveContent.timeSeries.announcedAttribute := {"ToBeDeleted"};
 						v_updateRequest.primitiveContent.timeSeries.parentID := PX_CSE1_ID;
@@ -10877,6 +11018,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_updateRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
 
 						v_cse1.start(f_CSE_ANNC_UPD_006(int29, v_createRequest, v_createRequestAnnc, v_updateRequest));//TimeSeries
@@ -10935,6 +11077,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_updateRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
 
 						v_cse1.start(f_CSE_ANNC_UPD_007(int29, v_createRequest, v_createRequestAnnc, v_updateRequest));//TimeSeries
@@ -11050,6 +11193,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 						var XSD.NonNegativeInteger v_maxByteSize := 512;
   
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize;
 						v_createRequest.primitiveContent.timeSeries.announcedAttribute := v_announcedAttribute;
@@ -11142,6 +11286,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequestAnnc := mw_updateTimeSeriesAnnc;
 						var XSD.NonNegativeInteger v_maxByteSize := 512;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize;	
 	
@@ -11241,6 +11386,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var Timestamp v_expirationTime_1 := "21001231T012345";
 						var Timestamp v_expirationTime_2 := "21101231T012345";
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.timeSeries.expirationTime := v_expirationTime_1;
 
@@ -11318,6 +11464,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var XSD.NonNegativeInteger v_maxByteSize_1 := 512;
 						var XSD.NonNegativeInteger v_maxByteSize_2 := 1024;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize_1;
 						v_createRequest.primitiveContent.timeSeries.announcedAttribute := {"mbs"};	
@@ -11425,6 +11572,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AttributeAux_list v_nullFields;
 						var ListOfNCNames v_announcedAttribute := {"ToBeDeleted"};
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize;
 						v_createRequest.primitiveContent.timeSeries.announcedAttribute := {"mbs"};	
@@ -11556,6 +11704,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 						var XSD.NonNegativeInteger v_maxByteSize := 512;
   
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize;
 						v_createRequest.primitiveContent.timeSeries.announcedAttribute := {"mbs"};
@@ -11669,6 +11818,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
   
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
   
 						v_ae1.start(f_CSE_ANNC_DEL_001(int29, v_createRequestAnnc, v_createRequest));//TimeSeries
@@ -11724,6 +11874,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
   
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
   
 						v_cse1.start(f_CSE_ANNC_DEL_002(int29, v_createRequestAnnc, v_createRequest));//TimeSeries
@@ -12210,7 +12361,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 			 v_requestNotify := valueof(m_notify(f_getResourceAddress(v_aeIndex)));	
 			 v_request.from_ := PX_CSE1_ID;
 		
-			 mccPort.send(m_request(v_request));
+			 mccPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 			 tc_ac.start;
 			 alt {
 				 [] mccPort.receive(mw_response(mw_responsePrimitive(int4108))) -> value vc_response {