From 23efeabc03fc9d7123643733d885e30963994ad7 Mon Sep 17 00:00:00 2001
From: aahmad <ABBAS.AHMAD@eglobalmark.com>
Date: Tue, 3 Jul 2018 10:19:59 +0200
Subject: [PATCH] Added All Protocol Biding related modifications

---
 LibOneM2M/OneM2M_Functions.ttcn     | 129 ++++---
 LibOneM2M/OneM2M_Pixits.ttcn        |  17 +-
 LibOneM2M/OneM2M_Templates.ttcn     |   4 +-
 LibOneM2M/OneM2M_TestSystem.ttcn    |   1 +
 OneM2M_PermutationFunctions.ttcn    | 226 ++++++------
 OneM2M_Testcases_AE_Release_1.ttcn  | 159 +++++++--
 OneM2M_Testcases_CSE_Release_1.ttcn | 533 +++++++++++++++++++++++-----
 OneM2M_Testcases_CSE_Release_2.ttcn | 353 ++++++++++++++++--
 8 files changed, 1105 insertions(+), 317 deletions(-)

diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 09fa966..f676280 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -45,6 +45,7 @@ module OneM2M_Functions {
 			if(p_auxiliaryAe2Required) {
 				vc_auxiliaryAe2Up := p_auxiliaryAe2Required;
 				vc_ae2 := AeSimu.create("AE2") alive;
+				f_setProtocolBinding(PX_PROTOCOL_BINDING_AE2);
 				vc_ae2.start(f_cf01UpAe2());
 				vc_ae2.done;
 			}
@@ -80,6 +81,7 @@ module OneM2M_Functions {
 			vc_config := e_cf02;
 			vc_testSystemRole := e_ae;	
 			vc_cse1 := CseSimu.create("CSE1") alive;
+			f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 				
 			// Map
 			map(self:mcaPort, system:mcaPort);
@@ -130,6 +132,7 @@ module OneM2M_Functions {
 			vc_config := e_cf02CseSimuMaster;
 			vc_testSystemRole := e_cse;		
 			vc_ae1 := AeSimu.create("AE1") alive;
+			f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 			
 			//Initialization of local CSEBase
 			v_cSEBaseResource := f_generateLocalResource(-, -1, int5);
@@ -528,7 +531,7 @@ module OneM2M_Functions {
 				
 				v_request := f_getCreateRequestPrimitive(int2, v_request, -1);
 				
-				mcaPort.send(m_request(v_request));
+				mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 				
 				tc_ac.start;
 				alt {
@@ -593,10 +596,10 @@ module OneM2M_Functions {
 					//TODO Test, to be removed
 					v_request.to_ := f_getResourceAddress();
 					
-					mcaPort.send(m_request(v_request));
-					//mcaPort.send(m_request(m_createAeAux(p_name, {PX_URI_CSE & PX_CSE_NAME & "/" & PX_ACPAUX_NAME})));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
+					//mcaPort.send(f_getMsgOutPrimitive(m_request(m_createAeAux(p_name, {PX_URI_CSE & PX_CSE_NAME & "/" & PX_ACPAUX_NAME}))));
 				} else {
-					mcaPort.send(m_request(m_createAe(p_appId)));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(m_createAe(p_appId))));
 				}
 				tc_ac.start;
 				alt {
@@ -733,7 +736,7 @@ module OneM2M_Functions {
 						
 						v_request.from_ := f_getOriginator(vc_resourcesIndexToBeDeleted[i]);
 
-						mcaPort.send(m_request(v_request));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 						
 						tc_ac.start;
 						alt {
@@ -818,7 +821,7 @@ module OneM2M_Functions {
 			
 						v_request := valueof(m_delete(v_resourceAddress, f_getOriginator(vc_resourcesIndexToBeDeleted[i],false)));
 
-						mccPort.send(m_request(v_request));
+						mccPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 			
 						tc_ac.start;
 						alt {
@@ -862,7 +865,7 @@ module OneM2M_Functions {
 								
 				v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, p_parentIndex);
 			
-				mcaPort.send(m_request(v_request));
+				mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 				tc_ac.start;
 				alt {
 					[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
@@ -926,7 +929,7 @@ module OneM2M_Functions {
 			 */
 			function f_cse_updateAnnouncedResource(in RequestPrimitive p_requestPrimitive) runs on CseSimu {
 
-				mccPort.send(m_request(p_requestPrimitive));
+				mccPort.send(f_getMsgOutPrimitive(m_request(p_requestPrimitive)));
 				tc_ac.start;
 				alt {
 					[] mccPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
@@ -964,7 +967,7 @@ module OneM2M_Functions {
 				
 				v_request := f_getCreateRequestPrimitive(int1, v_request, -1);
 								
-				mcaPort.send(m_request(v_request));
+				mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 				tc_ac.start;
 				alt {
 					[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
@@ -1000,7 +1003,7 @@ module OneM2M_Functions {
 			 */
 			function f_cse_updateResource(in RequestPrimitive p_requestPrimitive) runs on AeSimu {
 
-				mcaPort.send(m_request(p_requestPrimitive));
+				mcaPort.send(f_getMsgOutPrimitive(m_request(p_requestPrimitive)));
 				tc_ac.start;
 				alt {
 					[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
@@ -1032,7 +1035,7 @@ module OneM2M_Functions {
 			 */
 			function f_cse_retrieveResource(integer p_resourceIndex) runs on AeSimu return PrimitiveContent{
 
-				mcaPort.send(m_request(m_retrieve(f_getResourceAddress(p_resourceIndex), f_getOriginator(p_resourceIndex))));
+				mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(p_resourceIndex), f_getOriginator(p_resourceIndex)))));
 				tc_ac.start;
 				alt {
 					[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
@@ -1069,7 +1072,7 @@ module OneM2M_Functions {
 					v_request := valueof(p_requestPrimitive);
 				}
 				
-				mcaPort.send(m_request(v_request));
+				mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 						
 				tc_ac.start;
 				alt {
@@ -1100,7 +1103,7 @@ module OneM2M_Functions {
 			function f_isResourcePresent (integer p_resourceIndex) runs on AeSimu return boolean {
 			
 				//Check to see if the resource is present or not
-				mcaPort.send(m_request(m_retrieve(f_getResourceAddress(p_resourceIndex), f_getOriginator(p_resourceIndex))));
+				mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(p_resourceIndex), f_getOriginator(p_resourceIndex)))));
 				tc_ac.start;
 				alt {
 					[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) {
@@ -1137,7 +1140,7 @@ module OneM2M_Functions {
 				log(testcasename() & ":INFO: Hierarchical addressing method is required to check the non presence of the resource");
 				
 				//Check to see if the resource has NOT been created
-				mcaPort.send(m_request(m_retrieve(f_getResourceAddress(p_parentIndex, e_hierarchical) & "/" & p_resourceName, f_getOriginator(p_parentIndex))));
+				mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(p_parentIndex, e_hierarchical) & "/" & p_resourceName, f_getOriginator(p_parentIndex)))));
 				tc_ac.start;
 				alt {
 					[] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))) {
@@ -1174,7 +1177,7 @@ module OneM2M_Functions {
 				v_request.from_ := f_getOriginator(vc_acpAuxIndex);
 				v_request.primitiveContent.accessControlPolicy.privileges.accessControlRule_list := {valueof(m_createAcr(PX_ACOR, p_allowedOperations))};
 							
-				mcaPort.send(m_request(v_request));
+				mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 				tc_ac.start;
 				alt {
 					[] mcaPort.receive(mw_response(mw_responsePrimitiveOK))  {
@@ -1330,7 +1333,7 @@ module OneM2M_Functions {
 	
 				v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, p_parentIndex);
 
-				mcaPort.send(m_request(v_request));
+				mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 
 			}
 			
@@ -1385,13 +1388,13 @@ module OneM2M_Functions {
 						
 					v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
 					if(getverdict == pass) {
-						mcaPortIn.send(m_httpResponse(v_responsePrimitive));
+						mcaPortIn.send(f_getMsgOutPrimitive(m_httpResponse(v_responsePrimitive)));
 					} else {
 						v_responsePrimitive.responseStatusCode := int4000; 
-						mcaPortIn.send(m_httpResponse(v_responsePrimitive));
+						mcaPortIn.send(f_getMsgOutPrimitive(m_httpResponse(v_responsePrimitive)));
 					}
 					
-					//mcaPort.send(m_response(v_responsePrimitive));	// TODO have to be deleted
+					//mcaPort.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));	// TODO have to be deleted
         
 				} //end f_subscriptionVerificationHandler
 				
@@ -1416,7 +1419,7 @@ module OneM2M_Functions {
 							//Send response in any case
 							v_responsePrimitive := valueof(m_responseNotification(int2001, omit));
 							v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
-							mcaPortIn.send(m_response(v_responsePrimitive));
+							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 							tc_ac.start;
 							repeat;
 						}
@@ -1455,7 +1458,7 @@ module OneM2M_Functions {
 							//Send response in any case
 							v_responsePrimitive := valueof(m_responseNotification(int2001, omit));
 							v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
-							mcaPortIn.send(m_response(v_responsePrimitive));
+							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 						}
 						[] mcaPortIn.receive{
 							tc_ac.stop;
@@ -1499,7 +1502,7 @@ module OneM2M_Functions {
 							//Send response in any case
 							v_responsePrimitive := valueof(m_responseNotification(int2001, omit));
 							v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
-							mcaPortIn.send(m_response(v_responsePrimitive));
+							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 						}
 						[] mcaPortIn.receive(mw_request(mw_notifyNotification(mw_contentNotification(?)))) -> value vc_request {
 							tc_ac.stop;
@@ -1512,7 +1515,7 @@ module OneM2M_Functions {
 							//Send response in any case
 							v_responsePrimitive := valueof(m_responseNotification(int2001, omit));
 							v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
-							mcaPortIn.send(m_response(v_responsePrimitive));
+							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 							v_notificationsReceived := v_notificationsReceived + 1;
 							if(v_notificationsReceived < p_numberOfAggregatedNotification) {
 								tc_ac.start;
@@ -1547,7 +1550,7 @@ module OneM2M_Functions {
 							tc_ac.stop;
 							v_responsePrimitive := valueof(m_responseNotification(int2001, omit));
 							v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
-							mcaPortIn.send(m_response(v_responsePrimitive));
+							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 							if(not(match(vc_request.primitive.requestPrimitive.primitiveContent.notification.subscriptionDeletion, true))) {
 								setverdict(fail, __SCOPE__ & ":ERROR: subscriptionDeletion attribute have to be set to TRUE");
 							}
@@ -1677,7 +1680,7 @@ module OneM2M_Functions {
 							v_responsePrimitive.from_ := PX_CSE1_ID;
 							v_responsePrimitive.to_ := v_request.primitive.requestPrimitive.from_;
 							v_responsePrimitive.primitiveContent := vc_localResourcesList[v_announcedResourceIndex].resource;
-							mccPortIn.send(m_response(v_responsePrimitive));			
+							mccPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));			
 						}
 						[] tc_ac.timeout {
 							setverdict(fail, __SCOPE__ & ":ERROR:  No announcement received");
@@ -1703,7 +1706,7 @@ module OneM2M_Functions {
 				
 					v_request := f_getCreateRequestPrimitive(f_getAnnouncedResourceType(p_resourceType), p_requestPrimitive, vc_remoteCseIndex);
 			
-					mccPort.send(m_request(v_request));
+					mccPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 					tc_ac.start;
 					alt {
 						[] mccPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
@@ -1766,10 +1769,10 @@ module OneM2M_Functions {
 		
 					v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
 					if(getverdict == pass) {
-						mccPortIn.send(m_httpResponse(v_responsePrimitive));
+						mccPortIn.send(f_getMsgOutPrimitive(m_httpResponse(v_responsePrimitive)));
 					} else {
 						v_responsePrimitive.responseStatusCode := int4000; 
-						mccPortIn.send(m_httpResponse(v_responsePrimitive));
+						mccPortIn.send(f_getMsgOutPrimitive(m_httpResponse(v_responsePrimitive)));
 					}
 
 				} //end f_cse_notifyProcedure_updateHandler	
@@ -1784,7 +1787,7 @@ module OneM2M_Functions {
 			function f_cse_isResourcePresent (integer p_resourceIndex) runs on CseSimu return boolean {
 
 				//Check to see if the resource is present or not
-				mccPort.send(m_request(m_retrieve(f_getResourceAddress(p_resourceIndex), f_getOriginator(p_resourceIndex))));
+				mccPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(p_resourceIndex), f_getOriginator(p_resourceIndex)))));
 				tc_ac.start;
 				alt {
 					[] mccPort.receive(mw_response(mw_responsePrimitive(int2000))) {
@@ -1821,7 +1824,7 @@ module OneM2M_Functions {
 				log(testcasename() & ":INFO: Hierarchical addressing method is required to check the non presence of the resource");
 				
 				//Check to see if the resource has NOT been created
-				mccPort.send(m_request(m_retrieve(f_getResourceAddress(p_parentIndex, e_hierarchical) & "/" & p_resourceName, f_getOriginator(p_parentIndex))));
+				mccPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(p_parentIndex, e_hierarchical) & "/" & p_resourceName, f_getOriginator(p_parentIndex)))));
 				tc_ac.start;
 				alt {
 					[] mccPort.receive(mw_response(mw_responsePrimitive(int4004))) {
@@ -1864,7 +1867,7 @@ module OneM2M_Functions {
 
 				v_request := f_getCreateRequestPrimitive(int16, p_requestPrimitive, -1);
 
-				mccPort.send(m_request(v_request));
+				mccPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 				tc_ac.start;
 				alt {
 					[] mccPort.receive(mw_response(mw_responsePrimitiveOK(p_contentResponse))) -> value v_response {
@@ -1931,7 +1934,7 @@ module OneM2M_Functions {
 						v_response.from_ := PX_CSE1_ID;
 						v_response.to_ := v_request.primitive.requestPrimitive.from_;
 						v_response.primitiveContent.remoteCSE := vc_localResourcesList[vc_localRemoteCseIndex].resource.remoteCSE;
-						mccPortIn.send(m_response(v_response));
+						mccPortIn.send(f_getMsgOutPrimitive(m_response(v_response)));
 						
 						vc_remoteCseIndex := f_setResource(valueof(m_primitiveContentRemoteCSE(m_contentMyRemoteCSEResource)), int16, -1);
 						v_resourceIndex := vc_remoteCseIndex;
@@ -1969,7 +1972,7 @@ module OneM2M_Functions {
 						setverdict(pass, __SCOPE__&":INFO: CREATE Request received successfuly");
 						v_responsePrimitive := f_getCreateResponsePrimitive(vc_request.primitive.requestPrimitive.resourceType, vc_request.primitive.requestPrimitive);
 						v_responsePrimitive.responseStatusCode := int2001;
-						mccPortIn.send(m_response(v_responsePrimitive));
+						mccPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 					}
 					[] mccPortIn.receive(mw_request(?)) {
 						tc_ac.stop;
@@ -2011,7 +2014,7 @@ module OneM2M_Functions {
 					v_myResource.cSEBase.lastModifiedTime := v_myResource.cSEBase.creationTime;		
 					v_myResource.cSEBase.cSE_ID := PX_CSE1_ID;
 					v_myResource.cSEBase.supportedResourceType := PX_CSE1_SRT;
-					v_myResource.cSEBase.pointOfAccess := {f_getAnnouncementTargetPoA(PX_PROTOCOL_BINDING, PX_CSE1_ADDRESS, "")};
+					v_myResource.cSEBase.pointOfAccess := {f_getAnnouncementTargetPoA(PX_PROTOCOL_BINDING_CSE1, PX_CSE1_ADDRESS, "")};
 					v_myResource.cSEBase.cseType := vc_cseType;
 					    
 				}else if(p_resourceType == int16 and ispresent(p_resource)) {			//RemoteCSE
@@ -2241,7 +2244,7 @@ module OneM2M_Functions {
 				}
 				v_response.from_ := PX_CSE1_ID;
 				v_response.to_ := p_requestPrimitive.primitive.requestPrimitive.from_;
-				mccPortIn.send(m_response(v_response));
+				mccPortIn.send(f_getMsgOutPrimitive(m_response(v_response)));
 			
 			}
 			
@@ -2289,7 +2292,7 @@ module OneM2M_Functions {
 					//Send response 
 					v_responsePrimitive := valueof(m_responseNotification(int2000, omit));
 					v_responsePrimitive.requestIdentifier := v_request.primitive.requestPrimitive.requestIdentifier;
-					mcaPortIn.send(m_response(v_responsePrimitive));
+					mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 					log(__SCOPE__&": WARNING: Unexpected Notification message received");
 					repeat;
 				}
@@ -2297,7 +2300,7 @@ module OneM2M_Functions {
 					//Send response 
 					v_responsePrimitive := valueof(m_responseNotification(int2000, omit));
 					v_responsePrimitive.requestIdentifier := v_request.primitive.requestPrimitive.requestIdentifier;
-					mcaPortIn.send(m_response(v_responsePrimitive));
+					mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 					log(__SCOPE__&": WARNING: Unexpected Notification for Subscription Verification message received");
 					repeat;
 				}
@@ -2332,7 +2335,7 @@ module OneM2M_Functions {
 					}
 					v_response.from_ := PX_CSE1_ID;
 					v_response.to_ := v_request.primitive.requestPrimitive.from_;
-					mccPortIn.send(m_response(v_response));
+					mccPortIn.send(f_getMsgOutPrimitive(m_response(v_response)));
 					tc_ac.start(10.0);
 					repeat;
 				}
@@ -2347,16 +2350,16 @@ module OneM2M_Functions {
 						v_response := valueof(m_responsePrimitive(int4004,v_request.primitive.requestPrimitive.requestIdentifier));
 						v_response.from_ := PX_CSE1_ID;
 						v_response.to_ := v_request.primitive.requestPrimitive.from_;
-						mccPortIn.send(m_response(v_response));
+						mccPortIn.send(f_getMsgOutPrimitive(m_response(v_response)));
 					} else {
 						v_response := valueof(m_responsePrimitive(int2000,v_request.primitive.requestPrimitive.requestIdentifier));
 						v_response.from_ := PX_CSE1_ID;
 						v_response.to_ := v_request.primitive.requestPrimitive.from_;
 						v_response.primitiveContent := vc_localResourcesList[v_localResourceIndex].resource;
 						if(ischosen(vc_localResourcesList[v_localResourceIndex].resource.cSEBase)) {
-							mccPortIn.send(m_response(v_response, {{"parentID", omit}})); 
+							mccPortIn.send(f_getMsgOutPrimitive(m_response(v_response, {{"parentID", omit}}))); 
 						} else {
-							mccPortIn.send(m_response(v_response));
+							mccPortIn.send(f_getMsgOutPrimitive(m_response(v_response)));
 						}
 						
 					}
@@ -2374,14 +2377,14 @@ module OneM2M_Functions {
 						v_response := valueof(m_responsePrimitive(int4004,v_request.primitive.requestPrimitive.requestIdentifier));
 						v_response.from_ := PX_CSE1_ID;
 						v_response.to_ := v_request.primitive.requestPrimitive.from_;
-						mccPortIn.send(m_response(v_response));
+						mccPortIn.send(f_getMsgOutPrimitive(m_response(v_response)));
 					} else {
 						v_response := valueof(m_responsePrimitive(int2004,v_request.primitive.requestPrimitive.requestIdentifier));
 						v_response.from_ := PX_CSE1_ID;
 						v_response.to_ := v_request.primitive.requestPrimitive.from_;
 						f_updateLocalResource(v_localResourceIndex, v_request.primitive.requestPrimitive.primitiveContent);
 						v_response.primitiveContent := vc_localResourcesList[v_localResourceIndex].resource;
-						mccPortIn.send(m_response(v_response));
+						mccPortIn.send(f_getMsgOutPrimitive(m_response(v_response)));
 					}
 					tc_ac.start(10.0);
 					repeat;
@@ -2478,7 +2481,7 @@ module OneM2M_Functions {
     					
 						v_localResourceIndex := f_processCreateRequestPrimitive(v_request.primitive.requestPrimitive);
 						
-						mcaPortIn.send(m_response(vc_response.primitive.responsePrimitive));
+						mcaPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
 							
 					}
     					
@@ -2524,11 +2527,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: Container 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: Container creation failed");
 						}					
 					}
@@ -2561,7 +2564,7 @@ module OneM2M_Functions {
 				
 				[] mcaPort.receive(mw_request(?)) -> value v_request {
 					log(__SCOPE__ & ":WARNING: Unexpected request received");
-					mcaPort.send(m_response(m_responsePrimitive(int5000, v_request.primitive.requestPrimitive.requestIdentifier)));
+					mcaPort.send(f_getMsgOutPrimitive(m_response(m_responsePrimitive(int5000, v_request.primitive.requestPrimitive.requestIdentifier))));
 					repeat;
 				}
 				    		
@@ -2589,10 +2592,10 @@ module OneM2M_Functions {
 					v_modifiedResource := f_generateLocalResource(v_rp.primitiveContent, v_parentIndex, v_rp.resourceType);
 					v_resourceIndex := f_setLocalResource(v_modifiedResource, v_rp.resourceType, 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))));
 					}
 					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))));
 					}					
 					repeat;	
 				}
@@ -3002,7 +3005,7 @@ module OneM2M_Functions {
 		 * @param p_announcementTargetResource Announcement Target Resource
 		 * @return p_annoucementTargetPoA Announcemenet Target PoA
 		 */
-		function f_getAnnouncementTargetPoA(in charstring p_protocolBinding := PX_PROTOCOL_BINDING, in charstring p_announcementTargetAddress := PX_CSE1_ADDRESS, charstring p_announcementTargetResource := "" ) return charstring {
+		function f_getAnnouncementTargetPoA(in charstring p_protocolBinding := PX_PROTOCOL_BINDING_CSE1, in charstring p_announcementTargetAddress := PX_CSE1_ADDRESS, charstring p_announcementTargetResource := "" ) return charstring {
 						
 			if(p_protocolBinding == "HTTP") {
 				return "http://" & p_announcementTargetAddress & "/" & p_announcementTargetResource;
@@ -3502,6 +3505,22 @@ module OneM2M_Functions {
 			f_checkAeSimuStatus();
 		} 
 		
+		/**
+		 * @desc Sets the protocol binding to be used by a component
+		 * @param p_protocolBinding Protocol binding to be used
+		 */
+ 
+		function f_setProtocolBinding(charstring p_protocolBinding) runs on Tester {
+			vc_protocolBinding := p_protocolBinding;
+		}
+ 
+			/**
+		 * @desc Returns the protocol binding used by the component
+		 */
+		function f_getProtocolBinding() runs on Tester return charstring {
+			return vc_protocolBinding;			
+		}
+		
 		/**
 		 * @desc Sending of an Adapter Control primitive
 		 * @param event Action to be performed by TA
@@ -3570,6 +3589,16 @@ module OneM2M_Functions {
 			
 		}
 		
+		/**
+		* @desc Get MsgOut primitive
+		* @param MsgOut MsgOut primitive
+		 */
+
+		function f_getMsgOutPrimitive(MsgOut p_msgOut) runs on Tester return MsgOut {
+			p_msgOut.protocolBinding := vc_protocolBinding;
+			return p_msgOut; 
+		}
+		
 		function f_sendUtPrimitive(template UtTriggerPrimitive p_utRequest, in universal charstring p_action) runs on Tester {
 			
 			if (PX_UT_IMPLEMENTED){
diff --git a/LibOneM2M/OneM2M_Pixits.ttcn b/LibOneM2M/OneM2M_Pixits.ttcn
index f579312..fc12f30 100644
--- a/LibOneM2M/OneM2M_Pixits.ttcn
+++ b/LibOneM2M/OneM2M_Pixits.ttcn
@@ -119,7 +119,22 @@ module OneM2M_Pixits {
 			/**
 			 * @desc Protocolo binding to use during test execution 
 			 */			
-			modulepar charstring PX_PROTOCOL_BINDING 		:= "HTTP";		
+			//modulepar charstring PX_PROTOCOL_BINDING 		:= "HTTP";
+			
+			/**
+			 * @desc Protocolo binding to use during test execution 
+			 */			
+			modulepar charstring PX_PROTOCOL_BINDING_CSE1 		:= "HTTP";
+						
+			/**
+			 * @desc Protocolo binding to use during test execution 
+			 */			
+			modulepar charstring PX_PROTOCOL_BINDING_AE1 		:= "HTTP";
+						
+			/**
+			 * @desc Protocolo binding to use during test execution 
+			 */			
+			modulepar charstring PX_PROTOCOL_BINDING_AE2 		:= "HTTP";		
 			
 			/**
 			 * @desc Namespace composed of "prefix" = "xml namespace" to use during test execution 
diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index 58ad561..96cf028 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -45,7 +45,7 @@ module OneM2M_Templates {
 			primitive := { requestPrimitive := p_requestPrimitive},
 			host := PX_SUT_ADDRESS,
 			xmlNamespace := PX_XML_NAMESPACE,
-			protocolBinding := PX_PROTOCOL_BINDING,
+			protocolBinding := PX_PROTOCOL_BINDING_CSE1,
 			serialization := PX_SERIALIZATION, 
 			forcedFields := p_forcedFields
 		};
@@ -58,7 +58,7 @@ module OneM2M_Templates {
 			primitive := { responsePrimitive := p_responsePrimitive},
 			host := PX_SUT_ADDRESS,
 			xmlNamespace := PX_XML_NAMESPACE,
-			protocolBinding := PX_PROTOCOL_BINDING,
+			protocolBinding := PX_PROTOCOL_BINDING_CSE1,
 			serialization := PX_SERIALIZATION, 
 			forcedFields := p_forcedFields
 		};
diff --git a/LibOneM2M/OneM2M_TestSystem.ttcn b/LibOneM2M/OneM2M_TestSystem.ttcn
index 722e34a..e4bff93 100644
--- a/LibOneM2M/OneM2M_TestSystem.ttcn
+++ b/LibOneM2M/OneM2M_TestSystem.ttcn
@@ -30,6 +30,7 @@ module OneM2M_TestSystem {
 		timer tc_ac := PX_TAC;
 		timer tc_wait := PX_TWAIT;
 		//global variables
+		var charstring vc_protocolBinding;
 		var Configurations vc_config;
 		var TestSystemRole vc_testSystemRole;
 		var MyResourcesList vc_resourcesList;
diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index 6ae5c88..e2cf37f 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -60,12 +60,12 @@ module OneM2M_PermutationFunctions {
 								v_resource := f_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, v_parentIndex, v_request.primitive.requestPrimitive.resourceType);
 								v_resourceIndex := f_setLocalResource(v_resource, v_request.primitive.requestPrimitive.resourceType, v_parentIndex);	
 								v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
-								mcaPortIn.send(m_response(v_responsePrimitive));
+								mcaPortIn.send(f_getMsgOutPrimitive(f_getMsgOutPrimitive(m_response(v_responsePrimitive))));
 							}
 							[] mcaPortIn.receive(mw_request(?)) {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__, " : Error while creating container");
-								mcaPortIn.send(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
+								mcaPortIn.send(f_getMsgOutPrimitive(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))));
 								stop;
 							}
 							[] tc_ac.timeout {
@@ -109,12 +109,12 @@ module OneM2M_PermutationFunctions {
 								v_resource := f_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, v_parentIndex, v_request.primitive.requestPrimitive.resourceType);
 								v_resourceIndex := f_setLocalResource(v_resource, v_request.primitive.requestPrimitive.resourceType, v_parentIndex);	
 								v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
-								mcaPortIn.send(m_response(v_responsePrimitive));
+								mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 							}
 							[] mcaPortIn.receive(mw_request(?)) {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__, " : Error while creating container");
-								mcaPortIn.send(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
+								mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 								stop;
 							}
 							[] tc_ac.timeout {
@@ -162,12 +162,12 @@ module OneM2M_PermutationFunctions {
 								v_resourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
 								f_updateLocalResource(v_resourceIndex, v_request.primitive.requestPrimitive.primitiveContent);
 								v_responsePrimitive := valueof(m_responsePrimitive(int2004, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
-								mcaPortIn.send(m_response(v_responsePrimitive));
+								mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 							}
 							[] mcaPortIn.receive(mw_request(?)) {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__, " : Error while updating container");
-								mcaPortIn.send(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
+								mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 								stop;
 							}
 							[] tc_ac.timeout {
@@ -209,12 +209,12 @@ module OneM2M_PermutationFunctions {
 								v_resourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
 								f_updateLocalResource(v_resourceIndex, v_request.primitive.requestPrimitive.primitiveContent);
 								v_responsePrimitive := valueof(m_responsePrimitive(int2004, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
-								mcaPortIn.send(m_response(v_responsePrimitive));
+								mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 							}
 							[] mcaPortIn.receive(mw_request(?)) {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__, " : Error while updating container");
-								mcaPortIn.send(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
+								mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 								stop;
 							}
 							[] tc_ac.timeout {
@@ -262,12 +262,12 @@ module OneM2M_PermutationFunctions {
 								setverdict(pass, __SCOPE__, " : Container retrieve request received successfuly");
 								v_resourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
 								v_responsePrimitive := valueof(m_responsePrimitive(int2000, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
-								mcaPortIn.send(m_response(v_responsePrimitive));
+								mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 							}
 							[] mcaPortIn.receive(mw_request(?)) {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__, " : Error while retrieving container");
-								mcaPortIn.send(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
+								mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 								stop;
 							}
 							[] tc_ac.timeout {
@@ -310,12 +310,12 @@ module OneM2M_PermutationFunctions {
 								setverdict(pass, __SCOPE__, " : Container retrieve request received successfuly");
 								v_resourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
 								v_responsePrimitive := valueof(m_responsePrimitive(int2000, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
-								mcaPortIn.send(m_response(v_responsePrimitive));
+								mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 							}
 							[] mcaPortIn.receive(mw_request(?)) {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__, " : Error while retrieving container");
-								mcaPortIn.send(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
+								mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 								stop;
 							}
 							[] tc_ac.timeout {
@@ -360,12 +360,12 @@ module OneM2M_PermutationFunctions {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__, " : Container update request received successfuly");
 								v_responsePrimitive := valueof(m_responsePrimitive(int2004, v_request.primitive.requestPrimitive.requestIdentifier, omit));
-								mcaPortIn.send(m_response(v_responsePrimitive));
+								mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 							}
 							[] mcaPortIn.receive(mw_request(?)) {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__, " : Error while updating container");
-								mcaPortIn.send(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
+								mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 								stop;
 							}
 							[] tc_ac.timeout {
@@ -406,12 +406,12 @@ module OneM2M_PermutationFunctions {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__, " : Container update request received successfuly");
 								v_responsePrimitive := valueof(m_responsePrimitive(int2004, v_request.primitive.requestPrimitive.requestIdentifier, omit));
-								mcaPortIn.send(m_response(v_responsePrimitive));
+								mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 							}
 							[] mcaPortIn.receive(mw_request(?)) {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__, " : Error while updating container");
-								mcaPortIn.send(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
+								mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 								stop;
 							}
 							[] tc_ac.timeout {
@@ -460,12 +460,12 @@ module OneM2M_PermutationFunctions {
 							   v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
 
 							   //send back responsePrimitive
-								mcaPortIn.send(m_response(v_responsePrimitive));
+								mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 						   }
 							[] mcaPortIn.receive(mw_request(mw_createAe(*,?,m_contentCreateAe_Invalid))) -> value v_request {
 							   tc_ac.stop;
 							   setverdict(fail, __SCOPE__, " : AE registration request is rejected due to not including the optional attribute!");
-								mcaPortIn.send(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
+								mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 						   }
 						   [] tc_ac.timeout{
 							   setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
@@ -521,13 +521,13 @@ module OneM2M_PermutationFunctions {
 								v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
 
 								//send back responsePrimitive
-								mcaPortIn.send(m_response(v_responsePrimitive));
+								mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 							}
 	
 							[] mcaPortIn.receive {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__, " : ContentInstance creation request is rejected due to not including the attribute!");
-								mcaPortIn.send(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
+								mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 							}
 	
 							[] tc_ac.timeout{
@@ -567,12 +567,12 @@ module OneM2M_PermutationFunctions {
 								v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
 	
 								//send back responsePrimitive
-								mcaPortIn.send(m_response(v_responsePrimitive));
+								mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 							}
 							[] mcaPortIn.receive {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__, " : Container creation request is rejected due to not including the attribute!");
-								mcaPortIn.send(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
+								mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 							}
 							[] tc_ac.timeout{
 								setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
@@ -614,12 +614,12 @@ module OneM2M_PermutationFunctions {
 							   v_resourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
 							   f_updateLocalResource(v_resourceIndex, v_request.primitive.requestPrimitive.primitiveContent);
 							   v_responsePrimitive := valueof(m_responsePrimitive(int2004, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
-							   mcaPortIn.send(m_response(v_responsePrimitive));
+							   mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 						   }
 							[] mcaPortIn.receive(mw_request(?)) -> value v_request {
 							   tc_ac.stop;
 							   setverdict(fail, __SCOPE__, " : AE update request is rejected due to not including the optional attribute!");
-								mcaPortIn.send(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
+								mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 						   }
 						   [] tc_ac.timeout{
 							   setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
@@ -656,13 +656,13 @@ module OneM2M_PermutationFunctions {
 								v_resourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
 								f_updateLocalResource(v_resourceIndex, v_request.primitive.requestPrimitive.primitiveContent);
 								v_responsePrimitive := valueof(m_responsePrimitive(int2004, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
-								mcaPortIn.send(m_response(v_responsePrimitive));
+								mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 							}
 
 							[] mcaPortIn.receive {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__, " : Container update request is rejected due to not including the attribute!");
-								mcaPortIn.send(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
+								mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 							}
 
 							[] tc_ac.timeout{
@@ -703,12 +703,12 @@ module OneM2M_PermutationFunctions {
 								setverdict(pass, __SCOPE__, " : retrieve resource type request is accepted!!");
 								v_resourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
 								v_responsePrimitive := valueof(m_responsePrimitive(int2000, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
-								mcaPortIn.send(m_response(v_responsePrimitive));
+								mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 							}
 							[] mcaPortIn.receive {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__, " : error while retrieving resource !");
-								mcaPortIn.send(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
+								mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 							}
 							[] tc_ac.timeout{
 								setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
@@ -757,12 +757,12 @@ module OneM2M_PermutationFunctions {
 								v_resourceIndex := f_setLocalResource(v_resource, v_request.primitive.requestPrimitive.resourceType, v_parentIndex);	
 								v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
 								//send back responsePrimitive
-								mcaPortIn.send(m_response(v_responsePrimitive));
+								mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 							}
 							[] mcaPortIn.receive {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__, " : Subscription creation request is rejected due to not including the optional attribute!");
-								mcaPortIn.send(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
+								mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 							}
 							[] tc_ac.timeout{
 								setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
@@ -826,7 +826,7 @@ module OneM2M_PermutationFunctions {
 						v_request := f_getCreateRequestPrimitive(int3, m_createContainerBase, v_resourceIndex);
 						v_request.to_ := f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope);
 						
-						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))) {
@@ -886,7 +886,7 @@ module OneM2M_PermutationFunctions {
 						v_request := f_getCreateRequestPrimitive(int3, m_createContainerBase, v_resourceIndex);
 						v_request.to_ := f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope);
 												
-						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))) {
@@ -947,7 +947,7 @@ module OneM2M_PermutationFunctions {
 						v_addressingMethod := e_nonHierarchical;
 						v_primitiveScope := p_primitiveScope;
 						
-						mcaPort.send(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope), f_getOriginator(v_resourceIndex))));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope), f_getOriginator(v_resourceIndex)))));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) {
@@ -1004,7 +1004,7 @@ module OneM2M_PermutationFunctions {
 						v_addressingMethod := e_hierarchical;
 						v_primitiveScope := p_primitiveScope;
 						
-						mcaPort.send(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope), f_getOriginator(v_resourceIndex))));tc_ac.start;
+						mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope), f_getOriginator(v_resourceIndex)))));tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) {
 								tc_ac.stop;
@@ -1070,7 +1070,7 @@ module OneM2M_PermutationFunctions {
 						v_updateRequest := f_getUpdateRequestPrimitive(int3, v_resourceIndex, v_updateRequest);
 						v_updateRequest.to_ := f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope);
 						
-						mcaPort.send(m_request(v_updateRequest));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(v_updateRequest)));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) {
@@ -1133,7 +1133,7 @@ module OneM2M_PermutationFunctions {
 						v_updateRequest := f_getUpdateRequestPrimitive(int3, v_resourceIndex, v_updateRequest);
 						v_updateRequest.to_ := f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope);
 						
-						mcaPort.send(m_request(v_updateRequest));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(v_updateRequest)));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) {
@@ -1197,7 +1197,7 @@ module OneM2M_PermutationFunctions {
 						
 						v_request := valueof(m_delete(f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope), f_getOriginator(v_resourceIndex)));
 												
-						mcaPort.send(m_request(v_request));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) {
@@ -1257,7 +1257,7 @@ module OneM2M_PermutationFunctions {
 						
 						v_request := valueof(m_delete(f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope), f_getOriginator(v_resourceIndex)));
 						
-						mcaPort.send(m_request(v_request));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) {
@@ -1310,7 +1310,7 @@ module OneM2M_PermutationFunctions {
 						v_request := valueof(p_createAe);
 						v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, -1);
 						
-						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{
@@ -1356,7 +1356,7 @@ module OneM2M_PermutationFunctions {
 						// Test Body
 						v_request := f_getCreateRequestPrimitive(v_resourceType, p_requestPrimitive, -1);
 					
-						mccPort.send(m_request(v_request));
+						mccPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 						tc_ac.start;
 						alt {
 							[] mccPort.receive(mw_response(mw_responsePrimitive(int2001, f_getTemplateFromPrimitiveContent(v_request.primitiveContent)))) -> value v_response {
@@ -1410,7 +1410,7 @@ module OneM2M_PermutationFunctions {
 						// Test Body
 						v_request := f_getCreateRequestPrimitive(int2, p_createRequestPrimitive, -1);
 						
-						mcaPort.send(m_request(v_request));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 						tc_ac.start;
 						alt {
 							 [] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) { //BAD REQUEST
@@ -1468,7 +1468,7 @@ module OneM2M_PermutationFunctions {
 								v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, omit));
 
 								//send back responsePrimitive
-								mccPortIn.send(m_response(v_responsePrimitive));
+								mccPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 							}
 							[] mccPortIn.receive {
 								tc_ac.stop;
@@ -1537,7 +1537,7 @@ module OneM2M_PermutationFunctions {
 						 // Preamble
 						 v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
 						 
-						 mcaPort.send(m_request(m_retrieve(f_getResourceAddress(), f_getOriginator(v_aeIndex))));
+						 mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(), f_getOriginator(v_aeIndex)))));
 						 tc_ac.start;
 						 alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, p_contentResponse))) -> value v_response {
@@ -1583,7 +1583,7 @@ module OneM2M_PermutationFunctions {
 						 // Preamble
 						 v_aeIndex := f_cse_createResource(int2, p_createRequestPrimitive, -1);
 		 
-						 mcaPort.send(m_request(m_retrieve(f_getResourceAddress(v_aeIndex), f_getOriginator(v_aeIndex))));//TODO Maybe PX_SUPER_AE_ID
+						 mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_aeIndex), f_getOriginator(v_aeIndex)))));//TODO Maybe PX_SUPER_AE_ID
 						 tc_ac.start;
 						 alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, p_contentResponse))) -> value v_response {
@@ -1630,7 +1630,7 @@ module OneM2M_PermutationFunctions {
 						// Preamble
 						if(PICS_IN_CSE){
 							vc_remoteCseIndex := f_cse_registerRemoteCse(p_createRequestPrimitive);
-							mccPort.send(m_request(m_retrieve(f_getResourceAddress(vc_remoteCseIndex), f_getOriginator(vc_remoteCseIndex))));
+							mccPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(vc_remoteCseIndex), f_getOriginator(vc_remoteCseIndex)))));
 						    tc_ac.start;
 							alt {
 								[] mccPort.receive(mw_response(mw_responsePrimitive(int2000, p_contentResponse))) -> value v_response {
@@ -1655,7 +1655,7 @@ module OneM2M_PermutationFunctions {
 							}
 						} else if (PICS_MN_CSE){
 							vc_remoteCseIndex := f_cse_registrationRemoteCse(p_createRequestPrimitive);
-							mccPort.send(m_request(m_retrieve(f_getResourceAddress(vc_remoteCseIndex), f_getOriginator(vc_remoteCseIndex))));
+							mccPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(vc_remoteCseIndex), f_getOriginator(vc_remoteCseIndex)))));
 							tc_ac.start;
 							alt {
 								[] mccPort.receive(mw_response(mw_responsePrimitive(int2000, p_contentResponse))) -> value v_response {
@@ -1709,7 +1709,7 @@ module OneM2M_PermutationFunctions {
 						// Test Body
 						v_request := f_getUpdateRequestPrimitive(int16, vc_remoteCseIndex, p_requestPrimitive);
 	
-						mccPort.send(m_request(v_request));
+						mccPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 						tc_ac.start;
 						alt {
 							[] mccPort.receive(mw_response(mw_responsePrimitive(int2004, f_getTemplateFromPrimitiveContent(v_request.primitiveContent)))) -> value v_response {
@@ -1878,7 +1878,7 @@ module OneM2M_PermutationFunctions {
     					
 						v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, 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(int2001))) -> value vc_response {
@@ -1954,7 +1954,7 @@ module OneM2M_PermutationFunctions {
     					
 							v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, vc_remoteCseIndex);
 						
-							mccPort.send(m_request(v_request));
+							mccPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 							tc_ac.start;
 							alt {
 								[] mccPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value vc_response {
@@ -2019,7 +2019,7 @@ module OneM2M_PermutationFunctions {
 						// Test Body
 						v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_aeIndex);
 						
-						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 vc_response {
@@ -2091,7 +2091,7 @@ module OneM2M_PermutationFunctions {
 							vc_ae2.start(f_cse_notifyProcedure_subscriptionVerificationHandler());
 						}
     					
-						mcaPort.send(m_request(v_request));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int4105))) -> value v_response {
@@ -2150,7 +2150,7 @@ module OneM2M_PermutationFunctions {
 						// Test Body
 						v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_aeIndex);
 						
-						mcaPort.send(m_request(v_request));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response {
@@ -2207,7 +2207,7 @@ module OneM2M_PermutationFunctions {
 						// Test Body
 						v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_aeIndex);
 						
-						mcaPort.send(m_request(v_request, {p_invalidAttribute}));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(v_request, {p_invalidAttribute})));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) -> value v_response {
@@ -2266,7 +2266,7 @@ module OneM2M_PermutationFunctions {
 						// Test Body
 						v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_aeIndex);
 					
-						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 vc_response {
@@ -2352,9 +2352,9 @@ module OneM2M_PermutationFunctions {
 						v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_parentIndex);
 					
 						if(v_myOptionalAttribute == "creator") {
-							mcaPort.send(m_request(v_request, {{v_myOptionalAttribute, omit}}));
+							mcaPort.send(f_getMsgOutPrimitive(m_request(v_request, {{v_myOptionalAttribute, omit}})));
 						} else {
-							mcaPort.send(m_request(v_request));
+							mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 						}
 						tc_ac.start;
 						alt {
@@ -2420,7 +2420,7 @@ module OneM2M_PermutationFunctions {
 						// Test Body
 						v_request := f_getCreateRequestPrimitive(p_childResourceType, p_childRequestPrimitive, v_resourceIndex); 
 	
-						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 {
@@ -2441,7 +2441,7 @@ module OneM2M_PermutationFunctions {
 						}	
 						
 						//Check currentByteSize
-						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 {
@@ -2495,7 +2495,7 @@ module OneM2M_PermutationFunctions {
 						v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_aeIndex);
 						v_request.resultContent := int0;//Attributes
 						
-						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, omit))) -> value v_response {
@@ -2551,7 +2551,7 @@ module OneM2M_PermutationFunctions {
 						v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_aeIndex);
 						v_request.resultContent := int2;//Attributes
 						
-						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, p_contentResponse))) -> value v_response {
@@ -2612,7 +2612,7 @@ module OneM2M_PermutationFunctions {
 						v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_aeIndex);
 						v_request.resultContent := int3;//Attributes + Hierarchichal Address
 						
-						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, p_contentResponse))) -> value v_response {
@@ -2674,7 +2674,7 @@ module OneM2M_PermutationFunctions {
 						// Test Body
 						v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_parentIndex);
 						
-						mcaPort.send(m_request(v_request));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 						
 						vc_cse1.start(f_cse_receiveCreateRequest(p_requestAnnc));
 						vc_cse1.done;	
@@ -2727,7 +2727,7 @@ module OneM2M_PermutationFunctions {
 						v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_parentIndex);
 						
 						vc_cse1.start(f_cse_receiveCreateRequest(p_requestAnnc));						
-						mcaPort.send(m_request(v_request));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 						vc_cse1.done;	
     								
 						vc_request.primitive.requestPrimitive := f_getRequestPrimitive(vc_cse1);
@@ -2778,7 +2778,7 @@ module OneM2M_PermutationFunctions {
 						v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_parentIndex); 				
     									
 						// Test Body
-						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 {
@@ -2845,7 +2845,7 @@ module OneM2M_PermutationFunctions {
 						v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex); 	
 
 						// Test Body
-						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 {
@@ -2898,7 +2898,7 @@ module OneM2M_PermutationFunctions {
 						v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex); 				
     									
 						// Test Body
-						mcaPort.send(m_request(m_retrieveAttributeToOption(f_getResourceAddress(v_resourceIndex) & v_attribute, f_getOriginator(v_resourceIndex))));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieveAttributeToOption(f_getResourceAddress(v_resourceIndex) & v_attribute, f_getOriginator(v_resourceIndex)))));
 
 						tc_ac.start;
 						alt {
@@ -2954,7 +2954,7 @@ module OneM2M_PermutationFunctions {
 						v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex); 				
     									
 						// Test Body
-						mcaPort.send(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex) ,	{"pi"}, f_getOriginator(v_resourceIndex))));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex) ,	{"pi"}, f_getOriginator(v_resourceIndex)))));
 
 						tc_ac.start;
 						alt {
@@ -3202,7 +3202,7 @@ module OneM2M_PermutationFunctions {
 						}
 						
 						// Test Body
-						mcaPort.send(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_aeIndex))));//from AE ID
+						mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_aeIndex)))));//from AE ID
 
 						tc_ac.start;
 						alt {
@@ -3298,7 +3298,7 @@ module OneM2M_PermutationFunctions {
 						}
 								
 						// Test Body
-						mcaPort.send(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_aeIndex))));//from AE ID
+						mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_aeIndex)))));//from AE ID
 
 						tc_ac.start;
 						alt {
@@ -3373,7 +3373,7 @@ module OneM2M_PermutationFunctions {
 						}
 						
 						// Test Body
-						mcaPort.send(m_request(m_retrieveAttributeToOption(f_getResourceAddress(v_resourceIndex) & v_attribute, f_getOriginator(v_aeIndex))));//from AE ID
+						mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieveAttributeToOption(f_getResourceAddress(v_resourceIndex) & v_attribute, f_getOriginator(v_aeIndex)))));//from AE ID
 
 						tc_ac.start;
 						alt {
@@ -3454,7 +3454,7 @@ module OneM2M_PermutationFunctions {
 							v_resourceIndex := f_getRemoteCseResource(vc_cse1);
 						}
 						
-						mcaPort.send(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex) ,	{"pi"}, f_getOriginator(v_aeIndex))));//from AE ID
+						mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex) ,	{"pi"}, f_getOriginator(v_aeIndex)))));//from AE ID
 
 						tc_ac.start;
 						alt {
@@ -3752,7 +3752,7 @@ module OneM2M_PermutationFunctions {
 					// Test Body
 					v_request := valueof(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
 					v_request.resultContent := p_resultContent;
-					mcaPort.send(m_request(v_request));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) { //BAD REQUEST
@@ -3817,7 +3817,7 @@ module OneM2M_PermutationFunctions {
 						// Test Body
 						v_request := valueof(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
 						v_request.resultContent := int1;//Attributes
-						mcaPort.send(m_request(v_request));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, p_contentResponse))) -> value v_response {
@@ -3886,7 +3886,7 @@ module OneM2M_PermutationFunctions {
 						// Test Body
 						v_request := valueof(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
 						v_request.resultContent := int4;//Attributes and child resources
-						mcaPort.send(m_request(v_request));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, p_contentResponse))) -> value v_response {
@@ -3956,7 +3956,7 @@ module OneM2M_PermutationFunctions {
 						// Test Body
 						v_request := valueof(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
 						v_request.resultContent := int5;//attributes and child resource references
-						mcaPort.send(m_request(v_request));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, p_contentResponse))) -> value v_response {
@@ -4025,7 +4025,7 @@ module OneM2M_PermutationFunctions {
 						// Test Body
 						v_request := valueof(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
 						v_request.resultContent := int6;//Child resource references
-						mcaPort.send(m_request(v_request));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, p_contentResponse))) -> value v_response {
@@ -4094,7 +4094,7 @@ module OneM2M_PermutationFunctions {
 						// Test Body
 						v_request := valueof(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
 						v_request.resultContent := int6;//Child resource references
-						mcaPort.send(m_request(v_request));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, p_contentResponse))) -> value v_response {
@@ -4155,7 +4155,7 @@ module OneM2M_PermutationFunctions {
 						// Test Body
 						v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, 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(int2004))) -> value vc_response {
@@ -4216,7 +4216,7 @@ module OneM2M_PermutationFunctions {
 						// Test Body
 						v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, 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(int2004))) -> value vc_response {
@@ -4276,7 +4276,7 @@ module OneM2M_PermutationFunctions {
 						// Test Body
 						v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive);
 						
-						mcaPort.send(m_request(v_request, p_nullFields));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(v_request, p_nullFields)));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value vc_response {
@@ -4334,7 +4334,7 @@ module OneM2M_PermutationFunctions {
 						// Test Body
 						v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive);
 						
-						mcaPort.send(m_request(v_request, p_nullFields));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(v_request, p_nullFields)));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value vc_response {
@@ -4399,7 +4399,7 @@ module OneM2M_PermutationFunctions {
 						// Test Body
 						v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, 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(int4103))) -> value v_response {
@@ -4455,7 +4455,7 @@ module OneM2M_PermutationFunctions {
 						// Test Body
 						v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, 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(int4000))) -> value v_response {
@@ -4511,7 +4511,7 @@ module OneM2M_PermutationFunctions {
 						// Test Body
 						v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive);
 						
-						mcaPort.send(m_request(v_request,p_nullFields));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(v_request,p_nullFields)));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) -> value v_response {
@@ -4567,7 +4567,7 @@ module OneM2M_PermutationFunctions {
 						// Test Body
 						v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive);
 	
-						mcaPort.send(m_request(v_request));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 						
 						tc_ac.start;
 						alt {
@@ -4622,7 +4622,7 @@ module OneM2M_PermutationFunctions {
 						// Test Body
 						v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, 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(int2004))) -> value vc_response {
@@ -4703,7 +4703,7 @@ module OneM2M_PermutationFunctions {
 						//Test Body
 						vc_request.primitive.requestPrimitive := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive);
  
-						mcaPort.send(m_request(vc_request.primitive.requestPrimitive)); //CSEBase
+						mcaPort.send(f_getMsgOutPrimitive(m_request(vc_request.primitive.requestPrimitive))); //CSEBase
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value vc_response {
@@ -4792,7 +4792,7 @@ module OneM2M_PermutationFunctions {
 							v_request.primitiveContent.subscription.notificationURI := {f_getResourceAddress(v_aeIndex)};							
 						}
 						
-						mcaPort.send(m_request(v_request));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 						
 						tc_ac.start;
 						alt {
@@ -4813,7 +4813,7 @@ module OneM2M_PermutationFunctions {
 								setverdict(pass, __SCOPE__ & ":INFO: Notification for Subscription verification received");
 								v_responsePrimitive := valueof(m_responseNotification(int2000, omit));
 								v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
-								mcaPortIn.send(m_response(v_responsePrimitive));
+								mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 								tc_ac.start;
 								repeat;
 							}
@@ -4874,7 +4874,7 @@ module OneM2M_PermutationFunctions {
 						// Test Body
 						v_request := valueof(m_delete(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 {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) -> value v_response {
@@ -4963,7 +4963,7 @@ module OneM2M_PermutationFunctions {
 						v_request := valueof(m_delete(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
 						v_request.from_ := f_getOriginator(v_aeIndex);
                 		
-						mcaPort.send(m_request(v_request));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response {
@@ -5037,7 +5037,7 @@ module OneM2M_PermutationFunctions {
 						f_checkAeSimuStatus();
                 		
 						// 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 {
@@ -5132,7 +5132,7 @@ module OneM2M_PermutationFunctions {
 						
 						// Test Body
 	
-						mcaPort.send(m_request(valueof(p_requestPrimitive)));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(p_responseStatusCode))) -> value v_response {
@@ -5209,7 +5209,7 @@ module OneM2M_PermutationFunctions {
 	
 						// Test Body
 	
-						mcaPort.send(m_request(valueof(p_requestPrimitive)));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response {
@@ -5276,7 +5276,7 @@ module OneM2M_PermutationFunctions {
 	
 						// Test Body
 	
-						mcaPort.send(m_request(valueof(p_requestPrimitive)));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(p_responseStatusCode))) -> value v_response {
@@ -5353,7 +5353,7 @@ module OneM2M_PermutationFunctions {
 	
 						// Test Body
 	
-						mcaPort.send(m_request(valueof(p_requestPrimitive)));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response {
@@ -5416,7 +5416,7 @@ module OneM2M_PermutationFunctions {
 	
 						// Test Body
 	
-						mcaPort.send(m_request(valueof(p_requestPrimitive)));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(p_responseStatusCode))) -> value v_response {
@@ -5503,7 +5503,7 @@ module OneM2M_PermutationFunctions {
 	
 						// Test Body
 	
-						mcaPort.send(m_request(v_createRequest));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(v_createRequest)));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
@@ -5576,7 +5576,7 @@ module OneM2M_PermutationFunctions {
 				v_resourceIndex := f_cse_createResource(c_containerResourceType, m_createContainerBase, v_aeIndex);
 				v_childResourceIndex := f_cse_createResource(c_containerResourceType, m_createContainerBase, v_resourceIndex); 
 				v_request := valueof(m_retrieveFilterCriteria(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex), p_filterCriteria));
-				mcaPort.send(m_request(v_request));
+				mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 				tc_ac.start;
 				alt {
 	
@@ -5680,7 +5680,7 @@ module OneM2M_PermutationFunctions {
 							p_requestPrimitive.from_ := "UnknowOriginator";
 							p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
 	
-							mcaPort.send(m_request(valueof(p_requestPrimitive)));
+							mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
 							tc_ac.start;
 							alt {
 								[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response {
@@ -5753,7 +5753,7 @@ module OneM2M_PermutationFunctions {
 							p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);
 							p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
 	
-							mcaPort.send(m_request(valueof(p_requestPrimitive)));
+							mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
 							tc_ac.start;
 							alt {
 								[] mcaPort.receive(mw_response(mw_responsePrimitive(p_responseStatusCode))) -> value v_response {
@@ -5809,7 +5809,7 @@ module OneM2M_PermutationFunctions {
 							p_requestPrimitive.from_ := "testDomain";
 							p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
 							
-							mcaPort.send(m_request(valueof(p_requestPrimitive)));
+							mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
 							tc_ac.start;
 							alt {
 								[] mcaPort.receive(mw_response(mw_responsePrimitive(p_responseStatusCode))) -> value v_response {
@@ -5835,7 +5835,7 @@ module OneM2M_PermutationFunctions {
 							v_updateRequest := valueof(m_updateAcpPrivileges(v_setOfArcs, v_setOfArcs));
 							v_updateRequest := f_getUpdateRequestPrimitive(int1, v_acpIndex, v_updateRequest);
 							v_updateRequest.from_ := "testDomain";
-							mcaPort.send(m_request(v_updateRequest));
+							mcaPort.send(f_getMsgOutPrimitive(m_request(v_updateRequest)));
 							tc_ac.start;
 							alt {
 								[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
@@ -5883,7 +5883,7 @@ module OneM2M_PermutationFunctions {
 							p_requestPrimitive.from_ := "UnknowOriginator";
 							p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
 			
-							mcaPort.send(m_request(valueof(p_requestPrimitive)));
+							mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
 							tc_ac.start;
 							alt {
 								[] mcaPort.receive(mw_response(mw_responsePrimitive(p_responseStatusCode))) -> value v_response {
@@ -5941,7 +5941,7 @@ module OneM2M_PermutationFunctions {
 							p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);
 							p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
 			
-							mcaPort.send(m_request(valueof(p_requestPrimitive)));
+							mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
 							tc_ac.start;
 							alt {
 								[] mcaPort.receive(mw_response(mw_responsePrimitive(p_responseStatusCode))) -> value v_response {
@@ -6011,7 +6011,7 @@ module OneM2M_PermutationFunctions {
 							p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);
 							p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
 			
-							mcaPort.send(m_request(valueof(p_requestPrimitive)));
+							mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
 							tc_ac.start;
 							alt {
 								[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response {
@@ -6074,7 +6074,7 @@ module OneM2M_PermutationFunctions {
 							p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);
 							p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
 			
-							mcaPort.send(m_request(valueof(p_requestPrimitive)));
+							mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
 							tc_ac.start;
 							alt {
 								[] mcaPort.receive(mw_response(mw_responsePrimitive(p_responseStatusCode))) -> value v_response {
@@ -6132,7 +6132,7 @@ module OneM2M_PermutationFunctions {
 							p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);
 							p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
 			
-							mcaPort.send(m_request(valueof(p_requestPrimitive)));
+							mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
 							tc_ac.start;
 							alt {
 								[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response {
@@ -6188,7 +6188,7 @@ module OneM2M_PermutationFunctions {
 							p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);
 							p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
 			
-							mcaPort.send(m_request(valueof(p_requestPrimitive)));
+							mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
 							tc_ac.start;
 							alt {
 								[] mcaPort.receive(mw_response(mw_responsePrimitive(p_responseStatusCode))) -> value v_response {
@@ -6249,7 +6249,7 @@ module OneM2M_PermutationFunctions {
 							p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);
 							p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
 			
-							mcaPort.send(m_request(valueof(p_requestPrimitive)));
+							mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
 							tc_ac.start;
 							alt {
 								[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response {
@@ -6305,7 +6305,7 @@ module OneM2M_PermutationFunctions {
 							p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);
 							p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
 	
-							mcaPort.send(m_request(valueof(p_requestPrimitive)));
+							mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
 							tc_ac.start;
 							alt {
 								[] mcaPort.receive(mw_response(mw_responsePrimitive(p_responseStatusCode))) -> value v_response {
@@ -6367,7 +6367,7 @@ module OneM2M_PermutationFunctions {
 							// Test Body
 							v_request := f_getCreateRequestPrimitive(int3, p_requestPrimitive, v_containerIndex);
 							
-							mcaPort.send(m_request(valueof(v_request)));
+							mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(v_request))));
 							tc_ac.start;
 							alt {
 								[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response {
@@ -6447,7 +6447,7 @@ module OneM2M_PermutationFunctions {
 					  	v_responsePrimitive.responseStatusCode := int2001;
 					}
 					vc_cse1.start(f_cse_announcementProcedure_createHandler(p_createRequestAnnc));	
-					mcaPort.send(m_request(v_request));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 
 					tc_ac.start;
 					alt {
diff --git a/OneM2M_Testcases_AE_Release_1.ttcn b/OneM2M_Testcases_AE_Release_1.ttcn
index 7d5f242..b394d30 100644
--- a/OneM2M_Testcases_AE_Release_1.ttcn
+++ b/OneM2M_Testcases_AE_Release_1.ttcn
@@ -39,6 +39,8 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_CRE_001_CSR() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 												
 						// Test control
 						if(not(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE)) {
@@ -53,6 +55,8 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_CRE_001_SPR() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 												
 						// Test control
 						if(not(PICS_PRIMITIVE_SCOPE_SP_RELATIVE)) {
@@ -67,6 +71,8 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_CRE_001_ABS() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						
 						// Test control
 						if(not(PICS_PRIMITIVE_SCOPE_ABSOLUTE)) {
@@ -88,6 +94,8 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_CRE_002_CSR() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						
 						if(not(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE)) {
 							setverdict(inconc, __SCOPE__, ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
@@ -101,6 +109,8 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_CRE_002_SPR() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						
 						if(not(PICS_PRIMITIVE_SCOPE_SP_RELATIVE)) {
 							setverdict(inconc, __SCOPE__, ": Structured-SP-Relative-Resource-ID format support is required to run this test case");
@@ -114,6 +124,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_CRE_002_ABS() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						
 						if(not(PICS_PRIMITIVE_SCOPE_ABSOLUTE)) {
 							setverdict(inconc, __SCOPE__, ": Structured-Absolute-Resource-ID format support is required to run this test case");
@@ -139,6 +150,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_UPD_001_CSR() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						
 						// Test control
 						if(not(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE)) {
@@ -153,6 +165,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_UPD_001_SPR() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						
 					//Test control
 					if(not(PICS_PRIMITIVE_SCOPE_SP_RELATIVE)) {
@@ -167,6 +180,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_UPD_001_ABS() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_ABSOLUTE)) {
@@ -189,6 +203,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_UPD_002_CSR() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE)) {
@@ -203,6 +218,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_UPD_002_SPR() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_SP_RELATIVE)) {
@@ -217,6 +233,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_UPD_002_ABS() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_ABSOLUTE)) {
@@ -243,6 +260,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_RET_001_CSR() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						
 						// Test control
 						if(not(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE)) {
@@ -257,6 +275,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_RET_001_SPR() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_SP_RELATIVE)) {
@@ -271,6 +290,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_RET_001_ABS() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_ABSOLUTE)) {
@@ -293,6 +313,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_RET_002_CSR() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE)) {
@@ -307,6 +328,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_RET_002_SPR() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_SP_RELATIVE)) {
@@ -321,6 +343,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_RET_002_ABS() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_ABSOLUTE)) {
@@ -347,6 +370,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_DEL_001_CSR() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE)) {
@@ -361,6 +385,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_DEL_001_SPR() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_SP_RELATIVE)) {
@@ -375,6 +400,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_DEL_001_ABS() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_ABSOLUTE)) {
@@ -397,6 +423,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_DEL_002_CSR() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE)) {
@@ -411,6 +438,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_DEL_002_SPR() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_SP_RELATIVE)) {
@@ -425,6 +453,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_GEN_DEL_002_ABS() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_ABSOLUTE)) {
@@ -453,6 +482,7 @@ module OneM2M_Testcases_AE_Release_1 {
 				testcase TC_AE_REG_CRE_001() runs on Tester system AeSystem {
 						
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 					
 					v_cse1.start(f_AE_REG_CRE_001());
 					
@@ -492,12 +522,12 @@ module OneM2M_Testcases_AE_Release_1 {
 							v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
 							
 							//send back responsePrimitive
-							mcaPortIn.send(m_response(v_responsePrimitive));
+							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 						}
 						[] mcaPortIn.receive(mw_request(mw_createAe(*,?,m_contentCreateAe_Invalid))) -> value v_request {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__, " : AE registration request is rejected due to not including mandatory attributes!!");
-							mcaPortIn.send(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
+							mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 						}
 						[] tc_ac.timeout{
 							setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
@@ -518,6 +548,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_REG_CRE_002_RN() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						//primitives for utPort
 						var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
 						var template RequestPrimitive v_createAe := mw_createAe;
@@ -531,6 +562,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_REG_CRE_002_ET() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						//primitives for utPort
 						var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
 						var template RequestPrimitive v_createAe := mw_createAe;
@@ -545,6 +577,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_REG_CRE_002_LBL() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						//primitives for utPort
 						var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
 						var template RequestPrimitive v_createAe := mw_createAe;
@@ -558,6 +591,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_REG_CRE_002_APN() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						//primitives for utPort
 						var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
 						var template RequestPrimitive v_createAe := mw_createAe;
@@ -571,6 +605,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_REG_CRE_002_API() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						//primitives for utPort
 						var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
 						var template RequestPrimitive v_createAe := mw_createAe;
@@ -584,6 +619,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_REG_CRE_002_POA() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						//primitives for utPort
 						var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
 						var template RequestPrimitive v_createAe := mw_createAe;
@@ -597,6 +633,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_REG_CRE_002_OR() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						//primitives for utPort
 						var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
 						var template RequestPrimitive v_createAe := mw_createAe;
@@ -610,6 +647,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_REG_CRE_002_NL() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						//primitives for utPort
 						var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
 						var template RequestPrimitive v_createAe := mw_createAe;
@@ -623,6 +661,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_REG_CRE_002_RR() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						//primitives for utPort
 						var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
 						var template RequestPrimitive v_createAe := mw_createAe;
@@ -637,6 +676,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_REG_CRE_002_CSZ() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						//primitives for utPort
 						var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
 						var template RequestPrimitive v_createAe := mw_createAe;
@@ -661,6 +701,7 @@ module OneM2M_Testcases_AE_Release_1 {
 				testcase TC_AE_REG_DEL_001() runs on Tester system AeSystem {
 						
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 					
 					v_cse1.start(f_AE_REG_DEL_001());
 					
@@ -696,12 +737,12 @@ module OneM2M_Testcases_AE_Release_1 {
 							v_responsePrimitive := valueof(m_responsePrimitive(int2002, v_request.primitive.requestPrimitive.requestIdentifier, omit));
 	
 							//send back responsePrimitive
-							mcaPortIn.send(m_response(v_responsePrimitive));
+							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 						}
 						[] mcaPortIn.receive {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__, " : Error while AE deregistration");
-							mcaPortIn.send(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
+							mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 						}
 						[] tc_ac.timeout{
 							setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
@@ -727,6 +768,7 @@ module OneM2M_Testcases_AE_Release_1 {
 				testcase TC_AE_DMR_CRE_001() runs on Tester system AeSystem {
 						
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 					
 					v_cse1.start(f_AE_DMR_CRE_001());
 					
@@ -764,12 +806,12 @@ module OneM2M_Testcases_AE_Release_1 {
 							v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
 							
 							//send back responsePrimitive
-							mcaPortIn.send(m_response(v_responsePrimitive));
+							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 						}
 						[] mcaPortIn.receive {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__, " : Container creation request is rejected due to not including mandatory attributes!!");
-							mcaPortIn.send(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
+							mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 						}
 						[] tc_ac.timeout{
 							setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
@@ -786,6 +828,7 @@ module OneM2M_Testcases_AE_Release_1 {
 				testcase TC_AE_DMR_CRE_002() runs on Tester system AeSystem {
 						
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 					
 					v_cse1.start(f_AE_DMR_CRE_002());
 					
@@ -829,12 +872,12 @@ module OneM2M_Testcases_AE_Release_1 {
 							v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
 	
 							//send back responsePrimitive
-							mcaPortIn.send(m_response(v_responsePrimitive));
+							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 						}
 						[] mcaPortIn.receive {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__, " : ContentInstance creation request is rejected due to not including mandatory attributes!!");
-							mcaPortIn.send(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
+							mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 						}
 	
 						[] tc_ac.timeout{
@@ -855,6 +898,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_DMR_CRE_003_CNF() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContentInstance;
 						var template RequestPrimitive v_request := mw_createContentInstance;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute ContentInfo";
@@ -867,6 +911,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_DMR_CRE_003_RN() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContentInstance;
 						var template RequestPrimitive v_request := mw_createContentInstance;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute ResourceName";
@@ -879,6 +924,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_DMR_CRE_003_ET() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContentInstance;
 						var template RequestPrimitive v_request := mw_createContentInstance;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute ExpirationTime";
@@ -892,6 +938,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_DMR_CRE_003_LBL() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContentInstance;
 						var template RequestPrimitive v_request := mw_createContentInstance;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute Labels";
@@ -904,6 +951,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_DMR_CRE_003_CR() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContentInstance;
 						var template RequestPrimitive v_request := mw_createContentInstance;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute Creator";
@@ -926,6 +974,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_DMR_CRE_004_ACPI() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
 						var template RequestPrimitive v_request := mw_createContainer;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute AccessControlPolicyIDs";
@@ -938,6 +987,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_DMR_CRE_004_MNI() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
 						var template RequestPrimitive v_request := mw_createContainer;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute MaxNrOfInstances";
@@ -951,6 +1001,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_DMR_CRE_004_MBS() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
 						var template RequestPrimitive v_request := mw_createContainer;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute MaxByteSize";
@@ -964,6 +1015,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_DMR_CRE_004_MIA() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
 						var template RequestPrimitive v_request := mw_createContainer;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute MaxInstanceAge";
@@ -977,6 +1029,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_DMR_CRE_004_OR() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
 						var template RequestPrimitive v_request := mw_createContainer;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute OntologyRef";
@@ -989,6 +1042,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_DMR_CRE_004_RN() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
 						var template RequestPrimitive v_request := mw_createContainer;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute ResourceName";
@@ -1001,6 +1055,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_DMR_CRE_004_ET() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
 						var template RequestPrimitive v_request := mw_createContainer;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute ExpirationTime";
@@ -1014,6 +1069,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_DMR_CRE_004_LBL() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
 						var template RequestPrimitive v_request := mw_createContainer;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute Labels";
@@ -1026,6 +1082,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_DMR_CRE_004_CR() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
 						var template RequestPrimitive v_request := mw_createContainer;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute Creator";
@@ -1049,7 +1106,8 @@ module OneM2M_Testcases_AE_Release_1 {
 	
 					testcase TC_AE_DMR_UPD_001_ET() runs on Tester system AeSystem {
 						
-						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;						
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);						
 						
 						var template RequestPrimitive v_expectedUpdateRequestAe;
 						var universal charstring v_action := "Please, send a valid UPDATE Request for AE updating attribute expirationTime";
@@ -1066,7 +1124,8 @@ module OneM2M_Testcases_AE_Release_1 {
 					
 					testcase TC_AE_DMR_UPD_001_LBL() runs on Tester system AeSystem {
 						
-						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;						
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);						
 						var template RequestPrimitive v_expectedUpdateRequestAe;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateAe;
 						var universal charstring v_action := "Please, send a valid UPDATE Request for AE updating attribute labels";
@@ -1084,6 +1143,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_DMR_UPD_001_APN() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						
 						var template RequestPrimitive v_expectedUpdateRequestAe;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateAe;
@@ -1101,6 +1161,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_DMR_UPD_001_POA() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						
 						var template RequestPrimitive v_expectedUpdateRequestAe;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateAe;
@@ -1118,6 +1179,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_DMR_UPD_001_OR() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						
 						var template RequestPrimitive v_expectedUpdateRequestAe;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateAe;
@@ -1135,6 +1197,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_DMR_UPD_001_NL() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						
 						var template RequestPrimitive v_expectedUpdateRequestAe;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateAe;
@@ -1152,6 +1215,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_DMR_UPD_001_RR() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						var template RequestPrimitive v_expectedUpdateRequestAe;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateAe;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute requestReachability";
@@ -1169,6 +1233,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_DMR_UPD_001_CSZ() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						var template RequestPrimitive v_expectedUpdateRequestAe;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateAe;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute contentSerialization";
@@ -1194,6 +1259,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_DMR_UPD_002_ET() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						var template RequestPrimitive v_request := mw_updateContainer;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute expirationTime";
@@ -1206,6 +1272,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_DMR_UPD_002_LBL() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						var template RequestPrimitive v_request := mw_updateContainer;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute labels";
@@ -1218,6 +1285,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_DMR_UPD_002_MNI() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						var template RequestPrimitive v_request := mw_updateContainer;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute maxNrOfInstances";
@@ -1231,6 +1299,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_DMR_UPD_002_MBS() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						var template RequestPrimitive v_request := mw_updateContainer;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute maxByteSize";
@@ -1244,6 +1313,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_DMR_UPD_002_MIA() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						var template RequestPrimitive v_request := mw_updateContainer;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute maxInstanceAge";
@@ -1269,6 +1339,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_DMR_RET_001_CB() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for CSEBase";
 						v_cse1.start(f_AE_DMR_RET_001(int5, m_primitiveContentCSEBase(m_contentCreateCSEBase),v_action));
 						v_cse1.done;
@@ -1277,6 +1348,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_DMR_RET_001_AE() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for AE";
 						v_cse1.start(f_AE_DMR_RET_001(int2, m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit)),v_action));
 						v_cse1.done;
@@ -1285,6 +1357,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_DMR_RET_001_CNT() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for Container";
 						v_cse1.start(f_AE_DMR_RET_001(int3, m_primitiveContentContainer(m_contentCreateContainer()),v_action));
 						v_cse1.done;
@@ -1299,6 +1372,7 @@ module OneM2M_Testcases_AE_Release_1 {
 				testcase TC_AE_DMR_RET_002() runs on Tester system AeSystem {
 						
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 					
 					v_cse1.start(f_AE_DMR_RET_002());
 					
@@ -1333,12 +1407,12 @@ module OneM2M_Testcases_AE_Release_1 {
 							setverdict(pass, __SCOPE__, " : retrieve attribute oldest request is accepted!");
 							v_resourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
 							v_responsePrimitive := valueof(m_responsePrimitive(int2000, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
-							mcaPortIn.send(m_response(v_responsePrimitive));
+							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 						}
 						[] mcaPortIn.receive {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__, " : error while retrieving attribute !");
-							mcaPortIn.send(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
+							mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 						}
 						[] tc_ac.timeout{
 							setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
@@ -1356,6 +1430,7 @@ module OneM2M_Testcases_AE_Release_1 {
 				testcase TC_AE_DMR_RET_003() runs on Tester system AeSystem {
 						
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 					
 					v_cse1.start(f_AE_DMR_RET_003());
 					
@@ -1390,12 +1465,12 @@ module OneM2M_Testcases_AE_Release_1 {
 							setverdict(pass, __SCOPE__, " : retrieve attribute latest request is accepted!!");
 							v_resourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
 							v_responsePrimitive := valueof(m_responsePrimitive(int2000, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
-							mcaPortIn.send(m_response(v_responsePrimitive));
+							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 						}
 						[] mcaPortIn.receive {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__, " : error while retrieving attribute !");
-							mcaPortIn.send(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
+							mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 						}
 						[] tc_ac.timeout{
 							setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
@@ -1413,6 +1488,7 @@ module OneM2M_Testcases_AE_Release_1 {
 				testcase TC_AE_DMR_RET_004() runs on Tester system AeSystem {
 						
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 					
 					v_cse1.start(f_AE_DMR_RET_004());
 					
@@ -1447,12 +1523,12 @@ module OneM2M_Testcases_AE_Release_1 {
 							setverdict(pass, __SCOPE__, " : retrieve resource type request is accepted!!");
 							v_resourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
 							v_responsePrimitive := valueof(m_responsePrimitive(int2000, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
-							mcaPortIn.send(m_response(v_responsePrimitive));
+							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 						}
 						[] mcaPortIn.receive {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__, " : error while retrieving resource !");
-							mcaPortIn.send(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
+							mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 						}
 						[] tc_ac.timeout{
 							setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
@@ -1470,6 +1546,7 @@ module OneM2M_Testcases_AE_Release_1 {
 				testcase TC_AE_DMR_RET_005 () runs on Tester system AeSystem {
 						
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 					
 					v_cse1.start(f_AE_DMR_RET_005());
 					
@@ -1504,12 +1581,12 @@ module OneM2M_Testcases_AE_Release_1 {
 							setverdict(pass, __SCOPE__, " : retrieve resource type request is accepted!!");
 							v_resourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
 							v_responsePrimitive := valueof(m_responsePrimitive(int2000, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
-							mcaPortIn.send(m_response(v_responsePrimitive));
+							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 						}
 						[] mcaPortIn.receive {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__, " : error while retrieving resource !");
-							mcaPortIn.send(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
+							mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 						}
 						[] tc_ac.timeout{
 							setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
@@ -1531,6 +1608,7 @@ module OneM2M_Testcases_AE_Release_1 {
 				testcase TC_AE_DMR_DEL_001() runs on Tester system AeSystem {
 						
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 					
 					v_cse1.start(f_AE_DMR_DEL_001());
 					
@@ -1568,7 +1646,7 @@ module OneM2M_Testcases_AE_Release_1 {
 							v_responsePrimitive := valueof(m_responsePrimitive(int2002, v_request.primitive.requestPrimitive.requestIdentifier, omit));
 
 							//send back responsePrimitive
-							mcaPortIn.send(m_response(v_responsePrimitive));
+							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 							tc_ac.stop;
 						}
 						[] mcaPortIn.receive {
@@ -1591,6 +1669,7 @@ module OneM2M_Testcases_AE_Release_1 {
 				testcase TC_AE_DMR_DEL_002() runs on Tester system AeSystem {
 						
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 					
 					v_cse1.start(f_AE_DMR_DEL_002());
 					
@@ -1628,7 +1707,7 @@ module OneM2M_Testcases_AE_Release_1 {
 							v_responsePrimitive := valueof(m_responsePrimitive(int2002, v_request.primitive.requestPrimitive.requestIdentifier, omit));
 
 							//send back responsePrimitive
-							mcaPortIn.send(m_response(v_responsePrimitive));
+							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 							tc_ac.stop;
 						}
 						[] mcaPortIn.receive {
@@ -1651,6 +1730,7 @@ module OneM2M_Testcases_AE_Release_1 {
 				testcase TC_AE_DMR_DEL_003() runs on Tester system AeSystem {
 						
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 					
 					v_cse1.start(f_AE_DMR_DEL_003());
 					
@@ -1688,7 +1768,7 @@ module OneM2M_Testcases_AE_Release_1 {
 							v_responsePrimitive := valueof(m_responsePrimitive(int2002, v_request.primitive.requestPrimitive.requestIdentifier, omit));
 
 							//send back responsePrimitive
-							mcaPortIn.send(m_response(v_responsePrimitive));
+							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 							tc_ac.stop;
 						}
 						[] mcaPortIn.receive {
@@ -1711,6 +1791,7 @@ module OneM2M_Testcases_AE_Release_1 {
 				testcase TC_AE_DMR_DEL_004 () runs on Tester system AeSystem {
 						
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 					
 					v_cse1.start(f_AE_DMR_DEL_004());
 					
@@ -1748,7 +1829,7 @@ module OneM2M_Testcases_AE_Release_1 {
 							v_responsePrimitive := valueof(m_responsePrimitive(int2002, v_request.primitive.requestPrimitive.requestIdentifier, omit));
 
 							//send back responsePrimitive
-							mcaPortIn.send(m_response(v_responsePrimitive));
+							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 							tc_ac.stop;
 						}
 						[] mcaPortIn.receive {
@@ -1780,6 +1861,7 @@ module OneM2M_Testcases_AE_Release_1 {
 				testcase TC_AE_SUB_CRE_001() runs on Tester system AeSystem {
 						
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 					
 					v_cse1.start(f_AE_SUB_CRE_001());
 					
@@ -1815,12 +1897,12 @@ module OneM2M_Testcases_AE_Release_1 {
 							v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
 							
 							//send back responsePrimitive
-							mcaPortIn.send(m_response(v_responsePrimitive));
+							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 						}
 						[] mcaPortIn.receive {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__, " : Subscription creation request is rejected due to not including mandatory attributes!!");
-							mcaPortIn.send(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
+							mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 						}
 						[] tc_ac.timeout{
 							setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
@@ -1840,6 +1922,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_SUB_CRE_002_ACPI() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
 						var template RequestPrimitive v_requestT := mw_createSubscription;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute accessControlPolicyIDs";
@@ -1856,6 +1939,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_SUB_CRE_002_ENC() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
 						var template RequestPrimitive v_requestT := mw_createSubscription;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute createdBefore";
@@ -1874,6 +1958,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_SUB_CRE_002_EXC() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
 						var template RequestPrimitive v_requestT := mw_createSubscription;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute expirationCounter";
@@ -1892,6 +1977,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_SUB_CRE_002_NFU() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
 						var template RequestPrimitive v_requestT := mw_createSubscription;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute notificationForwardingURI";
@@ -1908,6 +1994,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_SUB_CRE_002_NCT() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
 						var template RequestPrimitive v_requestT := mw_createSubscription;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute notificationContentType";
@@ -1925,6 +2012,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_SUB_CRE_002_NEC() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
 						var template RequestPrimitive v_requestT := mw_createSubscription;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute notificationEventCat";
@@ -1942,6 +2030,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_SUB_CRE_002_SU() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
 						var template RequestPrimitive v_requestT := mw_createSubscription;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute subscriberURI";
@@ -1968,6 +2057,7 @@ module OneM2M_Testcases_AE_Release_1 {
 				testcase TC_AE_SUB_NTF_001() runs on Tester system AeSystem {
 						
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+					f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 					
 					v_cse1.start(f_AE_SUB_NTF_001());
 					
@@ -2004,12 +2094,12 @@ module OneM2M_Testcases_AE_Release_1 {
 							v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
 							
 							//send back responsePrimitive
-							mcaPortIn.send(m_response(v_responsePrimitive));
+							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 						}
 						[] mcaPortIn.receive(mw_request(mw_createAe(*,?,m_contentCreateAe_Invalid))) -> value v_request {
 							tc_ac.stop;
 							setverdict(inconc, __SCOPE__, " : AE registration request is rejected due to not including mandatory attributes!!");
-							mcaPortIn.send(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
+							mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 						}
 						[] tc_ac.timeout{
 							setverdict(inconc, __SCOPE__, " : Timeout due to no response received from requested SUT!");
@@ -2036,12 +2126,12 @@ module OneM2M_Testcases_AE_Release_1 {
 							v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
 							
 							//send back responsePrimitive
-							mcaPortIn.send(m_response(v_responsePrimitive));
+							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 						}
 						[] mcaPortIn.receive {
 							tc_ac.stop;
 							setverdict(inconc, __SCOPE__, " : Subscription creation request is rejected due to not including mandatory attributes!!");
-							mcaPortIn.send(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
+							mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 						}
 						[] tc_ac.timeout{
 							setverdict(inconc, __SCOPE__, " : Timeout due to no response received from requested SUT!");
@@ -2051,7 +2141,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					f_checkCseSimuStatus();
 					
 					//Test behavior
-					mcaPortIn.send(m_request(m_notify(f_getLocalResourceAddress(v_resourceIndex))));
+					mcaPortIn.send(f_getMsgOutPrimitive(m_request(m_notify(f_getLocalResourceAddress(v_resourceIndex)))));
 					
 					tc_ac.start;
 					alt{
@@ -2079,6 +2169,7 @@ module OneM2M_Testcases_AE_Release_1 {
 				testcase TC_AE_SUB_NTF_002() runs on Tester system AeSystem {
 						
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 					
 					v_cse1.start(f_AE_SUB_NTF_002());
 					
@@ -2113,12 +2204,12 @@ module OneM2M_Testcases_AE_Release_1 {
 							v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
 							
 							//send back responsePrimitive
-							mcaPortIn.send(m_response(v_responsePrimitive));
+							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 						}
 						[] mcaPortIn.receive(mw_request(mw_createAe(*,?,m_contentCreateAe_Invalid))) -> value v_request {
 							tc_ac.stop;
 							setverdict(inconc, __SCOPE__, " : AE registration request is rejected due to not including mandatory attributes!!");
-							mcaPortIn.send(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
+							mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 						}
 						[] tc_ac.timeout{
 							setverdict(inconc, __SCOPE__, " : Timeout due to no response received from requested SUT!");
@@ -2145,12 +2236,12 @@ module OneM2M_Testcases_AE_Release_1 {
 							v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
 							
 							//send back responsePrimitive
-							mcaPortIn.send(m_response(v_responsePrimitive));
+							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 						}
 						[] mcaPortIn.receive {
 							tc_ac.stop;
 							setverdict(inconc, __SCOPE__, " : Subscription creation request is rejected due to not including mandatory attributes!!");
-							mcaPortIn.send(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
+							mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 						}
 						[] tc_ac.timeout{
 							setverdict(inconc, __SCOPE__, " : Timeout due to no response received from requested SUT!");
@@ -2160,7 +2251,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					f_checkCseSimuStatus();
 					
 					//Test behavior
-					mcaPortIn.send(m_request(m_notifyAggregatedNotification));
+					mcaPortIn.send(f_getMsgOutPrimitive(m_request(m_notifyAggregatedNotification)));
 					
 					tc_ac.start;
 					alt{
diff --git a/OneM2M_Testcases_CSE_Release_1.ttcn b/OneM2M_Testcases_CSE_Release_1.ttcn
index 5fa26dd..7164a3f 100644
--- a/OneM2M_Testcases_CSE_Release_1.ttcn
+++ b/OneM2M_Testcases_CSE_Release_1.ttcn
@@ -44,7 +44,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						
 					v_request := valueof(m_delete(v_resourceAddress, PX_SUPER_AE_ID));
 					    
-					mcaPort.send(m_request(v_request));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 					
 					t_ac.start;
 					alt {
@@ -93,6 +93,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// 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_GEN_CRE_001(e_cseRelative));
 						v_ae1.done;
@@ -102,6 +104,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 						v_ae1.start(f_CSE_GEN_CRE_001(e_spRelative));
 						v_ae1.done;
@@ -110,6 +113,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_GEN_CRE_001_ABS() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
                         
 						v_ae1.start(f_CSE_GEN_CRE_001(e_absolute));
 						v_ae1.done;
@@ -127,6 +131,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						                        
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
                         
 						v_ae1.start(f_CSE_GEN_CRE_002(e_cseRelative));
 						v_ae1.done;
@@ -136,6 +141,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
                         
 						v_ae1.start(f_CSE_GEN_CRE_002(e_spRelative));
 						v_ae1.done;
@@ -145,6 +151,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 							
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
                         
 						v_ae1.start(f_CSE_GEN_CRE_002(e_absolute));
 						v_ae1.done;
@@ -165,6 +172,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						                        
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
                         
 						v_ae1.start(f_CSE_GEN_RET_001(e_cseRelative));
 						v_ae1.done;
@@ -174,6 +182,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
                         
 						v_ae1.start(f_CSE_GEN_RET_001(e_spRelative));
 						v_ae1.done;
@@ -182,6 +191,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_GEN_RET_001_ABS() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
                         
 						v_ae1.start(f_CSE_GEN_RET_001(e_absolute));
 						v_ae1.done;
@@ -199,6 +209,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_GEN_RET_002_CSR() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
                         
 						v_ae1.start(f_CSE_GEN_RET_002(e_cseRelative));
 						v_ae1.done;
@@ -208,6 +219,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
                         
 						v_ae1.start(f_CSE_GEN_RET_002(e_spRelative));
 						v_ae1.done;
@@ -217,6 +229,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 							
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
                         
 						v_ae1.start(f_CSE_GEN_RET_002(e_absolute));
 						v_ae1.done;
@@ -236,6 +249,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_GEN_UPD_001_CSR() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
                         
 						v_ae1.start(f_CSE_GEN_UPD_001(e_cseRelative));
 						v_ae1.done;
@@ -244,6 +258,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_GEN_UPD_001_SPR() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
                         
 						v_ae1.start(f_CSE_GEN_UPD_001(e_spRelative));
 						v_ae1.done;
@@ -253,6 +268,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 							
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
                         
 						v_ae1.start(f_CSE_GEN_UPD_001(e_absolute));
 						v_ae1.done;
@@ -270,6 +286,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						                        
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
                         
 						v_ae1.start(f_CSE_GEN_UPD_002(e_cseRelative));
 						v_ae1.done;
@@ -279,6 +296,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
                         
 						v_ae1.start(f_CSE_GEN_UPD_002(e_spRelative));
 						v_ae1.done;
@@ -288,6 +306,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 							
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
                         
 						v_ae1.start(f_CSE_GEN_UPD_002(e_absolute));
 						v_ae1.done;
@@ -308,6 +327,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						                        
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
                         
 						v_ae1.start(f_CSE_GEN_DEL_001(e_cseRelative));
 						v_ae1.done;
@@ -317,6 +337,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
                         
 						v_ae1.start(f_CSE_GEN_DEL_001(e_spRelative));
 						v_ae1.done;
@@ -326,6 +347,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 							
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
                         
 						v_ae1.start(f_CSE_GEN_DEL_001(e_absolute));
 						v_ae1.done;
@@ -343,6 +365,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						                        
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
                         
 						v_ae1.start(f_CSE_GEN_DEL_002(e_cseRelative));
 						v_ae1.done;
@@ -352,6 +375,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
                         
 						v_ae1.start(f_CSE_GEN_DEL_002(e_spRelative));
 						v_ae1.done;
@@ -361,6 +385,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 							
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
                         
 						v_ae1.start(f_CSE_GEN_DEL_002(e_absolute));
 						v_ae1.done;
@@ -383,6 +408,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_CRE_001() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 					
 					v_ae1.start(f_CSE_REG_CRE_001());
 		  	  	
@@ -416,7 +442,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, -1);
 					
-					mcaPort.send(m_request(v_request));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 					
 					tc_ac.start;
 					alt {
@@ -451,6 +477,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_CRE_002() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						
 					v_ae1.start(f_CSE_REG_CRE_002());
 			  	  	
@@ -477,7 +504,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 	    									
 					v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, -1);
 	
-					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{
@@ -511,6 +538,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_CRE_003() runs on Tester system CseSystem {
 					
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						
 					v_cse1.start(f_CSE_REG_CRE_003());
 			  	  	
@@ -528,6 +556,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					//Preamble
 					v_remoteCseIndex := f_cse_registrationRemoteCse();
 					vc_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 					vc_ae1.start(f_cse_preamble_registerAe());
 					
 				
@@ -540,6 +569,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_CRE_004() runs on Tester system CseSystem {
 					
 				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						
 					v_ae1.start(f_CSE_REG_CRE_004());
 			  	  	
@@ -572,7 +602,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 	    											
 					v_request := f_getCreateRequestPrimitive(int2, m_createAe(PX_APP_ID, omit, PX_NOT_ALLOWED_C_AE_IDS[0]), -1);
 			
-					mcaPort.send(m_request(v_request));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int4107))) {
@@ -609,6 +639,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_CRE_005() runs on Tester system CseSystem {
 					
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						
 					v_cse1.start(f_CSE_REG_CRE_005());
 			  	  	
@@ -681,6 +712,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_CRE_006() runs on Tester system CseSystem {
 					
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 							
 					v_cse1.start(f_CSE_REG_CRE_006());
 				  	  	
@@ -737,6 +769,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_CRE_007() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						
 					v_ae1.start(f_CSE_REG_CRE_007());
 			  	  	
@@ -763,7 +796,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					vc_cse1.start(f_cse_registrationRemoteCse(mw_createRemoteCSE));
 					vc_cse1.done;
 			
-					mcaPort.send(m_request(f_getCreateRequestPrimitive(int2, m_createAe(PX_APP_ID, omit, "S"),-1)));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(f_getCreateRequestPrimitive(int2, m_createAe(PX_APP_ID, omit, "S"),-1))));
 					
 					vc_cse1.start(f_cse_announcementProcedure_createHandler());
 					vc_cse1.done;
@@ -805,6 +838,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_CRE_008() runs on Tester system CseSystem {
 					
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 							
 					v_cse1.start(f_CSE_REG_CRE_008());
 				  	  	
@@ -836,7 +870,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					//TODO:
 					//v_request := valueof(m_delete(f_getResourceAddress(v_aeIndex), f_getOriginator(v_aeIndex)));
-					//mcaPort.send(m_request(v_request));
+					//mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 					
 					//Test Body
 					vc_ae1.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, omit, "S")));
@@ -876,6 +910,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_CRE_009() runs on Tester system CseSystem {
 					
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 							
 					v_cse1.start(f_CSE_REG_CRE_009());
 				  	  	
@@ -918,7 +953,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_request := f_getUpdateRequestPrimitive(f_getAnnouncedResourceType(int2),v_aeAnncIndex, v_request);//TODO 
 					v_request.primitiveContent.aEAnnc.labels := {"Credential-ID:None"};
 		  	  		
-					mccPort.send(m_request(v_request));
+					mccPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 					tc_ac.start;
 	
 					alt {
@@ -954,6 +989,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_CRE_010() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						
 					v_ae1.start(f_CSE_REG_CRE_010());
 			  	  	
@@ -988,7 +1024,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					//TODO Deregister
 					//f_cse_deleteResource(v_aeIndex);
 					v_request := valueof(m_delete(f_getResourceAddress(v_aeIndex), f_getOriginator(v_aeIndex)));
-					mcaPort.send(m_request(v_request));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 					
 					//Test Body
 					f_cse_createResource(int2, m_createAe(PX_APP_ID, omit, f_getResourceId(vc_resourcesList[v_aeIndex].resource)));
@@ -1036,6 +1072,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_CRE_011() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						
 					v_ae1.start(f_CSE_REG_CRE_011());
 			  	  	
@@ -1063,7 +1100,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 	
 					v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, -1);
 	
-					mcaPort.send(m_request(v_request));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 	
 					tc_ac.start;
 					alt {
@@ -1105,6 +1142,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					testcase TC_CSE_REG_CRE_012_AE_LBL() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, PX_AE1_ID_STEM);
 						
 						v_create.primitiveContent.aE.labels := {"labels"};
@@ -1114,6 +1152,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					testcase TC_CSE_REG_CRE_012_AE_APN() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, PX_AE1_ID_STEM);
 						
 						v_create.primitiveContent.aE.appName := "AeAppName";
@@ -1123,6 +1162,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					testcase TC_CSE_REG_CRE_012_AE_POA() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, PX_AE1_ID_STEM);
 						
 						v_create.primitiveContent.aE.pointOfAccess := {PX_AE1_ADDRESS};
@@ -1143,6 +1183,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createRemoteCSEBase;	
 						const AttributeAux c_optionalAttribute := {"labels", omit};
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
                         						
 						v_createRequest.primitiveContent.remoteCSE.labels := {"MyLabel"};
 						
@@ -1156,6 +1197,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createRemoteCSEBase;	
 						const AttributeAux c_optionalAttribute := {"cseType", omit};
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 												
 						v_createRequest.primitiveContent.remoteCSE.cseType := int1;
 						
@@ -1168,6 +1210,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createRemoteCSEBase;	
 						const AttributeAux c_optionalAttribute := {"pointOfAccess", omit};
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 	
 						v_createRequest.primitiveContent.remoteCSE.pointOfAccess := {"http://" & PX_CSE1_ADDRESS & "/"};
 	
@@ -1181,6 +1224,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createRemoteCSEBase;	
 						const AttributeAux c_optionalAttribute := {"nodeLink", omit};
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 
 						v_createRequest.primitiveContent.remoteCSE.nodeLink := c_defaultNodeID;
 
@@ -1198,6 +1242,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_CRE_016() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 							
 					v_ae1.start(f_CSE_REG_CRE_016());
 				  	  	
@@ -1227,7 +1272,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 	    									
 					v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, v_cseBaseIndex);
 					
-					mcaPort.send(m_request(v_request));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int4107))) {
@@ -1266,6 +1311,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						
 						//Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_createRequest := m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM);
 						
 						v_createRequest.primitiveContent.aE.app_ID := omit;	//Mandatory app_ID field is being set empty
@@ -1278,6 +1324,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 	
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_createRequest := m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM);
 						
 						v_createRequest.primitiveContent.aE.requestReachability := omit;	//Mandatory requestReachability field is being set empty
@@ -1296,6 +1343,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_CRE_018() runs on Tester system CseSystem {
 						
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 							
 					v_cse1.start(f_CSE_REG_CRE_018());
 				  	  	
@@ -1323,7 +1371,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					// Test Body
 					v_request := f_getCreateRequestPrimitive(v_resourceType, v_createRequestPrimitive, -1);
 	
-					mccPort.send(m_request(v_request));
+					mccPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 					tc_ac.start;
 					alt {
 						[] mccPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
@@ -1360,6 +1408,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_CRE_019() runs on Tester system CseSystem {
 					
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 							
 					v_cse1.start(f_CSE_REG_CRE_019());
 				  	  	
@@ -1387,7 +1436,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					// Test Body
 					v_request := f_getCreateRequestPrimitive(v_resourceType, v_createRequestPrimitive, -1);
 
-					mccPort.send(m_request(v_request));
+					mccPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 					tc_ac.start;
 					alt {
 						[] mccPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
@@ -1421,6 +1470,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_CRE_020() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 							
 					v_ae1.start(f_CSE_REG_CRE_020());
 				  	  	
@@ -1452,7 +1502,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						
 					v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, -1);
 
-					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{
@@ -1515,6 +1565,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_CRE_021() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 							
 					v_ae1.start(f_CSE_REG_CRE_021());
 				  	  	
@@ -1544,7 +1595,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_request := f_getCreateRequestPrimitive(v_resourceType, m_createCSEBaseBase, -1); 
 					v_request.from_ := f_getOriginator(v_aeIndex);
 					
-					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))) {
@@ -1575,6 +1626,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_CRE_022() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 							
 					v_ae1.start(f_CSE_REG_CRE_022());
 				  	  	
@@ -1600,7 +1652,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 
 					v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, -1);
 
-					mcaPort.send(m_request(v_request));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 
 					tc_ac.start;
 					alt {
@@ -1641,6 +1693,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_CRE_023() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 							
 					v_ae1.start(f_CSE_REG_CRE_023());
 				  	  	
@@ -1670,7 +1723,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 	    									
 					v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, -1);
 					
-					mcaPort.send(m_request(v_request));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int4105))) {
@@ -1701,6 +1754,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_CRE_024() runs on Tester system CseSystem {
 					
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 							
 					v_cse1.start(f_CSE_REG_CRE_024());
 				  	  	
@@ -1741,7 +1795,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
 
 							//send back responsePrimitive
-							mccPortIn.send(m_response(v_responsePrimitive));
+							mccPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 						}
 						[] mccPortIn.receive {
 							tc_ac.stop;
@@ -1766,6 +1820,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_CRE_025() runs on Tester system CseSystem {
 					
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 							
 					v_cse1.start(f_CSE_REG_CRE_025());
 				  	  	
@@ -1791,7 +1846,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 
 					// Preamble
 					v_request := f_getCreateRequestPrimitive(int16, m_createRemoteCSEBase, -1);
-					mccPort.send(m_request(v_request));
+					mccPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 
 					// Test Body
 					tc_ac.start;
@@ -1831,6 +1886,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					testcase TC_CSE_REG_CRE_026_RN() runs on Tester system CseSystem {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
 						var template RequestPrimitive v_request := mw_createRemoteCSE;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a CSE registration request with optional attribute resourceName";
@@ -1842,6 +1898,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					testcase TC_CSE_REG_CRE_026_ET() runs on CseSimu system CseSystem {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
 						var template RequestPrimitive v_request := mw_createRemoteCSE;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a CSE registration request with optional attribute expirationTime";
@@ -1853,6 +1910,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					testcase TC_CSE_REG_CRE_026_LBL() runs on CseSimu system CseSystem {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
 						var template RequestPrimitive v_request := mw_createRemoteCSE;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a CSE registration request with optional attribute labels";
@@ -1864,6 +1922,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					testcase TC_CSE_REG_CRE_026_POA() runs on CseSimu system CseSystem {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
 						var template RequestPrimitive v_request := mw_createRemoteCSE;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a CSE registration request with optional attribute pointOfAccess";
@@ -1875,6 +1934,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					testcase TC_CSE_REG_CRE_026_NL() runs on CseSimu system CseSystem {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
 						var template RequestPrimitive v_request := mw_createRemoteCSE;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a CSE registration request with optional attribute nodeLink";
@@ -1886,6 +1946,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					testcase TC_CSE_REG_CRE_026_CST() runs on CseSimu system CseSystem {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
 						var template RequestPrimitive v_request := mw_createRemoteCSE;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a CSE registration request with optional attribute cseType";
@@ -1904,6 +1965,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_CRE_027() runs on Tester system CseSystem {
 					
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 							
 					v_cse1.start(f_CSE_REG_CRE_027());
 				  	  	
@@ -1957,6 +2019,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_REG_CRE_028_LBL() runs on Tester system CseSystem {
 						 //Local variables
 						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						 var RequestPrimitive v_request;
 						 var template PrimitiveContent v_contentResponse;
 						 var Labels v_labels_1 := {"VALUE_1"};
@@ -1977,6 +2040,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_REG_CRE_028_POA() runs on Tester system CseSystem {
 						 //Local variables
 						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						 var RequestPrimitive v_request;
 						 var template PrimitiveContent v_contentResponse;
 		 
@@ -1996,6 +2060,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_REG_CRE_028_NL() runs on Tester system CseSystem {
 						 //Local variables
 						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						 var RequestPrimitive v_request;
 						 var template PrimitiveContent v_contentResponse;
 	 
@@ -2025,6 +2090,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_RET_001() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 								
 					v_ae1.start(f_CSE_REG_RET_001());
 					  	  	
@@ -2052,7 +2118,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					// Test Body
 					v_contentResponse.cSEBase := mw_contentCSEBase_rc1;
 					
-					mcaPort.send(m_request(m_retrieve(f_getResourceAddress(), f_getOriginator(v_aeIndex))));//TODO Maybe PX_SUPER_AE_ID
+					mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(), f_getOriginator(v_aeIndex)))));//TODO Maybe PX_SUPER_AE_ID
 	
 					tc_ac.start;
 					alt {
@@ -2094,6 +2160,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_REG_RET_002_CST() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 					
 						v_contentResponse.cSEBase := mw_contentCSEBase_rc1;
@@ -2106,6 +2173,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_REG_RET_002_NL() runs on Tester system CseSystem {
 						//Local variables
 						 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						 var template PrimitiveContent v_contentResponse;
 	
 						 v_contentResponse.cSEBase := mw_contentCSEBase_rc1;
@@ -2125,6 +2193,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_RET_003() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 									
 					v_ae1.start(f_CSE_REG_RET_003());
 						  	  	
@@ -2151,7 +2220,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					// Test Body
 					v_contentResponse.aE := mw_contentAeBase;
 	
-					mcaPort.send(m_request(m_retrieve(f_getResourceAddress(v_aeIndex), f_getOriginator(v_aeIndex))));//TODO Maybe PX_SUPER_AE_ID
+					mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_aeIndex), f_getOriginator(v_aeIndex)))));//TODO Maybe PX_SUPER_AE_ID
 
 					tc_ac.start;
 					alt {
@@ -2196,6 +2265,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var Labels v_labels_1 := {"VALUE_1"};
 						var template RequestPrimitive v_createRequest := m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM);
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 						
 						v_createRequest.primitiveContent.aE.labels := v_labels_1;
@@ -2210,6 +2280,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_REG_RET_004_APN() runs on Tester system CseSystem {
 						//Local variables
 						 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						 var template RequestPrimitive v_createRequest := m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM);
 						 var template PrimitiveContent v_contentResponse;
 						 
@@ -2225,6 +2296,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_REG_RET_004_POA() runs on Tester system CseSystem {
 						//Local variables
 						 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						 var template RequestPrimitive v_createRequest := m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM);
 						 var template PrimitiveContent v_contentResponse;
 						 
@@ -2246,6 +2318,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_RET_005() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 									
 					v_ae1.start(f_CSE_REG_RET_005());
 						  	  	
@@ -2274,7 +2347,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_contentResponse_IN.cSEBase := mw_contentCSEBase_rc1;
 					v_contentResponse_IN.cSEBase.cseType := int1;
 	
-					mcaPort.send(m_request(m_retrieve(f_getResourceAddress(), f_getOriginator(v_aeIndex))));//TODO Maybe PX_SUPER_AE_ID 
+					mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(), f_getOriginator(v_aeIndex)))));//TODO Maybe PX_SUPER_AE_ID 
 					
 					tc_ac.start;
 					alt {
@@ -2329,6 +2402,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_RET_006() runs on Tester system CseSystem {
 					
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 							
 					v_cse1.start(f_CSE_REG_RET_006());
 				  	  	
@@ -2357,7 +2431,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					    
 						 v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
 	 
-						 mccPort.send(m_request(m_retrieve(f_getResourceAddress(vc_remoteCseIndex), f_getOriginator(vc_remoteCseIndex))));
+						 mccPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(vc_remoteCseIndex), f_getOriginator(vc_remoteCseIndex)))));
 						 tc_ac.start;
 						 alt {
 							 [] mccPort.receive(mw_response(mw_responsePrimitive(int2000, v_contentResponse))) -> value v_response {
@@ -2386,7 +2460,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						
 						v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
 						
-						mccPort.send(m_request(m_retrieve(f_getResourceAddress(vc_remoteCseIndex), f_getOriginator(vc_remoteCseIndex))));
+						mccPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(vc_remoteCseIndex), f_getOriginator(vc_remoteCseIndex)))));
 						tc_ac.start;
 						alt {
 							 [] mccPort.receive(mw_response(mw_responsePrimitive(int2000, v_contentResponse))) -> value v_response {
@@ -2428,6 +2502,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_REG_RET_007_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						var Labels v_labels_1 := {"VALUE_1"};
 						var template RequestPrimitive v_createRequest := m_createRemoteCSEBase;
 						var template PrimitiveContent v_contentResponse;
@@ -2444,6 +2519,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_REG_RET_007_CST() runs on Tester system CseSystem {
 						// Local variables
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						var template RequestPrimitive v_createRequest := m_createRemoteCSEBase;
 						var template PrimitiveContent v_contentResponse;
 						
@@ -2459,6 +2535,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_REG_RET_007_POA() runs on Tester system CseSystem {
 						// Local variables
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						var template RequestPrimitive v_createRequest := m_createRemoteCSEBase;
 						var template PrimitiveContent v_contentResponse;
 						
@@ -2474,6 +2551,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_REG_RET_007_NL() runs on Tester system CseSystem {
 						// Local variables
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						var template RequestPrimitive v_createRequest := m_createRemoteCSEBase;
 						var template PrimitiveContent v_contentResponse;
 						
@@ -2495,6 +2573,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_RET_008() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 									
 					v_ae1.start(f_CSE_REG_RET_008());
 						  	  	
@@ -2522,7 +2601,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					// Test Body
 					v_contentResponse.cSEBase := mw_contentCSEBase_rc1;
 
-					mcaPort.send(m_request(m_retrieve(f_getResourceAddress(), f_getOriginator(v_aeIndex))));//TODO Maybe PX_SUPER_AE_ID
+					mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(), f_getOriginator(v_aeIndex)))));//TODO Maybe PX_SUPER_AE_ID
 
 					tc_ac.start;
 					alt {
@@ -2574,6 +2653,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_RET_009() runs on Tester system CseSystem {
 					
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 								
 					v_cse1.start(f_CSE_REG_RET_009());
 					  	  	
@@ -2638,6 +2718,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_RET_010() runs on Tester system CseSystem {
 						
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 								
 					v_cse1.start(f_CSE_REG_RET_010());
 					  	  	
@@ -2671,7 +2752,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					 
 					v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
 	 
-					 mccPort.send(m_request(m_retrieve(f_getResourceAddress(vc_remoteCseIndex), f_getOriginator(vc_remoteCseIndex))));
+					 mccPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(vc_remoteCseIndex), f_getOriginator(vc_remoteCseIndex)))));
 					 tc_ac.start;
 					 alt {
 						[] mccPort.receive(mw_response(mw_responsePrimitive(int2000, v_contentResponse))) -> value v_response {
@@ -2713,6 +2794,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_UPD_001() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 									
 					v_ae1.start(f_CSE_REG_UPD_001());
 						  	  	
@@ -2742,7 +2824,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_updateRequest.primitiveContent.cSEBase.labels := v_labels_1;
 					v_request := f_getUpdateRequestPrimitive(int5, c_cseBaseIndex, v_updateRequest);
 					
-					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))) {
@@ -2777,6 +2859,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;	
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
     						
 						v_updateRequest.primitiveContent.remoteCSE.labels := {"MyLabel"};
 	
@@ -2789,6 +2872,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;	
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
     					
 						v_updateRequest.primitiveContent.remoteCSE.pointOfAccess := {"http://" & PX_CSE1_ADDRESS & "/"};
 	
@@ -2801,6 +2885,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;	
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
     						
 						v_updateRequest.primitiveContent.remoteCSE.nodeLink := c_defaultNodeID;
 	
@@ -2822,6 +2907,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;	
 						var AttributeList c_optionalAttribute;
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 			
 						v_updateRequest.primitiveContent.remoteCSE.labels := {"MyLabel"};
 						c_optionalAttribute := {"labels"};
@@ -2836,6 +2922,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;	
 						var AttributeList c_optionalAttribute;
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 		
 						v_updateRequest.primitiveContent.remoteCSE.pointOfAccess := {"http://" & PX_CSE1_ADDRESS & "/"};
 						c_optionalAttribute := {"pointofAccess"};
@@ -2850,6 +2937,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;	
 						var AttributeList c_optionalAttribute;
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 			
 						v_updateRequest.primitiveContent.remoteCSE.nodeLink := c_defaultNodeID;
 						c_optionalAttribute := {"nodeLink"};
@@ -2864,6 +2952,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;	
 						var AttributeList c_optionalAttribute;
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 			
 						v_updateRequest.primitiveContent.remoteCSE.expirationTime := "20301231T012345";
 						c_optionalAttribute := {"expirationTime"};
@@ -2878,6 +2967,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;	
 						var AttributeList c_optionalAttribute;
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 	
 						v_updateRequest.primitiveContent.remoteCSE.requestReachability := true;
 						c_optionalAttribute := {"requestReachability"};
@@ -2900,6 +2990,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_DEL_001() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 									
 					v_ae1.start(f_CSE_REG_DEL_001());
 						  	  	
@@ -2925,7 +3016,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 		
 					// Test Body
 					v_request := valueof(m_delete(f_getResourceAddress(), f_getOriginator()));
-					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))) {
@@ -2956,6 +3047,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_DEL_002() runs on Tester system CseSystem {
 					
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 								
 					v_cse1.start(f_CSE_REG_DEL_002());
 					  	  	
@@ -2985,7 +3077,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					// Test Body
 					v_request := valueof(m_delete(f_getResourceAddress(vc_remoteCseIndex), f_getOriginator(vc_remoteCseIndex)));
 
-					mccPort.send(m_request(v_request));
+					mccPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 					tc_ac.start;
 					alt {
 						[] mccPort.receive(mw_response(mw_responsePrimitive(int2002))) {
@@ -3029,6 +3121,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_DEL_003() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 										
 					v_ae1.start(f_CSE_REG_DEL_003());
 							  	  	
@@ -3053,7 +3146,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					// Test Body
 					v_request := valueof(m_delete(f_getResourceAddress(v_aeIndex), f_getOriginator(v_aeIndex)));
 
-					mcaPort.send(m_request(v_request));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) {
@@ -3089,6 +3182,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_DEL_004() runs on Tester system CseSystem {
 					
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 								
 					v_cse1.start(f_CSE_REG_DEL_004());
 					  	  	
@@ -3165,6 +3259,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						
 						v_createRequest.primitiveContent.container.resourceName := omit;
 						v_ae1.start(f_CSE_DMR_CRE_001(int3, v_createRequest, -)); //Container
@@ -3183,6 +3278,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						
 						v_createRequest.primitiveContent.container.resourceName := omit;
 						v_ae1.start(f_CSE_DMR_CRE_001(int3, v_createRequest, m_createAeAux(omit,omit)));//Container
@@ -3204,6 +3300,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						
 						v_createRequest.primitiveContent.container.resourceName := omit;
 
@@ -3225,6 +3322,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						
 						v_createRequest.primitiveContent.group_.resourceName := omit;
 
@@ -3246,6 +3344,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						
 						v_createRequest.primitiveContent.group_.resourceName := omit;
 
@@ -3267,6 +3366,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createAcpBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						
 						v_createRequest.primitiveContent.accessControlPolicy.resourceName := omit;
 
@@ -3288,6 +3388,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createAcpBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						
 						v_createRequest.primitiveContent.accessControlPolicy.resourceName := omit;
 
@@ -3309,6 +3410,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						
 						v_createRequest.primitiveContent.subscription.resourceName := omit;
 						v_ae1.start(f_CSE_DMR_CRE_001(int23, v_createRequest, -));//Subscription
@@ -3329,6 +3431,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						
 						v_createRequest.primitiveContent.subscription.resourceName := omit;
 						v_ae1.start(f_CSE_DMR_CRE_001(int23, v_createRequest, m_createAeAux(omit,omit)));//Subscription
@@ -3349,6 +3452,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						
 						v_createRequest.primitiveContent.subscription.resourceName := omit;
 						v_ae1.start(f_CSE_DMR_CRE_001(int23, v_createRequest, m_createContainerBase));//Subscription
@@ -3369,6 +3473,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						
 						v_createRequest.primitiveContent.subscription.resourceName := omit;
 						v_ae1.start(f_CSE_DMR_CRE_001(int23, v_createRequest, m_createAcpBase));//Subscription
@@ -3388,6 +3493,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						
 						v_createRequest.primitiveContent.subscription.resourceName := omit;
 						v_cse1.start(f_CSE_DMR_CRE_001_cseSimu(int23, v_createRequest));//Subscription
@@ -3407,6 +3513,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						
 						v_createRequest.primitiveContent.contentInstance.resourceName := omit;
 						v_ae1.start(f_CSE_DMR_CRE_001(int4, v_createRequest, m_createContainerBase));//ContentInstance
@@ -3435,6 +3542,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 			
 						v_ae1.start(f_CSE_DMR_CRE_002(int3, m_createContainerBase));//container
 						v_ae1.done;
@@ -3457,6 +3565,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 			
 						v_ae1.start(f_CSE_DMR_CRE_002(int9, m_createGroupBase));//group
 						v_ae1.done;
@@ -3478,6 +3587,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 			
 						v_ae1.start(f_CSE_DMR_CRE_002(int1, m_createAcpBase ));//accessControlPolicy
 						v_ae1.done;
@@ -3499,6 +3609,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 			
 						v_ae1.start(f_CSE_DMR_CRE_002(int23, m_createSubscriptionBase));//Subscription
 						v_ae1.done;
@@ -3527,6 +3638,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_CRE_003_CNT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 						v_ae1.start(f_CSE_DMR_CRE_003(int3, m_createContainerBase));//container
 						v_ae1.done;
@@ -3536,6 +3648,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 						v_ae1.start(f_CSE_DMR_CRE_003(int9, m_createGroupBase));//group
 						v_ae1.done;
@@ -3545,6 +3658,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
                         
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 						v_ae1.start(f_CSE_DMR_CRE_003(int1, m_createAcpBase));//accessControlPolicy
 						v_ae1.done;
@@ -3554,6 +3668,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
                         
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 						v_ae1.start(f_CSE_DMR_CRE_003(int23, m_createSubscriptionBase));//Subscription
 						v_ae1.done;
@@ -3571,6 +3686,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
                         
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 						v_ae1.start(f_CSE_DMR_CRE_004(int3, m_createContainerBase));//container
 						v_ae1.done;
@@ -3580,6 +3696,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 						v_ae1.start(f_CSE_DMR_CRE_004(int9, m_createGroupBase));//group
 						v_ae1.done;
@@ -3589,6 +3706,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
                         
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 						v_ae1.start(f_CSE_DMR_CRE_004(int1, m_createAcpBase));//accessControlPolicy
 						v_ae1.done;
@@ -3598,6 +3716,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
                         
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 						v_ae1.start(f_CSE_DMR_CRE_004(int23, m_createSubscriptionBase));//Subscription
 						v_ae1.done;
@@ -3616,6 +3735,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createContainerBaseInvalid;
 						var AttributeAux v_invalidAttribute;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 												
 						v_createRequest.primitiveContent.container_update_invalid.maxNrOfInstances := -1;
 						v_invalidAttribute := {name := "maxNrOfInstances", value_ := "-1"};
@@ -3629,6 +3749,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createContainerBaseInvalid;
 						var AttributeAux v_invalidAttribute;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						
 						v_createRequest.primitiveContent.container_update_invalid.maxByteSize := -1;
 						v_invalidAttribute := {name := "maxByteSize", value_ := "-1"};
@@ -3643,6 +3764,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createContainerBaseInvalid;
 						var AttributeAux v_invalidAttribute;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						
 						v_createRequest.primitiveContent.container_update_invalid.maxInstanceAge := -1;
 						v_invalidAttribute := {name := "maxInstanceAge", value_ := "-1"};
@@ -3665,6 +3787,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						
 						v_ae1.start(f_CSE_DMR_CRE_006(int3, v_createRequest));		
 						v_ae1.done;
@@ -3683,6 +3806,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						
 						v_ae1.start(f_CSE_DMR_CRE_006(int3, v_createRequest));
 						v_ae1.done;
@@ -3702,6 +3826,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 												
 						v_ae1.start(f_CSE_DMR_CRE_006(int3, v_createRequest));
 						v_ae1.done;
@@ -3754,7 +3879,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_createRequestContentInstance.primitiveContent.contentInstance.resourceName := c_defaultContentInstanceResourceName & "2";	//ContentInstance 2
 						v_request := f_getCreateRequestPrimitive(int4, v_createRequestContentInstance, v_containerIndex);
 					
-						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 {
@@ -3834,7 +3959,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_createRequestContentInstance.primitiveContent.contentInstance.resourceName := c_defaultContentInstanceResourceName & "2";
 						v_request := f_getCreateRequestPrimitive(int4, v_createRequestContentInstance, v_containerIndex);
 	
-						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 {
@@ -3904,7 +4029,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_contentInstanceIndex := f_cse_createResource(int4, m_createContentInstanceBase, v_containerIndex);
 					
 						// Test Body
-						mcaPort.send(m_request(m_retrieve(f_getResourceAddress(v_containerIndex), f_getOriginator(v_containerIndex))));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_containerIndex), f_getOriginator(v_containerIndex)))));
 						
 						v_contentResponse.container := mw_contentContainerBase;
 						
@@ -3977,7 +4102,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						
 						v_request := f_getCreateRequestPrimitive(int3, v_createRequest, v_containerIndex);
 					
-						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 {
@@ -4049,7 +4174,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						
 						v_request := f_getCreateRequestPrimitive(int3, v_createRequest, v_containerIndex);
 					
-						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 {
@@ -4099,6 +4224,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_CRE_012_CNT_ACPI() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						const AttributeList c_optionalAttribute := {"accessControlPolicyIDs"};
 						
@@ -4111,6 +4237,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_CRE_012_CNT_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						const AttributeList c_optionalAttribute := {"labels"};
 						
@@ -4124,6 +4251,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_CRE_012_CNT_MNI() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						const AttributeList c_optionalAttribute := {"maxNrOfInstances"};
 						
@@ -4137,6 +4265,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_CRE_012_CNT_MBS() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						const AttributeList c_optionalAttribute := {"maxByteSize"};
 						
@@ -4150,6 +4279,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_CRE_012_CNT_MIA() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						const AttributeList c_optionalAttribute := {"maxInstanceAge"};
 						
@@ -4163,6 +4293,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_CRE_012_CNT_CR() runs on Tester system CseSystem { 
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AttributeList v_optionalAttribute := {"creator"};
 						
@@ -4176,6 +4307,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_CRE_012_CIN_LBL() runs on Tester system CseSystem {//TODO
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
 						const AttributeList c_optionalAttribute := {"labels"};
 						
@@ -4189,6 +4321,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_CRE_012_CIN_CR() runs on Tester system CseSystem {//TODO
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
 						var AttributeList v_optionalAttribute := {"creator"};
 						
@@ -4202,6 +4335,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_CRE_012_CIN_CNF() runs on Tester system CseSystem {//TODO
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
 						const AttributeList c_optionalAttribute := {"contentInfo"};
 						
@@ -4215,6 +4349,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_CRE_012_ACP_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_createRequest := m_createAcpBase;
 						const AttributeList c_optionalAttribute := {"labels"};
 						
@@ -4228,6 +4363,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_CRE_012_SUB_ACPI() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"accessControlPolicyIDs"};
 						
@@ -4240,6 +4376,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_CRE_012_SUB_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"labels"};
 						
@@ -4253,6 +4390,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_CRE_012_SUB_CR() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var AttributeList v_optionalAttribute := {"creator"};
 						
@@ -4296,7 +4434,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Test Body
 						v_request := f_getCreateRequestPrimitive(int4, m_createContentInstanceBase, v_containerIndex);
 	
-						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 {
@@ -4339,6 +4477,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_childResourceRequest := m_createContentInstanceBase;//Default content: "AnyValue" (8 bytes length)
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						const integer c_maxByteSize := 512;	
 						
 						v_parentResourceRequest.primitiveContent.container.maxByteSize := c_maxByteSize;
@@ -4363,6 +4502,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_RET_001_CNT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var ResponsePrimitive v_responsePrimitive;
 						var template PrimitiveContent v_contentResponse;
 					
@@ -4376,6 +4516,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_RET_001_GRP() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var ResponsePrimitive v_responsePrimitive;
 						var template PrimitiveContent v_contentResponse;
 					
@@ -4389,6 +4530,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_RET_001_ACP() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var ResponsePrimitive v_responsePrimitive;
 						var template PrimitiveContent v_contentResponse;
 					
@@ -4402,6 +4544,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_RET_001_SUB() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var ResponsePrimitive v_responsePrimitive;
 						var template PrimitiveContent v_contentResponse;
 					
@@ -4415,6 +4558,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_RET_001_CIN() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var ResponsePrimitive v_responsePrimitive;
 						var template PrimitiveContent v_contentResponse;
 
@@ -4437,6 +4581,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_RET_003_CNT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
                         
 						v_ae1.start(f_CSE_DMR_RET_003(int3, m_createContainerBase));//Container
 						v_ae1.done;
@@ -4445,6 +4590,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_RET_003_GRP() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						
 						v_ae1.start(f_CSE_DMR_RET_003(int9, m_createGroupBase));//Group
 						v_ae1.done;
@@ -4453,6 +4599,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_RET_003_ACP() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_requestPrimitive := m_createAcpBase;
 						
 						v_requestPrimitive.primitiveContent.accessControlPolicy.selfPrivileges.accessControlRule_list[0].accessControlOperations := int61;
@@ -4464,6 +4611,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_RET_003_SUB() runs on Tester system CseSystem {
 							// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 	
 						v_ae1.start(f_CSE_DMR_RET_003(int23, m_createSubscriptionBase));//Subscription
 						v_ae1.done;
@@ -4505,7 +4653,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_contentResponse.contentInstance.resourceName := vc_resourcesList[v_contentInstanceIndex1].resource.contentInstance.resourceName;
     									
 						// Test Body
-						mcaPort.send(m_request(m_retrieve(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameOldest, f_getOriginator(v_containerIndex))));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameOldest, f_getOriginator(v_containerIndex)))));
 
 						tc_ac.start;
 						alt {
@@ -4576,7 +4724,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						 
     					
 						// Test Body
-						mcaPort.send(m_request(m_retrieve(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameLatest, f_getOriginator(v_containerIndex))));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameLatest, f_getOriginator(v_containerIndex)))));
 
 						tc_ac.start;
 						alt {
@@ -4620,6 +4768,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_RET_013_ACP() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 					
 						v_contentResponse.accessControlPolicy := mw_contentAcp_rc1;
@@ -4632,6 +4781,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_RET_013_AE() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 					
 						v_contentResponse.aE := mw_contentAeBase;
@@ -4644,6 +4794,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_RET_013_CNT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 					
 						v_contentResponse.container := mw_contentContainer_rc1;
@@ -4656,6 +4807,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_RET_013_GRP() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 					
 						v_contentResponse.group_ := mw_contentGroup_rc1;
@@ -4668,6 +4820,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_RET_013_CSR() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 					
 						v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
@@ -4680,6 +4833,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_RET_013_SUB() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 					
 						v_contentResponse.subscription := mw_contentSubscription_rc1;
@@ -4700,6 +4854,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_RET_014_ACP() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_requestPrimitive := m_createAcpBase;
 						
 						v_requestPrimitive.primitiveContent.accessControlPolicy.selfPrivileges.accessControlRule_list[0].accessControlOperations := int61;
@@ -4711,6 +4866,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_RET_014_AE() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 	
 						v_ae1.start(f_CSE_DMR_RET_014(int2, m_createAe(PX_APP_ID,-,PX_AE1_ID_STEM)));//AE
 						v_ae1.done;
@@ -4719,6 +4875,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_RET_014_CNT() runs on Tester system CseSystem {
 						// Local variables
  						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
                         
 						v_ae1.start(f_CSE_DMR_RET_014(int3, m_createContainerBase));//Container
 						v_ae1.done;
@@ -4727,6 +4884,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_RET_014_CSR() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 		
 						v_ae1.start(f_CSE_DMR_RET_014(int16, m_createRemoteCSEBase));//RemoteCSE
 						v_ae1.done;
@@ -4736,6 +4894,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_RET_014_GRP() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						
 						v_ae1.start(f_CSE_DMR_RET_014(int9, m_createGroupBase));//Group
 						v_ae1.done;
@@ -4744,6 +4903,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_RET_014_SUB() runs on AeSimu system CseSystem {
 							// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 	
 						v_ae1.start(f_CSE_DMR_RET_014(int23, m_createSubscriptionBase));//Subscription
 						v_ae1.done;
@@ -4763,6 +4923,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_UPD_001_CNT_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var Labels v_labels_1 := {"VALUE_1"};
 						var Labels v_labels_2:= {"VALUE_2"};
 						var ResponsePrimitive v_responsePrimitive;
@@ -4802,6 +4963,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_UPD_001_GRP_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var Labels v_labels_1 := {"VALUE_1"};
 						var Labels v_labels_2 := {"VALUE_2"};
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
@@ -4841,6 +5003,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_UPD_001_ACP_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var Labels v_labels_1 := {"VALUE_1"};
 						var Labels v_labels_2 := {"VALUE_2"};
 						var template RequestPrimitive v_createRequest := m_createAcpBase;
@@ -4880,6 +5043,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_UPD_001_SUB_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var Labels v_labels_1 := {"VALUE_1"};
 						var Labels v_labels_2 := {"VALUE_2"};
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
@@ -4928,6 +5092,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_UPD_002_CNT_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var Labels v_labels_1 := {"VALUE_1"};
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
@@ -4964,6 +5129,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_UPD_002_GRP_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var Labels v_labels_1 := {"VALUE_1"};
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 						var ResponsePrimitive v_responsePrimitive;
@@ -5000,6 +5166,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_UPD_002_ACP_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var Labels v_labels_1 := {"VALUE_1"};
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 						var ResponsePrimitive v_responsePrimitive;
@@ -5036,6 +5203,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_UPD_002_SUB_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var Labels v_labels_1 := {"VALUE_1"};
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
@@ -5080,6 +5248,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_UPD_003_CNT_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var Labels v_labels_1 := {"VALUE_1"};
 						var Labels v_labels_2 := {"To be deleted"};
 						var AttributeAux_list v_nullFields;
@@ -5126,6 +5295,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_UPD_003_GRP_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var Labels v_labels_1 := {"VALUE_1"};
 						var Labels v_labels_2 := {"To be deleted"};
 						var AttributeAux_list v_nullFields;
@@ -5170,6 +5340,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_UPD_003_ACP_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var Labels v_labels_1 := {"VALUE_1"};
 						var Labels v_labels_2 := {"To be deleted"};
 						var AttributeAux_list v_nullFields;
@@ -5214,6 +5385,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_UPD_003_SUB_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var Labels v_labels_1 := {"VALUE_1"};
 						var Labels v_labels_2 := {"To be deleted"};
 						var AttributeAux_list v_nullFields;
@@ -5266,6 +5438,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_UPD_004_CNT_ET_MNI_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var Labels v_labels_1 := {"VALUE_1"};
 						var Labels v_labels_2 := {"To be deleted"};
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
@@ -5327,6 +5500,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_UPD_004_GRP_ET_GN_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var XSD.String v_groupName_1 := "VALUE_1";
 						var Labels v_labels_1 := {"VALUE_1"};
 						var Labels v_labels_2 := {"To be deleted"};
@@ -5390,6 +5564,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_UPD_004_ACP_PVS_PV_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var Labels v_labels_1 := {"VALUE_1"};
 						var Labels v_labels_2 := {"To be deleted"};
 						var SetOfAcrs v_privileges_1 := {accessControlRule_list := {valueof(m_createAcr({"all"}, int63))}};
@@ -5454,6 +5629,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_UPD_004_ACP_PV_AT_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var Labels v_labels_1 := {"VALUE_1"};
 						var Labels v_labels_2 := {"To be deleted"};
 						var SetOfAcrs v_privileges_2 := {accessControlRule_list := {valueof(m_createAcr({PX_SUPER_AE_ID}, int61))}};
@@ -5516,6 +5692,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_UPD_004_SUB_ET_LBL_EXC() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var Labels v_labels_1 := {"VALUE_1"};
 						var AttributeAux_list v_nullFields;
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
@@ -5582,6 +5759,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_DMR_UPD_005() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						
 					v_ae1.start(f_CSE_DMR_UPD_005());
 			  	  	
@@ -5621,7 +5799,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_request := f_getUpdateRequestPrimitive(v_resourceType, v_aeIndex, v_updateRequest);
 					v_request.to_ := v_targetResourceAddress;
 					
-					mcaPort.send(m_request(v_request));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 					
 					tc_ac.start;
 					alt {
@@ -5660,6 +5838,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_UPD_006_CNT_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var Labels v_labels_1 := {"VALUE_1"};
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
@@ -5683,6 +5862,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_UPD_006_GRP_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var Labels v_labels_1 := {"VALUE_1"};
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
@@ -5706,6 +5886,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_UPD_006_ACP_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var Labels v_labels_1 := {"VALUE_1"};
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 						var template RequestPrimitive v_requestPrimitive := m_createAcpBase;
@@ -5732,6 +5913,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_UPD_006_SUB_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var Labels v_labels_1 := {"VALUE_1"};
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
@@ -5763,6 +5945,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_UPD_007_CNT_CT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var Timestamp v_creationTime := "21001231T012345";
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
@@ -5787,6 +5970,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_UPD_007_GRP_CT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var Timestamp v_creationTime := "21001231T012345";
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
@@ -5811,6 +5995,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_UPD_007_ACP_CT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var Timestamp v_creationTime := "21001231T012345";
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
@@ -5835,6 +6020,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_UPD_007_SUB_CT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var Timestamp v_creationTime := "21001231T012345";
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
@@ -5868,6 +6054,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_UPD_008_GRP_MNM() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 						var AttributeAux_list v_nullFields;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
@@ -5893,6 +6080,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_UPD_008_ACP_PVS() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var SetOfAcrs v_selfPrivileges:= {{valueof(m_createAcr({"all"}, int63))}};
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 						var AttributeAux_list v_nullFields;
@@ -5919,6 +6107,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_UPD_008_SUB_NU() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var AttributeAux_list v_nullFields;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
@@ -5952,6 +6141,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_UPD_009_CNT_EXC() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var XSD.PositiveInteger v_expirationCounter := 1;
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
@@ -5967,6 +6157,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_UPD_009_GRP_EXC() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var XSD.PositiveInteger v_expirationCounter := 1;
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
@@ -5982,6 +6173,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_UPD_009_ACP_EXC() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var XSD.PositiveInteger v_expirationCounter := 1;
 						var template RequestPrimitive v_createRequest := m_createAcpBase;
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
@@ -5997,6 +6189,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_UPD_009_SUB_MNI() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var XSD.NonNegativeInteger v_maxNrOfInstances := 5;
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
@@ -6043,7 +6236,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							v_updateRequest := f_getUpdateRequestPrimitive(int3, v_containerIndex, v_updateRequest);
 							f_cse_updateResource(v_updateRequest);
 
-							mcaPort.send(m_request(m_retrieve(f_getResourceAddress(v_containerIndex), f_getOriginator(v_containerIndex))));
+							mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_containerIndex), f_getOriginator(v_containerIndex)))));
 
 							tc_ac.start;
 							alt {
@@ -6116,7 +6309,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						//Test Body
 						v_request := f_getUpdateRequestPrimitive(int4, v_contentInstanceIndex, v_updateRequest);
 	
-						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 {
@@ -6194,7 +6387,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					  	
 						v_request.to_ := v_request.to_ & "/" & c_resourceShortNameLatest;		//<latest>
 
-						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 {
@@ -6272,7 +6465,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					  	
 						v_request.to_ := v_request.to_ & "/" & c_resourceShortNameOldest;		//<oldest>
 
-						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 {
@@ -6316,6 +6509,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_UPD_014_ACP_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var Labels v_labels_1 := {"VALUE_1"};
 						var Labels v_labels_2 := {"VALUE_2"};
 						var template RequestPrimitive v_createRequest := m_createAcpBase;
@@ -6346,6 +6540,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_UPD_014_CNT_ACPI() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var AcpType v_accessControlPolicyIDs_1 := {"NotInitialized_1"};
 						var AcpType v_accessControlPolicyIDs_2 := {"NotInitialized_2"};
 						var ResponsePrimitive v_responsePrimitive;
@@ -6376,6 +6571,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_UPD_014_CNT_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var Labels v_labels_1 := {"VALUE_1"};
 						var Labels v_labels_2 := {"VALUE_2"};
 						var ResponsePrimitive v_responsePrimitive;
@@ -6406,6 +6602,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_UPD_014_CNT_MBS() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var XSD.NonNegativeInteger v_maxByteSize_1 := 256;
 						var XSD.NonNegativeInteger v_maxByteSize_2 := 512;
 						var ResponsePrimitive v_responsePrimitive;
@@ -6436,6 +6633,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_UPD_014_CNT_MIA() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var XSD.NonNegativeInteger v_maxInstanceAge_1 := 60;
 						var XSD.NonNegativeInteger v_maxInstanceAge_2 := 120;
 						var ResponsePrimitive v_responsePrimitive;
@@ -6466,6 +6664,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_UPD_014_CNT_MNI() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var XSD.NonNegativeInteger v_maxNrOfInstances_1 := 1;
 						var XSD.NonNegativeInteger v_maxNrOfInstances_2 := 2;
 						var ResponsePrimitive v_responsePrimitive;
@@ -6496,6 +6695,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_UPD_014_SUB_ACPI() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var AcpType v_accessControlPolicyIDs_1 := {"NotInitialized_1"};
 						var AcpType v_accessControlPolicyIDs_2 := {"NotInitialized_2"};
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
@@ -6526,6 +6726,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_UPD_014_SUB_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var Labels v_labels_1 := {"VALUE_1"};
 						var Labels v_labels_2 := {"VALUE_2"};
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
@@ -6563,6 +6764,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					 */
 					testcase TC_CSE_DMR_UPD_015_CSR_LBL() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var Labels v_labels := {"MyLabel"};
 					   	var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;
 					   	var ResponsePrimitive v_responsePrimitive;
@@ -6597,6 +6799,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					testcase TC_CSE_DMR_UPD_015_CSR_POA() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var PoaList v_poaList := {"http://" & PX_AE2_ADDRESS & "/"};
 					   var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;
 					   var ResponsePrimitive v_responsePrimitive;
@@ -6631,6 +6834,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					testcase TC_CSE_DMR_UPD_015_CSR_NL() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var XSD.AnyURI v_nodeLink := "MyNodeId";
 					   	var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;
 					   	var ResponsePrimitive v_responsePrimitive;
@@ -6665,6 +6869,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 			  		
 					testcase TC_CSE_DMR_UPD_015_AE_LBL() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var Labels v_labels := {"MyLabel"};
 						var template RequestPrimitive v_updateRequest := m_updateAeBase;
 						var ResponsePrimitive v_responsePrimitive;
@@ -6699,6 +6904,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					testcase TC_CSE_DMR_UPD_015_AE_ACPI() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_updateRequest := m_updateAeBase;
 						var RequestPrimitive v_updateRequestPrimitive;
 						var ResponsePrimitive v_responsePrimitive;
@@ -6733,6 +6939,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					testcase TC_CSE_DMR_UPD_015_AE_APN() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var XSD.String v_appName := "MyAppName";
 						var template RequestPrimitive v_updateRequest := m_updateAeBase;
 						var ResponsePrimitive v_responsePrimitive;
@@ -6766,6 +6973,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					testcase TC_CSE_DMR_UPD_015_AE_POA() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var PoaList v_poaList := {"http://" & PX_AE2_ADDRESS & "/"};
 						var template RequestPrimitive v_updateRequest := m_updateAeBase;
 						var ResponsePrimitive v_responsePrimitive;
@@ -6799,6 +7007,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					testcase TC_CSE_DMR_UPD_015_CNT_LBL() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var Labels v_labels := {"MyLabel"};
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
@@ -6833,6 +7042,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					testcase TC_CSE_DMR_UPD_015_CNT_ACPI() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var RequestPrimitive v_updateRequestPrimitive;
 						var ResponsePrimitive v_responsePrimitive;
@@ -6867,6 +7077,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					testcase TC_CSE_DMR_UPD_015_CNT_MNI() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var XSD.NonNegativeInteger v_maxNrOfInstances := 5;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
@@ -6901,6 +7112,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					testcase TC_CSE_DMR_UPD_015_CNT_MBS() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var XSD.NonNegativeInteger v_maxByteSize := 512;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
@@ -6935,6 +7147,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					testcase TC_CSE_DMR_UPD_015_CNT_MIA() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var XSD.NonNegativeInteger v_maxInstanceAge := 1;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
@@ -6969,6 +7182,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					testcase TC_CSE_DMR_UPD_015_ACP_LBL() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var Labels v_labels := {"MyLabel"};
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 						var ResponsePrimitive v_responsePrimitive;
@@ -7003,6 +7217,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					testcase TC_CSE_DMR_UPD_015_SUB_ACPI() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var RequestPrimitive v_updateRequestPrimitive;
 						var ResponsePrimitive v_responsePrimitive;
@@ -7037,6 +7252,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					testcase TC_CSE_DMR_UPD_015_SUB_LBL() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var Labels v_labels := {"MyLabel"};
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
@@ -7070,6 +7286,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					testcase TC_CSE_DMR_UPD_015_GRP_LBL() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var Labels v_labels := {"MyLabel"};
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 						var ResponsePrimitive v_responsePrimitive;
@@ -7103,6 +7320,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					testcase TC_CSE_DMR_UPD_015_GRP_ACPI() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 						var RequestPrimitive v_updateRequestPrimitive;
 						var ResponsePrimitive v_responsePrimitive;
@@ -7137,6 +7355,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					testcase TC_CSE_DMR_UPD_015_GRP_MACP() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var ListOfURIs v_membersAccessControlPolicyIDs := {"NotInitialized"};
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 						var ResponsePrimitive v_responsePrimitive;
@@ -7170,6 +7389,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					testcase TC_CSE_DMR_UPD_015_GRP_GN() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var XSD.String v_groupName:="MyGroupName";
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 						var ResponsePrimitive v_responsePrimitive;
@@ -7210,6 +7430,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					*/
 					testcase TC_CSE_DMR_UPD_016_CSR_ET() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var Timestamp v_expirationTime := "21001231T012345";
 						var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;
 						var ResponsePrimitive v_responsePrimitive;
@@ -7244,6 +7465,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					testcase TC_CSE_DMR_UPD_016_CSR_RR() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var XSD.Boolean v_requestReachability := true;
 						var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;
 						var ResponsePrimitive v_responsePrimitive;
@@ -7276,6 +7498,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 			  		
 					testcase TC_CSE_DMR_UPD_016_AE_ET() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var Timestamp v_expirationTime := "21001231T012345";
 						var template RequestPrimitive v_updateRequest := m_updateAeBase;
 						var ResponsePrimitive v_responsePrimitive;
@@ -7310,6 +7533,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					testcase TC_CSE_DMR_UPD_016_AE_RR() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var XSD.Boolean v_requestReachability := true;
 						var template RequestPrimitive v_updateRequest := m_updateAeBase;
 						var ResponsePrimitive v_responsePrimitive;
@@ -7344,6 +7568,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					testcase TC_CSE_DMR_UPD_016_CNT_ET() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var Timestamp v_expirationTime := "21001231T012345";
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
@@ -7378,6 +7603,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					testcase TC_CSE_DMR_UPD_016_ACP_ET() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var Timestamp v_expirationTime := "21001231T012345";
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 						var ResponsePrimitive v_responsePrimitive;
@@ -7412,6 +7638,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					testcase TC_CSE_DMR_UPD_016_ACP_PV() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var SetOfAcrs v_privileges_1 := {{valueof(m_createAcr({PX_SUPER_AE_ID}, int61))}};
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 						var ResponsePrimitive v_responsePrimitive;
@@ -7445,6 +7672,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					testcase TC_CSE_DMR_UPD_016_ACP_PVS() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var SetOfAcrs v_privileges_1 := {{valueof(m_createAcr({PX_SUPER_AE_ID}, int61))}};
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 						var ResponsePrimitive v_responsePrimitive;
@@ -7478,6 +7706,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				    
 					testcase TC_CSE_DMR_UPD_016_SUB_ET() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var Timestamp v_expirationTime := "21001231T012345";
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
@@ -7513,6 +7742,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					testcase TC_CSE_DMR_UPD_016_SUB_NU() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var ListOfURIs v_notificationURI := {"NotReachableNotificationURI"};
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
@@ -7547,6 +7777,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					testcase TC_CSE_DMR_UPD_016_SUB_NCT() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var NotificationContentType v_notificationContentType := int2;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
@@ -7581,6 +7812,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					testcase TC_CSE_DMR_UPD_016_GRP_ET() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var Timestamp v_expirationTime := "21001231T012345";
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 						var ResponsePrimitive v_responsePrimitive;
@@ -7615,6 +7847,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					testcase TC_CSE_DMR_UPD_016_GRP_MNM() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var XSD.PositiveInteger v_maxNrOfMembers := 10;
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 						var ResponsePrimitive v_responsePrimitive;
@@ -7649,6 +7882,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					testcase TC_CSE_DMR_UPD_016_GRP_MID() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var ListOfURIs v_memberIDs := {"NotInitialized"};
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 						var ResponsePrimitive v_responsePrimitive;
@@ -7696,6 +7930,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_DEL_001_CNT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
                 		
 						v_ae1.start(f_CSE_DMR_DEL_001(int3, m_createContainerBase));//Container
 						v_ae1.done;
@@ -7708,6 +7943,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_DEL_001_GRP() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
                 		
 						v_ae1.start(f_CSE_DMR_DEL_001(int9, m_createGroupBase));//Group
 						v_ae1.done;
@@ -7716,6 +7952,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_DEL_001_ACP() runs on Tester system CseSystem {
 						// Local variables
  						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
                 
 						v_ae1.start(f_CSE_DMR_DEL_001(int1, m_createAcpBase));//AccessControlPolicy
 						v_ae1.done;
@@ -7724,6 +7961,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_DEL_001_SUB() runs on Tester system CseSystem {
 							// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
                 
 						v_ae1.start(f_CSE_DMR_DEL_001(int23, m_createSubscriptionBase));//Subscription
 						v_ae1.done;
@@ -7732,6 +7970,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_DEL_001_CIN() runs on AeSimu system CseSystem {
 							// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
                 
 						v_ae1.start(f_CSE_DMR_DEL_001(int4, m_createContentInstanceBase));//ContentInstance
 						v_ae1.done;
@@ -7748,6 +7987,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_DEL_002_CNT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
                 		
 						v_ae1.start(f_CSE_DMR_DEL_002(int3, m_createContainerBase));//Container
 						v_ae1.done;
@@ -7756,6 +7996,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_DEL_002_GRP() runs on Tester system CseSystem {
 						// Local variables
  						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
                 		
 						v_ae1.start(f_CSE_DMR_DEL_002(int9, m_createGroupBase));//Group
 						v_ae1.done;
@@ -7764,6 +8005,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_DEL_002_ACP() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
                 
 						v_ae1.start(f_CSE_DMR_DEL_002(int1, m_createAcpBase));//AccessControlPolicy
 						v_ae1.done;
@@ -7772,6 +8014,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_DMR_DEL_002_SUB() runs on Tester system CseSystem {
 							// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
                 
 						v_ae1.start(f_CSE_DMR_DEL_002(int23, m_createSubscriptionBase));//Subscription
 						v_ae1.done;
@@ -7812,7 +8055,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							v_childResourceIndex := f_cse_createResource(c_containerResourceType, m_createContainerBase, 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 {
@@ -7835,7 +8078,7 @@ module OneM2M_Testcases_CSE_Release_1 {
             	
             	
             	
-							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 {
@@ -7968,7 +8211,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Test Body
 						v_request := valueof(m_delete(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameLatest, f_getOriginator(v_containerIndex)));
 						            	
-						mcaPort.send(m_request(v_request));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) -> value v_response {
@@ -7990,7 +8233,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						
 						f_checkAeSimuStatus();
 			       		            	
-						mcaPort.send(m_request(m_retrieve((f_getResourceAddress(v_contentInstanceIndex_2)), f_getOriginator(v_contentInstanceIndex_2))));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve((f_getResourceAddress(v_contentInstanceIndex_2)), f_getOriginator(v_contentInstanceIndex_2)))));
 					            
 						tc_ac.start;
 						alt {
@@ -8053,7 +8296,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Test Body
 						v_request := valueof(m_delete(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameOldest, f_getOriginator(v_containerIndex)));
 						            	
-						mcaPort.send(m_request(v_request));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 						tc_ac.start;
 						alt {
 								[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) -> value v_response {
@@ -8075,7 +8318,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						   
 						f_checkAeSimuStatus();
 						   
-						mcaPort.send(m_request(m_retrieve((f_getResourceAddress(v_contentInstanceIndex_1)), f_getOriginator(v_contentInstanceIndex_1))));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve((f_getResourceAddress(v_contentInstanceIndex_1)), f_getOriginator(v_contentInstanceIndex_1)))));
 					            
 						tc_ac.start;
 						alt {
@@ -8116,6 +8359,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_SUB_CRE_001_SUB() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 							
 					v_ae1.start(f_CSE_SUB_CRE_001_SUB());
 				  	  	
@@ -8149,7 +8393,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_request := f_getCreateRequestPrimitive(int23, v_createRequest, v_resourceIndex);
 			
 					// 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 {
@@ -8189,6 +8433,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_SUB_CRE_001_CIN() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 								
 					v_ae1.start(f_CSE_SUB_CRE_001_CIN());
 					  	  	
@@ -8222,7 +8467,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_request := f_getCreateRequestPrimitive(int23, v_createRequest, v_contentInstanceResourceIndex);
 					
 					// 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 {
@@ -8266,6 +8511,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_SUB_CRE_002() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 								
 					v_ae1.start(f_CSE_SUB_CRE_002());
 					  	  	
@@ -8300,7 +8546,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_request := f_getCreateRequestPrimitive(int23, v_createRequest, v_aeIndex);//Subscription 
 					
 					// 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(int4103))) -> value v_response {
@@ -8344,6 +8590,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_SUB_CRE_003() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 								
 					v_ae1.start(f_CSE_SUB_CRE_003());
 					  	  	
@@ -8372,7 +8619,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_request.primitiveContent.subscription.notificationURI := {"NotReachableNotificationURI"};
 					
 					// 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(int5204))) -> value v_response { //SUBSCRIPTION_VERIFICATION_INITIATION_FAILED
@@ -8416,6 +8663,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_SUB_CRE_004() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 								
 					v_ae1.start(f_CSE_SUB_CRE_004());
 					  	  	
@@ -8478,6 +8726,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_SUB_CRE_005() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 								
 					v_ae1.start(f_CSE_SUB_CRE_005());
 					  	  	
@@ -8521,7 +8770,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					vc_ae2.start(f_cse_notifyProcedure_representationHandler(v_contentNotification)); // check if the notification is well received and if its content matchs
 					
-					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 {
@@ -8561,6 +8810,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_SUB_UPD_001() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 								
 					v_ae1.start(f_CSE_SUB_UPD_001());
 					  	  	
@@ -8606,7 +8856,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest); // Update request
 					v_request.primitiveContent.aE.labels := v_labels_1; 
 
-					mcaPort.send(m_request(v_request));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
@@ -8647,6 +8897,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_SUB_DEL_001() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 									
 					v_ae1.start(f_CSE_SUB_DEL_001());
 						  	  	
@@ -8692,7 +8943,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_notificationContent.notificationEvent := omit;
 					vc_ae2.start(f_cse_notifyProcedure_subscriptionDeletionHandler(v_notificationContent)); // check that no notification is received
 					
-					mcaPort.send(m_request(v_request));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) -> value v_response {
@@ -8747,6 +8998,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_SEC_ACP_CRE_001() runs on Tester system CseSystem {
 					
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 									
 						v_ae1.start(f_CSE_SEC_ACP_CRE_001());
 						  	  	
@@ -8785,7 +9037,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Test Body
 						v_createRequest := f_getCreateRequestPrimitive(c_accessControlPolicyType, v_createRequest, v_aeIndex);
 						
-						mcaPort.send(m_request(v_createRequest));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(v_createRequest)));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
@@ -8830,6 +9082,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_SEC_ACP_CRE_002() runs on Tester system CseSystem {
 					
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 										
 						v_ae1.start(f_CSE_SEC_ACP_CRE_002());
 							  	  	
@@ -8868,7 +9121,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Test Body
 						v_createRequest := f_getCreateRequestPrimitive(c_accessControlPolicyType, v_createRequest, v_aeIndex);// CSE child resource
 						
-						mcaPort.send(m_request(v_createRequest));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(v_createRequest)));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
@@ -8914,6 +9167,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_SEC_ACP_CRE_003() runs on Tester system CseSystem {
 					
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 										
 						v_ae1.start(f_CSE_SEC_ACP_CRE_003());
 							  	  	
@@ -8945,7 +9199,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Test Body
 						v_createRequest := f_getCreateRequestPrimitive(c_accessControlPolicyType, v_createRequest, -1);
 						
-						mcaPort.send(m_request(v_createRequest));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(v_createRequest)));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001, v_contentResponse))) -> value v_response {
@@ -8997,6 +9251,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_SEC_ACP_CRE_004() runs on Tester system CseSystem {
 					
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 										
 						v_ae1.start(f_CSE_SEC_ACP_CRE_004());
 							  	  	
@@ -9024,7 +9279,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Test Body
 						v_createRequest := f_getCreateRequestPrimitive(c_accessControlPolicyType, v_createRequest, -1);
 						
-						mcaPort.send(m_request(v_createRequest));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(v_createRequest)));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) -> value v_response {
@@ -9074,6 +9329,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_SEC_ACP_UPD_001() runs on Tester system CseSystem {
 					
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 										
 						v_ae1.start(f_CSE_SEC_ACP_UPD_001());
 							  	  	
@@ -9123,7 +9379,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_updateRequest.primitiveContent.aE.accessControlPolicyIDs := {f_getResourceId(vc_resourcesList[v_acpIndex2].resource)};
 						v_updateRequest := f_getUpdateRequestPrimitive(int1, v_aeIndex, v_updateRequest);
 						
-						mcaPort.send(m_request(v_updateRequest));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(v_updateRequest)));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
@@ -9167,6 +9423,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_SEC_ACP_UPD_002() runs on Tester system CseSystem {
 					
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 										
 						v_ae1.start(f_CSE_SEC_ACP_UPD_002());
 							  	  	
@@ -9216,7 +9473,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_updateRequest.primitiveContent.aE.accessControlPolicyIDs := {f_getResourceId(vc_resourcesList[v_acpIndex2].resource)};
 						v_updateRequest := f_getUpdateRequestPrimitive(int1, v_aeIndex, v_updateRequest);
 
-						mcaPort.send(m_request(v_updateRequest));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(v_updateRequest)));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response {
@@ -9265,6 +9522,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						 */
 						testcase TC_CSE_SEC_ACP_001_CRE() runs on Tester system CseSystem { //Create
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 							v_ae1.start(f_CSE_SEC_ACP_001(m_createContainerBase));	
 							v_ae1.done;
@@ -9272,6 +9530,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 	
 						testcase TC_CSE_SEC_ACP_001_UPD() runs on Tester system CseSystem { //Update
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 							var template RequestPrimitive v_updateRequest := m_updateAeBase;
 							var Labels v_labels_1:= {"VALUE_1"};
 							v_updateRequest.primitiveContent.aE.labels := v_labels_1;
@@ -9282,6 +9541,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 	
 						testcase TC_CSE_SEC_ACP_001_RET() runs on Tester system CseSystem { //Retrieve
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 							v_ae1.start(f_CSE_SEC_ACP_001(m_retrieve("Temporary", "Temporary")));	
 							v_ae1.done;
@@ -9289,6 +9549,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 	
 						testcase TC_CSE_SEC_ACP_001_DEL() runs on Tester system CseSystem { //Delete
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 							v_ae1.start(f_CSE_SEC_ACP_001(m_delete("Temporary", "Temporary")));	
 							v_ae1.done;
@@ -9304,6 +9565,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						 */
 						testcase TC_CSE_SEC_ACP_002_CRE() runs on Tester system CseSystem { //Create
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 							v_ae1.start(f_CSE_SEC_ACP_002(m_createContainerBase, int2001));	
 							v_ae1.done;
@@ -9311,6 +9573,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 	
 						testcase TC_CSE_SEC_ACP_002_UPD() runs on Tester system CseSystem { //Update
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 							var template RequestPrimitive v_updateRequest := m_updateAeBase;
 							var Labels v_labels_1:= {"VALUE_1"};
 							v_updateRequest.primitiveContent.aE.labels := v_labels_1;
@@ -9321,6 +9584,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 	
 						testcase TC_CSE_SEC_ACP_002_RET() runs on Tester system CseSystem { //Retrieve
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 							v_ae1.start(f_CSE_SEC_ACP_002(m_retrieve("Temporary", "Temporary"), int2000));	
 							v_ae1.done;
@@ -9328,6 +9592,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 	
 						testcase TC_CSE_SEC_ACP_002_DEL() runs on Tester system CseSystem { //Delete
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 							v_ae1.start(f_CSE_SEC_ACP_002(m_delete("Temporary", "Temporary"), int2002));	
 							v_ae1.done;
@@ -9343,6 +9608,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						 */
 						testcase TC_CSE_SEC_ACP_003_CRE() runs on Tester system CseSystem { //Create
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 							v_ae1.start(f_CSE_SEC_ACP_003(m_createContainerBase, int2001));	
 							v_ae1.done;
@@ -9350,6 +9616,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						
 						testcase TC_CSE_SEC_ACP_003_UPD() runs on Tester system CseSystem { //Update
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 							var template RequestPrimitive v_updateRequest := m_updateAeBase;
 							var Labels v_labels_1:= {"VALUE_1"};
 							v_updateRequest.primitiveContent.aE.labels := v_labels_1;
@@ -9360,6 +9627,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						
 						testcase TC_CSE_SEC_ACP_003_RET() runs on Tester system CseSystem { //Retrieve
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 							v_ae1.start(f_CSE_SEC_ACP_003(m_retrieve("Temporary", "Temporary"), int2000));	
 							v_ae1.done;
@@ -9367,6 +9635,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						
 						testcase TC_CSE_SEC_ACP_003_DEL() runs on Tester system CseSystem { //Delete
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 							v_ae1.start(f_CSE_SEC_ACP_003(m_delete("Temporary", "Temporary"), int2002));	
 							v_ae1.done;
@@ -9382,6 +9651,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						 */
 						testcase TC_CSE_SEC_ACP_004_CRE() runs on Tester system CseSystem { //Create
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 							v_ae1.start(f_CSE_SEC_ACP_004(m_createContainerBase, int2001));	
 							v_ae1.done;
@@ -9389,6 +9659,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 		
 						testcase TC_CSE_SEC_ACP_004_UPD() runs on Tester system CseSystem { //Update
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 							var template RequestPrimitive v_updateRequest := m_updateAeBase;
 							var Labels v_labels_1:= {"VALUE_1"};
 							v_updateRequest.primitiveContent.aE.labels := v_labels_1;
@@ -9399,6 +9670,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 		
 						testcase TC_CSE_SEC_ACP_004_RET() runs on Tester system CseSystem { //Retrieve
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 							v_ae1.start(f_CSE_SEC_ACP_004(m_retrieve("Temporary", "Temporary"), int2000));	
 							v_ae1.done;
@@ -9406,6 +9678,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 		
 						testcase TC_CSE_SEC_ACP_004_DEL() runs on Tester system CseSystem { //Delete
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 							v_ae1.start(f_CSE_SEC_ACP_004(m_delete("Temporary", "Temporary"), int2002));	
 							v_ae1.done;
@@ -9421,6 +9694,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						 */
 						testcase TC_CSE_SEC_ACP_005_CRE() runs on Tester system CseSystem { //Create
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 							v_ae1.start(f_CSE_SEC_ACP_005(m_createContainerBase, int2001));	
 							v_ae1.done;
@@ -9428,6 +9702,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 		
 						testcase TC_CSE_SEC_ACP_005_UPD() runs on Tester system CseSystem { //Update
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 							var template RequestPrimitive v_updateRequest := m_updateAeBase;
 							var Labels v_labels_1:= {"VALUE_1"};
 							v_updateRequest.primitiveContent.aE.labels := v_labels_1;
@@ -9438,6 +9713,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 		
 						testcase TC_CSE_SEC_ACP_005_RET() runs on Tester system CseSystem { //Retrieve
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 							v_ae1.start(f_CSE_SEC_ACP_005(m_retrieve("Temporary", "Temporary"), int2000));	
 							v_ae1.done;
@@ -9445,6 +9721,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 		
 						testcase TC_CSE_SEC_ACP_005_DEL() runs on Tester system CseSystem { //Delete
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 							v_ae1.start(f_CSE_SEC_ACP_005(m_delete("Temporary", "Temporary"), int2002));	
 							v_ae1.done;
@@ -9460,6 +9737,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						 */
 						testcase TC_CSE_SEC_ACP_006_CRE() runs on Tester system CseSystem { //Create
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 							v_ae1.start(f_CSE_SEC_ACP_006(m_createContainerBase, int2001));	
 							v_ae1.done;
@@ -9467,6 +9745,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 		
 						testcase TC_CSE_SEC_ACP_006_UPD() runs on Tester system CseSystem { //Update
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 							var template RequestPrimitive v_updateRequest := m_updateAeBase;
 							var Labels v_labels_1:= {"VALUE_1"};
 							v_updateRequest.primitiveContent.aE.labels := v_labels_1;
@@ -9477,6 +9756,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 		
 						testcase TC_CSE_SEC_ACP_006_RET() runs on Tester system CseSystem { //Retrieve
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 							v_ae1.start(f_CSE_SEC_ACP_006(m_retrieve("Temporary", "Temporary"), int2000));	
 							v_ae1.done;
@@ -9484,6 +9764,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 		
 						testcase TC_CSE_SEC_ACP_006_DEL() runs on Tester system CseSystem { //Delete
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 							v_ae1.start(f_CSE_SEC_ACP_006(m_delete("Temporary", "Temporary"), int2002));	
 							v_ae1.done;
@@ -9499,6 +9780,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						 */
 						testcase TC_CSE_SEC_ACP_007_CRE() runs on Tester system CseSystem { //Create
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 							v_ae1.start(f_CSE_SEC_ACP_007(m_createContainerBase, int2001));	
 							v_ae1.done;
@@ -9506,6 +9788,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 		
 						testcase TC_CSE_SEC_ACP_007_UPD() runs on Tester system CseSystem { //Update
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 							var template RequestPrimitive v_updateRequest := m_updateAeBase;
 							var Labels v_labels_1:= {"VALUE_1"};
 							v_updateRequest.primitiveContent.aE.labels := v_labels_1;
@@ -9516,6 +9799,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 		
 						testcase TC_CSE_SEC_ACP_007_RET() runs on Tester system CseSystem { //Retrieve
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 							v_ae1.start(f_CSE_SEC_ACP_007(m_retrieve("Temporary", "Temporary"), int2000));	
 							v_ae1.done;
@@ -9523,6 +9807,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 		
 						testcase TC_CSE_SEC_ACP_007_DEL() runs on Tester system CseSystem { //Delete
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 							v_ae1.start(f_CSE_SEC_ACP_007(m_delete("Temporary", "Temporary"), int2002));	
 							v_ae1.done;
@@ -9538,6 +9823,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						 */
 						testcase TC_CSE_SEC_ACP_008_CRE() runs on Tester system CseSystem { //Create
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 							v_ae1.start(f_CSE_SEC_ACP_008(m_createContainerBase, int2001));	
 							v_ae1.done;
@@ -9545,6 +9831,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 		
 						testcase TC_CSE_SEC_ACP_008_UPD() runs on Tester system CseSystem { //Update
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 							var template RequestPrimitive v_updateRequest := m_updateAeBase;
 							var Labels v_labels_1:= {"VALUE_1"};
 							v_updateRequest.primitiveContent.aE.labels := v_labels_1;
@@ -9555,6 +9842,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 		
 						testcase TC_CSE_SEC_ACP_008_RET() runs on Tester system CseSystem { //Retrieve
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 							v_ae1.start(f_CSE_SEC_ACP_008(m_retrieve("Temporary", "Temporary"), int2000));	
 							v_ae1.done;
@@ -9562,6 +9850,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 		
 						testcase TC_CSE_SEC_ACP_008_DEL() runs on Tester system CseSystem { //Delete
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 							v_ae1.start(f_CSE_SEC_ACP_008(m_delete("Temporary", "Temporary"), int2002));	
 							v_ae1.done;
@@ -9577,6 +9866,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						 */
 						testcase TC_CSE_SEC_ACP_009_CRE() runs on Tester system CseSystem { //Create
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 							v_ae1.start(f_CSE_SEC_ACP_009(m_createContainerBase, int2001));	
 							v_ae1.done;
@@ -9584,6 +9874,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 		
 						testcase TC_CSE_SEC_ACP_009_UPD() runs on Tester system CseSystem { //Update
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 							var template RequestPrimitive v_updateRequest := m_updateAeBase;
 							var Labels v_labels_1:= {"VALUE_1"};
 							v_updateRequest.primitiveContent.aE.labels := v_labels_1;
@@ -9594,6 +9885,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 		
 						testcase TC_CSE_SEC_ACP_009_RET() runs on Tester system CseSystem { //Retrieve
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 							v_ae1.start(f_CSE_SEC_ACP_009(m_retrieve("Temporary", "Temporary"), int2000));	
 							v_ae1.done;
@@ -9601,6 +9893,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 		
 						testcase TC_CSE_SEC_ACP_009_DEL() runs on Tester system CseSystem { //Delete
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 							v_ae1.start(f_CSE_SEC_ACP_009(m_delete("Temporary", "Temporary"), int2002));	
 							v_ae1.done;
@@ -9616,6 +9909,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						 */
 						testcase TC_CSE_SEC_ACP_010_CRE() runs on Tester system CseSystem { //Create
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 							v_ae1.start(f_CSE_SEC_ACP_010(m_createContainerBase, int2001));	
 							v_ae1.done;
@@ -9623,6 +9917,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 		
 						testcase TC_CSE_SEC_ACP_010_UPD() runs on Tester system CseSystem { //Update
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 							var template RequestPrimitive v_updateRequest := m_updateAeBase;
 							var Labels v_labels_1:= {"VALUE_1"};
 							v_updateRequest.primitiveContent.aE.labels := v_labels_1;
@@ -9633,6 +9928,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 		
 						testcase TC_CSE_SEC_ACP_010_RET() runs on Tester system CseSystem { //Retrieve
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 							v_ae1.start(f_CSE_SEC_ACP_010(m_retrieve("Temporary", "Temporary"), int2000));	
 							v_ae1.done;
@@ -9640,6 +9936,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 		
 						testcase TC_CSE_SEC_ACP_010_DEL() runs on Tester system CseSystem { //Delete
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 							v_ae1.start(f_CSE_SEC_ACP_010(m_delete("Temporary", "Temporary"), int2002));	
 							v_ae1.done;
@@ -9655,6 +9952,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						 */
 						testcase TC_CSE_SEC_ACP_011_CRE() runs on Tester system CseSystem { //Create
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 							v_ae1.start(f_CSE_SEC_ACP_011(m_createContainerBase, int2001));	
 							v_ae1.done;
@@ -9662,6 +9960,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 	
 						testcase TC_CSE_SEC_ACP_011_UPD() runs on Tester system CseSystem { //Update
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 							var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 							var Labels v_labels_1:= {"VALUE_1"};
 							v_updateRequest.primitiveContent.container.labels := v_labels_1;
@@ -9672,6 +9971,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 	
 						testcase TC_CSE_SEC_ACP_011_RET() runs on Tester system CseSystem { //Retrieve
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 							v_ae1.start(f_CSE_SEC_ACP_011(m_retrieve("Temporary", "Temporary"), int2000));	
 							v_ae1.done;
@@ -9679,6 +9979,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 	
 						testcase TC_CSE_SEC_ACP_011_DEL() runs on Tester system CseSystem { //Delete
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 							v_ae1.start(f_CSE_SEC_ACP_011(m_delete("Temporary", "Temporary"), int2002));	
 							v_ae1.done;
@@ -9694,6 +9995,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						 */
 						testcase TC_CSE_SEC_ACP_012_CRE() runs on Tester system CseSystem { //Create
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 							v_ae1.start(f_CSE_SEC_ACP_012(m_createContainerBase, int62));	
 							v_ae1.done;
@@ -9701,6 +10003,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 	
 						testcase TC_CSE_SEC_ACP_012_UPD() runs on Tester system CseSystem { //Update
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 							var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 							var Labels v_labels_1:= {"VALUE_1"};
 							v_updateRequest.primitiveContent.container.labels := v_labels_1;
@@ -9711,6 +10014,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 	
 						testcase TC_CSE_SEC_ACP_012_RET() runs on Tester system CseSystem { //Retrieve
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 							v_ae1.start(f_CSE_SEC_ACP_012(m_retrieve("Temporary", "Temporary"), int61));
 							v_ae1.done;
@@ -9718,6 +10022,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 	
 						testcase TC_CSE_SEC_ACP_012_DEL() runs on Tester system CseSystem { //Delete
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 							v_ae1.start(f_CSE_SEC_ACP_012(m_delete("Temporary", "Temporary"), int55));
 							v_ae1.done;
@@ -9740,6 +10045,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 			testcase TC_CSE_DIS_001() runs on Tester system CseSystem {
 					
 				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 										
 				v_ae1.start(f_CSE_DIS_001());
 							  	  	
@@ -9768,7 +10074,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				v_resourceIndex := f_cse_createResource(c_containerResourceType, m_createContainerBase, v_aeIndex);
 				v_childResourceIndex := f_cse_createResource(c_containerResourceType, m_createContainerBase, v_resourceIndex);
 				v_request := valueof(m_retrieveFilterUsageOption(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex), int1));
-				mcaPort.send(m_request(v_request));
+				mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 				tc_ac.start;
 				alt {
 					[] mcaPort.receive(mw_response(mw_responseDiscovery)){
@@ -9802,6 +10108,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 			testcase TC_CSE_DIS_002() runs on Tester system CseSystem {
 					
 				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 											
 				v_ae1.start(f_CSE_DIS_002());
 								  	  	
@@ -9834,7 +10141,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				v_createRequest.primitiveContent.container.labels := v_labels;
 				v_childResourceIndex := f_cse_createResource(c_containerResourceType, v_createRequest, v_resourceIndex);
 				v_request := valueof(m_retrieveFilterUsageOptionLabel(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex), int1, v_labels));
-				mcaPort.send(m_request(v_request));
+				mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 				tc_ac.start;
 				alt {
 					[] mcaPort.receive(mw_response(mw_responseDiscovery)) -> value v_response {
@@ -9874,6 +10181,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 			testcase TC_CSE_DIS_003() runs on Tester system CseSystem {
 					
 				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 											
 				v_ae1.start(f_CSE_DIS_003());
 								  	  	
@@ -9905,7 +10213,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				v_childResourceIndex := f_cse_createResource(c_containerResourceType, m_createContainerBase, v_resourceIndex);
 				//v_request := valueof(m_retrieveResourceFilterUsageOption(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex), int1));
 				v_request := valueof(m_retrieveFilterUsageOptionLabel(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex), int1, v_labels));
-				mcaPort.send(m_request(v_request));
+				mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 				tc_ac.start;
 				alt {
 					[] mcaPort.receive(mw_response(mw_responseDiscovery)) -> value v_response {
@@ -9945,6 +10253,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 			testcase TC_CSE_DIS_004() runs on Tester system CseSystem {
 					
 				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 											
 				v_ae1.start(f_CSE_DIS_004());
 								  	  	
@@ -9975,7 +10284,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				v_resourceIndex := f_cse_createResource(c_containerResourceType, m_createContainerBase, v_aeIndex);
 				v_childResourceIndex := f_cse_createResource(c_containerResourceType, m_createContainerBase, v_resourceIndex);
 				v_request := valueof(m_retrieveDiscResTypeFilterUsageOption(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex), int2, int1));
-				mcaPort.send(m_request(v_request));
+				mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 				tc_ac.start;
 				alt {
 					[] mcaPort.receive(mw_response(mw_responseDiscovery)) -> value v_response {
@@ -10016,6 +10325,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 			testcase TC_CSE_DIS_005() runs on Tester system CseSystem {
 					
 				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 											
 				v_ae1.start(f_CSE_DIS_005());
 								  	  	
@@ -10051,7 +10361,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				v_resourceIndex := f_cse_createResource(c_containerResourceType, m_createContainerBase, v_aeIndex);
 				v_childResourceIndex := f_cse_createResource(c_containerResourceType, m_createContainerBase, v_resourceIndex);
 				v_request := valueof(m_retrieveFilterUsageOption(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex), int1));
-				mcaPort.send(m_request(v_request));
+				mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 				tc_ac.start;
 				alt {
 					[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) {
@@ -10085,6 +10395,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 			testcase TC_CSE_DIS_006() runs on Tester system CseSystem {
 					
 				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 											
 				v_ae1.start(f_CSE_DIS_006());
 								  	  	
@@ -10116,7 +10427,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_request := valueof(m_retrieveFilterUsageOption(f_getResourceAddress(v_aeIndex) & "/" & v_resourceId, f_getOriginator(v_resourceIndex), int1));
 				}
 			
-				mcaPort.send(m_request(v_request));
+				mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 				tc_ac.start;
 				alt {
 				
@@ -10151,6 +10462,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 			testcase TC_CSE_DIS_007() runs on Tester system CseSystem {
 					
 				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 											
 				v_ae1.start(f_CSE_DIS_007());
 								  	  	
@@ -10182,7 +10494,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				v_childResourceIndex := f_cse_createResource(c_containerResourceType, m_createContainerBase, v_resourceIndex); 
 				v_request := valueof(m_retrieveFilterUsageOption(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex), int1));
 				v_invalidAttribute := {name := "filterCriteria.sizeBelow", value_ := "-1"};
-				mcaPort.send(m_request(v_request, {v_invalidAttribute}));
+				mcaPort.send(f_getMsgOutPrimitive(m_request(v_request, {v_invalidAttribute})));
 				tc_ac.start;
 				alt {
 				
@@ -10220,6 +10532,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					//Local variables
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 					var FilterCriteria v_filterCriteria := valueof(m_filterCriteria);
 					
 					v_filterCriteria.createdBefore := "20171231T012345";
@@ -10235,6 +10548,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					//Local variables
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 					var FilterCriteria v_filterCriteria := valueof(m_filterCriteria);
 	
 					v_filterCriteria.unmodifiedSince := "20171231T012345";
@@ -10250,6 +10564,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					//Local variables
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 					var FilterCriteria v_filterCriteria := valueof(m_filterCriteria);
 	
 					v_filterCriteria.stateTagSmaller := 1;
@@ -10265,6 +10580,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					//Local variables
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 					var FilterCriteria v_filterCriteria := valueof(m_filterCriteria);
 
 					v_filterCriteria.expireBefore := "20171231T012345";
@@ -10285,6 +10601,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 			testcase TC_CSE_DIS_009() runs on Tester system CseSystem {
 					
 				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 											
 				v_ae1.start(f_CSE_DIS_009());
 								  	  	
@@ -10323,7 +10640,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				v_resourceIndex := f_cse_createResource(c_containerResourceType, v_createRequest, v_aeIndex);
 				
 				v_request := valueof(m_retrieveFilterUsageOptionLabel(f_getResourceAddress(v_aeIndex), f_getOriginator(v_resourceIndex), int1, v_labels));
-				mcaPort.send(m_request(v_request));
+				mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 				tc_ac.start;
 				alt {
 					[] mcaPort.receive(mw_response(mw_responseDiscovery)) -> value v_response {
@@ -10369,6 +10686,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_GMG_CRE_001() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 											
 					v_ae1.start(f_CSE_GMG_CRE_001());
 								  	  	
@@ -10411,7 +10729,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_request := f_getCreateRequestPrimitive(int9, v_createRequest, v_aeIndex);
                 
                                                                          
-					mcaPort.send(m_request(v_request));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int6010))) -> value v_response {
@@ -10456,6 +10774,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_GMG_CRE_002() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 												
 					v_ae1.start(f_CSE_GMG_CRE_002());
 									  	  	
@@ -10497,7 +10816,7 @@ module OneM2M_Testcases_CSE_Release_1 {
                 	                		   
 					// 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(int5105))) -> value v_response {
@@ -10540,6 +10859,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_GMG_CRE_003() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 												
 					v_ae1.start(f_CSE_GMG_CRE_003());
 									  	  	
@@ -10570,7 +10890,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_createRequest := f_getCreateRequestPrimitive(int9, v_createRequest, v_aeIndex);
             		
 					// Test Body                                              
-					mcaPort.send(m_request(v_createRequest));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_createRequest)));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
@@ -10607,6 +10927,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_GMG_CRE_004() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 												
 					v_ae1.start(f_CSE_GMG_CRE_004());
 									  	  	
@@ -10635,7 +10956,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_createRequest := f_getCreateRequestPrimitive(int9, v_createRequest, v_aeIndex);
                 	
 					// Test Body       
-					mcaPort.send(m_request(v_createRequest));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_createRequest)));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
@@ -10674,6 +10995,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_GMG_CRE_005() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 												
 					v_ae1.start(f_CSE_GMG_CRE_005());
 									  	  	
@@ -10702,7 +11024,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_createRequest := f_getCreateRequestPrimitive(int9, v_createRequest, v_aeIndex);                                                            
                     
 					// Test Body
-					mcaPort.send(m_request(v_createRequest));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_createRequest)));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
@@ -10752,6 +11074,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_GMG_CRE_006() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 												
 					v_ae1.start(f_CSE_GMG_CRE_006());
 									  	  	
@@ -10784,7 +11107,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_createRequest := f_getCreateRequestPrimitive(int9, v_createRequest, v_aeIndex);                                                       
                     
 					// Test Body               
-					mcaPort.send(m_request(v_createRequest));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_createRequest)));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
@@ -10834,6 +11157,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_GMG_CRE_007() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 												
 					v_ae1.start(f_CSE_GMG_CRE_007());
 									  	  	
@@ -10866,7 +11190,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_createRequest := f_getCreateRequestPrimitive(int9, v_createRequest, v_aeIndex);                                                       
                     
 					// Test Body
-					mcaPort.send(m_request(v_createRequest));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_createRequest)));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int4110))) -> value v_response {
@@ -10905,6 +11229,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_GMG_RET_001() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 												
 					v_ae1.start(f_CSE_GMG_RET_001());
 									  	  	
@@ -10955,7 +11280,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_fanoutPointAddress := f_getResourceAddress(v_groupIndex) & "/" & c_resourceShortNameFanOutPoint & "/" & c_resourceShortNameLatest;
 					
 					// Test Body
-					mcaPort.send(m_request(m_retrieve(v_fanoutPointAddress, f_getOriginator(v_aeIndex_1)))); //TODO see if it is correct or if we have to use PX_SUPER_ADMIN
+					mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(v_fanoutPointAddress, f_getOriginator(v_aeIndex_1))))); //TODO see if it is correct or if we have to use PX_SUPER_ADMIN
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) -> value v_response {
@@ -11010,6 +11335,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_GMG_UPD_001() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 												
 					v_ae1.start(f_CSE_GMG_UPD_001());
 									  	  	
@@ -11055,7 +11381,7 @@ module OneM2M_Testcases_CSE_Release_1 {
                 	    
 					// 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(int5105))) -> value v_response {
@@ -11090,6 +11416,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 			  testcase TC_CSE_GMG_UPD_002() runs on Tester system CseSystem {
 					
 				  var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 													
 				  v_ae1.start(f_CSE_GMG_UPD_002());
 										  	  	
@@ -11128,7 +11455,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_updateRequest := f_getUpdateRequestPrimitive(int9, v_groupIndex, v_updateRequest);
 					
 					//Test Body
-					mcaPort.send(m_request(v_updateRequest));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_updateRequest)));
 					tc_ac.start;
 					alt {
 						 [] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
@@ -11184,6 +11511,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_GMG_UPD_003() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 													
 					v_ae1.start(f_CSE_GMG_UPD_003());
 										  	  	
@@ -11218,7 +11546,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_updateRequest := f_getUpdateRequestPrimitive(int9, v_groupIndex, v_updateRequest);
 					
 					// Test Body
-					mcaPort.send(m_request(v_updateRequest));// TODO see if the memberTypeValidated is present in the update response
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_updateRequest)));// TODO see if the memberTypeValidated is present in the update response
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
@@ -11270,6 +11598,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_GMG_UPD_004() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 													
 					v_ae1.start(f_CSE_GMG_UPD_004());
 										  	  	
@@ -11308,7 +11637,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_updateRequest := f_getUpdateRequestPrimitive(int9, v_groupIndex, v_updateRequest);
 					
 					// Test Body
-					mcaPort.send(m_request(v_updateRequest));// TODO see if the memberTypeValidated is present in the update response
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_updateRequest)));// TODO see if the memberTypeValidated is present in the update response
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
@@ -11376,6 +11705,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_GMG_UPD_005() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 													
 					v_ae1.start(f_CSE_GMG_UPD_005());
 										  	  	
@@ -11415,7 +11745,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					//Test Body
                     
-					mcaPort.send(m_request(v_updateRequest));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_updateRequest)));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
@@ -11485,6 +11815,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_GMG_UPD_006() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 													
 					v_ae1.start(f_CSE_GMG_UPD_006());
 										  	  	
@@ -11522,7 +11853,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_updateRequest := f_getUpdateRequestPrimitive(int9, v_groupIndex, v_updateRequest);
                 					
 					//Test Body
-					mcaPort.send(m_request(v_updateRequest));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_updateRequest)));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int4110))) -> value v_response {
@@ -11556,6 +11887,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_GMG_UPD_007() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 													
 					v_ae1.start(f_CSE_GMG_UPD_007());
 										  	  	
@@ -11604,7 +11936,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_memberIDs := v_memberIDs & {f_getResourceId(vc_resourcesList[v_containerIndex_3].resource)};
 					v_request.primitiveContent.group_.memberIDs := v_memberIDs;
         
-					mcaPort.send(m_request(v_request));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int6010))) -> value v_response {
@@ -11648,6 +11980,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_GMG_UPD_008() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 													
 					v_ae1.start(f_CSE_GMG_UPD_008());
 										  	  	
@@ -11686,7 +12019,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_updateRequest := f_getUpdateRequestPrimitive(int9, v_groupIndex, v_updateRequest);
 					
 					//Test Body
-					mcaPort.send(m_request(v_updateRequest));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_updateRequest)));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int6010))) -> value v_response {
@@ -11730,6 +12063,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_GMG_UPD_009() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 													
 					v_ae1.start(f_CSE_GMG_UPD_009());
 										  	  	
@@ -11782,7 +12116,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_updateRequest.primitiveContent.group_.memberIDs := {v_memberId_1, v_memberId_2};
         			v_request := f_getUpdateRequestPrimitive(c_ResourceTypeGroup, v_groupIndex, v_updateRequest);
 
-					mcaPort.send(m_request(v_request));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
@@ -11842,6 +12176,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_GMG_UPD_010() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 													
 					v_ae1.start(f_CSE_GMG_UPD_010());
 										  	  	
@@ -11900,7 +12235,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_request.to_ := f_getResourceAddress(v_remoteCSEIndex);
 					//Content set to <remoteCSE> resource containing onlineStatus := false;
         
-					mcaPort.send(m_request(v_request));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
@@ -11939,6 +12274,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					 */
 					testcase TC_CSE_GMG_001_CRE() runs on Tester system CseSystem { //Create
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 						v_ae1.start(f_CSE_GMG_001(m_createContainerBase, int2001));
 						v_ae1.done;
@@ -11946,6 +12282,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 	
 					testcase TC_CSE_GMG_001_UPD() runs on Tester system CseSystem { //Update
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var Labels v_labels_1:= {"VALUE_1"};
 						v_updateRequest.primitiveContent.container.labels := v_labels_1;
@@ -11956,6 +12293,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 	
 					testcase TC_CSE_GMG_001_RET() runs on Tester system CseSystem { //Retrieve
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						
 						v_ae1.start(f_CSE_GMG_001(m_retrieve("Temporary", "Temporary"), int2000));
 						v_ae1.done;
@@ -11963,6 +12301,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 	
 					testcase TC_CSE_GMG_001_DEL() runs on Tester system CseSystem { //Delete
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 						v_ae1.start(f_CSE_GMG_001(m_delete("Temporary", "Temporary"), int2002));	
 						v_ae1.done;
@@ -11978,6 +12317,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					 */
 					testcase TC_CSE_GMG_002_CRE() runs on Tester system CseSystem { //Create
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 						v_ae1.start(f_CSE_GMG_002(m_createContainerBase, int62));	//c_RUDNDi
 						v_ae1.done;
@@ -11985,6 +12325,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 	
 					testcase TC_CSE_GMG_002_UPD() runs on Tester system CseSystem { //Update
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var Labels v_labels_1:= {"VALUE_1"};
 						v_updateRequest.primitiveContent.container.labels := v_labels_1;
@@ -11995,6 +12336,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 	
 					testcase TC_CSE_GMG_002_RET() runs on Tester system CseSystem { //Retrieve
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 						v_ae1.start(f_CSE_GMG_002(m_retrieve("Temporary", "Temporary"), int61));//c_CUDNDi
 						v_ae1.done;
@@ -12002,6 +12344,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 	
 					testcase TC_CSE_GMG_002_DEL() runs on Tester system CseSystem { //Delete
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 						v_ae1.start(f_CSE_GMG_002(m_delete("Temporary", "Temporary"), int55)); //c_CRUNDi	
 						v_ae1.done;
@@ -12017,6 +12360,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					 */
 					testcase TC_CSE_GMG_003_CRE() runs on Tester system CseSystem { //Create
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 						v_ae1.start(f_CSE_GMG_003(m_createContainerBase, int2001));
 						v_ae1.done;
@@ -12024,6 +12368,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 	
 					testcase TC_CSE_GMG_003_UPD() runs on Tester system CseSystem { //Update
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var Labels v_labels_1:= {"VALUE_1"};
 						v_updateRequest.primitiveContent.container.labels := v_labels_1;
@@ -12034,6 +12379,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 	
 					testcase TC_CSE_GMG_003_RET() runs on Tester system CseSystem { //Retrieve
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 						v_ae1.start(f_CSE_GMG_003(m_retrieve("Temporary", "Temporary"), int2000));
 						v_ae1.done;
@@ -12041,6 +12387,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 	
 					testcase TC_CSE_GMG_003_DEL() runs on Tester system CseSystem { //Delete
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 						v_ae1.start(f_CSE_GMG_003(m_delete("Temporary", "Temporary"), int2002));	
 						v_ae1.done;
@@ -12056,6 +12403,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					 */
 					testcase TC_CSE_GMG_004_CRE() runs on Tester system CseSystem { //Create
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 						v_ae1.start(f_CSE_GMG_004(m_createContainerBase, int62));	//c_RUDNDi
 						v_ae1.done;
@@ -12063,6 +12411,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 	
 					testcase TC_CSE_GMG_004_UPD() runs on Tester system CseSystem { //Update
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var Labels v_labels_1:= {"VALUE_1"};
 						v_updateRequest.primitiveContent.container.labels := v_labels_1;
@@ -12073,6 +12422,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 	
 					testcase TC_CSE_GMG_004_RET() runs on Tester system CseSystem { //Retrieve
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 						v_ae1.start(f_CSE_GMG_004(m_retrieve("Temporary", "Temporary"), int61));//c_CUDNDi
 						v_ae1.done;
@@ -12080,6 +12430,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 	
 					testcase TC_CSE_GMG_004_DEL() runs on Tester system CseSystem { //Delete
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 						v_ae1.start(f_CSE_GMG_004(m_delete("Temporary", "Temporary"), int55)); //c_CRUNDi	
 						v_ae1.done;
@@ -12095,6 +12446,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					 */
 					testcase TC_CSE_GMG_005_CRE() runs on Tester system CseSystem { //Create
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 						v_contentResponse.container := mw_contentContainer_rc1;
 						
@@ -12104,6 +12456,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 	
 					testcase TC_CSE_GMG_005_UPD() runs on Tester system CseSystem { //Update
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var template PrimitiveContent v_contentResponse;
 						var Labels v_labels_1:= {"VALUE_1"};
@@ -12117,6 +12470,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 	
 					testcase TC_CSE_GMG_005_RET() runs on Tester system CseSystem { //Retrieve
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 						v_contentResponse.container := mw_contentContainerBase;
 						
@@ -12126,6 +12480,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 	
 					testcase TC_CSE_GMG_005_DEL() runs on Tester system CseSystem { //Delete
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 						v_contentResponse.container := mw_contentContainerBase;// TODO see with wath should it be matched
 						
@@ -12143,6 +12498,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					 */
 					testcase TC_CSE_GMG_006_CRE() runs on Tester system CseSystem { //Create
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 						v_contentResponse.container := mw_contentContainer_rc1;
 						
@@ -12152,6 +12508,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 	
 					testcase TC_CSE_GMG_006_UPD() runs on Tester system CseSystem { //Update
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var template PrimitiveContent v_contentResponse;
 						var Labels v_labels_1:= {"VALUE_1"};
@@ -12165,6 +12522,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 	
 					testcase TC_CSE_GMG_006_RET() runs on Tester system CseSystem { //Retrieve
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 						v_contentResponse.container := mw_contentContainerBase;
 						
@@ -12174,6 +12532,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 	
 					testcase TC_CSE_GMG_006_DEL() runs on Tester system CseSystem { //Delete
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 						v_contentResponse.container := mw_contentContainerBase;// TODO see with wath should it be matched
 						
diff --git a/OneM2M_Testcases_CSE_Release_2.ttcn b/OneM2M_Testcases_CSE_Release_2.ttcn
index aeeecb7..857f672 100644
--- a/OneM2M_Testcases_CSE_Release_2.ttcn
+++ b/OneM2M_Testcases_CSE_Release_2.ttcn
@@ -43,7 +43,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						
 					v_request := valueof(m_delete(v_resourceAddress, PX_SUPER_AE_ID));
 					    
-					mcaPort.send(m_request(v_request));
+					mcaPort.send(f_getMsgOutPrimitive(f_getMsgOutPrimitive(m_request(v_request))));
 					
 					t_ac.start;
 					alt {
@@ -108,6 +108,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_REG_CRE_012_AE_NL() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
 						
 						v_create.primitiveContent.aE.nodeLink := "http://127.0.0.1/";
@@ -117,6 +119,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_REG_CRE_012_AE_OR() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
 						
 						v_create.primitiveContent.aE.ontologyRef := "MyOntologyRef";
@@ -229,6 +233,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_REG_CRE_028_RN() runs on Tester system CseSystem {
 						 //Local variables
 						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						 var RequestPrimitive v_request;
 						 var template PrimitiveContent v_contentResponse;
 						 
@@ -248,6 +254,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_REG_CRE_028_ET() runs on Tester system CseSystem {
 						 //Local variables
 						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						 var RequestPrimitive v_request;
 						 var template PrimitiveContent v_contentResponse;
 		 
@@ -281,6 +289,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_REG_RET_004_NL() 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);
 						 var template RequestPrimitive v_createRequest := m_createAe(PX_APP_ID);
 						 var template PrimitiveContent v_contentResponse;
 						 
@@ -296,6 +306,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_REG_RET_004_CSZ() 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);
 						 var template RequestPrimitive v_createRequest := m_createAe(PX_APP_ID);
 						 var template PrimitiveContent v_contentResponse;
 						 
@@ -326,6 +338,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;	
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
     						
 						v_updateRequest.primitiveContent.remoteCSE.expirationTime := "20301231T012345";
 	
@@ -338,6 +352,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;	
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 
 						v_updateRequest.primitiveContent.remoteCSE.requestReachability := true;
 
@@ -375,6 +391,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createScheduleBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						
 						v_createRequest.primitiveContent.schedule.resourceName := omit;
 						v_ae1.start(f_CSE_DMR_CRE_001(int18, v_createRequest, -));//Schedule
@@ -395,6 +412,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createScheduleBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						
 						v_createRequest.primitiveContent.schedule.resourceName := omit;
 						v_ae1.start(f_CSE_DMR_CRE_001(int18, v_createRequest, m_createAeAux(omit,omit)));//Schedule
@@ -415,6 +433,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createScheduleBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						
 						v_createRequest.primitiveContent.schedule.resourceName := omit;
 						v_ae1.start(f_CSE_DMR_CRE_001(int18, v_createRequest, m_createSubscriptionBase));//Schedule
@@ -435,6 +454,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createPollingChannelBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						
 						
 						v_createRequest.primitiveContent.pollingChannel.resourceName := omit;
@@ -457,6 +477,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						
 						v_createRequest.primitiveContent.subscription.resourceName := omit;
 						v_ae1.start(f_CSE_DMR_CRE_001(int23, v_createRequest, m_createScheduleBase));//Subscription
@@ -476,6 +497,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						
 						v_createRequest.primitiveContent.subscription.resourceName := omit;
 						v_ae1.start(f_CSE_DMR_CRE_001(int23, v_createRequest, m_createGroupBase));//Subscription
@@ -495,6 +517,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createNodeBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						 
 						v_createRequest.primitiveContent.node.resourceName := omit;
 
@@ -516,6 +539,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createMgmtCmdBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						
 						v_createRequest.primitiveContent.mgmtCmd.resourceName := omit;
 						v_ae1.start(f_CSE_DMR_CRE_001(int12, v_createRequest, -));//Management Command
@@ -536,6 +560,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createLocationPolicyBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						
 						v_createRequest.primitiveContent.locationPolicy.resourceName := omit;
 						v_ae1.start(f_CSE_DMR_CRE_001(int10, v_createRequest, -));//Location Policy
@@ -556,6 +581,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createStatsConfigBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						
 						v_createRequest.primitiveContent.statsConfig.resourceName := omit;
 						v_ae1.start(f_CSE_DMR_CRE_001(int22, v_createRequest, -));//Stats Config
@@ -575,6 +601,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createStatsCollectBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						 
 						v_createRequest.primitiveContent.statsCollect.resourceName := omit;
 						
@@ -596,6 +623,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createM2mServiceSubscriptionProfileBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						
 						v_createRequest.primitiveContent.m2mServiceSubscriptionProfile.resourceName := omit;
 						v_ae1.start(f_CSE_DMR_CRE_001(int11, v_createRequest, -));//Subscription Profile
@@ -616,6 +644,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createServiceSubscribedAppRuleBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						 
 						v_createRequest.primitiveContent.serviceSubscribedAppRule.resourceName := omit;
 						v_ae1.start(f_CSE_DMR_CRE_001(int19, v_createRequest, -));//Service Subscribed App
@@ -643,6 +672,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 			
 						v_ae1.start(f_CSE_DMR_CRE_002(int18, m_createScheduleBase));//Schedule
 						v_ae1.done;
@@ -663,6 +693,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 			
 						v_ae1.start(f_CSE_DMR_CRE_002(int15, m_createPollingChannelBase));//Pollingchannel
 						v_ae1.done;
@@ -691,6 +722,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_CRE_003_SCH() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 						v_ae1.start(f_CSE_DMR_CRE_003(int18, m_createScheduleBase));//Schedule
 						v_ae1.done;
@@ -699,6 +731,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_CRE_003(int15, m_createPollingChannelBase));//Pollingchannel
 						v_ae1.done;
@@ -716,6 +749,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_CRE_004(int18, m_createScheduleBase));//Schedule
 						v_ae1.done;
@@ -724,6 +758,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_CRE_004(int15, m_createPollingChannelBase));//Pollingchannel
 						v_ae1.done;
@@ -740,6 +775,7 @@ 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;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						const AttributeList c_optionalAttribute := {"expirationTime"};
 						
@@ -753,6 +789,7 @@ 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;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
 						const AttributeList c_optionalAttribute := {"expirationTime"};
 						
@@ -765,6 +802,7 @@ 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;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
 						const AttributeList c_optionalAttribute := {"ontologyRef"};
 						
@@ -778,6 +816,7 @@ 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;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_createRequest := m_createAcpBase;
 						const AttributeList c_optionalAttribute := {"expirationTime"};
 						
@@ -791,6 +830,7 @@ 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;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"expirationTime"};
 						
@@ -804,6 +844,7 @@ 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;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"eventNotificationCriteria"};
 						
@@ -817,6 +858,7 @@ 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;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"expirationCounter"};
 						
@@ -830,6 +872,7 @@ 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;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"groupID"};
 						
@@ -843,6 +886,7 @@ 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;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"notificationForwardingURI"};
 						
@@ -856,6 +900,7 @@ 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;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"batchNotify"};
 						
@@ -868,6 +913,7 @@ 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;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"rateLimit"};
 						
@@ -881,6 +927,7 @@ 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;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"preSubscriptionNotify"};
 						
@@ -894,6 +941,7 @@ 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;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"pendingNotification"};
 						
@@ -906,6 +954,7 @@ 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;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"notificationStoragePriority"};
 						
@@ -919,6 +968,7 @@ 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;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"latestNotify"};
 						
@@ -932,6 +982,7 @@ 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;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"notificationContentType"};
 						
@@ -945,6 +996,7 @@ 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;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"notificationEventCat"};
 						
@@ -958,6 +1010,7 @@ 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;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"subscriberURI"};
 						
@@ -979,6 +1032,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_CRE_015_CNT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						                        
 						v_ae1.start(f_CSE_DMR_CRE_015(int3, m_createContainerBase));//Container
 						v_ae1.done;
@@ -988,6 +1042,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_CRE_015(int9, m_createGroupBase));//Group
 						v_ae1.done;
@@ -997,6 +1052,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_CRE_015(int1, m_createAcpBase));//AccessControlPolicy
 						v_ae1.done;
@@ -1006,6 +1062,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_CRE_015(int18, m_createScheduleBase));//Schedule
 						v_ae1.done;
@@ -1015,6 +1072,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_CRE_015(int15, m_createPollingChannelBase));//PollingChannel
 						v_ae1.done;
@@ -1024,6 +1082,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_CRE_015(int23, m_createSubscriptionBase));//Subscription
 						v_ae1.done;
@@ -1041,6 +1100,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var template PrimitiveContent v_contentResponse;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 					
 						v_contentResponse.uRI := mw_contentContainer_rc2;
 					                        
@@ -1052,6 +1112,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var template PrimitiveContent v_contentResponse;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 					
 						v_contentResponse.uRI := mw_contentGroup_rc2;
 					
@@ -1063,6 +1124,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var template PrimitiveContent v_contentResponse;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 											
 						v_contentResponse.uRI := mw_contentAcp_rc2;
 						
@@ -1074,6 +1136,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var template PrimitiveContent v_contentResponse;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 											
 						v_contentResponse.uRI := mw_contentSchedule_rc2;
 						
@@ -1085,6 +1148,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var template PrimitiveContent v_contentResponse;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 											
 						v_contentResponse.uRI := mw_contentPollingChannel_rc2;
 						
@@ -1096,6 +1160,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var template PrimitiveContent v_contentResponse;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 											
 						v_contentResponse.uRI := mw_contentSubscription_rc2;
 
@@ -1115,6 +1180,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var template PrimitiveContent v_contentResponse;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 					
 						v_contentResponse.resource := mw_contentContainer_rc3;
 					                        
@@ -1126,6 +1192,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var template PrimitiveContent v_contentResponse;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 					
 						v_contentResponse.resource := mw_contentGroup_rc3;
 					
@@ -1137,6 +1204,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var template PrimitiveContent v_contentResponse;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 					
 						v_contentResponse.resource := mw_contentAcp_rc3;
 						
@@ -1148,6 +1216,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var template PrimitiveContent v_contentResponse;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 					
 						v_contentResponse.resource := mw_contentSchedule_rc3;
 						
@@ -1159,6 +1228,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var template PrimitiveContent v_contentResponse;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 					
 						v_contentResponse.resource := mw_contentPollingChannel_rc3;
 						
@@ -1170,6 +1240,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var template PrimitiveContent v_contentResponse;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 					
 						v_contentResponse.resource := mw_contentSubscription_rc3;
 
@@ -1189,6 +1260,7 @@ 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;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_createRequest := m_createAcpBase;
 						
 						v_createRequest.primitiveContent.accessControlPolicy.announceTo := {f_getAnnouncementTargetPoA()};
@@ -1200,6 +1272,7 @@ 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;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						
 						v_createRequest.primitiveContent.container.announceTo := {f_getAnnouncementTargetPoA()};
@@ -1211,6 +1284,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_CRE_020_CIN() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
 						
 						v_createRequest.primitiveContent.contentInstance.announceTo := {f_getAnnouncementTargetPoA()};
@@ -1222,6 +1296,7 @@ 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;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
 						
 						v_createRequest.primitiveContent.group_.announceTo := {f_getAnnouncementTargetPoA()};
@@ -1233,6 +1308,7 @@ 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;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_createRequest := m_createLocationPolicy(int1, omit, omit, omit, omit);
 						
 						v_createRequest.primitiveContent.locationPolicy.announceTo := {f_getAnnouncementTargetPoA()};
@@ -1244,6 +1320,7 @@ 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;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_createRequest := m_createMgmtObjBase;
 						
 						v_createRequest.primitiveContent.mgmtResource.announceTo := {f_getAnnouncementTargetPoA()};
@@ -1255,6 +1332,7 @@ 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;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_createRequest := m_createNodeBase;
 						
 						v_createRequest.primitiveContent.node.announceTo := {f_getAnnouncementTargetPoA()};
@@ -1266,6 +1344,7 @@ 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;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_createRequest := m_createScheduleBase;
 						
 						v_createRequest.primitiveContent.schedule.announceTo := {f_getAnnouncementTargetPoA()};
@@ -1285,6 +1364,7 @@ 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;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var RequestPrimitive v_requestPrimitive;
 						var XSD.NonNegativeInteger maxByteSize := 512;		//Correct value? Shall be indicated in TP?
@@ -1315,6 +1395,7 @@ 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;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
 						var RequestPrimitive v_requestPrimitive;
 						var XSD.NonNegativeInteger v_contentSize := 512;			//Correct value? Shall be indicated in TP?
@@ -1345,6 +1426,7 @@ 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;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
 						var RequestPrimitive v_requestPrimitive;
 						var XSD.PositiveInteger maxNrOfMembers := 10;						//Correct value? Shall be indicated in TP?
@@ -1374,6 +1456,7 @@ 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;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_createRequest := m_createLocationPolicy(int1, omit, omit, omit, omit);
 						var RequestPrimitive v_requestPrimitive;
 						var LocationSource locationSource := int1;//Network-based		//Correct value? Shall be indicated in TP?
@@ -1403,6 +1486,7 @@ 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;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_createRequest := m_createMgmtObjBase;
 						var RequestPrimitive v_requestPrimitive;
 						var XSD.String description := "Description of mgmtObj";	//Correct value? Shall be indicated in TP?
@@ -1432,6 +1516,7 @@ 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;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_createRequest := m_createNodeBase;
 						var RequestPrimitive v_requestPrimitive;
 		
@@ -1446,6 +1531,7 @@ 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;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_createRequest := m_createScheduleBase;
 						var RequestPrimitive v_requestPrimitive;
 						var ScheduleEntries scheduleElement := {{"0 0 0,1,2 1 1 *"}};
@@ -1487,6 +1573,7 @@ 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;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var ResponsePrimitive v_responsePrimitive;
 						var template PrimitiveContent v_contentResponse;
 					
@@ -1500,6 +1587,7 @@ 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;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var ResponsePrimitive v_responsePrimitive;
 						var template PrimitiveContent v_contentResponse;
 					
@@ -1521,6 +1609,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_002() runs on Tester system CseSystem {
 					
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 													
 						v_ae1.start(f_CSE_DMR_RET_002());
 										  	  	
@@ -1557,7 +1646,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							v_targetResourceAddress := f_getResourceAddress(v_aeIndex) & "/" & v_resourceName;
 						}
 						
-						mcaPort.send(m_request(m_retrieve(v_targetResourceAddress, f_getOriginator(v_aeIndex))));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(v_targetResourceAddress, f_getOriginator(v_aeIndex)))));
 
 						tc_ac.start;
 						alt {
@@ -1597,6 +1686,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_003_SCH() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 	
 						v_ae1.start(f_CSE_DMR_RET_003(int18, m_createScheduleBase));//Schedule
 						v_ae1.done;
@@ -1605,6 +1695,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_003_PCH() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 	
 						v_ae1.start(f_CSE_DMR_RET_003(int15, m_createPollingChannelBase));//PollingChannel
 						v_ae1.done;
@@ -1621,6 +1712,7 @@ 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;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 					
 						v_contentResponse.container := m_contentContainer_allOmit;
@@ -1633,6 +1725,7 @@ 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;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 					
 						v_contentResponse.group_ := m_contentGroup_allOmit;
@@ -1645,6 +1738,7 @@ 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;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 					
 						v_contentResponse.accessControlPolicy := m_contentAcp_allOmit;
@@ -1658,6 +1752,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var template PrimitiveContent v_contentResponse;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 					
 						v_contentResponse.schedule := m_contentSchedule_allOmit;
 						v_contentResponse.schedule.parentID := ?;
@@ -1670,6 +1765,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var template PrimitiveContent v_contentResponse;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 					
 						v_contentResponse.pollingChannel := m_contentPollingChannel_allOmit;
 						v_contentResponse.pollingChannel.parentID := ?;
@@ -1682,6 +1778,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var template PrimitiveContent v_contentResponse;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 					
 						v_contentResponse.subscription := m_contentSubscription_allOmit;
 						v_contentResponse.subscription.parentID := ?;
@@ -1701,6 +1798,7 @@ 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;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 					
 						v_contentResponse.container := m_contentContainer_allOmit;
@@ -1713,6 +1811,7 @@ 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;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 					
 						v_contentResponse.group_ := m_contentGroup_allOmit;
@@ -1725,6 +1824,7 @@ 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;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 					
 						v_contentResponse.accessControlPolicy := m_contentAcp_allOmit;
@@ -1737,6 +1837,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_005_SCH() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 					
 						v_contentResponse.schedule := m_contentSchedule_allOmit;
@@ -1749,6 +1850,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_005_PCH() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 					
 						v_contentResponse.pollingChannel := m_contentPollingChannel_allOmit;
@@ -1761,6 +1863,7 @@ 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;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 					
 						v_contentResponse.subscription := m_contentSubscription_allOmit;
@@ -1782,6 +1885,7 @@ 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;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 					
 						v_contentResponse.container := m_contentContainer_allOmit;
@@ -1795,6 +1899,7 @@ 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;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 					
 						v_contentResponse.group_ := m_contentGroup_allOmit;
@@ -1808,6 +1913,7 @@ 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;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 					
 						v_contentResponse.accessControlPolicy := m_contentAcp_allOmit;
@@ -1821,6 +1927,7 @@ 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;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 					
 						v_contentResponse.schedule := m_contentSchedule_allOmit;
@@ -1834,6 +1941,7 @@ 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;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 					
 						v_contentResponse.pollingChannel := m_contentPollingChannel_allOmit;
@@ -1847,6 +1955,7 @@ 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;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 					
 						v_contentResponse.subscription := m_contentSubscription_allOmit;
@@ -1869,6 +1978,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_007_CNT_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
                         
 						v_ae1.start(f_CSE_DMR_RET_007(int3, m_createContainerBase));//Container
 						v_ae1.done;
@@ -1877,6 +1987,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_007_GRP_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						
 						v_ae1.start(f_CSE_DMR_RET_007(int9, m_createGroupBase));//Group
 						v_ae1.done;
@@ -1885,6 +1996,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_007_ACP_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 	
 						v_ae1.start(f_CSE_DMR_RET_007(int1, m_createAcpBase));//AccessControlPolicy
 						v_ae1.done;
@@ -1893,6 +2005,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_007_SCH_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 	
 						v_ae1.start(f_CSE_DMR_RET_007(int18, m_createScheduleBase));//Schedule
 						v_ae1.done;
@@ -1901,6 +2014,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_007_PCH_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 	
 						v_ae1.start(f_CSE_DMR_RET_007(int15, m_createPollingChannelBase));//PollingChannel
 						v_ae1.done;
@@ -1909,6 +2023,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_007_SUB_LBL() runs on AeSimu system CseSystem {
 							// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 	
 						v_ae1.start(f_CSE_DMR_RET_007(int23, m_createSubscriptionBase));//Subscription
 						v_ae1.done;
@@ -1925,6 +2040,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_008_CNT_AT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
                         
 						v_ae1.start(f_CSE_DMR_RET_008(int3, m_createContainerBase));//Container
 						v_ae1.done;
@@ -1933,6 +2049,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_008_GRP_AT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						
 						v_ae1.start(f_CSE_DMR_RET_008(int9, m_createGroupBase));//Group
 						v_ae1.done;
@@ -1941,6 +2058,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_008_ACP_AT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 	
 						v_ae1.start(f_CSE_DMR_RET_008(int1, m_createAcpBase));//AccessControlPolicy
 						v_ae1.done;
@@ -1949,6 +2067,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_008_SCH_AT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 	
 						v_ae1.start(f_CSE_DMR_RET_008(int18, m_createScheduleBase));//Schedule
 						v_ae1.done;
@@ -1957,6 +2076,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_008_PCH_AT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 	
 						v_ae1.start(f_CSE_DMR_RET_008(int15, m_createPollingChannelBase));//PollingChannel
 						v_ae1.done;
@@ -1965,6 +2085,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_008_SUB_AT() runs on Tester system CseSystem {
 							// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 	
 						v_ae1.start(f_CSE_DMR_RET_008(int23, m_createSubscriptionBase));//Subscription
 						v_ae1.done;
@@ -1981,6 +2102,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_009() runs on Tester system CseSystem {
 					
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 														
 						v_ae1.start(f_CSE_DMR_RET_009());
 											  	  	
@@ -2006,7 +2128,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex); 	
 		
 						// Test Body
-						mcaPort.send(m_request(m_retrieve(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameLatest, f_getOriginator(v_containerIndex))));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameLatest, f_getOriginator(v_containerIndex)))));
 
 						tc_ac.start;
 						alt {
@@ -2046,6 +2168,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_011() runs on Tester system CseSystem {
 					
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 														
 						v_ae1.start(f_CSE_DMR_RET_011());
 											  	  	
@@ -2071,7 +2194,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex); 	
 		
 						// Test Body
-						mcaPort.send(m_request(m_retrieve(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameOldest, f_getOriginator(v_containerIndex))));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameOldest, f_getOriginator(v_containerIndex)))));
 
 						tc_ac.start;
 						alt {
@@ -2111,6 +2234,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_013_SCH() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 					
 						v_contentResponse.schedule := mw_contentSchedule_rc1;
@@ -2131,6 +2255,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_014_SCH() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 	
 						v_ae1.start(f_CSE_DMR_RET_014(int18, m_createScheduleBase));//Schedule
 						v_ae1.done;
@@ -2147,6 +2272,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_015_ACP() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 					
 						v_contentResponse.accessControlPolicy := m_contentAcp_allOmit;
@@ -2159,6 +2285,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_015_AE() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 					
 						v_contentResponse.aE := m_contentAe_allOmit;
@@ -2171,6 +2298,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_015_CNT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 					
 						v_contentResponse.container := m_contentContainer_allOmit;
@@ -2183,6 +2311,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_015_GRP() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 					
 						v_contentResponse.group_ := m_contentGroup_allOmit;
@@ -2195,6 +2324,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_015_CSR() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 
 						v_contentResponse.remoteCSE := m_contentRemoteCSE_allOmit;
@@ -2207,6 +2337,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_015_SCH() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 					
 						v_contentResponse.schedule := m_contentSchedule_allOmit;
@@ -2219,6 +2350,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_015_SUB() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 					
 						v_contentResponse.subscription := m_contentSubscription_allOmit;
@@ -2239,6 +2371,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_016_ACP() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 					
 						v_contentResponse.accessControlPolicy := m_contentAcp_allOmit;
@@ -2251,6 +2384,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_016_AE() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 					
 						v_contentResponse.aE := m_contentAe_allOmit;
@@ -2263,6 +2397,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_016_CNT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 					
 						v_contentResponse.container := m_contentContainer_allOmit;
@@ -2275,6 +2410,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_016_GRP() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 					
 						v_contentResponse.group_ := m_contentGroup_allOmit;
@@ -2287,6 +2423,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_016_CSR() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 					
 						v_contentResponse.remoteCSE := m_contentRemoteCSE_allOmit;
@@ -2299,6 +2436,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_016_SCH() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 					
 						v_contentResponse.schedule := m_contentSchedule_allOmit;
@@ -2311,6 +2449,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_016_SUB() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 					
 						v_contentResponse.subscription := m_contentSubscription_allOmit;
@@ -2331,6 +2470,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_017_ACP() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 					
 						v_contentResponse.accessControlPolicy := m_contentAcp_allOmit;
@@ -2344,6 +2484,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_017_AE() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 					
 						v_contentResponse.aE := m_contentAe_allOmit;
@@ -2357,6 +2498,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_017_CNT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 					
 						v_contentResponse.container := m_contentContainer_allOmit;
@@ -2370,6 +2512,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					/*testcase TC_CSE_DMR_RET_017_DLV() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 					
 						v_contentResponse.delivery := m_contentDelivery_allOmit;
@@ -2383,6 +2526,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_017_GRP() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 					
 						v_contentResponse.group_ := m_contentGroup_allOmit;
@@ -2396,6 +2540,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_017_LCP() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 
 						v_contentResponse.locationPolicy := m_contentLocationPolicy_allOmit;
@@ -2409,6 +2554,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_017_MGC() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 
 						v_contentResponse.mgmtCmd := m_contentMgmtCmd_allOmit;
@@ -2422,6 +2568,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_017_NOD() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 
 						v_contentResponse.node := m_contentNode_allOmit;
@@ -2435,6 +2582,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_017_CSR() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 
 						v_contentResponse.remoteCSE := m_contentRemoteCSE_allOmit;
@@ -2448,6 +2596,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_017_SCH() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 					
 						v_contentResponse.schedule := m_contentSchedule_allOmit;
@@ -2461,6 +2610,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_017_STCL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 					
 						v_contentResponse.statsCollect := m_contentStatsCollect_allOmit;
@@ -2474,6 +2624,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_017_STCG() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 
 						v_contentResponse.statsConfig := m_contentStatsConfig_allOmit;
@@ -2487,6 +2638,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_017_SUB() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 					
 						v_contentResponse.subscription := m_contentSubscription_allOmit;
@@ -2508,6 +2660,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_018_ACP_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 	
 						v_ae1.start(f_CSE_DMR_RET_018(int1, m_createAcpBase));//AccessControlPolicy
 						v_ae1.done;
@@ -2516,6 +2669,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_018_AE_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 	
 						v_ae1.start(f_CSE_DMR_RET_018(int2, m_createAe(PX_APP_ID)));//AE
 						v_ae1.done;
@@ -2524,6 +2678,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_018_CNT_LBL() runs on Tester system CseSystem {
 						// Local variables
  						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
                         
 						v_ae1.start(f_CSE_DMR_RET_018(int3, m_createContainerBase));//Container
 						v_ae1.done;
@@ -2532,6 +2687,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_018_GRP_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						
 						v_ae1.start(f_CSE_DMR_RET_018(int9, m_createGroupBase));//Group
 						v_ae1.done;
@@ -2540,6 +2696,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_018_CSR_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 						v_ae1.start(f_CSE_DMR_RET_018(int16, m_createRemoteCSEBase));//RemoteCSE
 						v_ae1.done;
@@ -2548,6 +2705,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_018_SCH_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 	
 						v_ae1.start(f_CSE_DMR_RET_018(int18, m_createScheduleBase));//Schedule
 						v_ae1.done;
@@ -2556,6 +2714,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_018_SUB_LBL() runs on AeSimu system CseSystem {
 							// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 	
 						v_ae1.start(f_CSE_DMR_RET_018(int23, m_createSubscriptionBase));//Subscription
 						v_ae1.done;
@@ -2572,6 +2731,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_019_ACP_LBL_AT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 	
 						v_ae1.start(f_CSE_DMR_RET_019(int1, m_createAcpBase));//AccessControlPolicy
 						v_ae1.done;
@@ -2580,6 +2740,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_019_AE_LBL_AT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 	
 						v_ae1.start(f_CSE_DMR_RET_019(int2, m_createAe(PX_APP_ID)));//AE
 						v_ae1.done;
@@ -2588,6 +2749,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_019_CNT_LBL_AT() runs on Tester system CseSystem {
 						// Local variables
  						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
                         
 						v_ae1.start(f_CSE_DMR_RET_019(int3, m_createContainerBase));//Container
 						v_ae1.done;
@@ -2596,6 +2758,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_019_GRP_LBL_AT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						
 						v_ae1.start(f_CSE_DMR_RET_019(int9, m_createGroupBase));//Group
 						v_ae1.done;
@@ -2604,6 +2767,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_019_CSR_LBL_AT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 						v_ae1.start(f_CSE_DMR_RET_019(int16, m_createRemoteCSEBase));//RemoteCSE
 						v_ae1.done;
@@ -2612,6 +2776,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_019_SCH_LBL_AT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 	
 						v_ae1.start(f_CSE_DMR_RET_019(int18, m_createScheduleBase));//Schedule
 						v_ae1.done;
@@ -2620,6 +2785,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_019_SUB_LBL_AT() runs on Tester system CseSystem {
 							// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 	
 						v_ae1.start(f_CSE_DMR_RET_019(int23, m_createSubscriptionBase));//Subscription
 						v_ae1.done;
@@ -2636,6 +2802,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_020_RCN_0() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_ae1.start(f_CSE_DMR_RET_020(int3, m_createContainerBase, int0));//ResultContent = 0 (nothing)
 						v_ae1.done;
 					}
@@ -2643,6 +2810,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_020_RCN_2() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_ae1.start(f_CSE_DMR_RET_020(int3, m_createContainerBase, int2));//ResultContent = 2 (hierarchical address)
 						v_ae1.done;
 					}
@@ -2650,6 +2818,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_020_RCN_3() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_ae1.start(f_CSE_DMR_RET_020(int3, m_createContainerBase, int3));//ResultContent = 3 (attributes and hierarchichal address)
 						v_ae1.done;
 					}
@@ -2665,6 +2834,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_021_CNT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 		
 						v_contentResponse.container := mw_contentContainer_rc1;
@@ -2676,6 +2846,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_021_GRP() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 		
 						v_contentResponse.group_ := mw_contentGroup_rc1;
@@ -2687,6 +2858,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_021_ACP() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 		
 						v_contentResponse.accessControlPolicy := mw_contentAcp_rc1;
@@ -2698,6 +2870,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_021_SCH() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 		
 						v_contentResponse.schedule := mw_contentSchedule_rc1;
@@ -2709,6 +2882,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_021_PCH() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 		
 						v_contentResponse.pollingChannel := mw_contentPollingChannelBase;
@@ -2720,6 +2894,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_021_SUB() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 		
 						v_contentResponse.subscription := mw_contentSubscription_rc1;
@@ -2739,6 +2914,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_022_CNT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 		
 						v_contentResponse.container := mw_contentContainer_rc4;
@@ -2750,6 +2926,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_022_GRP() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 		
 						v_contentResponse.group_ := mw_contentGroup_rc4;
@@ -2761,6 +2938,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_022_ACP() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 		
 						v_contentResponse.accessControlPolicy := mw_contentAcp_rc4;
@@ -2772,6 +2950,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_022_SCH() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 		
 						v_contentResponse.schedule := mw_contentSchedule_rc4;
@@ -2783,6 +2962,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_022_PCH() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 		
 						v_contentResponse.pollingChannel := mw_contentPollingChannelBase;
@@ -2794,6 +2974,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_022_SUB() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 		
 						v_contentResponse.subscription := mw_contentSubscription_rc4;
@@ -2813,6 +2994,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_023_CNT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 		
 						v_contentResponse.container := mw_contentContainer_rc5;
@@ -2824,6 +3006,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_023_GRP() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 		
 						v_contentResponse.group_ := mw_contentGroup_rc5;
@@ -2835,6 +3018,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_023_ACP() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 		
 						v_contentResponse.accessControlPolicy := mw_contentAcp_rc5;
@@ -2846,6 +3030,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_023_SCH() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 		
 						v_contentResponse.schedule := mw_contentSchedule_rc5;
@@ -2857,6 +3042,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_023_PCH() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 		
 						v_contentResponse.pollingChannel := mw_contentPollingChannelBase;
@@ -2868,6 +3054,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_023_SUB() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 		
 						v_contentResponse.subscription := mw_contentSubscription_rc5;
@@ -2887,6 +3074,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_024_CNT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 		
 						v_contentResponse.container := mw_contentContainer_rc6;
@@ -2898,6 +3086,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_024_GRP() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 		
 						v_contentResponse.group_ := mw_contentGroup_rc6;
@@ -2909,6 +3098,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_024_ACP() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 		
 						v_contentResponse.accessControlPolicy := mw_contentAcp_rc6;
@@ -2920,6 +3110,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_024_SCH() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 		
 						v_contentResponse.schedule := mw_contentSchedule_rc6;
@@ -2931,6 +3122,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_024_PCH() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 		
 						v_contentResponse.pollingChannel := mw_contentPollingChannelBase;
@@ -2942,6 +3134,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_024_SUB() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 		
 						v_contentResponse.subscription := mw_contentSubscription_rc6;
@@ -2961,6 +3154,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_025_CNT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 		
 						v_contentResponse.container := mw_contentContainer_rc8;
@@ -2972,6 +3166,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_025_GRP() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 		
 						v_contentResponse.group_ := mw_contentGroup_rc8;
@@ -2983,6 +3178,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_025_ACP() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 		
 						v_contentResponse.accessControlPolicy := mw_contentAcp_rc8;
@@ -2994,6 +3190,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_025_SCH() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 		
 						v_contentResponse.schedule := mw_contentSchedule_rc8;
@@ -3005,6 +3202,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_025_PCH() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 		
 						v_contentResponse.pollingChannel := mw_contentPollingChannelBase;
@@ -3016,6 +3214,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_025_SUB() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template PrimitiveContent v_contentResponse;
 		
 						v_contentResponse.subscription := mw_contentSubscription_rc8;
@@ -3038,6 +3237,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_UPD_001_SCH_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var Labels v_labels_1 := {"VALUE_1"};
 						var Labels v_labels_2 := {"VALUE_2"};
 						var template RequestPrimitive v_createRequest := m_createScheduleBase;
@@ -3078,6 +3278,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_UPD_001_PCH_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var Labels v_labels_1 := {"VALUE_1"};
 						var Labels v_labels_2 := {"VALUE_2"};
 						var template RequestPrimitive v_createRequest := m_createPollingChannelBase;
@@ -3125,6 +3326,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_UPD_002_SCH_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var Labels v_labels_1 := {"VALUE_1"};
 						var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
 						var ResponsePrimitive v_responsePrimitive;
@@ -3161,6 +3363,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_UPD_002_PCH_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var Labels v_labels_1 := {"VALUE_1"};
 						var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
 						var ResponsePrimitive v_responsePrimitive;
@@ -3205,6 +3408,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_UPD_003_SCH_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var Labels v_labels_1 := {"VALUE_1"};
 						var Labels v_labels_2 := {"To be deleted"};
 						var AttributeAux_list v_nullFields;
@@ -3249,6 +3453,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_UPD_003_PCH_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var Labels v_labels_1 := {"VALUE_1"};
 						var Labels v_labels_2 := {"To be deleted"};
 						var AttributeAux_list v_nullFields;
@@ -3301,6 +3506,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_UPD_004_SCH_SE_AT_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var Labels v_labels_1 := {"To be deleted"};
 						var AttributeAux_list v_nullFields;
 						var template RequestPrimitive v_createRequest := m_createScheduleBase;
@@ -3361,6 +3567,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_UPD_004_PCH_LBL_ACP_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var Labels v_labels_1 := {"VALUE_1"};
 						var Labels v_labels_2 := {"To be deleted"};
 						var AttributeAux_list v_nullFields;
@@ -3419,6 +3626,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_UPD_006_SCH_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var Labels v_labels_1 := {"VALUE_1"};
 						var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
@@ -3442,6 +3650,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_UPD_006_PCH_LBL() runs on Tester system CseSystem {
 						// Local variable
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var Labels v_labels_1 := {"VALUE_1"};
 						var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
@@ -3475,6 +3684,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_UPD_007_SCH_CT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var Timestamp v_creationTime := "21001231T012345";
 						var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
@@ -3499,6 +3709,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_UPD_007_PCH_CT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var Timestamp v_creationTime := "21001231T012345";
 						var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
@@ -3531,6 +3742,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_UPD_008_SCH_ET() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var Timestamp v_expirationTime := "21001231T012345";
 						var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
 						var AttributeAux_list v_nullFields;
@@ -3557,6 +3769,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_UPD_008_PCH_ET() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var Timestamp v_expirationTime := "21001231T012345";
 						var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
 						var AttributeAux_list v_nullFields;
@@ -3591,6 +3804,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_UPD_009_SCH_EXC() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var XSD.PositiveInteger v_expirationCounter := 1;
 						var template RequestPrimitive v_createRequest := m_createScheduleBase;
 						var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
@@ -3606,6 +3820,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_UPD_009_PCH_EXC() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var XSD.PositiveInteger v_expirationCounter := 1;
 						var template RequestPrimitive v_createRequest := m_createPollingChannelBase;
 						var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
@@ -3629,6 +3844,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_UPD_014_ACP_ET() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var Timestamp v_expirationTime_1 := "20301231T012345";
 						var Timestamp v_expirationTime_2 := "20401020T012345";
 						var template RequestPrimitive v_createRequest := m_createAcpBase;
@@ -3659,6 +3875,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_UPD_014_CNT_ET() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var Timestamp v_expirationTime_1 := "20301231T012345";
 						var Timestamp v_expirationTime_2 := "20401020T012345";
 						var ResponsePrimitive v_responsePrimitive;
@@ -3689,6 +3906,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_UPD_014_CNT_OR() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var XSD.AnyURI v_ontologyRef_1 := "MyOntologyRef_1";
 						var XSD.AnyURI v_ontologyRef_2 := "MyOntologyRef_2";
 						var ResponsePrimitive v_responsePrimitive;
@@ -3719,6 +3937,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_UPD_014_SUB_ACPI() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var AcpType v_accessControlPolicyIDs_1 := {"NotInitialized_1"};
 						var AcpType v_accessControlPolicyIDs_2 := {"NotInitialized_2"};
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
@@ -3749,6 +3968,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_UPD_014_SUB_BN() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var BatchNotify v_batchNotify_1 := {1, "PT1S"};
 						var BatchNotify v_batchNotify_2 := {2, "PT1S"};
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
@@ -3779,6 +3999,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_UPD_014_SUB_ENC() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var EventNotificationCriteria v_eventNotificationCriteria_1 := valueof(m_eventNotificationCriteria({int1}, -));
 						var EventNotificationCriteria v_eventNotificationCriteria_2 := valueof(m_eventNotificationCriteria({int2}, -));
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
@@ -3809,6 +4030,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_UPD_014_SUB_ET() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var Timestamp v_expirationTime_1 := "20301231T012345";
 						var Timestamp v_expirationTime_2 := "20401020T012345";
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
@@ -3839,6 +4061,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_UPD_014_SUB_EXC() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var XSD.PositiveInteger v_expirationCounter_1 := 10;
 						var XSD.PositiveInteger v_expirationCounter_2 := 20;
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
@@ -3869,6 +4092,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_UPD_014_SUB_GPI() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var XSD.AnyURI v_groupID_1 := "MyGroupID_1";
 						var XSD.AnyURI v_groupID_2 := "MyGroupID_2";
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
@@ -3899,6 +4123,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_UPD_014_SUB_LN() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var XSD.Boolean v_latestNotify_1 := true;
 						var XSD.Boolean v_latestNotify_2 := false;
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
@@ -3929,6 +4154,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_UPD_014_SUB_NCT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var NotificationContentType v_notificationContentType_1 := int1;
 						var NotificationContentType v_notificationContentType_2 := int2;
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
@@ -3959,6 +4185,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_UPD_014_SUB_NEC() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var EventCat v_notificationEventCat_1 := {alt_1 := 100};
 						var EventCat v_notificationEventCat_2 := {alt_1 := 101};
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
@@ -3989,6 +4216,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_UPD_014_SUB_NFU() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var XSD.AnyURI v_notificationForwardingURI_1 := "MyForwardingURI_1";
 						var XSD.AnyURI v_notificationForwardingURI_2 := "MyForwardingURI_2";
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
@@ -4019,6 +4247,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_UPD_014_SUB_NSP() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var XSD.PositiveInteger v_notificationStoragePriority_1 := 1;
 						var XSD.PositiveInteger v_notificationStoragePriority_2 := 2;
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
@@ -4049,6 +4278,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_UPD_014_SUB_PN() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var PendingNotification v_pendingNotification_1 := int1;
 						var PendingNotification v_pendingNotification_2 := int2;
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
@@ -4079,6 +4309,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_UPD_014_SUB_RL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var RateLimit v_rateLimit_1 := {0, omit};
 						var RateLimit v_rateLimit_2 := {1, omit};
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
@@ -4115,6 +4346,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					 */
 					testcase TC_CSE_DMR_UPD_015_NOD_LBL() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var Labels v_labels := {"MyLabel"};
 						var template RequestPrimitive v_updateRequest := m_updateNodeBase;
 						var ResponsePrimitive v_responsePrimitive;
@@ -4149,6 +4381,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_UPD_015_NOD_ACPI() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_updateRequest := m_updateNodeBase;
 						var RequestPrimitive v_updateRequestPrimitive;
 						var ResponsePrimitive v_responsePrimitive;
@@ -4190,6 +4423,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_UPD_015_AE_OR() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var XSD.AnyURI v_ontoLogyRef := "MyOntologyRef";
 						var template RequestPrimitive v_updateRequest := m_updateAeBase;
 						var ResponsePrimitive v_responsePrimitive;
@@ -4223,6 +4457,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_UPD_015_CNT_OR() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var XSD.AnyURI v_ontoLogyRef := "MyOntologyRef";
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
@@ -4257,6 +4492,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_UPD_015_CNT_LI() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var XSD.AnyURI v_locationID := "MyLocationID";
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
@@ -4291,6 +4527,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_UPD_015_SUB_ENC() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var EventNotificationCriteria v_eventNotificationCriteria:= valueof(m_eventNotificationCriteria({int3}, -));
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
@@ -4324,6 +4561,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_UPD_015_SUB_EXC() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var XSD.PositiveInteger v_expirationCounter:=10;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
@@ -4357,6 +4595,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_UPD_015_SUB_GPI() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var XSD.AnyURI v_groupID := "MyGroupID";
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
@@ -4390,6 +4629,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_UPD_015_SUB_NFU() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var XSD.AnyURI v_notificationForwardingURI:= "MyNotificationForwardingURI";
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
@@ -4423,6 +4663,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_UPD_015_SUB_BN() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var BatchNotify v_batchNotify:= {1, "PT1S"};
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
@@ -4456,6 +4697,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_UPD_015_SUB_RL() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var RateLimit v_rateLimit:= {2, "PT1S"};
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
@@ -4489,6 +4731,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_UPD_015_SUB_PN() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var PendingNotification v_pendingNotification:=int2;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
@@ -4522,6 +4765,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_UPD_015_SUB_NSP() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var XSD.PositiveInteger v_notificationStoragePriority:=10;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
@@ -4555,6 +4799,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_UPD_015_SUB_LN() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var XSD.Boolean v_latestNotify:=true;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
@@ -4588,6 +4833,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_UPD_015_SUB_NEC() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var EventCat v_eventCat:= {alt_1:= 300};
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
@@ -4628,6 +4874,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					*/
 					testcase TC_CSE_DMR_UPD_016_NOD_ET() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var Timestamp v_expirationTime := "21001231T012345";
 						var template RequestPrimitive v_updateRequest := m_updateNodeBase;
 						var ResponsePrimitive v_responsePrimitive;
@@ -4662,6 +4909,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					testcase TC_CSE_DMR_UPD_016_NOD_NI() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_updateRequest := m_updateNodeBase;
 						var XSD.Token v_targetId := "TARGET-ID";
 						var ResponsePrimitive v_responsePrimitive;
@@ -4709,6 +4957,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_DEL_001_SCH() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
                 
 						v_ae1.start(f_CSE_DMR_DEL_001(int18, m_createScheduleBase));//Schedule
 						v_ae1.done;
@@ -4717,6 +4966,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_DEL_001_PCH() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
                 
 						v_ae1.start(f_CSE_DMR_DEL_001(int15, m_createPollingChannelBase));//PollingChannel
 						v_ae1.done;
@@ -4733,6 +4983,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_DEL_002_SCH() runs on Tester system CseSystem {
 						// Local variables
   						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
                 
 						v_ae1.start(f_CSE_DMR_DEL_002(int18, m_createScheduleBase));//Schedule
 						v_ae1.done;
@@ -4741,6 +4992,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_DEL_002_PCH() runs on Tester system CseSystem {
 						// Local variables
  						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
                 
 						v_ae1.start(f_CSE_DMR_DEL_002(int15, m_createPollingChannelBase));//PollingChannel
 						v_ae1.done;
@@ -4757,6 +5009,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_DEL_003() runs on Tester system CseSystem {
 					
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 														
 						v_ae1.start(f_CSE_DMR_DEL_003());
 											  	  	
@@ -4789,7 +5042,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							v_request := valueof(m_delete(f_getResourceAddress(v_aeIndex) & "/" & v_resourceIdOrName, f_getOriginator(v_aeIndex)));
 						}
                 		
-						mcaPort.send(m_request(v_request));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))) -> value v_response {
@@ -4827,6 +5080,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_DEL_004_CNT() runs on Tester system CseSystem {
 						// Local variables
  						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
                 		
 						v_ae1.start(f_CSE_DMR_DEL_004(int3, m_createContainerBase, int3, m_createContainerBase));//Container
 						v_ae1.done;
@@ -4835,6 +5089,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_DEL_004_GRP() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
                 		
 						v_ae1.start(f_CSE_DMR_DEL_004(int9, m_createGroupBase, int23, m_createSubscriptionBase));//Group
 						v_ae1.done;
@@ -4843,6 +5098,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_DEL_004_ACP() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
                 
 						v_ae1.start(f_CSE_DMR_DEL_004(int1, m_createAcpBase, int23, m_createSubscriptionBase));//AccessControlPolicy
 						v_ae1.done;
@@ -4851,6 +5107,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_DEL_004_SCH() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
                 
 						v_ae1.start(f_CSE_DMR_DEL_004(int18, m_createScheduleBase, int23, m_createSubscriptionBase));//Schedule
 						v_ae1.done;
@@ -4866,6 +5123,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_DEL_004_SUB() runs on Tester system CseSystem {
 							// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
                 
 						v_ae1.start(f_CSE_DMR_DEL_004(int23, m_createSubscriptionBase, int18, m_createScheduleBase));//Subscription
 						v_ae1.done;
@@ -4882,6 +5140,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_DEL_008() runs on Tester system CseSystem {
 					
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 														
 						v_ae1.start(f_CSE_DMR_DEL_008());
 											  	  	
@@ -4912,7 +5171,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							
 						// Test Body
 						v_request := valueof(m_delete(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameLatest, f_getOriginator(v_containerIndex)));
-						mcaPort.send(m_request(v_request));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 						tc_ac.start;
 						alt {
 								[] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))) -> value v_response {
@@ -4950,6 +5209,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_DEL_010() runs on Tester system CseSystem {
 					
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 														
 						v_ae1.start(f_CSE_DMR_DEL_010());
 											  	  	
@@ -4980,7 +5240,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							
 						// Test Body
 						v_request := valueof(m_delete(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameOldest, f_getOriginator(v_containerIndex)));
-						mcaPort.send(m_request(v_request));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 						tc_ac.start;
 						alt {
 								[] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))) -> value v_response {
@@ -5019,6 +5279,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);
 																
 				 v_ae1.start(f_CSE_LOC_001());
 													  	  	
@@ -5043,7 +5304,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 				v_request	 := f_getCreateRequestPrimitive(int10, m_createLocationPolicy(v_locationSource, omit, omit, omit, omit), v_aeIndex);
      	     	
 				//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(int4000))) -> value v_response { //BAD REQUEST
@@ -5087,6 +5348,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);
 																	
 				v_ae1.start(f_CSE_LOC_002());
 														  	  	
@@ -5115,7 +5377,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 				v_request	 := f_getCreateRequestPrimitive(int10, m_createLocationPolicy(v_locationSource, omit, locationUpdatePeriod, locationTargetID, locationServerAddress), v_aeAuxIndex);
      	     	    									
 				// 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(int2001))) -> value v_response {
@@ -5162,6 +5424,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);
 																	
 				v_ae1.start(f_CSE_LOC_003());
 														  	  	
@@ -5198,7 +5461,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 				v_request				:= f_getCreateRequestPrimitive(int10, m_createLocationPolicy(v_locationSource,omit, locationUpdatePeriod, locationTargetID, locationServerAddress), v_aeIndex);
      	        									
 				// 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(int4103))) -> value v_response {
@@ -5242,6 +5505,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);
 																	
 				v_ae1.start(f_CSE_LOC_004());
 														  	  	
@@ -5269,7 +5533,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 				v_request		:= f_getCreateRequestPrimitive(int10, m_createLocationPolicy(v_locationSource, omit, locationUpdatePeriod, locationTargetID, locationServerAddress), v_aeIndex);
      	    							
 				// 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(int4000))) -> value v_response {
@@ -5313,6 +5577,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);
 																	
 				v_ae1.start(f_CSE_LOC_005());
 														  	  	
@@ -5346,7 +5611,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 				v_request					:= f_getUpdateRequestPrimitive(int10, v_locPolicyResourceIndex, m_updateLocationPolicy(f_getResourceAddress(v_locPolicyResourceIndex), omit, locationUpdatePeriod_invalid));
      	     	    									
 				// 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(int4000))) -> value v_response {
@@ -5385,6 +5650,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);
 																	
 				v_ae1.start(f_CSE_LOC_006());
 														  	  	
@@ -5418,7 +5684,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 			  v_locContainerResourceIndex	:= f_cse_createResource(int3, v_container_request_preamble, v_locPolicyResourceIndex);//created container index
 			  			  	
 			  //Test Body - retrieve the created container resource
-			  mcaPort.send(m_request(valueof(m_retrieve(f_getResourceAddress(v_locContainerResourceIndex), f_getOriginator(v_locContainerResourceIndex))))); 
+			  mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(m_retrieve(f_getResourceAddress(v_locContainerResourceIndex), f_getOriginator(v_locContainerResourceIndex)))))); 
 			  tc_ac.start;
 			  alt{
 				[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response{
@@ -5461,6 +5727,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);
 																	
 				v_ae1.start(f_CSE_LOC_007());
 														  	  	
@@ -5493,7 +5760,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 				v_request	  := f_getCreateRequestPrimitive(int10, m_createLocationPolicy(v_locationSource, omit, locationUpdatePeriod, omit, omit), v_aeAuxIndex);
 			   									
 				// 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(int2001))) -> value v_response {
@@ -5539,6 +5806,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);
 																	
 				v_ae1.start(f_CSE_LOC_008());
 														  	  	
@@ -5570,7 +5838,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 				v_request	  := f_getCreateRequestPrimitive(int10, m_createLocationPolicy(v_locationSource, omit, omit, omit, omit), v_aeAuxIndex);
 			  									
 				// 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(int2001))) -> value v_response {
@@ -5616,6 +5884,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);
 																	
 				v_ae1.start(f_CSE_LOC_009_01());
 														  	  	
@@ -5654,7 +5923,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 				v_subscriptionResourceIndex		:= f_cse_createResource(int23, v_subscription_request_preamble, v_locContainerResourceIndex);
 				
 			  //Test Body - retrieve the <latest> resource of the created container resource linked with the locationPolicy resource
-			  mcaPort.send(m_request(valueof(m_retrieve(f_getResourceAddress(v_locContainerResourceIndex) & "/" & "latest", f_getOriginator(v_locContainerResourceIndex)))));
+			  mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(m_retrieve(f_getResourceAddress(v_locContainerResourceIndex) & "/" & "latest", f_getOriginator(v_locContainerResourceIndex))))));
 			  tc_ac.start;
 			  alt{
 				[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response{
@@ -5690,6 +5959,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);
 																	
 				v_ae1.start(f_CSE_LOC_009_02());
 														  	  	
@@ -5727,7 +5997,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 				v_subscriptionResourceIndex		:= f_cse_createResource(int23, v_subscription_request_preamble, v_locContainerResourceIndex);
 				
 			  //Test Body - retrieve the <latest> resource of the created container resource linked with the locationPolicy resource
-			  mcaPort.send(m_request(valueof(m_retrieve(f_getResourceAddress(v_locContainerResourceIndex) & "/" & "latest", f_getOriginator(v_locContainerResourceIndex)))));
+			  mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(m_retrieve(f_getResourceAddress(v_locContainerResourceIndex) & "/" & "latest", f_getOriginator(v_locContainerResourceIndex))))));
 			  tc_ac.start;
 			  alt{
 				[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response{
@@ -5763,6 +6033,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);
 																	
 				v_ae1.start(f_CSE_LOC_009_03());
 														  	  	
@@ -5799,7 +6070,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 				v_subscriptionResourceIndex		:= f_cse_createResource(int23, v_subscription_request_preamble, v_locContainerResourceIndex);
 				
 			  //Test Body - retrieve the <latest> resource of the created container resource linked with the locationPolicy resource
-			  mcaPort.send(m_request(valueof(m_retrieve(f_getResourceAddress(v_locContainerResourceIndex) & "/" & "latest", f_getOriginator(v_locContainerResourceIndex)))));
+			  mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(m_retrieve(f_getResourceAddress(v_locContainerResourceIndex) & "/" & "latest", f_getOriginator(v_locContainerResourceIndex))))));
 			  tc_ac.start;
 			  alt{
 				[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response{
@@ -5850,6 +6121,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);
 																	
 				v_ae1.start(f_CSE_LOC_012());
 														  	  	
@@ -5886,7 +6158,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					v_subscription_request_preamble	:= valueof(m_createSubscription(f_getResourceAddress(v_locContainerResourceIndex), c_defaultResourceName, -));
     				    				
 				  //Test Body
-				  mcaPort.send(m_request(valueof(f_getCreateRequestPrimitive(int23, v_subscription_request_preamble, v_locContainerResourceIndex)))); 
+				  mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(f_getCreateRequestPrimitive(int23, v_subscription_request_preamble, v_locContainerResourceIndex))))); 
 				  tc_ac.start;
 				  alt{
 					[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response{
@@ -5920,6 +6192,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);
 																	
 				v_ae1.start(f_CSE_LOC_013());
 														  	  	
@@ -5950,7 +6223,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 			  v_locPolicyResourceIndex	:= f_cse_createResource(int10, v_locpolicy_request_preamble, v_aeAuxIndex);//created locationpolicy index
 				
 			  //Test Body - retrieve the created locationpolicy resource
-			  mcaPort.send(m_request(valueof(m_retrieve(f_getResourceAddress(v_locPolicyResourceIndex), f_getOriginator(v_locPolicyResourceIndex))))); 
+			  mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(m_retrieve(f_getResourceAddress(v_locPolicyResourceIndex), f_getOriginator(v_locPolicyResourceIndex)))))); 
 			  tc_ac.start;
 			  alt{
 				[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response{
@@ -6004,6 +6277,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);
 														
 					v_ae1.start(f_CSE_SUB_NTF_001());
 											  	  	
@@ -6034,7 +6308,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					// Test Body
 					v_request := f_getCreateRequestPrimitive(int23, v_createRequest, v_aeIndex);//Subscription 
 					
-					mcaPort.send(m_request(v_request));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 					
 					tc_ac.start;
 					alt {
@@ -6079,6 +6353,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);
 															
 					v_ae1.start(f_CSE_SUB_NTF_002());
 												  	  	
@@ -6109,7 +6384,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					// Test Body
 					v_request := f_getCreateRequestPrimitive(int23, v_createRequest, v_aeIndex);//Subscription 
 					
-					mcaPort.send(m_request(v_request));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 					
 					tc_ac.start;
 					alt {
@@ -6154,6 +6429,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);
 															
 					v_ae1.start(f_CSE_SUB_NTF_003());
 												  	  	
@@ -6240,6 +6516,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);
 															
 					v_ae1.start(f_CSE_SUB_UPD_002());
 												  	  	
@@ -6290,7 +6567,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 			
 					v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest);
 					
-					mcaPort.send(m_request(v_request));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
@@ -6327,6 +6604,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);
 																
 					v_ae1.start(f_CSE_SUB_UPD_003());
 													  	  	
@@ -6373,7 +6651,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest);
 					
-					mcaPort.send(m_request(v_request));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
@@ -6410,6 +6688,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);
 																
 					v_ae1.start(f_CSE_SUB_UPD_004());
 													  	  	
@@ -6462,7 +6741,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
 					
-					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 {
@@ -6505,6 +6784,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);
 																
 					v_ae1.start(f_CSE_SUB_UPD_005());
 													  	  	
@@ -6554,7 +6834,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
 
-					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 {
@@ -6592,6 +6872,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);
 																
 					v_ae1.start(f_CSE_SUB_UPD_006());
 													  	  	
@@ -6638,7 +6919,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					// Test Body
 					vc_ae2.start(f_cse_notifyProcedure_noNotificationHandler()); // check that no notification is received
 		
-					mcaPort.send(m_request(v_request));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
@@ -6675,6 +6956,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);
 																
 					v_ae1.start(f_CSE_SUB_UPD_007());
 													  	  	
@@ -6750,6 +7032,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);
 																
 					v_ae1.start(f_CSE_SUB_UPD_008());
 													  	  	
@@ -6829,6 +7112,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);
 																
 					v_ae1.start(f_CSE_SUB_UPD_009());
 													  	  	
@@ -6877,7 +7161,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					// Test Body
 					vc_ae2.start(f_cse_notifyProcedure_representationHandler(v_contentResponse)); // check if the notification is well received and if its content matchs
 					
-					mcaPort.send(m_request(v_request));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
@@ -6920,6 +7204,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);
 																
 					v_ae1.start(f_CSE_SUB_DEL_002());
 													  	  	
@@ -6964,7 +7249,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					v_deleteRequest:= valueof(m_delete(f_getResourceAddress(v_aeIndex), f_getOriginator(v_aeIndex))); // Ae delete request
 										
-					mcaPort.send(m_request(v_deleteRequest));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_deleteRequest)));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) -> value v_response {
@@ -7003,6 +7288,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);
 																
 					v_ae1.start(f_CSE_SUB_DEL_003());
 													  	  	
@@ -7048,7 +7334,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					v_deleteRequest := valueof(m_delete(f_getResourceAddress(v_containerResourceIndex), f_getOriginator(v_containerResourceIndex)));// Container deletion request
 										
-					mcaPort.send(m_request(v_deleteRequest));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_deleteRequest)));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) -> value v_response {
@@ -7111,6 +7397,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_ANNC_001_ACP_UPD() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
   
@@ -7123,6 +7410,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_ANNC_001_ACP_CRE() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_createRequest := m_createAcpBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
   
@@ -7135,6 +7423,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_ANNC_001_CNT_UPD() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
   
@@ -7147,6 +7436,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_ANNC_001_CNT_CRE() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
   
@@ -7159,6 +7449,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_ANNC_001_GRP_UPD() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
   
@@ -7171,6 +7462,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_ANNC_001_GRP_CRE() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
   
@@ -7183,6 +7475,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_ANNC_001_CIN_CRE() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnncBase;
   
-- 
GitLab