diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 3bb9ebc9519203d6f8f7d95692b5882bfe639a16..bb0a7e1325e7d92b2f81ebea0cc92a50ffd874d9 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);
@@ -114,7 +116,7 @@ module OneM2M_Functions {
 			map(self:mccPortIn, system:mccPortIn);
 			map(self:acPort, system:acPort);
 						
-			v_cSEBaseResource := f_cse_generateLocalResource(-, -1, int5);
+			v_cSEBaseResource := f_generateLocalResource(-, -1, int5);
 			vc_cSEBaseIndex := f_setLocalResource(v_cSEBaseResource, int5, -1);
 			
 			//Initialze the IUT
@@ -132,9 +134,10 @@ module OneM2M_Functions {
 			vc_testSystemRole := e_cse;	
 			vc_cseType := p_cseType;
 			vc_ae1 := AeSimu.create("AE1") alive;
+			f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 			
 			//Initialization of local CSEBase
-			v_cSEBaseResource := f_cse_generateLocalResource(-, -1, int5);
+			v_cSEBaseResource := f_generateLocalResource(-, -1, int5);
 			vc_cSEBaseIndex := f_setLocalResource(v_cSEBaseResource, int5, -1);
 				
 			// Map
@@ -182,7 +185,7 @@ module OneM2M_Functions {
 			vc_cseType := p_cseType;	
 			
 			//Creation of CSEBase
-			v_cSEBaseResource := f_cse_generateLocalResource(-, -1, int5);
+			v_cSEBaseResource := f_generateLocalResource(-, -1, int5);
 			vc_cSEBaseIndex := f_setLocalResource(v_cSEBaseResource, int5, -1);
 			
 			// Map
@@ -211,7 +214,7 @@ module OneM2M_Functions {
 			vc_testSystemRole := e_cse;	
 			vc_cseType := p_cseType;			
 			//Creation of CSEBase
-			v_cSEBaseResource := f_cse_generateLocalResource(-, -1, int5);
+			v_cSEBaseResource := f_generateLocalResource(-, -1, int5);
 			vc_cSEBaseIndex := f_setLocalResource(v_cSEBaseResource, int5, -1);
 			
 			// Map
@@ -566,7 +569,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 {
@@ -631,10 +634,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 {
@@ -771,7 +774,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 {
@@ -856,7 +859,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 {
@@ -900,7 +903,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 {
@@ -962,7 +965,7 @@ module OneM2M_Functions {
 							v_response := valueof(m_responsePrimitive(int4004,vc_request.primitive.requestPrimitive.requestIdentifier));
 	
 						} else {
-							v_localResource := f_cse_generateLocalResource(vc_request.primitive.requestPrimitive.primitiveContent, v_parentResourceIndex, vc_request.primitive.requestPrimitive.resourceType);
+							v_localResource := f_generateLocalResource(vc_request.primitive.requestPrimitive.primitiveContent, v_parentResourceIndex, vc_request.primitive.requestPrimitive.resourceType);
 							v_localResourceIndex := f_setLocalResource(v_localResource, vc_request.primitive.requestPrimitive.resourceType, v_parentResourceIndex);
 
 							v_response := valueof(m_responsePrimitive(int2001,vc_request.primitive.requestPrimitive.requestIdentifier));
@@ -1018,7 +1021,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 {
@@ -1056,7 +1059,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 {
@@ -1133,7 +1136,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 {
@@ -1170,7 +1173,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 {
@@ -1201,7 +1204,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))) {
@@ -1238,7 +1241,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))) {
@@ -1275,7 +1278,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))  {
@@ -1538,13 +1541,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
 				
@@ -1569,7 +1572,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;
 						}
@@ -1608,7 +1611,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;
@@ -1687,7 +1690,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;
@@ -1700,7 +1703,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;
@@ -1735,7 +1738,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");
 							}
@@ -1903,7 +1906,7 @@ module OneM2M_Functions {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__ & ":INFO: Announcement received");
 							//TODO Save resource and generate required attributes
-							v_announcedResource:= f_cse_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, v_parentIndex,v_request.primitive.requestPrimitive.resourceType);
+							v_announcedResource:= f_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, v_parentIndex,v_request.primitive.requestPrimitive.resourceType);
 							v_announcedResourceIndex := f_setLocalResource(v_announcedResource, v_request.primitive.requestPrimitive.resourceType, v_parentIndex);
 							
 							if(isvalue(p_expectedResourceIndex)){
@@ -1926,7 +1929,7 @@ module OneM2M_Functions {
 							}
 							v_responsePrimitive.from_ := PX_CSE1_ID;
 							v_responsePrimitive.to_ := v_request.primitive.requestPrimitive.from_;
-							mccPortIn.send(m_response(v_responsePrimitive));			
+							mccPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));			
 						}
 						[] tc_ac.timeout {
 							setverdict(fail, __SCOPE__ & ":ERROR:  No announcement received");
@@ -1952,7 +1955,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 {
@@ -2015,10 +2018,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	
@@ -2079,7 +2082,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))) {
@@ -2116,7 +2119,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))) {
@@ -2159,7 +2162,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 {
@@ -2167,7 +2170,7 @@ module OneM2M_Functions {
 						setverdict(pass, __SCOPE__&":INFO: Resource type remoteCSE created successfuly");
 						f_checkAttributesToBeSaved(int16, v_request, v_response.primitive.responsePrimitive);
 						vc_remoteCseIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int16, -1);
-						v_remoteCSEResource := f_cse_generateLocalResource(v_response.primitive.responsePrimitive.primitiveContent, vc_cSEBaseIndex, int16);
+						v_remoteCSEResource := f_generateLocalResource(v_response.primitive.responsePrimitive.primitiveContent, vc_cSEBaseIndex, int16);
 						vc_localRemoteCseIndex := f_setLocalResource(v_remoteCSEResource, int16, vc_cSEBaseIndex);
 					}
 					[] mccPort.receive(mw_response(mw_responsePrimitiveKO)) {
@@ -2219,14 +2222,14 @@ module OneM2M_Functions {
 					[] mccPortIn.receive(mw_request(p_requestPrimitive)) -> value v_request {
 						tc_ac.stop;
 						setverdict(pass, __SCOPE__&":INFO: Resource type remoteCSE created successfuly");
-						v_remoteCSEResource := f_cse_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, vc_cSEBaseIndex, int16);//TODO Get index from v_request.primitive.requestPrimitive.to_
+						v_remoteCSEResource := f_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, vc_cSEBaseIndex, int16);//TODO Get index from v_request.primitive.requestPrimitive.to_
 						vc_localRemoteCseIndex := f_setLocalResource(v_remoteCSEResource, int16, vc_cSEBaseIndex);
 						
 						v_response := valueof(m_responsePrimitive(int2001,v_request.primitive.requestPrimitive.requestIdentifier));
 						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;
@@ -2264,7 +2267,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;
@@ -2290,7 +2293,7 @@ module OneM2M_Functions {
 			 * @param  p_resourceType      Type of the resource to be created
 			 * @return Internal created resource
 			 */
-			function f_cse_generateLocalResource(in template(omit) PrimitiveContent p_resource := omit, in integer p_parentIndex, in ResourceType p_resourceType) runs on CseSimu return PrimitiveContent {
+			function f_generateLocalResource(in template(omit) PrimitiveContent p_resource := omit, in integer p_parentIndex, in ResourceType p_resourceType) runs on CseSimu return PrimitiveContent {
 
 				var integer v_resourceIndex := lengthof(vc_localResourcesList);
 				var PrimitiveContent v_myResource;
@@ -2306,7 +2309,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
@@ -2413,17 +2416,64 @@ module OneM2M_Functions {
 					v_myResource.accessControlPolicy.announcedAttribute := omit;
 					
 				   }
-				}
+				} else if(p_resourceType == int2 and ispresent(p_resource)) {//AE
+					if(ischosen(p_resource.aE)){
+						v_myResource.aE := valueof(p_resource.aE);
+					
+						v_myResource.aE.resourceType := p_resourceType;
+						v_myResource.aE.parentID := f_getResourceId(vc_localResourcesList[p_parentIndex].resource);
+						v_myResource.aE.creationTime := fx_generateTimestamp();
+						v_myResource.aE.lastModifiedTime := v_myResource.aE.creationTime;											
+						if(not(ispresent(p_resource.aE.expirationTime))) {
+							v_myResource.aE.expirationTime := "20301231T012345";
+						}
+						v_myResource.aE.resourceID := "ae" & int2str(v_resourceIndex);
+						v_myResource.aE.aE_ID := v_myResource.aE.resourceID;
+						v_myResource.aE.resourceName := "ae" & int2str(v_resourceIndex);
+					}
+				} else if(p_resourceType == int3 and ispresent(p_resource)) {
+					if(ischosen(p_resource.container)){
+						v_myResource.container := valueof(p_resource.container);
+						v_myResource.container.resourceType := p_resourceType;
+      					
+						v_myResource.container.parentID := f_getResourceId(vc_localResourcesList[p_parentIndex].resource);
+						v_myResource.container.creationTime := fx_generateTimestamp();
+						v_myResource.container.lastModifiedTime := v_myResource.container.creationTime;											
+						if(not(ispresent(p_resource.container.expirationTime))) {
+							v_myResource.container.expirationTime := "20301231T012345";
+						}
+						v_myResource.container.resourceID := "cnt" & int2str(v_resourceIndex);
+						v_myResource.container.resourceName := "cnt" & int2str(v_resourceIndex);
+					}
+										
+				} else if(p_resourceType == int4 and ispresent(p_resource)) {
+					if(ischosen(p_resource.contentInstance)){
+						v_myResource.contentInstance := valueof(p_resource.contentInstance);
+						v_myResource.contentInstance.resourceID := "cnt" & int2str(v_resourceIndex);
+						v_myResource.contentInstance.resourceName := "cnt" & int2str(v_resourceIndex);
+						v_myResource.contentInstance.resourceType := p_resourceType;
+      					v_myResource.contentInstance.parentID := f_getResourceId(vc_localResourcesList[p_parentIndex].resource);
+						v_myResource.contentInstance.creationTime := fx_generateTimestamp();
+						v_myResource.contentInstance.lastModifiedTime := v_myResource.container.creationTime;											
+						if(not(ispresent(p_resource.contentInstance.expirationTime))) {
+							v_myResource.contentInstance.expirationTime := "20301231T012345";
+						}
+						v_myResource.contentInstance.stateTag := 0;
+						v_myResource.contentInstance.contentSize := lengthof(v_myResource.contentInstance.content);
+						v_myResource.contentInstance.content := p_resource.contentInstance.content;
+					}
+										
+				}	
 				return v_myResource;
 				
-			}//End of function	
+			}//End of function		
 			
 			/**
 			 * @desc   Update of a local resource (Test System simulating a CSE)
 			 * @param  p_localResourceIndex	Resource index of resource to be updated
 			 * @param  p_resource          	Resource update
 			 */
-			function f_cse_updateLocalResource(in integer p_localResourceIndex, in PrimitiveContent p_resource) runs on CseSimu {
+			function f_updateLocalResource(in integer p_localResourceIndex, in PrimitiveContent p_resource) runs on CseSimu {
 
 				// TODO To review the code (use of indexes, generation of value for certain attributes, etc..)
 				if(ischosen(vc_localResourcesList[p_localResourceIndex].resource.remoteCSE) and ischosen(p_resource.remoteCSE)) {//RemoteCSE
@@ -2481,7 +2531,7 @@ module OneM2M_Functions {
 					v_response := valueof(m_responsePrimitive(int4004,p_requestPrimitive.primitive.requestPrimitive.requestIdentifier));
 				
 				} else {
-					v_localResource := f_cse_generateLocalResource(p_requestPrimitive.primitive.requestPrimitive.primitiveContent, v_parentResourceIndex, p_requestPrimitive.primitive.requestPrimitive.resourceType);
+					v_localResource := f_generateLocalResource(p_requestPrimitive.primitive.requestPrimitive.primitiveContent, v_parentResourceIndex, p_requestPrimitive.primitive.requestPrimitive.resourceType);
 					v_localResourceIndex := f_setLocalResource(v_localResource, p_requestPrimitive.primitive.requestPrimitive.resourceType, v_parentResourceIndex);
 
 					v_response := valueof(m_responsePrimitive(int2001,p_requestPrimitive.primitive.requestPrimitive.requestIdentifier));
@@ -2489,7 +2539,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)));
 			
 			}
 			
@@ -2537,7 +2587,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;
 				}
@@ -2545,7 +2595,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;
 				}
@@ -2572,7 +2622,7 @@ module OneM2M_Functions {
 						v_response := valueof(m_responsePrimitive(int4004,v_request.primitive.requestPrimitive.requestIdentifier));
 						
 					} else {
-						v_localResource := f_cse_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, v_parentResourceIndex, v_request.primitive.requestPrimitive.resourceType);
+						v_localResource := f_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, v_parentResourceIndex, v_request.primitive.requestPrimitive.resourceType);
 						v_localResourceIndex := f_setLocalResource(v_localResource, v_request.primitive.requestPrimitive.resourceType, v_parentResourceIndex);
 	
 						v_response := valueof(m_responsePrimitive(int2001,v_request.primitive.requestPrimitive.requestIdentifier));
@@ -2580,7 +2630,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;
 				}
@@ -2595,16 +2645,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)));
 						}
 						
 					}
@@ -2622,14 +2672,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_cse_updateLocalResource(v_localResourceIndex, v_request.primitive.requestPrimitive.primitiveContent);
+						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;
@@ -2726,7 +2776,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)));
 							
 					}
     					
@@ -2769,14 +2819,14 @@ module OneM2M_Functions {
     					
 						v_rp := v_request.primitive.requestPrimitive;		
 						v_parentIndex := f_getResourceIndex(v_rp.to_);
-						v_modifiedResource := f_ae_generateLocalResource(v_rp.primitiveContent, v_parentIndex, v_rp.resourceType);
+						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");
 						}					
 					}
@@ -2795,68 +2845,8 @@ module OneM2M_Functions {
 		} // end preambleFunctions
 		
 		group helpingFunctions {
-			
-			/**
-			 * @desc   Creates specified resource
-			 * @param  p_resource          Resource to be created
-			 * @param  p_parentIndex       Parent index of resource to be saved
-			 * @param  p_resourceType      Type of the resource to be created
-			 * @param  p_modifiedResource  Assigned and/or modified fields
-			 * @return Internal resource index of the saved resource or -1
-			 */
-			function f_ae_generateLocalResource(in PrimitiveContent p_resource, in integer p_parentIndex, in ResourceType p_resourceType) runs on CseSimu return PrimitiveContent {
 
-				var integer v_resourceIndex;
-				var PrimitiveContent v_primitiveContent;
-				
-				// AE TODO To review the code (use of indexes, generation of value for certain attributes, etc..)
-				if(p_resourceType == int2 and ispresent(p_resource)) {
-					if(ischosen(p_resource.aE)){
-						var AE_optional v_content := p_resource.aE;
-						
-						v_resourceIndex := lengthof(vc_localResourcesList) - 1;
-						v_content.resourceType := p_resourceType;
-      					
-						v_content.parentID := PX_CSE1_ID;
-						v_content.creationTime := fx_generateTimestamp();
-						v_content.lastModifiedTime := v_content.creationTime;											
-						v_content.resourceID := "ae" & int2str(v_resourceIndex);
-						v_content.aE_ID := "Cae" & int2str(v_resourceIndex);
-						v_content.resourceName := "ae" & int2str(v_resourceIndex);
-      					v_primitiveContent := {aE := v_content};
-						return v_primitiveContent;
-				    
-					}
-										
-				}	
-				
-				if(p_resourceType == int3 and ispresent(p_resource)) {
-					if(ischosen(p_resource.container)){
-						var Container_optional v_content := p_resource.container;
-						
-						v_resourceIndex := lengthof(vc_localResourcesList) - 1;
-						v_content.resourceType := p_resourceType;
-      					
-						v_content.parentID := PX_CSE1_ID;
-						v_content.creationTime := fx_generateTimestamp();
-						v_content.lastModifiedTime := v_content.creationTime;											
-						v_content.resourceID := "cnt" & int2str(v_resourceIndex);
-						v_content.resourceName := "cnt" & int2str(v_resourceIndex);
-						v_primitiveContent := {container := v_content};
-						return v_primitiveContent;
-				    
-					}
-										
-				}	
-				
-				// TODO: implement other resource types			
-				
-				// Error
-				return p_resource;
-			}
-			
 			function f_ae_createPollingChannel(template UtTriggerPrimitive p_utRequest := m_utCreateAe) runs on CseSimu return integer {
-
 				var MsgIn v_request;
 				var PrimitiveContent v_modifiedResource;
 				var integer v_resourceIndex, v_parentIndex;
@@ -2876,7 +2866,7 @@ module OneM2M_Functions {
 			
 						v_rp := v_request.primitive.requestPrimitive;		
 						v_parentIndex := f_getResourceIndex(v_rp.to_);
-						v_modifiedResource := f_ae_generateLocalResource(v_rp.primitiveContent, v_parentIndex, v_rp.resourceType);
+						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)));
@@ -2912,7 +2902,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;
 				}
 				    		
@@ -2937,13 +2927,13 @@ module OneM2M_Functions {
 				[] mcaPortIn.receive(mw_request(mw_create)) -> value v_request {	
 					v_rp := v_request.primitive.requestPrimitive;		
 					v_parentIndex := f_getResourceIndex(v_rp.to_);
-					v_modifiedResource := f_ae_generateLocalResource(v_rp.primitiveContent, v_parentIndex, v_rp.resourceType);
+					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;	
 				}
@@ -3353,7 +3343,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;
@@ -3689,7 +3679,7 @@ module OneM2M_Functions {
 		
 			} else {
 				setverdict(pass, __SCOPE__&":INFO: Resource created successfuly");
-				v_localResource := f_ae_generateLocalResource(p_request.primitiveContent, v_parentIndex, p_request.resourceType);
+				v_localResource := f_generateLocalResource(p_request.primitiveContent, v_parentIndex, p_request.resourceType);
 				v_localResourceIndex := f_setLocalResource(v_localResource, p_request.resourceType, v_parentIndex);
 	
 				vc_response.primitive.responsePrimitive := valueof(m_responsePrimitive(int2001,p_request.requestIdentifier));
@@ -3853,6 +3843,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
@@ -3921,6 +3927,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 5549f3f1566535e89f134e59cc67f2d61ab3b759..fa83245b0fffa9711a69aff76fb275c7f3c5d04e 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 059426857d0a68df739dfdc88d35ad7cffb045ca..fed80bfb1d46978cab5e595d6bfad40eb9cbad20 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_AE1,
     		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_AE1,
 			serialization := PX_SERIALIZATION, 
 			forcedFields := p_forcedFields
 		};
@@ -615,7 +615,31 @@ module OneM2M_Templates {
 			template RequestPrimitive mw_updateAccessControlPolicyAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_update := {
 				resourceType := int10001,
 				primitiveContent := {accessControlPolicyAnnc := ?}
-			}; 			
+			}; 	
+			
+			/**
+			 * @desc Base UPDATE request primitive for TimeSeries resource
+			 */
+			template (value) RequestPrimitive m_updateTimeSeriesBase modifies m_update := {
+				requestIdentifier := "m_updateTimeSeries",
+				primitiveContent:= {timeSeries := m_contentUpdateTimeSeries}
+			};
+			
+			/**
+			 * @desc Base UPDATE request primitive for TimeSeriesInstance resource
+			 */
+			template (value) RequestPrimitive m_updateTimeSeriesInstanceBase modifies m_update:= {
+				requestIdentifier := "m_updateTimeSeriesInstance",
+				primitiveContent:= {timeSeriesInstance := m_contentUpdateTimeSeriesInstance}
+			};		
+			
+			/**
+			 * @desc Base Reception template for update TimeSeriesAnnc
+			 */
+			template RequestPrimitive mw_updateTimeSeriesAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_update := {
+				resourceType := int10029,
+				primitiveContent := {timeSeriesAnnc := ?}
+			}; 
 			
 			
     	}//end group Update
@@ -1303,6 +1327,22 @@ module OneM2M_Templates {
 				primitiveContent := {timeSeriesInstance := ?}
 			};
 			
+			/**
+			 * @desc Base Reception template for CREATE TimeSeriesAnnc
+			 */
+			template RequestPrimitive mw_createTimeSeriesAnncBase(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+				resourceType := int10029,
+				primitiveContent := {timeSeriesAnnc := mw_contentCreateTimeSeriesAnncBase}
+			};  
+			
+			/**
+			 * @desc Base Reception template for CREATE TimeSeriesInstanceAnnc
+			 */
+			template RequestPrimitive mw_createTimeSeriesInstanceAnncBase(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+				resourceType := int10030,
+				primitiveContent := {timeSeriesInstanceAnnc := mw_contentCreateTimeSeriesInstanceAnncBase}
+			};  
+			
     	}//end group Create
     	
     	group Delete {
@@ -2562,6 +2602,57 @@ module OneM2M_Templates {
 			choice := omit//NP
 		};
 		
+		/**
+		 * @desc Base primitiveContent for CREATE operation for TimeSeriesAnnc resource
+		 * @param p_primitiveContent Content for the TimeSeriesAnnc
+		 */
+		template TimeSeriesAnnc_optional mw_contentCreateTimeSeriesAnncBase := {
+			resourceName := omit,//NA M
+			resourceType := omit,//NA M
+			resourceID := omit,//NA M
+			parentID := omit,//NA M
+			creationTime := omit,//NA M
+			lastModifiedTime := omit,//NA M
+			labels := ?,//MA
+			accessControlPolicyIDs := ?,//MA
+			expirationTime := ?,//MA M
+			link := omit, //O NA
+			dynamicAuthorizationConsultationIDs := *, //OA			
+			stateTag := *,//OA
+			maxNrOfInstances := *,//O OA		
+			maxByteSize := *,//O OA	
+			maxInstanceAge := *,//O OA	
+			currentNrOfInstances := *,//M OA
+			currentByteSize := *,//M OA
+			periodicInterval := *,//O OA
+			missingDataDetect := omit,//O NA
+			missingDataList := *,//O OA
+			missingDataCurrentNr := *,//O OA
+			missingDataDetectTimer := *,//O OA
+			ontologyRef := *,//O OA
+			choice := omit //O
+		};
+		
+		/**
+		 * @desc Base primitiveContent for CREATE operation for TimeSeriesInstanceAnnc resource
+		 * @param p_primitiveContent Content for the TimeSeriesInstanceAnnc
+		 */
+		template TimeSeriesInstanceAnnc_optional mw_contentCreateTimeSeriesInstanceAnncBase := {			
+			resourceName := omit,//NA M
+			resourceType := omit,//NA M
+			resourceID := omit,//NA M
+			parentID := omit,//NA M
+			creationTime := omit,//NA M
+			lastModifiedTime := omit,//NA M
+			labels := ?,//MA
+			expirationTime := omit,//NA M
+			link := omit, //O NA
+			dataGenerationTime := *,//M OA
+			content := *,//M OA
+			sequenceNr := *,//O OA
+			contentSize := *//M OA			
+		}		
+		
 		/**
 		 * @desc Base primitiveContent for CREATE operation for timeSeries resource
 		 * @param p_name Resource name
@@ -2628,7 +2719,7 @@ module OneM2M_Templates {
 			announceTo := omit,//O
 			announcedAttribute := omit,//O
 			dataGenerationTime := {alt_ := fx_generateTimestamp()},//M
-			content := "Value",//M
+			content := "AnyValue",//M
 			sequenceNr := omit,//O
 			contentSize  := omit//NP
 		};
@@ -3008,6 +3099,59 @@ module OneM2M_Templates {
 		  	choice := omit
 		};	
 		
+		/**
+		 * @desc Base primitiveContent for UPDATE operation for TimeSeries resource
+		 */
+		template (value) TimeSeries_optional m_contentUpdateTimeSeries := {
+			resourceName := omit,//O
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			labels := omit,//O
+			accessControlPolicyIDs := omit,//O
+			expirationTime := omit,//O
+			dynamicAuthorizationConsultationIDs := omit, //O
+			announceTo := omit,//O
+			announcedAttribute := omit,//O
+			stateTag := omit,//NP
+			creator := omit,//O
+			maxNrOfInstances := omit,//O
+			maxByteSize := omit,//O
+			maxInstanceAge := omit,//O
+			currentNrOfInstances := omit,//NP
+			currentByteSize := omit,//NP
+			periodicInterval := omit,//O
+			missingDataDetect := omit,//O
+			missingDataMaxNr := omit,//O
+			missingDataList := omit,//NP
+			missingDataCurrentNr := omit,//NP
+			missingDataDetectTimer := omit,//O
+			ontologyRef := omit,//O
+			choice := omit//NP
+		};
+		
+		/**
+		 * @desc Base primitiveContent for UPDATE operation for TimeSeriesInstance resource
+		 */
+		template (value) TimeSeriesInstance_optional m_contentUpdateTimeSeriesInstance := {
+			resourceName := omit,
+			resourceType := omit,
+			resourceID := omit,
+			parentID := omit,
+			creationTime := omit,
+			lastModifiedTime := omit,
+			labels := omit,
+			expirationTime := omit,
+			announceTo := omit,
+			announcedAttribute := omit,
+			dataGenerationTime := omit,
+			content := omit,
+			sequenceNr := omit,
+			contentSize := omit
+		};
+		
  		
 	}//end group ContentUpdate
 	
@@ -4143,6 +4287,36 @@ module OneM2M_Templates {
 			choice := omit	//O
 		}
 		
+		template TimeSeries_optional m_contentTimeSeries_allOmit := {
+			resourceName := omit,//M
+			resourceType := omit,//M
+			resourceID := omit,//M
+			parentID := omit,//M
+			creationTime := omit,//M
+			lastModifiedTime := omit,//M
+			labels := omit,//O
+			accessControlPolicyIDs := omit,//O
+			expirationTime := omit,//M
+			dynamicAuthorizationConsultationIDs := omit,//O
+			announceTo := omit,//O
+			announcedAttribute := omit,//O
+			stateTag := omit,//M
+			creator := omit,//M
+			maxNrOfInstances := omit,//O
+			maxByteSize := omit,//O
+			maxInstanceAge := omit,//O
+			currentNrOfInstances := omit,//M
+			currentByteSize := omit,//M
+			periodicInterval := omit,//O
+			missingDataDetect := omit,//O
+			missingDataMaxNr := omit,//O
+			missingDataList := omit,//O
+			missingDataCurrentNr := omit,//O
+			missingDataDetectTimer := omit,//O
+			ontologyRef := omit,//O
+			choice := omit//O
+		}
+		
 		template TimeSeries_optional mw_contentTimeSeriesBase := {
 			resourceName := ?,//M
 			resourceType := ?,//M
@@ -4181,6 +4355,55 @@ module OneM2M_Templates {
 		template TimeSeries_optional mw_contentTimeSeries_rc1 modifies mw_contentTimeSeriesBase := {
 			choice := omit	//O
 		}
+		
+		template XSD.AnyURI mw_contentTimeSeries_rc2 := ?;
+		
+		template Resource mw_contentTimeSeries_rc3 := {
+			choice := {timeSeries := ?},
+			uRI := ?
+		}
+		
+		template TimeSeries_optional mw_contentTimeSeries_rc4 modifies mw_contentTimeSeriesBase := {
+			choice := { choice_list := {{subscription := ?}}}	//O
+		}
+		
+		template TimeSeries_optional mw_contentTimeSeries_rc5 modifies mw_contentTimeSeriesBase := {
+			choice := {childResource_list := ?}	//O
+		}
+		
+		template TimeSeries_optional mw_contentTimeSeries_rc6 modifies mw_contentTimeSeriesBase := {
+			resourceName := omit,//M
+			resourceType := omit,//M
+			resourceID := omit,//M
+			parentID := omit,//M
+			creationTime := omit,//M
+			lastModifiedTime := omit,//M
+			labels := omit,//O
+			accessControlPolicyIDs := omit,//O
+			expirationTime := omit,//M
+			dynamicAuthorizationConsultationIDs := omit,//O
+			announceTo := omit,//O
+			announcedAttribute := omit,//O
+			stateTag := omit,//M
+			creator := omit,//M
+			maxNrOfInstances := omit,//O
+			maxByteSize := omit,//O
+			maxInstanceAge := omit,//O
+			currentNrOfInstances := omit,//M
+			currentByteSize := omit,//M
+			periodicInterval := omit,//O
+			missingDataDetect := omit,//O
+			missingDataMaxNr := omit,//O
+			missingDataList := omit,//O
+			missingDataCurrentNr := omit,//O
+			missingDataDetectTimer := omit,//O
+			ontologyRef := omit,//O
+			choice := {childResource_list := ?}//O
+		}
+		
+		template TimeSeries_optional mw_contentTimeSeries_rc8 modifies m_contentTimeSeries_allOmit := {
+			choice := {childResource_list := ?}	//O
+		}
 
 
 	}//end group responseContent
@@ -4392,7 +4615,38 @@ module OneM2M_Templates {
 			ontologyRef := omit,//O
 			disableRetrieval := omit, //O
 			choice := omit//O
-		};		
+		};	
+		
+		template (value) TimeSeries_update_invalid m_contentUpdateTimeSeries_invalid := {
+			resourceName := omit,//O
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			expirationCounter := omit,//Field not existing in container resource
+			labels := omit,//O
+			accessControlPolicyIDs := omit,//O
+			expirationTime := omit,//O
+			dynamicAuthorizationConsultationIDs := omit, //O
+			announceTo := omit,//O
+			announcedAttribute := omit,//O
+			stateTag := omit,//NP
+			creator := omit,//O
+			maxNrOfInstances := omit,//O
+			maxByteSize := omit,//O
+			maxInstanceAge := omit,//O
+			currentNrOfInstances := omit,//NP
+			currentByteSize := omit,//NP
+			periodicInterval := omit,//O
+			missingDataDetect := omit,//O
+			missingDataMaxNr := omit,//O
+			missingDataList := omit,//NP
+			missingDataCurrentNr := omit,//NP
+			missingDataDetectTimer := omit,//O
+			ontologyRef := omit,//O
+			choice := omit//NP
+		};	
 				
 	}//end group SpecialContents
 	
diff --git a/LibOneM2M/OneM2M_TestSystem.ttcn b/LibOneM2M/OneM2M_TestSystem.ttcn
index 916183ef8fa5a118c8aa8671b0b294ac16813ccb..a5b1777ea193fb9b5c69cf7dda95e0ea5ee003fe 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;
@@ -67,7 +68,7 @@ module OneM2M_TestSystem {
 		var AeSimu vc_ae1;//For CF02 when CseSimu is master
 		var integer vc_localRemoteCseIndex := -1;
 		var integer vc_cSEBaseIndex := -1;	//Index of the CSEBase resource of the Tester inside vc_localResourcesList
-		var CseTypeID vc_cseType;			//cseType of the simulated CSE. IN = 1; MN = 2
+		var CseTypeID vc_cseType;	//cseType of the simulated CSE. IN =1, MN = 2
 	};
 	
 	type component InCseSimu extends CseSimu {
diff --git a/LibOneM2M/OneM2M_Types.ttcn b/LibOneM2M/OneM2M_Types.ttcn
index 9baf894e36db594cf988f4ad0a9685d8ca7702b2..330f82eb9b4e9200528e431ba571f2d769060166 100644
--- a/LibOneM2M/OneM2M_Types.ttcn
+++ b/LibOneM2M/OneM2M_Types.ttcn
@@ -1718,6 +1718,8 @@ type union PrimitiveContent {
 	SemanticDescriptor_optional semanticDescriptor,
 	TimeSeries_optional timeSeries,
 	TimeSeriesInstance_optional timeSeriesInstance,
+	TimeSeriesAnnc_optional timeSeriesAnnc,
+	TimeSeriesInstanceAnnc_optional timeSeriesInstanceAnnc,
 	GenericInterworkingOperationInstance_optional genericInterworkingOperationInstance,
 	//SecurityInfo
 	SecurityInfo securityInfo,
@@ -1742,7 +1744,8 @@ type union PrimitiveContent {
 	PollingChannel_update_invalid pollingChannel_update_invalid,
 	Schedule_update_invalid schedule_update_invalid,
 	Subscription_update_invalid subscription_update_invalid,
-	LocationPolicy_update_invalid locationPolicy_update_invalid	
+	LocationPolicy_update_invalid locationPolicy_update_invalid,
+	TimeSeries_update_invalid timeSeries_update_invalid
 }
 
 
@@ -8495,7 +8498,7 @@ group InvalidTypes {
 		NhURI parentID optional,
 		Timestamp creationTime optional,
 		Timestamp lastModifiedTime optional,
-		XSD.PositiveInteger expirationCounter optional,//Invalid field, non existing for Container
+		XSD.PositiveInteger expirationCounter optional,//Invalid field, non existing for TimeSeries
 		Labels labels optional,
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
@@ -8541,14 +8544,14 @@ group InvalidTypes {
 
 
        
-	 type record LocationPolicy_update_invalid {	
+	 type record LocationPolicy_update_invalid {
 		ResourceName resourceName optional,
 		ResourceType resourceType optional,
 		XSD.ID resourceID optional,
 		NhURI parentID optional,
 		Timestamp creationTime optional,
 		Timestamp lastModifiedTime optional,
-		XSD.PositiveInteger expirationCounter optional,//Invalid field, non existing for Schedule
+		XSD.PositiveInteger expirationCounter optional,//Invalid field, non existing for LocationPolicy
 		Labels labels optional,
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
diff --git a/LibOneM2M/OneM2M_TypesAndValues.ttcn b/LibOneM2M/OneM2M_TypesAndValues.ttcn
index feb81891475aa7c4a51ded27ec46d35e38cb22b4..0514eeae980e84104014a062d99777a6a292d4b3 100644
--- a/LibOneM2M/OneM2M_TypesAndValues.ttcn
+++ b/LibOneM2M/OneM2M_TypesAndValues.ttcn
@@ -38,7 +38,7 @@ module OneM2M_TypesAndValues {
 	const XSD.String c_defaultm2mServiceSubscriptionProfileResourceName := "Mym2mServiceSubscriptionProfileResource";
 	const XSD.String c_defaultServiceSubscribedAppRuleResourceName := "MyServiceSubscribedAppRuleResource";
 	const XSD.String c_defaultTimeSeriesResourceName := "MyTimeSeriesResource";
-	const XSD.String c_defaultTimeSeriesInstanceResourceName := "MyTimeSeriesResource";
+	const XSD.String c_defaultTimeSeriesInstanceResourceName := "MyTimeSeriesInstanceResource";
 	const XSD.ID c_aeAuxName := "MyAe";
 	const XSD.String c_defaultAE2Name := "MyAe2";
 	const XSD.String c_acpAuxName := "MyAcp";
diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index a0719a1c54851fd96d50076e2b51b80a843be612..8a00c2a89d6c7d6e3ba5a3c969db490d33d8b1a6 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -57,15 +57,15 @@ module OneM2M_PermutationFunctions {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__, " : Container creation request received successfuly");
 								v_parentIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
-								v_resource := f_ae_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, v_parentIndex, v_request.primitive.requestPrimitive.resourceType);
+								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 {
@@ -107,15 +107,15 @@ module OneM2M_PermutationFunctions {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__, " : Container creation request received successfuly");
 								v_parentIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
-								v_resource := f_ae_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, v_parentIndex, v_request.primitive.requestPrimitive.resourceType);
+								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 {
@@ -150,7 +150,7 @@ module OneM2M_PermutationFunctions {
 						f_cf03Up();
 						
 						//Send Trigger Message
-						v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
+						v_localResource := f_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
 						v_resourceIndex := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
 						v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_resourceIndex, e_nonHierarchical, p_primitiveScope);
 						f_sendUtPrimitive(v_utRequest,v_action);
@@ -161,14 +161,14 @@ module OneM2M_PermutationFunctions {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__, " : Container update request received successfuly");
 								v_resourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
-								f_cse_updateLocalResource(v_resourceIndex, v_request.primitive.requestPrimitive.primitiveContent);
+								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 {
@@ -197,7 +197,7 @@ module OneM2M_PermutationFunctions {
 						f_cf03Up();
 	
 						//Send Trigger Message
-						v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
+						v_localResource := f_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
 						v_resourceIndex := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
 						v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_resourceIndex, e_hierarchical, p_primitiveScope);
 						f_sendUtPrimitive(v_utRequest,v_action);
@@ -208,14 +208,14 @@ module OneM2M_PermutationFunctions {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__, " : Container update request received successfuly");
 								v_resourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
-								f_cse_updateLocalResource(v_resourceIndex, v_request.primitive.requestPrimitive.primitiveContent);
+								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 {
@@ -250,7 +250,7 @@ module OneM2M_PermutationFunctions {
 						f_cf03Up();
 			
 						//Send Trigger Message
-						v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
+						v_localResource := f_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
 						v_resourceIndex := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
 						v_utRequestTemplate := m_utRetrieve(f_getLocalResourceAddress(v_resourceIndex, e_nonHierarchical, p_primitiveScope));
 						f_sendUtPrimitive(v_utRequestTemplate,v_action);
@@ -263,12 +263,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 {
@@ -298,7 +298,7 @@ module OneM2M_PermutationFunctions {
 						f_cf03Up();
 
 						//Send Trigger Message
-						v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
+						v_localResource := f_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
 						v_resourceIndex := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
 						v_utRequestTemplate := m_utRetrieve(f_getLocalResourceAddress(v_resourceIndex, e_hierarchical, p_primitiveScope));
                         v_utRequest := valueof(v_utRequestTemplate);
@@ -311,12 +311,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 {
@@ -350,7 +350,7 @@ module OneM2M_PermutationFunctions {
 						f_cf03Up();
 			
 						//Send Trigger Message
-						v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
+						v_localResource := f_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
 						v_auxInteger := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
 						v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_auxInteger, e_nonHierarchical, p_primitiveScope);
 						f_sendUtPrimitive(v_utRequest,v_action);
@@ -361,12 +361,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 {
@@ -394,8 +394,7 @@ module OneM2M_PermutationFunctions {
 
 						f_cf03Up();
 
-						//Send Trigger Message
-						v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
+						//Send Trigger Mesf_generateLocalResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
 						v_auxInteger := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
 						v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_auxInteger, e_hierarchical, p_primitiveScope);
 						f_sendUtPrimitive(v_utRequest,v_action);
@@ -407,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 {
@@ -456,17 +455,17 @@ module OneM2M_PermutationFunctions {
 							   tc_ac.stop;
 							   setverdict(pass, __SCOPE__, " : AE registration request is accepted!!");
 							   v_parentIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
-							   v_resource := f_ae_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, v_parentIndex, v_request.primitive.requestPrimitive.resourceType);
+							   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));
 	
 							   //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!");
@@ -502,8 +501,7 @@ module OneM2M_PermutationFunctions {
 						//Test component configuration
 						f_cf03Up();
 	
-						//send triggering primitive to SUT
-						v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
+						//send triggeringf_generateLocalResourcelocalResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
 						v_containerIndex := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
 						p_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_containerIndex, -, -);
 						p_request.to_ := p_utRequest.requestPrimitive.to_;
@@ -518,18 +516,18 @@ module OneM2M_PermutationFunctions {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__, " : ContentInstance creation request is accepted!!");
 								v_parentIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
-								v_resource := f_ae_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, v_parentIndex, v_request.primitive.requestPrimitive.resourceType);
+								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));
 	
 								//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{
@@ -564,17 +562,17 @@ module OneM2M_PermutationFunctions {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__, " : Container creation request is accepted!!");
 								v_parentIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
-								v_resource := f_ae_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, v_parentIndex, v_request.primitive.requestPrimitive.resourceType);
+								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));
 	
 								//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!");
@@ -601,8 +599,7 @@ module OneM2M_PermutationFunctions {
 					   
 					   	//Preamble
 						
-					   	//Send Trigger Message
-						v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))), vc_cSEBaseIndex, int2);
+					   	//Send Trf_generateLocalResourcelResource := f_ae_generateLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))), vc_cSEBaseIndex, int2);
 						v_resourceIndex := f_setLocalResource(v_localResource, int2, vc_cSEBaseIndex);
 						p_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_resourceIndex);
 					   	f_sendUtPrimitive(p_utRequest,p_action);
@@ -615,14 +612,14 @@ module OneM2M_PermutationFunctions {
 							   tc_ac.stop;
 							   setverdict(pass, __SCOPE__, " : AE update request is accepted!");
 							   v_resourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
-							   f_cse_updateLocalResource(v_resourceIndex, v_request.primitive.requestPrimitive.primitiveContent);
+							   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!");
@@ -643,8 +640,7 @@ module OneM2M_PermutationFunctions {
 						//Test component configuration
 						f_cf03Up();
 
-						//send triggering primitive to SUT
-						v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
+						//send triggering f_generateLocalResourceocalResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
 						v_resourceIndex := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
 						p_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_resourceIndex);
 						f_sendUtPrimitive(p_utRequest,p_action);
@@ -658,15 +654,15 @@ module OneM2M_PermutationFunctions {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__, " : Container update request is accepted!!");
 								v_resourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
-								f_cse_updateLocalResource(v_resourceIndex, v_request.primitive.requestPrimitive.primitiveContent);
+								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{
@@ -694,8 +690,7 @@ module OneM2M_PermutationFunctions {
 						//Test component configuration
 						f_cf03Up();
 		
-						//send triggering primitive to SUT
-						v_localResource := f_ae_generateLocalResource(valueof(p_primitiveContent), vc_cSEBaseIndex, p_resourceType);
+						//send triggerinf_generateLocalResource_localResource := f_ae_generateLocalResource(valueof(p_primitiveContent), vc_cSEBaseIndex, p_resourceType);
 						v_resourceIndex := f_setLocalResource(v_localResource, p_resourceType, vc_cSEBaseIndex);
 						v_utRequest := m_utRetrieve(f_getLocalResourceAddress(v_resourceIndex));
 						f_sendUtPrimitive(v_utRequest,p_action);
@@ -708,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!");
@@ -758,17 +753,16 @@ module OneM2M_PermutationFunctions {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__, " : Subscription creation request is accepted!");
 								v_parentIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
-								v_resource := f_ae_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, v_parentIndex, v_request.primitive.requestPrimitive.resourceType);
+								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));
-							
 								//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!");
@@ -832,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))) {
@@ -892,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))) {
@@ -953,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))) {
@@ -1010,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;
@@ -1076,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))) {
@@ -1139,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))) {
@@ -1203,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))) {
@@ -1263,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))) {
@@ -1316,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{
@@ -1362,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 {
@@ -1416,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
@@ -1474,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;
@@ -1543,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 {
@@ -1589,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 {
@@ -1636,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 {
@@ -1661,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 {
@@ -1715,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 {
@@ -1884,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 {
@@ -1960,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 {
@@ -2025,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 {
@@ -2097,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 {
@@ -2156,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 {
@@ -2213,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 {
@@ -2272,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 {
@@ -2312,6 +2306,130 @@ module OneM2M_PermutationFunctions {
 						return vc_response.primitive.responsePrimitive;
 					    				
 					}//end f_CSE_DMR_CRE_006
+					
+					function f_CSE_DMR_CRE_007(ResourceType p_resourceTypeParent, template RequestPrimitive p_requestPrimitiveParent, ResourceType p_resourceTypeChild, template RequestPrimitive p_requestPrimitiveChild1, template RequestPrimitive p_requestPrimitiveChild2, XSD.String p_resourceName) runs on AeSimu {
+						//Local variables
+						var MsgIn v_response;
+						var RequestPrimitive v_request;
+						var integer v_aeIndex := -1;
+						var integer v_parentIndex := -1;
+						var integer v_childIndex := -1;
+									   
+						// Test control
+
+						// Test component configuration
+						f_cf01Up();
+
+						// Test adapter configuration
+
+						// Preamble
+						v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+							
+						v_parentIndex := f_cse_createResource(p_resourceTypeParent, p_requestPrimitiveParent, v_aeIndex);	//Parent
+	
+						v_childIndex := f_cse_createResource(p_resourceTypeChild, p_requestPrimitiveChild1, v_parentIndex);	//Child1
+
+						// Test Body
+						v_request := f_getCreateRequestPrimitive(p_resourceTypeChild, p_requestPrimitiveChild2, v_parentIndex);	////Child2
+
+						mcaPort.send(m_request(v_request));
+						tc_ac.start;
+						alt {
+							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
+								tc_ac.stop;
+								setverdict(pass, __SCOPE__ & ": Resource " & int2str(enum2int(p_resourceTypeChild)) & " created");
+							}
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+								tc_ac.stop;
+								setverdict(fail, __SCOPE__ & ": Wrong response status code in the response");
+							}
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+								tc_ac.stop;
+								setverdict(fail, __SCOPE__ & ": Error while creating resource type " & int2str(enum2int(p_resourceTypeChild)));			
+							}
+							[] tc_ac.timeout {
+								setverdict(fail, __SCOPE__ & ": No answer while creating resource type " & int2str(enum2int(p_resourceTypeChild)));
+							}
+						}	
+			
+						f_checkAeSimuStatus();
+	
+						//Check to see if the resource is NOT present
+						if(f_isResourceNotPresent(v_parentIndex, p_resourceName)){
+							setverdict(pass, __SCOPE__ & ":INFO: Oldest resource " & int2str(enum2int(p_resourceTypeChild)) & " has been removed to allow the creation of the new instance");
+						} else {
+							setverdict(fail, __SCOPE__ & ":ERROR: Oldest resource " & int2str(enum2int(p_resourceTypeChild)) & " has not been removed to allow the creation of the new instance");
+						}
+							
+						// Postamble
+						f_cse_postamble_deleteResources();
+	
+						// Tear down
+						f_cf01Down();	
+	
+					}//end f_CSE_DMR_CRE_007
+					
+					function f_CSE_DMR_CRE_008(ResourceType p_resourceTypeParent, template RequestPrimitive p_requestPrimitiveParent, ResourceType p_resourceTypeChild, template RequestPrimitive p_requestPrimitiveChild1, template RequestPrimitive p_requestPrimitiveChild2, XSD.String p_resourceName) runs on AeSimu {
+						//Local variables
+						var MsgIn v_response;
+						var RequestPrimitive v_request;
+						var integer v_aeIndex := -1;
+						var integer v_parentIndex := -1;
+						var integer v_childIndex := -1;		   
+						// Test control
+	
+						// Test component configuration
+						f_cf01Up();
+	
+						// Test adapter configuration
+	
+						// Preamble
+						v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+							
+						v_parentIndex := f_cse_createResource(p_resourceTypeParent, p_requestPrimitiveParent, v_aeIndex);	//Parent
+	
+						v_childIndex := f_cse_createResource(p_resourceTypeChild, p_requestPrimitiveChild1, v_parentIndex);	//Child1
+	
+						// Test Body
+	
+						v_request := f_getCreateRequestPrimitive(p_resourceTypeChild, p_requestPrimitiveChild2, v_parentIndex);	//Child2
+	
+						mcaPort.send(m_request(v_request));
+						tc_ac.start;
+						alt {
+							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
+								tc_ac.stop;
+								setverdict(pass, __SCOPE__ & ": Resource " & int2str(enum2int(p_resourceTypeChild)) & " created");
+							}
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+								tc_ac.stop;
+								setverdict(fail, __SCOPE__ & ": Wrong response status code in the response");
+							}
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+								tc_ac.stop;
+								setverdict(fail, __SCOPE__ & ": Error while creating resource type " & int2str(enum2int(p_resourceTypeChild)));			
+							}
+							[] tc_ac.timeout {
+								setverdict(fail, __SCOPE__ & ": No answer while creating resource type " & int2str(enum2int(p_resourceTypeChild)));
+							}
+						}	
+			
+						f_checkAeSimuStatus();
+	
+						//Check to see if the resource is NOT present
+						if(f_isResourceNotPresent(v_parentIndex, p_resourceName)){
+							setverdict(pass, __SCOPE__ & ":INFO: Oldest resource " & int2str(enum2int(p_resourceTypeChild)) & " has been removed to allow the creation of the new instance");
+						} else {
+							setverdict(fail, __SCOPE__ & ":ERROR: Oldest resource " & int2str(enum2int(p_resourceTypeChild)) & " has not been removed to allow the creation of the new instance");
+						}
+							
+						// Postamble
+						f_cse_postamble_deleteResources();
+	
+						// Tear down
+						f_cf01Down();	
+
+					}//end f_CSE_DMR_CRE_008
 						
 					function f_CSE_DMR_CRE_012(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, in AttributeList p_optionalAttribute) runs on AeSimu {
     				
@@ -2358,9 +2476,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 {
@@ -2404,6 +2522,56 @@ module OneM2M_PermutationFunctions {
 					    					    				
 					}//end f_CSE_DMR_CRE_012
 					
+					function f_CSE_DMR_CRE_013(ResourceType p_resourceTypeParent, template RequestPrimitive p_requestPrimitiveParent, ResourceType p_resourceTypeChild, template RequestPrimitive p_requestPrimitiveChild) runs on AeSimu {
+						// Local variables
+						var MsgIn v_response;
+						var RequestPrimitive v_request;
+						var integer v_aeIndex := -1;
+						var integer v_parentIndex := -1;
+						// Test control
+
+						// Test component configuration
+						f_cf01Up();
+
+						// Test adapter configuration
+
+						// Preamble
+						v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+								
+						v_parentIndex := f_cse_createResource(p_resourceTypeParent, p_requestPrimitiveParent, v_aeIndex);
+	
+						// Test Body
+						v_request := f_getCreateRequestPrimitive(p_resourceTypeChild, p_requestPrimitiveChild, v_parentIndex);
+	
+						mcaPort.send(m_request(v_request));
+						tc_ac.start;
+						alt {
+							[] mcaPort.receive(mw_response(mw_responsePrimitive(int5207))) -> value v_response {
+								tc_ac.stop;
+								setverdict(pass, __SCOPE__ & ": Maximum byte size exceeded");
+							}
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+								tc_ac.stop;
+								setverdict(fail, __SCOPE__ & ": Bad responseStatusCode in response");
+							}
+			
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+								tc_ac.stop;
+								setverdict(fail, __SCOPE__ & ": Accepted creation of resource type " & int2str(enum2int(p_resourceTypeChild)) & " exceding maximum byte size");
+							}
+							[] tc_ac.timeout {
+								setverdict(fail, __SCOPE__ & ": No answer while creating resource type 4 " & int2str(enum2int(p_resourceTypeChild)));
+							}
+						}	
+				
+						// Postamble
+						f_cse_postamble_deleteResources();
+		
+						// Tear down
+						f_cf01Down();
+		
+					}//end f_CSE_DMR_CRE_013
+					
 					function f_CSE_DMR_CRE_014(ResourceType p_parentResourceType, template RequestPrimitive p_parentResourceRequestPrimitive, ResourceType p_childResourceType, template RequestPrimitive p_childRequestPrimitive) runs on AeSimu {
 						// Local variables
 						var MsgIn v_response;
@@ -2426,7 +2594,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 {
@@ -2447,7 +2615,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 {
@@ -2501,7 +2669,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 {
@@ -2557,7 +2725,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 {
@@ -2618,7 +2786,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 {
@@ -2680,7 +2848,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;	
@@ -2733,7 +2901,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);
@@ -2784,7 +2952,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 {
@@ -2851,7 +3019,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 {
@@ -2904,7 +3072,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 {
@@ -2960,7 +3128,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 {
@@ -3208,7 +3376,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 {
@@ -3304,7 +3472,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 {
@@ -3379,7 +3547,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 {
@@ -3460,7 +3628,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 {
@@ -3758,7 +3926,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
@@ -3823,7 +3991,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 {
@@ -3892,7 +4060,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 {
@@ -3962,7 +4130,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 {
@@ -4031,7 +4199,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 {
@@ -4100,7 +4268,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 {
@@ -4161,7 +4329,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 {
@@ -4222,7 +4390,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 {
@@ -4282,7 +4450,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 {
@@ -4340,7 +4508,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 {
@@ -4405,7 +4573,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 {
@@ -4461,7 +4629,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 {
@@ -4517,7 +4685,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 {
@@ -4573,7 +4741,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 {
@@ -4601,6 +4769,110 @@ module OneM2M_PermutationFunctions {
 						f_cf01Down();
 	    					    				
 					}//end f_CSE_DMR_UPD_009
+					
+					function f_CSE_DMR_UPD_010(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive) runs on AeSimu {
+	    				
+						// Local variables
+						var MsgIn v_response;
+						var integer v_aeIndex := -1;
+						var integer v_resourceIndex := -1;
+						
+						// Test control
+						
+						// Test component configuration
+						f_cf01Up();
+						
+						// Test adapter configuration
+						
+						// Preamble
+						v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+						
+						v_resourceIndex := f_cse_createResource(p_resourceType, p_createRequestPrimitive, v_aeIndex); 
+						
+						// Test Body
+						
+						f_cse_updateResource(p_resourceType, v_resourceIndex, p_updateRequestPrimitive);
+					
+						mcaPort.send(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))));
+					
+						tc_ac.start;
+						alt {
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+								tc_ac.stop;
+							}
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
+								tc_ac.stop;
+								setverdict(fail, __SCOPE__ & ": Error while retrieving resource attributes");
+							}
+							[] tc_ac.timeout {
+								setverdict(fail, __SCOPE__ & ": No answer while retrieving resource attributes");
+							}
+						}	
+						
+						vc_primitiveContentRetrievedResource := f_cse_retrieveResource(v_resourceIndex);
+						
+						// Postamble
+						f_cse_postamble_deleteResources();
+						
+						// Tear down
+						f_cf01Down();
+		    				
+					}//end f_CSE_DMR_UPD_010
+					
+					function f_CSE_DMR_UPD_011(ResourceType p_resourceTypeParent, template RequestPrimitive p_createParentRequestPrimitive, ResourceType p_resourceTypeChild, template RequestPrimitive p_createChildRequestPrimitive,template RequestPrimitive p_updateRequestPrimitive) runs on AeSimu {
+						//Local variables
+						var MsgIn v_response;
+						var RequestPrimitive v_request;
+						var integer v_aeIndex := -1;
+						var integer v_parentIndex := -1;
+						var integer v_childIndex := -1; 
+			   
+						// Test control
+
+						// Test component configuration
+						f_cf01Up();
+
+						// Test adapter configuration
+
+						// Preamble
+						v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+	
+						v_parentIndex := f_cse_createResource(p_resourceTypeParent, p_createParentRequestPrimitive, v_aeIndex); 
+	
+						v_childIndex := f_cse_createResource(p_resourceTypeChild, p_createChildRequestPrimitive, v_parentIndex); 
+	
+						//Test Body
+						v_request := f_getUpdateRequestPrimitive(p_resourceTypeChild, v_childIndex, p_updateRequestPrimitive);
+
+						mcaPort.send(m_request(v_request));
+						tc_ac.start;
+						alt {
+							[] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) -> value v_response {
+								tc_ac.stop;
+								setverdict(pass, __SCOPE__ & ": Not allowed to update resource " & int2str(enum2int(p_resourceTypeChild)) & " with error OPERATION_NOT_ALLOWED");
+							}
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+								tc_ac.stop;
+								setverdict(fail, __SCOPE__ & ": Wrong response status code");
+							}
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+								tc_ac.stop;
+								setverdict(fail, __SCOPE__ & ": Accepted update of resource " & int2str(enum2int(p_resourceTypeChild)));
+							}
+							[] tc_ac.timeout {
+								setverdict(fail, __SCOPE__ & ": No answer while updating resource " & int2str(enum2int(p_resourceTypeChild)));
+							}
+						}	
+						 
+						vc_primitiveContentRetrievedResource := f_cse_retrieveResource(v_childIndex);
+		
+						// Postamble
+						f_cse_postamble_deleteResources();
+
+						// Tear down
+						f_cf01Down();
+		    			
+					}//end f_CSE_DMR_UPD_011
     				
 					function f_CSE_DMR_UPD_014(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive) runs on AeSimu {
 	
@@ -4628,7 +4900,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 {
@@ -4709,7 +4981,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 {
@@ -4798,7 +5070,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 {
@@ -4819,7 +5091,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;
 							}
@@ -4880,7 +5152,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 {
@@ -4968,7 +5240,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 {
@@ -5042,7 +5314,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 {
@@ -5070,6 +5342,135 @@ module OneM2M_PermutationFunctions {
 						f_cf01Down();
                 						
 					};//end f_CSE_DMR_DEL_004
+					
+					function f_CSE_DMR_DEL_005(ResourceType p_resourceTypeParent, template RequestPrimitive p_requestPrimitiveParent, ResourceType p_resourceTypeChild, template RequestPrimitive p_requestPrimitiveChild) runs on AeSimu {
+						//Local variables
+						var MsgIn v_response;
+						var RequestPrimitive v_request;
+						var integer v_aeIndex := -1;
+						var integer v_resourceIndex := -1;
+						var integer v_childResourceIndex := -1;
+					
+						// Test control
+					
+						// Test component configuration
+						f_cf01Up();
+					
+						// Test adapter configuration
+					
+						// Preamble
+						v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+					
+						v_resourceIndex := f_cse_createResource(p_resourceTypeParent, p_requestPrimitiveParent, v_aeIndex); 
+					
+						v_childResourceIndex := f_cse_createResource(p_resourceTypeChild, p_requestPrimitiveChild, v_resourceIndex); 
+				
+						// Test Body
+						mcaPort.send(m_request(m_delete(f_getResourceAddress(v_childResourceIndex), f_getOriginator(v_childResourceIndex))));
+					
+						tc_ac.start;
+						alt {
+							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) -> value v_response {
+								tc_ac.stop;
+								setverdict(pass, __SCOPE__ & ": Resource type " & int2str(enum2int(p_resourceTypeChild)) & " deleted successfully");
+							}
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+								tc_ac.stop;
+								setverdict(fail, __SCOPE__ & ": Wrong response status code");
+							}
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+								tc_ac.stop;
+								setverdict(fail, __SCOPE__ & ": Error while deleting resource type " & int2str(enum2int(p_resourceTypeChild)));
+							}
+							[] tc_ac.timeout {
+								setverdict(fail, __SCOPE__ & ": No answer while deleting resource type " & int2str(enum2int(p_resourceTypeChild)));
+							}
+						}					
+				
+						vc_primitiveContentRetrievedResource := f_cse_retrieveResource(v_resourceIndex);
+					
+						// Postamble
+						f_cse_postamble_deleteResources();
+					
+						// Tear down
+						f_cf01Down();
+						
+					};//end f_CSE_DMR_DEL_005
+					
+					function f_CSE_DMR_DEL_006(ResourceType p_resourceTypeParent, template RequestPrimitive p_requestPrimitiveParent, ResourceType p_resourceTypeChild, template RequestPrimitive p_requestPrimitiveChild) runs on AeSimu {
+						//Local variables
+						var integer v_aeIndex := -1;
+						var integer v_parentIndex := -1;
+						var integer v_childIndex := -1; 
+						var PrimitiveContent v_attributesParent, v_attributesParent_afterDeletion;
+			   
+						// Test control
+
+						// Test component configuration
+						f_cf01Up();
+
+						// Test adapter configuration
+
+						// Preamble
+						v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+	
+						v_parentIndex := f_cse_createResource(p_resourceTypeParent, p_requestPrimitiveParent, v_aeIndex); 
+	
+						v_childIndex := f_cse_createResource(p_resourceTypeChild, p_requestPrimitiveChild, v_parentIndex); 
+	
+						v_attributesParent := f_cse_retrieveResource(v_parentIndex);
+						
+						if (p_resourceTypeParent==int3){	//Container
+							if(not(ispresent(v_attributesParent.container.currentNrOfInstances))) {
+								setverdict(fail, __SCOPE__ & ": Error the currentNrOfInstances attribute is empty");
+								f_checkAeSimuStatus();
+							}
+						}else if (p_resourceTypeParent==int29){	//TimeSeries
+							if(not(ispresent(v_attributesParent.timeSeries.currentNrOfInstances))) {
+								setverdict(fail, __SCOPE__ & ": Error the currentNrOfInstances attribute is empty");
+								f_checkAeSimuStatus();
+							}
+						}						
+		
+						// Test Body
+						f_cse_deleteResource(v_childIndex);
+
+						v_attributesParent_afterDeletion := f_cse_retrieveResource(v_parentIndex);
+	
+						if (p_resourceTypeParent==int3){	//Container
+							if(not(ispresent(v_attributesParent_afterDeletion.container.currentNrOfInstances))) {
+								setverdict(fail, __SCOPE__ & ": Error the currentNrOfInstances attribute is empty");
+								f_checkAeSimuStatus();
+							}
+						}else if (p_resourceTypeParent==int29){	//TimeSeries
+							if(not(ispresent(v_attributesParent_afterDeletion.timeSeries.currentNrOfInstances))) {
+								setverdict(fail, __SCOPE__ & ": Error the currentNrOfInstances attribute is empty");
+								f_checkAeSimuStatus();
+							}
+						}		
+	
+						if (p_resourceTypeParent==int3){	//Container
+							if((v_attributesParent.container.currentNrOfInstances > v_attributesParent_afterDeletion.container.currentNrOfInstances) and
+								(v_attributesParent.container.currentByteSize > v_attributesParent_afterDeletion.container.currentByteSize)) {
+								setverdict(pass, __SCOPE__ & ": The currentNrOfInstances and currentByteSize attributes are decreased");
+							} else {
+								setverdict(fail, __SCOPE__ & ": currentNrOfInstances and/or currentByteSize attributes are not decreased");
+							}
+						}else if (p_resourceTypeParent==int29){	//TimeSeries
+							if((v_attributesParent.timeSeries.currentNrOfInstances > v_attributesParent_afterDeletion.timeSeries.currentNrOfInstances) and
+								(v_attributesParent.timeSeries.currentByteSize > v_attributesParent_afterDeletion.timeSeries.currentByteSize)) {
+								setverdict(pass, __SCOPE__ & ": The currentNrOfInstances and currentByteSize attributes are decreased");
+							} else {
+								setverdict(fail, __SCOPE__ & ": currentNrOfInstances and/or currentByteSize attributes are not decreased");
+							}
+						}
+		
+						// Postamble
+						f_cse_postamble_deleteResources();
+
+						// Tear down
+						f_cf01Down();
+					};//end f_CSE_DMR_DEL_006
 				
 			}//end group Delete
 			
@@ -5137,7 +5538,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 {
@@ -5214,7 +5615,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 {
@@ -5281,7 +5682,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 {
@@ -5358,7 +5759,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 {
@@ -5421,7 +5822,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 {
@@ -5508,7 +5909,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 {
@@ -5581,7 +5982,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 {
 	
@@ -5616,6 +6017,74 @@ module OneM2M_PermutationFunctions {
 	
 			group Create {
 				
+				function f_CSE_SUB_CRE_001(ResourceType p_parentResourceType, template RequestPrimitive p_parentResourceRequestPrimitive, ResourceType p_childResourceType, template RequestPrimitive p_childRequestPrimitive) runs on AeSimu {
+					//Local variables
+					var MsgIn v_response;
+					var integer v_aeIndex := -1;
+					var integer v_parentResourceIndex := -1;
+					var integer v_childResourceIndex := -1;
+					var RequestPrimitive v_request;
+					var integer v_ae2Index := -1;
+					var template RequestPrimitive v_createSubscriptionRequest := m_createSubscriptionBase;
+	
+					// Test control
+	
+					// Test component configuration
+					f_cf01Up();
+	
+					// Test adapter configuration
+								
+					// Preamble
+					v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);	
+									
+					f_cse_preamble_subscriptionVerification(v_ae2Index, v_createSubscriptionRequest, int23);	
+					
+					v_parentResourceIndex := f_cse_createResource(p_parentResourceType, p_parentResourceRequestPrimitive, v_aeIndex);//Parent 	
+					
+					if(p_parentResourceType != int23){			
+						v_childResourceIndex := f_cse_createResource(p_childResourceType, p_childRequestPrimitive, v_parentResourceIndex);//Child
+					}else{
+						v_childResourceIndex := v_parentResourceIndex;
+					}
+	
+					v_request := f_getCreateRequestPrimitive(int23, v_createSubscriptionRequest, v_childResourceIndex);//Subscription under child
+	
+					// Test Body
+					mcaPort.send(m_request(v_request));
+					tc_ac.start;
+					alt {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int5203))) -> value v_response {
+							tc_ac.stop;
+							setverdict(pass, __SCOPE__ & ": Resource type " & int2str(enum2int(p_childResourceType)) & " not subscribable");
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Wrong response status code");
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Subscription successful whereas resource type " & int2str(enum2int(p_childResourceType)) & " resource is not subscribable");
+						}
+						[] tc_ac.timeout {
+							setverdict(fail, __SCOPE__ & ": No answer while creating resource");
+						}
+					}
+	
+					f_checkAeSimuStatus();
+	
+					//Check to see if the resource is NOT present
+					if(f_isResourceNotPresent(v_childResourceIndex, f_getResourceName(v_request.primitiveContent))){
+						setverdict(pass, __SCOPE__ & ":INFO: Subscription resource not created");
+					} else {
+						setverdict(fail, __SCOPE__ & ":ERROR: Subscription resource created");
+					}
+	
+					//Postamble
+					f_cse_postamble_deleteResources();
+	
+					//Tear down
+					f_cf01Down();
+				}// end f_CSE_SUB_CRE_001
 	
 			}//end group Create
 			
@@ -5684,7 +6153,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 {
@@ -5755,7 +6224,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 {
@@ -5811,7 +6280,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 {
@@ -5837,7 +6306,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 {
@@ -5885,7 +6354,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 {
@@ -5943,7 +6412,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 {
@@ -6013,7 +6482,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 {
@@ -6076,7 +6545,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 {
@@ -6134,7 +6603,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 {
@@ -6190,7 +6659,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 {
@@ -6251,7 +6720,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 {
@@ -6307,7 +6776,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 {
@@ -6368,7 +6837,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 {
@@ -6452,7 +6921,7 @@ module OneM2M_PermutationFunctions {
 					//Retrieve the parent resource index
 					v_AEAnncResourceIndex := f_getLatestResourceIndex(vc_cse1);
 					vc_cse1.start(f_cse_announcementProcedure_createHandler(p_createRequestAnnc, -, v_AEAnncResourceIndex));	
-					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 2722f4e4cda4b7360017880bc5aeeb798990e760..e370e4b93c85214005188e19d666ef83c37d93b9 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());
 					
@@ -487,17 +517,17 @@ module OneM2M_Testcases_AE_Release_1 {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__, " : AE registration request is accepted!!");
 							v_parentIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
-							v_resource := f_ae_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, v_parentIndex, v_request.primitive.requestPrimitive.resourceType);
+							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));
 							
 							//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!");
@@ -522,6 +552,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
 						var template RequestPrimitive v_createAe := mw_createAe;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute ResourceName";
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_utRequest.requestPrimitive.primitiveContent.aE.resourceName := "UNINITIALIZED";
 						v_createAe.primitiveContent.aE.resourceName := complement("UNINITIALIZED");
 						v_cse1.start(f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action));
@@ -535,6 +566,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
 						var template RequestPrimitive v_createAe := mw_createAe;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute ExpirationTime";
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_utRequest.requestPrimitive.primitiveContent.aE.expirationTime := "20301231T012345";
 						v_utRequest.forcedFields := {{name := "expirationTime", value_ := "UNINITIALIZED"}};
 						v_createAe.primitiveContent.aE.expirationTime := ?;//Check value other than "UNINITIALIZED", done by typing
@@ -549,6 +581,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
 						var template RequestPrimitive v_createAe := mw_createAe;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute Labels";
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_utRequest.requestPrimitive.primitiveContent.aE.labels := {"UNINITIALIZED"};
 						v_createAe.primitiveContent.aE.labels := complement({*,"UNINITIALIZED",*});
 						v_cse1.start(f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action));
@@ -562,6 +595,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
 						var template RequestPrimitive v_createAe := mw_createAe;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute AppName";
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_utRequest.requestPrimitive.primitiveContent.aE.appName := "UNINITIALIZED";
 						v_createAe.primitiveContent.aE.appName := complement("UNINITIALIZED");
 						v_cse1.start(f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action));
@@ -575,6 +609,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
 						var template RequestPrimitive v_createAe := mw_createAe;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute AppID";
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_utRequest.requestPrimitive.primitiveContent.aE.app_ID := "UNINITIALIZED";
 						v_createAe.primitiveContent.aE.app_ID := complement("UNINITIALIZED");
 						v_cse1.start(f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action));
@@ -588,6 +623,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
 						var template RequestPrimitive v_createAe := mw_createAe;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute PointOfAccess";
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_utRequest.requestPrimitive.primitiveContent.aE.pointOfAccess := {"UNINITIALIZED"};
 						v_createAe.primitiveContent.aE.pointOfAccess := complement({*,"UNINITIALIZED",*});
 						v_cse1.start(f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action));
@@ -601,6 +637,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
 						var template RequestPrimitive v_createAe := mw_createAe;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute OntologyRef";
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_utRequest.requestPrimitive.primitiveContent.aE.ontologyRef := "UNINITIALIZED";
 						v_createAe.primitiveContent.aE.ontologyRef := complement("UNINITIALIZED");
 						v_cse1.start(f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action));
@@ -614,6 +651,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
 						var template RequestPrimitive v_createAe := mw_createAe;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute NodeLink";
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_utRequest.requestPrimitive.primitiveContent.aE.nodeLink := "UNINITIALIZED";
 						v_createAe.primitiveContent.aE.nodeLink := complement("UNINITIALIZED");
 						v_cse1.start(f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action));
@@ -627,6 +665,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
 						var template RequestPrimitive v_createAe := mw_createAe;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute RequestReachability";
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_utRequest.requestPrimitive.primitiveContent.aE.requestReachability := true;
 						v_utRequest.forcedFields := {{name := "requestReachability", value_ := "UNINITIALIZED"}};
 						v_createAe.primitiveContent.aE.requestReachability := ?;//Check value other than UNINITIALIZED, done by typing
@@ -641,6 +680,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
 						var template RequestPrimitive v_createAe := mw_createAe;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute ContentSerialization";
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_utRequest.requestPrimitive.primitiveContent.aE.contentSerialization := {applicationxml};
 						v_utRequest.forcedFields := {{name := "contentSerialization", value_ := "UNINITIALIZED"}};
 						v_createAe.primitiveContent.aE.contentSerialization := ?;//Check value other than UNINITIALIZED, done by typing
@@ -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());
 					
@@ -682,7 +723,7 @@ module OneM2M_Testcases_AE_Release_1 {
 	
 					f_cf03Up();
 	
-					v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, -, -, omit))), vc_cSEBaseIndex, int2);
+					v_localResource := f_generateLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, -, -, omit))), vc_cSEBaseIndex, int2);
 					v_auxInteger := f_setLocalResource(v_localResource, int2, vc_cSEBaseIndex);
 					v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_auxInteger, -, -);
 					f_sendUtPrimitive(v_utRequest,v_action);
@@ -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());
 					
@@ -759,17 +801,17 @@ module OneM2M_Testcases_AE_Release_1 {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__, " : Container creation request is accepted!");
 							v_parentIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
-							v_resource := f_ae_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, v_parentIndex, v_request.primitive.requestPrimitive.resourceType);
+							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));
 							
 							//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());
 					
@@ -809,7 +852,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					f_cf03Up();
 	
 					//send triggering primitive to SUT
-					v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
+					v_localResource := f_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
 					v_containerIndex := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
 					v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_containerIndex, -, -);
 					v_requestPrimitive.to_ := v_utRequest.requestPrimitive.to_;
@@ -824,17 +867,17 @@ module OneM2M_Testcases_AE_Release_1 {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__, " : ContentInstance creation request is accepted!!");
 							v_parentIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
-							v_resource := f_ae_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, v_parentIndex, v_request.primitive.requestPrimitive.resourceType);
+							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));
 	
 							//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{
@@ -858,6 +901,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContentInstance;
 						var template RequestPrimitive v_request := mw_createContentInstance;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute ContentInfo";
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_utRequest.requestPrimitive.primitiveContent.contentInstance.contentInfo := "UNINITIALIZED";
 						v_request.primitiveContent.contentInstance.contentInfo := complement("UNINITIALIZED");
 						v_cse1.start(f_AE_DMR_CRE_003(v_utRequest,v_request,v_action));
@@ -870,6 +914,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContentInstance;
 						var template RequestPrimitive v_request := mw_createContentInstance;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute ResourceName";
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_utRequest.requestPrimitive.primitiveContent.contentInstance.resourceName := "UNINITIALIZED";
 						v_request.primitiveContent.contentInstance.resourceName := complement("UNINITIALIZED");
 						v_cse1.start(f_AE_DMR_CRE_003(v_utRequest,v_request,v_action));
@@ -882,6 +927,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContentInstance;
 						var template RequestPrimitive v_request := mw_createContentInstance;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute ExpirationTime";
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_utRequest.requestPrimitive.primitiveContent.contentInstance.expirationTime := "20301231T012345";
 						v_utRequest.forcedFields := {{name := "expirationTime", value_ := "UNINITIALIZED"}};
 						v_request.primitiveContent.contentInstance.expirationTime := ?;//Check value other than "UNINITIALIZED", done by typing
@@ -895,6 +941,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContentInstance;
 						var template RequestPrimitive v_request := mw_createContentInstance;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute Labels";
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_utRequest.requestPrimitive.primitiveContent.contentInstance.labels := {"UNINITIALIZED"};
 						v_request.primitiveContent.contentInstance.labels := complement({*,"UNINITIALIZED",*});
 						v_cse1.start(f_AE_DMR_CRE_003(v_utRequest,v_request,v_action));
@@ -907,6 +954,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContentInstance;
 						var template RequestPrimitive v_request := mw_createContentInstance;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute Creator";
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_utRequest.requestPrimitive.primitiveContent.contentInstance.creator := "UNINITIALIZED";
 						v_request.primitiveContent.contentInstance.creator := complement("UNINITIALIZED");
 						v_cse1.start(f_AE_DMR_CRE_003(v_utRequest,v_request,v_action));
@@ -929,6 +977,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
 						var template RequestPrimitive v_request := mw_createContainer;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute AccessControlPolicyIDs";
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_utRequest.requestPrimitive.primitiveContent.container.accessControlPolicyIDs := {"UNINITIALIZED"};
 						v_request.primitiveContent.container.accessControlPolicyIDs := complement({*,"UNINITIALIZED",*});
 						v_cse1.start(f_AE_DMR_CRE_004(v_utRequest,v_request,v_action));
@@ -941,6 +990,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
 						var template RequestPrimitive v_request := mw_createContainer;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute MaxNrOfInstances";
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_utRequest.requestPrimitive.primitiveContent.container.maxNrOfInstances := 1;
 						v_utRequest.forcedFields := {{name := "maxNrOfInstances", value_ := "UNINITIALIZED"}};
 						v_request.primitiveContent.container.maxNrOfInstances := ?;//Check value other than "UNINITIALIZED", done by typing
@@ -954,6 +1004,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
 						var template RequestPrimitive v_request := mw_createContainer;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute MaxByteSize";
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_utRequest.requestPrimitive.primitiveContent.container.maxByteSize := 1;
 						v_utRequest.forcedFields := {{name := "maxByteSize", value_ := "UNINITIALIZED"}};
 						v_request.primitiveContent.container.maxByteSize := ?;//Check value other than "UNINITIALIZED", done by typing
@@ -967,6 +1018,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
 						var template RequestPrimitive v_request := mw_createContainer;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute MaxInstanceAge";
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_utRequest.requestPrimitive.primitiveContent.container.maxInstanceAge := 1;
 						v_utRequest.forcedFields := {{name := "maxInstanceAge", value_ := "UNINITIALIZED"}};
 						v_request.primitiveContent.container.maxInstanceAge := ?;//Check value other than "UNINITIALIZED", done by typing
@@ -980,6 +1032,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
 						var template RequestPrimitive v_request := mw_createContainer;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute OntologyRef";
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_utRequest.requestPrimitive.primitiveContent.container.ontologyRef := "UNINITIALIZED";
 						v_request.primitiveContent.container.ontologyRef := complement("UNINITIALIZED");
 						v_cse1.start(f_AE_DMR_CRE_004(v_utRequest,v_request,v_action));
@@ -992,6 +1045,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
 						var template RequestPrimitive v_request := mw_createContainer;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute ResourceName";
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_utRequest.requestPrimitive.primitiveContent.container.resourceName := "UNINITIALIZED";
 						v_request.primitiveContent.container.resourceName := complement("UNINITIALIZED");
 						v_cse1.start(f_AE_DMR_CRE_004(v_utRequest,v_request,v_action));
@@ -1004,6 +1058,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
 						var template RequestPrimitive v_request := mw_createContainer;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute ExpirationTime";
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_utRequest.requestPrimitive.primitiveContent.container.expirationTime := "20301231T012345";
 						v_utRequest.forcedFields := {{name := "expirationTime", value_ := "UNINITIALIZED"}};
 						v_request.primitiveContent.container.expirationTime := ?;//Check value other than "UNINITIALIZED", done by typing
@@ -1017,6 +1072,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
 						var template RequestPrimitive v_request := mw_createContainer;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute Labels";
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_utRequest.requestPrimitive.primitiveContent.container.labels := {"UNINITIALIZED"};
 						v_request.primitiveContent.container.labels := complement({*,"UNINITIALIZED",*});
 						v_cse1.start(f_AE_DMR_CRE_004(v_utRequest,v_request,v_action));
@@ -1029,6 +1085,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
 						var template RequestPrimitive v_request := mw_createContainer;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute Creator";
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_utRequest.requestPrimitive.primitiveContent.container.creator := "UNINITIALIZED";
 						v_request.primitiveContent.container.creator := complement("UNINITIALIZED");
 						v_cse1.start(f_AE_DMR_CRE_004(v_utRequest,v_request,v_action));
@@ -1049,12 +1106,13 @@ 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;
 						
 						var template RequestPrimitive v_expectedUpdateRequestAe;
 						var universal charstring v_action := "Please, send a valid UPDATE Request for AE updating attribute expirationTime";
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateAe;
 						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_utRequest.requestPrimitive.primitiveContent.aE.expirationTime := "20301231T012345";
 						
 						v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentAeUpdateRequest;
@@ -1066,11 +1124,12 @@ 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;
 						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";
 						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_utRequest.requestPrimitive.primitiveContent.aE.labels := {"UNINITIALIZED"};
 						
 						v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentAeUpdateRequest;
@@ -1089,6 +1148,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateAe;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute appName";
 						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_utRequest.requestPrimitive.primitiveContent.aE.appName := "UNINITIALIZED";
 
 						v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentAeUpdateRequest;
@@ -1106,6 +1166,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateAe;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute pointOfAccess";
 						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_utRequest.requestPrimitive.primitiveContent.aE.pointOfAccess := {"UNINITIALIZED"};
 
 						v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentAeUpdateRequest;
@@ -1122,7 +1183,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template RequestPrimitive v_expectedUpdateRequestAe;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateAe;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute ontologyRef";
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_utRequest.requestPrimitive.primitiveContent.aE.ontologyRef := "UNINITIALIZED";
 
 						v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentAeUpdateRequest;
@@ -1139,7 +1200,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template RequestPrimitive v_expectedUpdateRequestAe;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateAe;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute nodeLink";
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_utRequest.requestPrimitive.primitiveContent.aE.nodeLink := "UNINITIALIZED";
 
 						v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentAeUpdateRequest;
@@ -1155,7 +1216,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template RequestPrimitive v_expectedUpdateRequestAe;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateAe;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute requestReachability";
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_utRequest.requestPrimitive.primitiveContent.aE.requestReachability := true;
 						v_utRequest.forcedFields := {{name := "requestReachability", value_ := "UNINITIALIZED"}};
 						
@@ -1172,7 +1233,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template RequestPrimitive v_expectedUpdateRequestAe;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateAe;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute contentSerialization";
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_utRequest.requestPrimitive.primitiveContent.aE.contentSerialization := {applicationxml};
 						v_utRequest.forcedFields := {{name := "contentSerialization", value_ := "UNINITIALIZED"}};
 						
@@ -1197,6 +1258,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template RequestPrimitive v_request := mw_updateContainer;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute expirationTime";
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_utRequest.requestPrimitive.primitiveContent.container.expirationTime := "20301231T012345";
 						v_request.primitiveContent.container.expirationTime := ?;
 						v_cse1.start(f_AE_DMR_UPD_002(v_utRequest,v_request,v_action));
@@ -1209,6 +1271,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template RequestPrimitive v_request := mw_updateContainer;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute labels";
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_utRequest.requestPrimitive.primitiveContent.container.labels := {"UNINITIALIZED"};
 						v_request.primitiveContent.container.labels := complement({*,"UNINITIALIZED",*});
 						v_cse1.start(f_AE_DMR_UPD_002(v_utRequest,v_request,v_action));
@@ -1221,6 +1284,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template RequestPrimitive v_request := mw_updateContainer;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute maxNrOfInstances";
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_utRequest.requestPrimitive.primitiveContent.container.maxNrOfInstances := 1;
 						v_utRequest.forcedFields := {{name := "maxNrOfInstances", value_ := "UNINITIALIZED"}};
 						v_request.primitiveContent.container.maxNrOfInstances := ?;//Check value other than "UNINITIALIZED", done by typing
@@ -1234,6 +1298,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template RequestPrimitive v_request := mw_updateContainer;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute maxByteSize";
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_utRequest.requestPrimitive.primitiveContent.container.maxByteSize := 1;
 						v_utRequest.forcedFields := {{name := "maxByteSize", value_ := "UNINITIALIZED"}};
 						v_request.primitiveContent.container.maxByteSize := ?;//Check value other than "UNINITIALIZED", done by typing
@@ -1247,6 +1312,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template RequestPrimitive v_request := mw_updateContainer;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute maxInstanceAge";
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
                         v_utRequest.requestPrimitive.primitiveContent.container.maxInstanceAge := 1;
 						v_utRequest.forcedFields := {{name := "maxInstanceAge", value_ := "UNINITIALIZED"}};
 						v_request.primitiveContent.container.maxInstanceAge := ?;//Check value other than "UNINITIALIZED", done by typing
@@ -1270,6 +1336,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for CSEBase";
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_cse1.start(f_AE_DMR_RET_001(int5, m_primitiveContentCSEBase(m_contentCreateCSEBase),v_action));
 						v_cse1.done;
 					}
@@ -1278,6 +1345,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for AE";
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_cse1.start(f_AE_DMR_RET_001(int2, m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit)),v_action));
 						v_cse1.done;
 					}
@@ -1286,6 +1354,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for Container";
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_cse1.start(f_AE_DMR_RET_001(int3, m_primitiveContentContainer(m_contentCreateContainer()),v_action));
 						v_cse1.done;
 					}
@@ -1299,6 +1368,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());
 					
@@ -1320,7 +1390,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					f_cf03Up();
 	
 					//send triggering primitive to SUT
-					v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
+					v_localResource := f_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
 					v_resourceIndex := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
 					v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_resourceIndex) & "/" & c_resourceShortNameOldest;
 					f_sendUtPrimitive(v_utRequest,v_action);
@@ -1333,12 +1403,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 +1426,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());
 					
@@ -1377,7 +1448,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					f_cf03Up();
 	
 					//send triggering primitive to SUT
-					v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
+					v_localResource := f_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
 					v_resourceIndex := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
 					v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_resourceIndex) & "/" & c_resourceShortNameLatest;
 					f_sendUtPrimitive(v_utRequest,v_action);
@@ -1390,12 +1461,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 +1484,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());
 					
@@ -1434,7 +1506,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					f_cf03Up();
 
 					//send triggering primitive to SUT
-					v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
+					v_localResource := f_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
 					v_resourceIndex := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
 					v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_resourceIndex);
 					f_sendUtPrimitive(v_utRequest,v_action);
@@ -1447,12 +1519,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 +1542,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());
 					
@@ -1491,7 +1564,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					f_cf03Up();
 
 					//send triggering primitive to SUT
-					v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContentInstance(m_contentCreateContentInstance)), vc_cSEBaseIndex, int4);
+					v_localResource := f_generateLocalResource(valueof(m_primitiveContentContentInstance(m_contentCreateContentInstance)), vc_cSEBaseIndex, int4);
 					v_resourceIndex := f_setLocalResource(v_localResource, int4, vc_cSEBaseIndex);
 					v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_resourceIndex);
 					f_sendUtPrimitive(v_utRequest,v_action);
@@ -1504,12 +1577,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 +1604,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());
 					
@@ -1552,7 +1626,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					f_cf03Up();
 
 					//send triggering primitive to SUT
-					v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
+					v_localResource := f_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
 					v_resourceIndex := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
 					v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_resourceIndex) & "/" & c_resourceShortNameOldest;
 					f_sendUtPrimitive(v_utRequest,v_action);
@@ -1568,7 +1642,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 +1665,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());
 					
@@ -1612,7 +1687,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					f_cf03Up();
 
 					//send triggering primitive to SUT
-					v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
+					v_localResource := f_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
 					v_resourceIndex := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
 					v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_resourceIndex) & "/" & c_resourceShortNameLatest;
 					f_sendUtPrimitive(v_utRequest,v_action);
@@ -1628,7 +1703,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 +1726,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());
 					
@@ -1672,7 +1748,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					f_cf03Up();
 
 					//send triggering primitive to SUT
-					v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
+					v_localResource := f_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
 					v_resourceIndex := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
 					v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_resourceIndex);
 					f_sendUtPrimitive(v_utRequest,v_action);
@@ -1688,7 +1764,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 +1787,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());
 					
@@ -1732,7 +1809,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					f_cf03Up();
 
 					//send triggering primitive to SUT
-					v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContentInstance(m_contentCreateContentInstance)), vc_cSEBaseIndex, int4);
+					v_localResource := f_generateLocalResource(valueof(m_primitiveContentContentInstance(m_contentCreateContentInstance)), vc_cSEBaseIndex, int4);
 					v_resourceIndex := f_setLocalResource(v_localResource, int4, vc_cSEBaseIndex);
 					v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_resourceIndex);
 					f_sendUtPrimitive(v_utRequest,v_action);
@@ -1748,7 +1825,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 +1857,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());
 					
@@ -1810,17 +1888,17 @@ module OneM2M_Testcases_AE_Release_1 {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__, " : Subscription creation request is accepted!");
 							v_parentIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
-							v_resource := f_ae_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, v_parentIndex, v_request.primitive.requestPrimitive.resourceType);
+							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));
 							
 							//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!");
@@ -1843,6 +1921,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
 						var template RequestPrimitive v_requestT := mw_createSubscription;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute accessControlPolicyIDs";
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_utRequest.requestPrimitive.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
 						v_utRequest.requestPrimitive.primitiveContent.subscription.accessControlPolicyIDs := {"UNINITIALIZED"};
 						v_requestT.primitiveContent.subscription.notificationURI := complement({*,"UNINITIALIZED",*});
@@ -1859,6 +1938,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
 						var template RequestPrimitive v_requestT := mw_createSubscription;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute createdBefore";
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_utRequest.requestPrimitive.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
 						v_utRequest.requestPrimitive.primitiveContent.subscription.eventNotificationCriteria := m_eventNotificationCriteria();
 						v_utRequest.requestPrimitive.primitiveContent.subscription.eventNotificationCriteria.createdBefore := "20301231T012345";
@@ -1877,7 +1957,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
 						var template RequestPrimitive v_requestT := mw_createSubscription;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute expirationCounter";
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_utRequest.requestPrimitive.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
 						v_utRequest.requestPrimitive.primitiveContent.subscription.expirationCounter := 1;
 						v_utRequest.forcedFields := {{name := "expirationCounter", value_ := "UNINITIALIZED"}};
@@ -1895,6 +1975,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
 						var template RequestPrimitive v_requestT := mw_createSubscription;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute notificationForwardingURI";
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_utRequest.requestPrimitive.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
 						v_utRequest.requestPrimitive.primitiveContent.subscription.notificationForwardingURI := "UNINITIALIZED";
 						v_requestT.primitiveContent.subscription.notificationURI := complement({*,"UNINITIALIZED",*});
@@ -1911,6 +1992,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
 						var template RequestPrimitive v_requestT := mw_createSubscription;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute notificationContentType";
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_utRequest.requestPrimitive.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
 						v_utRequest.requestPrimitive.primitiveContent.subscription.notificationContentType := int1;
 						v_utRequest.forcedFields := {{name := "notificationContentType", value_ := "UNINITIALIZED"}};
@@ -1928,6 +2010,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
 						var template RequestPrimitive v_requestT := mw_createSubscription;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute notificationEventCat";
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_utRequest.requestPrimitive.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
 						v_utRequest.requestPrimitive.primitiveContent.subscription.notificationEventCat.alt_1 := 100;
 						v_utRequest.forcedFields := {{name := "alt_1", value_ := "UNINITIALIZED"}};
@@ -1945,6 +2028,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
 						var template RequestPrimitive v_requestT := mw_createSubscription;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute subscriberURI";
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_utRequest.requestPrimitive.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
 						v_utRequest.requestPrimitive.primitiveContent.subscription.subscriberURI := "UNINITIALIZED";
 						v_requestT.primitiveContent.subscription.notificationURI := complement({*,"UNINITIALIZED",*});
@@ -1968,6 +2052,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());
 					
@@ -1997,17 +2082,17 @@ module OneM2M_Testcases_AE_Release_1 {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__, " : AE registration request is accepted!!");
 							v_parentIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
-							v_resource := f_ae_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, v_parentIndex, v_request.primitive.requestPrimitive.resourceType);
+							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));
 							
 							//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!");
@@ -2029,17 +2114,17 @@ module OneM2M_Testcases_AE_Release_1 {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__, " : Subscription creation request is accepted!");
 							v_parentIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
-							v_resource := f_ae_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, v_parentIndex, v_request.primitive.requestPrimitive.resourceType);
+							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));
 							
 							//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!");
@@ -2049,7 +2134,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{
@@ -2077,6 +2162,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());
 					
@@ -2106,17 +2192,17 @@ module OneM2M_Testcases_AE_Release_1 {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__, " : AE registration request is accepted!!");
 							v_parentIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
-							v_resource := f_ae_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, v_parentIndex, v_request.primitive.requestPrimitive.resourceType);
+							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));
 							
 							//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!");
@@ -2138,17 +2224,17 @@ module OneM2M_Testcases_AE_Release_1 {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__, " : Subscription creation request is accepted!");
 							v_parentIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
-							v_resource := f_ae_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, v_parentIndex, v_request.primitive.requestPrimitive.resourceType);
+							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));
 							
 							//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!");
@@ -2158,7 +2244,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 e80720fc489b558523ecb695766668930a6c5938..41bafcdd03ba886cdf5e5b0d562637275d39dde3 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,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_cseRelative));
 						v_ae1.done;
@@ -102,6 +103,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 +112,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 +130,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 +140,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 +150,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 +171,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 +181,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 +190,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 +208,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 +218,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 +228,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 +248,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 +257,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 +267,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 +285,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 +295,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 +305,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 +326,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 +336,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 +346,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 +364,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 +374,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 +384,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 +407,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 +441,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 +476,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 +503,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 +537,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 +555,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());
 					
 				
@@ -539,7 +567,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				 */
 				testcase TC_CSE_REG_CRE_004() runs on Tester system CseSystem {
 					
-				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						
 					v_ae1.start(f_CSE_REG_CRE_004());
 			  	  	
@@ -572,7 +601,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 +638,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 +711,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 +768,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 +795,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 +837,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 +869,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 +909,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 +952,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 +988,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 +1023,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 +1071,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 +1099,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 {
@@ -1106,7 +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;
 						var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, PX_AE1_ID_STEM);
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_create.primitiveContent.aE.labels := {"labels"};
 						v_ae1.start(f_CSE_REG_CRE_012(v_create));
 						v_ae1.done;
@@ -1115,6 +1151,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;
 						var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, PX_AE1_ID_STEM);
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						
 						v_create.primitiveContent.aE.appName := "AeAppName";
 						v_ae1.start(f_CSE_REG_CRE_012(v_create));
@@ -1124,7 +1161,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;
 						var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, PX_AE1_ID_STEM);
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_create.primitiveContent.aE.pointOfAccess := {PX_AE1_ADDRESS};
 						v_ae1.start(f_CSE_REG_CRE_012(v_create));
 						v_ae1.done;
@@ -1143,6 +1180,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 +1194,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 +1207,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 +1221,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 +1239,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 +1269,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,8 +1308,9 @@ module OneM2M_Testcases_CSE_Release_1 {
 						
 						//Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template RequestPrimitive v_createRequest := m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM);
 						
+						var template RequestPrimitive v_createRequest := m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM);
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.aE.app_ID := omit;	//Mandatory app_ID field is being set empty
 	
 						v_ae1.start(f_CSE_REG_CRE_017(v_createRequest));
@@ -1279,7 +1322,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM);
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.aE.requestReachability := omit;	//Mandatory requestReachability field is being set empty
 						
 						v_ae1.start(f_CSE_REG_CRE_017(v_createRequest));
@@ -1296,6 +1339,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 +1367,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 +1404,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 +1432,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 +1466,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 +1498,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 +1561,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 +1591,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 +1622,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 +1648,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 +1689,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 +1719,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 +1750,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 +1791,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 +1816,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 +1842,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,9 +1882,11 @@ 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;
+						
 						var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
 						var template RequestPrimitive v_request := mw_createRemoteCSE;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a CSE registration request with optional attribute resourceName";
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_utRequest.requestPrimitive.primitiveContent.remoteCSE.resourceName := "UNINITIALIZED";
 						v_request.primitiveContent.remoteCSE.resourceName := ?;
 						v_cse1.start(f_CSE_REG_CRE_026(v_utRequest,v_request,v_action));
@@ -1845,6 +1898,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
 						var template RequestPrimitive v_request := mw_createRemoteCSE;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a CSE registration request with optional attribute expirationTime";
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_utRequest.requestPrimitive.primitiveContent.remoteCSE.expirationTime := "20301231T012345";
 						v_request.primitiveContent.remoteCSE.expirationTime := ?;
 						v_cse1.start(f_CSE_REG_CRE_026(v_utRequest,v_request,v_action));
@@ -1856,6 +1910,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
 						var template RequestPrimitive v_request := mw_createRemoteCSE;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a CSE registration request with optional attribute labels";
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_utRequest.requestPrimitive.primitiveContent.remoteCSE.labels := {"UNINITIALIZED"};
 						v_request.primitiveContent.remoteCSE.labels := ?;
 						v_cse1.start(f_CSE_REG_CRE_026(v_utRequest,v_request,v_action));
@@ -1867,6 +1922,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
 						var template RequestPrimitive v_request := mw_createRemoteCSE;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a CSE registration request with optional attribute pointOfAccess";
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_utRequest.requestPrimitive.primitiveContent.remoteCSE.pointOfAccess := {"UNINITIALIZED"};
 						v_request.primitiveContent.remoteCSE.pointOfAccess := ?;
 						v_cse1.start(f_CSE_REG_CRE_026(v_utRequest,v_request,v_action));
@@ -1878,6 +1934,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
 						var template RequestPrimitive v_request := mw_createRemoteCSE;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a CSE registration request with optional attribute nodeLink";
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_utRequest.requestPrimitive.primitiveContent.remoteCSE.nodeLink := "UNINITIALIZED";
 						v_request.primitiveContent.remoteCSE.nodeLink := ?;
 						v_cse1.start(f_CSE_REG_CRE_026(v_utRequest,v_request,v_action));
@@ -1889,6 +1946,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
 						var template RequestPrimitive v_request := mw_createRemoteCSE;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a CSE registration request with optional attribute cseType";
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_utRequest.requestPrimitive.primitiveContent.remoteCSE.cseType := int1;//TODO It should be marked as "UNITIALIZED"
 						v_request.primitiveContent.remoteCSE.cseType := ?;
 						v_cse1.start(f_CSE_REG_CRE_026(v_utRequest,v_request,v_action));
@@ -1904,6 +1962,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,10 +2016,11 @@ 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;
+						
 						 var RequestPrimitive v_request;
 						 var template PrimitiveContent v_contentResponse;
 						 var Labels v_labels_1 := {"VALUE_1"};
-		 
+						 f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						 v_request := valueof(m_createRemoteCSEBase);
 						 v_request.primitiveContent.remoteCSE.cseType := int2;	//MN_CSE
 						 v_request.primitiveContent.remoteCSE.labels := v_labels_1;
@@ -1977,9 +2037,10 @@ 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;
+						
 						 var RequestPrimitive v_request;
 						 var template PrimitiveContent v_contentResponse;
-		 
+						 f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						 v_request := valueof(m_createRemoteCSEBase);
 						 v_request.primitiveContent.remoteCSE.cseType := int2;	//MN_CSE
 						 v_request.primitiveContent.remoteCSE.pointOfAccess := {"http://" & PX_CSE1_ADDRESS & "/"};
@@ -1996,10 +2057,11 @@ 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;
+						
 						 var RequestPrimitive v_request;
 						 var template PrimitiveContent v_contentResponse;
-	 
-									 v_request := valueof(m_createRemoteCSEBase);
+						 f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						 v_request := valueof(m_createRemoteCSEBase);
 						 v_request.primitiveContent.remoteCSE.cseType := int2;	//MN_CSE
 						 v_request.primitiveContent.remoteCSE.nodeLink := c_defaultNodeID;
 	
@@ -2025,6 +2087,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 +2115,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,8 +2157,9 @@ 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;
+						
 						var template PrimitiveContent v_contentResponse;
-					
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.cSEBase := mw_contentCSEBase_rc1;
 						v_contentResponse.cSEBase.cseType := ?;
 						    
@@ -2107,7 +2171,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						//Local variables
 						 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						 var template PrimitiveContent v_contentResponse;
-	
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						 v_contentResponse.cSEBase := mw_contentCSEBase_rc1;
 						 v_contentResponse.cSEBase.nodeLink := ?;
 	    
@@ -2125,7 +2189,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());
 						  	  	
 					v_ae1.done;
@@ -2151,7 +2215,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,8 +2260,9 @@ 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;
-						var template PrimitiveContent v_contentResponse;
 						
+						var template PrimitiveContent v_contentResponse;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.aE.labels := v_labels_1;
 	
 						v_contentResponse.aE := mw_contentAeBase;
@@ -2210,9 +2275,10 @@ 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;
+						
 						 var template RequestPrimitive v_createRequest := m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM);
 						 var template PrimitiveContent v_contentResponse;
-						 
+						 f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						 v_createRequest.primitiveContent.aE.appName := "AeAppName";
 
 						 v_contentResponse.aE := mw_contentAeBase;
@@ -2227,7 +2293,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						 var template RequestPrimitive v_createRequest := m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM);
 						 var template PrimitiveContent v_contentResponse;
-						 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						 v_createRequest.primitiveContent.aE.pointOfAccess := {PX_AE1_ADDRESS};
 
 						 v_contentResponse.aE := mw_contentAeBase;
@@ -2246,7 +2312,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());
 						  	  	
 					v_ae1.done;
@@ -2274,7 +2340,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 +2395,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 +2424,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 +2453,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,10 +2495,11 @@ 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;
+						
 						var Labels v_labels_1 := {"VALUE_1"};
 						var template RequestPrimitive v_createRequest := m_createRemoteCSEBase;
 						var template PrimitiveContent v_contentResponse;
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_createRequest.primitiveContent.remoteCSE.labels := v_labels_1;
 
 						v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
@@ -2444,9 +2512,10 @@ 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;
+						
 						var template RequestPrimitive v_createRequest := m_createRemoteCSEBase;
 						var template PrimitiveContent v_contentResponse;
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_createRequest.primitiveContent.remoteCSE.cseType := int1;
 
 						v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
@@ -2459,9 +2528,10 @@ 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;
+						
 						var template RequestPrimitive v_createRequest := m_createRemoteCSEBase;
 						var template PrimitiveContent v_contentResponse;
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_createRequest.primitiveContent.remoteCSE.pointOfAccess := {"http://" & PX_CSE1_ADDRESS & "/"};
 
 						v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
@@ -2474,9 +2544,10 @@ 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;
+						
 						var template RequestPrimitive v_createRequest := m_createRemoteCSEBase;
 						var template PrimitiveContent v_contentResponse;
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_createRequest.primitiveContent.remoteCSE.nodeLink := c_defaultNodeID;
 
 						v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
@@ -2495,6 +2566,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 +2594,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 +2646,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 +2711,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 +2745,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 +2787,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 +2817,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 +2852,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 +2865,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 +2878,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 +2900,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 +2915,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 +2930,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 +2945,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 +2960,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 +2983,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 +3009,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 +3040,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 +3070,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 +3114,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 +3139,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 +3175,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 +3252,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 +3271,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 +3293,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 +3315,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 +3337,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 +3359,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 +3381,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 +3403,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 +3424,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 +3445,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 +3466,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 +3486,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 +3506,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 +3535,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 +3558,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 +3580,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 +3602,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 +3631,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 +3641,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 +3651,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 +3661,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 +3679,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 +3689,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 +3699,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 +3709,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 +3728,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 +3742,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 +3757,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 +3780,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 +3799,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 +3819,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 +3872,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 +3952,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 +4022,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 +4095,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 +4167,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 {
@@ -4101,7 +4219,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						const AttributeList c_optionalAttribute := {"accessControlPolicyIDs"};
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.container.accessControlPolicyIDs := {"NotInitialized"};
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int3, v_createRequest, c_optionalAttribute));			
@@ -4113,7 +4231,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						const AttributeList c_optionalAttribute := {"labels"};
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.container.labels := {"MyLabel"};
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int3, v_createRequest, c_optionalAttribute));
@@ -4126,7 +4244,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						const AttributeList c_optionalAttribute := {"maxNrOfInstances"};
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.container.maxNrOfInstances := 0;
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int3, v_createRequest, c_optionalAttribute));
@@ -4139,7 +4257,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						const AttributeList c_optionalAttribute := {"maxByteSize"};
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.container.maxByteSize := 0;
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int3, v_createRequest, c_optionalAttribute));
@@ -4152,7 +4270,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						const AttributeList c_optionalAttribute := {"maxInstanceAge"};
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.container.maxInstanceAge := 0;
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int3, v_createRequest, c_optionalAttribute));
@@ -4165,7 +4283,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AttributeList v_optionalAttribute := {"creator"};
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.container.creator := "NullValue";
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int3, v_createRequest, v_optionalAttribute));
@@ -4178,7 +4296,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
 						const AttributeList c_optionalAttribute := {"labels"};
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.contentInstance.labels := {"MyLabel"};
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int4, v_createRequest, c_optionalAttribute));
@@ -4191,7 +4309,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
 						var AttributeList v_optionalAttribute := {"creator"};
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.contentInstance.creator := "NullValue";
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int4, v_createRequest, v_optionalAttribute));
@@ -4204,7 +4322,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
 						const AttributeList c_optionalAttribute := {"contentInfo"};
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.contentInstance.contentInfo := "MyContentInfo";
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int4, v_createRequest, c_optionalAttribute));
@@ -4217,7 +4335,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createAcpBase;
 						const AttributeList c_optionalAttribute := {"labels"};
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.accessControlPolicy.labels := {"MyLabel"};
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int1, v_createRequest, c_optionalAttribute));
@@ -4230,7 +4348,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"accessControlPolicyIDs"};
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.subscription.accessControlPolicyIDs := {"NotInitialized"};
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));			
@@ -4242,7 +4360,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"labels"};
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.subscription.labels := {"MyLabel"};
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
@@ -4255,7 +4373,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var AttributeList v_optionalAttribute := {"creator"};
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.subscription.creator := "NullValue";
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, v_optionalAttribute));
@@ -4296,7 +4414,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 {
@@ -4340,7 +4458,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var ResponsePrimitive v_responsePrimitive;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						const integer c_maxByteSize := 512;	
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_parentResourceRequest.primitiveContent.container.maxByteSize := c_maxByteSize;
 						
 						v_ae1.start(f_CSE_DMR_CRE_014(int3, v_parentResourceRequest, int4, v_childResourceRequest));		
@@ -4365,9 +4483,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var ResponsePrimitive v_responsePrimitive;
 						var template PrimitiveContent v_contentResponse;
-					
 						v_contentResponse.container := mw_contentContainer_rc1;
-						    
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1); 
 						v_ae1.start(f_CSE_DMR_RET_001(int3, m_createContainerBase, v_contentResponse));//Container
 						v_ae1.done;
 						
@@ -4378,7 +4495,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var ResponsePrimitive v_responsePrimitive;
 						var template PrimitiveContent v_contentResponse;
-					
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.group_ := mw_contentGroup_rc1;
                         
 						v_ae1.start(f_CSE_DMR_RET_001(int9, m_createGroupBase, v_contentResponse));//Group
@@ -4391,7 +4508,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var ResponsePrimitive v_responsePrimitive;
 						var template PrimitiveContent v_contentResponse;
-					
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.accessControlPolicy := mw_contentAcp_rc1;
 							
 						v_ae1.start(f_CSE_DMR_RET_001(int1, m_createAcpBase, v_contentResponse));//AccessControlPolicy
@@ -4402,11 +4519,12 @@ 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;
+						
 						var ResponsePrimitive v_responsePrimitive;
 						var template PrimitiveContent v_contentResponse;
 					
 						v_contentResponse.subscription := mw_contentSubscription_rc1;
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_ae1.start(f_CSE_DMR_RET_001(int23, m_createSubscriptionBase, v_contentResponse));//Subscription
 						v_ae1.done;
 					
@@ -4415,9 +4533,10 @@ 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;
+						
 						var ResponsePrimitive v_responsePrimitive;
 						var template PrimitiveContent v_contentResponse;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.contentInstance := mw_contentContentInstance_rc1;
 	
 						v_ae1.start(f_CSE_DMR_RET_001(int4, m_createContentInstanceBase, v_contentResponse));//ContentInstance
@@ -4437,6 +4556,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 +4565,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,8 +4574,9 @@ 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;
-						var template RequestPrimitive v_requestPrimitive := m_createAcpBase;
 						
+						var template RequestPrimitive v_requestPrimitive := m_createAcpBase;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_requestPrimitive.primitiveContent.accessControlPolicy.selfPrivileges.accessControlRule_list[0].accessControlOperations := int61;
 						
 						v_ae1.start(f_CSE_DMR_RET_003(int1, v_requestPrimitive));//AccessControlPolicy
@@ -4464,6 +4586,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 +4628,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 +4699,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 {
@@ -4621,7 +4744,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-					
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.accessControlPolicy := mw_contentAcp_rc1;
 							
 						v_ae1.start(f_CSE_DMR_RET_013(int1, m_createAcpBase, v_contentResponse));//AccessControlPolicy
@@ -4633,7 +4756,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-					
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.aE := mw_contentAeBase;
 							
 						v_ae1.start(f_CSE_DMR_RET_013(int2, m_createAe(PX_APP_ID,-,PX_AE1_ID_STEM), v_contentResponse));//AE
@@ -4645,7 +4768,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-					
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.container := mw_contentContainer_rc1;
 						    
 						v_ae1.start(f_CSE_DMR_RET_013(int3, m_createContainerBase, v_contentResponse));//Container
@@ -4657,7 +4780,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-					
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.group_ := mw_contentGroup_rc1;
                         
 						v_ae1.start(f_CSE_DMR_RET_013(int9, m_createGroupBase, v_contentResponse));//Group
@@ -4669,7 +4792,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-					
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
 							
 						v_ae1.start(f_CSE_DMR_RET_013(int16, m_createRemoteCSEBase, v_contentResponse));//RemoteCSE
@@ -4681,7 +4804,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-					
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.subscription := mw_contentSubscription_rc1;
 						
 						v_ae1.start(f_CSE_DMR_RET_013(int23, m_createSubscriptionBase, v_contentResponse));//Subscription
@@ -4700,8 +4823,9 @@ 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;
-						var template RequestPrimitive v_requestPrimitive := m_createAcpBase;
 						
+						var template RequestPrimitive v_requestPrimitive := m_createAcpBase;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_requestPrimitive.primitiveContent.accessControlPolicy.selfPrivileges.accessControlRule_list[0].accessControlOperations := int61;
 						
 						v_ae1.start(f_CSE_DMR_RET_014(int1, v_requestPrimitive));//AccessControlPolicy
@@ -4711,6 +4835,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 +4844,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 +4853,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 +4863,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 +4872,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,13 +4892,14 @@ 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;
+						
 						var Labels v_labels_1 := {"VALUE_1"};
 						var Labels v_labels_2:= {"VALUE_2"};
 						var ResponsePrimitive v_responsePrimitive;
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.container.labels := v_labels_1;
 						v_updateRequest.primitiveContent.container.labels := v_labels_2;
 						
@@ -4802,13 +4932,14 @@ 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;
+						
 						var Labels v_labels_1 := {"VALUE_1"};
 						var Labels v_labels_2 := {"VALUE_2"};
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.group_.labels := v_labels_1;
 						v_updateRequest.primitiveContent.group_.labels := v_labels_2;
 
@@ -4841,13 +4972,14 @@ 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;
+						
 						var Labels v_labels_1 := {"VALUE_1"};
 						var Labels v_labels_2 := {"VALUE_2"};
 						var template RequestPrimitive v_createRequest := m_createAcpBase;
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.accessControlPolicy.labels := v_labels_1;
 						v_updateRequest.primitiveContent.accessControlPolicy.labels := v_labels_2;
 
@@ -4880,13 +5012,14 @@ 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;
+					
 						var Labels v_labels_1 := {"VALUE_1"};
 						var Labels v_labels_2 := {"VALUE_2"};
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.subscription.labels := v_labels_1;
 						v_updateRequest.primitiveContent.subscription.labels := v_labels_2;
 
@@ -4928,11 +5061,12 @@ 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;
+						
 						var Labels v_labels_1 := {"VALUE_1"};
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.container.labels := v_labels_1;
                         
 						v_ae1.start(f_CSE_DMR_UPD_002(int3, m_createContainerBase, v_updateRequest));//Container
@@ -4964,11 +5098,12 @@ 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;
+						
 						var Labels v_labels_1 := {"VALUE_1"};
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.group_.labels := v_labels_1;
 						
 						v_ae1.start(f_CSE_DMR_UPD_002(int9, m_createGroupBase, v_updateRequest));//Group
@@ -5000,11 +5135,12 @@ 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;
+						
 						var Labels v_labels_1 := {"VALUE_1"};
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.accessControlPolicy.labels := v_labels_1;
 							
 						v_ae1.start(f_CSE_DMR_UPD_002(int1, m_createAcpBase,v_updateRequest));//AccessControlPolicy
@@ -5036,11 +5172,12 @@ 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;
+						
 						var Labels v_labels_1 := {"VALUE_1"};
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.subscription.labels := v_labels_1;
 						
 						v_ae1.start(f_CSE_DMR_UPD_002(int23, m_createSubscriptionBase,v_updateRequest));//Subscription
@@ -5080,6 +5217,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;
+					
 						var Labels v_labels_1 := {"VALUE_1"};
 						var Labels v_labels_2 := {"To be deleted"};
 						var AttributeAux_list v_nullFields;
@@ -5087,7 +5225,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.container.labels := v_labels_1;
 						v_updateRequest.primitiveContent.container.labels := v_labels_2;
 						
@@ -5126,6 +5264,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;
+						
 						var Labels v_labels_1 := {"VALUE_1"};
 						var Labels v_labels_2 := {"To be deleted"};
 						var AttributeAux_list v_nullFields;
@@ -5133,7 +5272,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.group_.labels := v_labels_1;
 						v_updateRequest.primitiveContent.group_.labels := v_labels_2;
 						
@@ -5170,6 +5309,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;
+						
 						var Labels v_labels_1 := {"VALUE_1"};
 						var Labels v_labels_2 := {"To be deleted"};
 						var AttributeAux_list v_nullFields;
@@ -5177,7 +5317,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createAcpBase;
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.accessControlPolicy.labels := v_labels_1;
 						v_updateRequest.primitiveContent.accessControlPolicy.labels := v_labels_2;
 						
@@ -5214,6 +5354,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;
+						
 						var Labels v_labels_1 := {"VALUE_1"};
 						var Labels v_labels_2 := {"To be deleted"};
 						var AttributeAux_list v_nullFields;
@@ -5221,7 +5362,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.subscription.labels := v_labels_1;
 						v_updateRequest.primitiveContent.subscription.labels := v_labels_2;
 						
@@ -5273,7 +5414,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var ResponsePrimitive v_responsePrimitive;
 						var AttributeAux_list v_nullFields;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.container.labels := v_labels_1;//Attribute 3
 						v_updateRequest.primitiveContent.container.expirationTime := "20301231T012345";//Attribute 1
 						v_updateRequest.primitiveContent.container.maxNrOfInstances := 5;//Attribute 2
@@ -5336,7 +5477,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-												
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);					
 						v_createRequest.primitiveContent.group_.labels := v_labels_1;//Attribute 3
 						v_updateRequest.primitiveContent.group_.expirationTime := "20301231T012345";//Attribute 1
 						v_updateRequest.primitiveContent.group_.groupName:= v_groupName_1;//Attribute 2
@@ -5399,7 +5540,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.accessControlPolicy.labels := v_labels_1;//Attribute 3
 						v_createRequest.primitiveContent.accessControlPolicy.privileges.accessControlRule_list := {};//Attribute 2
 						v_updateRequest.primitiveContent.accessControlPolicy.selfPrivileges := v_selfprivileges_2; //Attribute 1
@@ -5462,7 +5603,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.accessControlPolicy.labels := v_labels_1;//Attribute 3
 						v_updateRequest.primitiveContent.accessControlPolicy.privileges := v_privileges_2; //Attribute 1
 						v_updateRequest.primitiveContent.accessControlPolicy.announceTo := {f_getAnnouncementTargetPoA()};//Attribute 2
@@ -5522,7 +5663,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.subscription.expirationCounter := 10;//Attribute 3
 						v_updateRequest.primitiveContent.subscription.expirationTime := "20301231T012345";//Attribute 1
 						v_updateRequest.primitiveContent.subscription.labels := v_labels_1;//Attribute 2
@@ -5582,6 +5723,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 +5763,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 {
@@ -5663,7 +5805,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var Labels v_labels_1 := {"VALUE_1"};
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.container.labels := v_labels_1;
 						
 						v_ae1.start(f_CSE_DMR_UPD_006(int3, m_createContainerBase, v_updateRequest));//Container
@@ -5686,7 +5828,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var Labels v_labels_1 := {"VALUE_1"};
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.group_.labels := v_labels_1;
 						
 						v_ae1.start(f_CSE_DMR_UPD_006(int9, m_createGroupBase, v_updateRequest));//Group
@@ -5710,7 +5852,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 						var template RequestPrimitive v_requestPrimitive := m_createAcpBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_requestPrimitive.primitiveContent.accessControlPolicy.selfPrivileges.accessControlRule_list[0].accessControlOperations := int59;
 
 						v_updateRequest.primitiveContent.accessControlPolicy.labels := v_labels_1;
@@ -5735,7 +5877,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var Labels v_labels_1 := {"VALUE_1"};
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.subscription.labels := v_labels_1;
 								
 						v_ae1.start(f_CSE_DMR_UPD_006(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
@@ -5766,7 +5908,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var Timestamp v_creationTime := "21001231T012345";
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent := {container_update_invalid := m_contentUpdateContainer_invalid};
 						v_updateRequest.primitiveContent.container_update_invalid.creationTime := v_creationTime;
 						
@@ -5790,7 +5932,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var Timestamp v_creationTime := "21001231T012345";
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent := {group_update_invalid := m_contentUpdateGroup_invalid};
 						v_updateRequest.primitiveContent.group_update_invalid.creationTime := v_creationTime;
 						
@@ -5814,7 +5956,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var Timestamp v_creationTime := "21001231T012345";
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent := {aCP_update_invalid := m_contentUpdateAcp_invalid};
 						v_updateRequest.primitiveContent.aCP_update_invalid.creationTime := v_creationTime;
 								
@@ -5838,7 +5980,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var Timestamp v_creationTime := "21001231T012345";
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent := {subscription_update_invalid := m_contentUpdateSubscription_invalid};
 						v_updateRequest.primitiveContent.subscription_update_invalid.creationTime := v_creationTime;
 								
@@ -5871,7 +6013,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 						var AttributeAux_list v_nullFields;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_nullFields := {{"maxNrOfMembers", omit}};
 						
 						v_updateRequest.primitiveContent.group_.maxNrOfMembers := 1;
@@ -5897,7 +6039,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 						var AttributeAux_list v_nullFields;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_nullFields := {{"selfPrivileges", omit}};
 						
 						v_updateRequest.primitiveContent.accessControlPolicy.selfPrivileges := v_selfPrivileges;
@@ -5922,7 +6064,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var AttributeAux_list v_nullFields;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_nullFields := {{"notificationURI", omit}};
 						
 						v_updateRequest.primitiveContent.subscription.notificationURI := {"NullTarget"};
@@ -5955,7 +6097,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var XSD.PositiveInteger v_expirationCounter := 1;
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
-	
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent := {container_update_invalid := m_contentUpdateContainer_invalid};
 
 						v_updateRequest.primitiveContent.container_update_invalid.expirationCounter := v_expirationCounter;
@@ -5970,7 +6112,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var XSD.PositiveInteger v_expirationCounter := 1;
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
-	
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent := {group_update_invalid := m_contentUpdateGroup_invalid};
 	
 						v_updateRequest.primitiveContent.group_update_invalid.expirationCounter := v_expirationCounter;
@@ -5985,7 +6127,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var XSD.PositiveInteger v_expirationCounter := 1;
 						var template RequestPrimitive v_createRequest := m_createAcpBase;
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
-	
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent := {aCP_update_invalid := m_contentUpdateAcp_invalid};
 	
 						v_updateRequest.primitiveContent.aCP_update_invalid.expirationCounter := v_expirationCounter;
@@ -6000,7 +6142,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var XSD.NonNegativeInteger v_maxNrOfInstances := 5;
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent := {subscription_update_invalid := m_contentUpdateSubscription_invalid};
 	
 						v_updateRequest.primitiveContent.subscription_update_invalid.maxNrOfInstances := v_maxNrOfInstances;
@@ -6042,7 +6184,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 		
 							f_cse_updateResource(int3, v_containerIndex, 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 {
@@ -6115,7 +6257,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 {
@@ -6193,7 +6335,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 {
@@ -6271,7 +6413,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 {
@@ -6315,12 +6457,13 @@ 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;
+						
 						var Labels v_labels_1 := {"VALUE_1"};
 						var Labels v_labels_2 := {"VALUE_2"};
 						var template RequestPrimitive v_createRequest := m_createAcpBase;
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 						var ResponsePrimitive v_responsePrimitive;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.accessControlPolicy.labels := v_labels_1;
 						v_updateRequest.primitiveContent.accessControlPolicy.labels := v_labels_2;
 
@@ -6351,7 +6494,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.container.accessControlPolicyIDs := v_accessControlPolicyIDs_1;
 						v_updateRequest.primitiveContent.container.accessControlPolicyIDs := v_accessControlPolicyIDs_2;
 
@@ -6381,7 +6524,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 		
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
-		
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.container.labels := v_labels_1;
 						v_updateRequest.primitiveContent.container.labels := v_labels_2;
 		
@@ -6411,7 +6554,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 	
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
-	
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.container.maxByteSize := v_maxByteSize_1;
 						v_updateRequest.primitiveContent.container.maxByteSize := v_maxByteSize_2;
 	
@@ -6441,7 +6584,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.container.maxInstanceAge := v_maxInstanceAge_1;
 						v_updateRequest.primitiveContent.container.maxInstanceAge := v_maxInstanceAge_2;
 
@@ -6471,7 +6614,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 	
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
-	
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.container.maxNrOfInstances := v_maxNrOfInstances_1;
 						v_updateRequest.primitiveContent.container.maxNrOfInstances := v_maxNrOfInstances_2;
 	
@@ -6500,7 +6643,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.subscription.accessControlPolicyIDs := v_accessControlPolicyIDs_1;
 						v_updateRequest.primitiveContent.subscription.accessControlPolicyIDs := v_accessControlPolicyIDs_2;
 
@@ -6530,7 +6673,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.subscription.labels := v_labels_1;
 						v_updateRequest.primitiveContent.subscription.labels := v_labels_2;
 
@@ -6566,7 +6709,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					   	var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;
 					   	var ResponsePrimitive v_responsePrimitive;
 					   	var PrimitiveContent v_primitiveContentRetrieveResource;
-	
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 					   v_updateRequest.primitiveContent.remoteCSE.labels := v_labels;
 	
 					   v_ae1.start(f_CSE_DMR_UPD_015(int16, m_createRemoteCSEBase, v_updateRequest));//Remote CSE
@@ -6600,7 +6743,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					   var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;
 					   var ResponsePrimitive v_responsePrimitive;
 					   var PrimitiveContent v_primitiveContentRetrieveResource;
-
+					   f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 					   v_updateRequest.primitiveContent.remoteCSE.pointOfAccess := v_poaList;
 
 					   v_ae1.start(f_CSE_DMR_UPD_015(int16, m_createRemoteCSEBase, v_updateRequest));//Remote CSE
@@ -6634,7 +6777,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					   	var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;
 					   	var ResponsePrimitive v_responsePrimitive;
 					   	var PrimitiveContent v_primitiveContentRetrieveResource;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 					   v_updateRequest.primitiveContent.remoteCSE.nodeLink := v_nodeLink;
 
 					   v_ae1.start(f_CSE_DMR_UPD_015(int16, m_createRemoteCSEBase, v_updateRequest));//Remote CSE
@@ -6668,7 +6811,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateAeBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.aE.labels := v_labels;
 						
 						v_ae1.start(f_CSE_DMR_UPD_015(int2, m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM), v_updateRequest));//AE
@@ -6702,7 +6845,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var RequestPrimitive v_updateRequestPrimitive;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_ae1.start(f_CSE_DMR_UPD_015(int2, m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM), v_updateRequest, true));//AE
 						v_ae1.done;
 						
@@ -6736,7 +6879,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateAeBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.aE.appName := v_appName;
 						v_ae1.start(f_CSE_DMR_UPD_015(int2, m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM), v_updateRequest));//AE
 						v_ae1.done;
@@ -6769,7 +6912,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateAeBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.aE.pointOfAccess := v_poaList;
 						v_ae1.start(f_CSE_DMR_UPD_015(int2, m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM), v_updateRequest));//AE
 						v_ae1.done;
@@ -6802,7 +6945,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.container.labels := v_labels;
 						
 						v_ae1.start(f_CSE_DMR_UPD_015(int3, m_createContainerBase, v_updateRequest));//Container
@@ -6836,7 +6979,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var RequestPrimitive v_updateRequestPrimitive;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_ae1.start(f_CSE_DMR_UPD_015(int3, m_createContainerBase, v_updateRequest, true));//Container
 						v_ae1.done;
 						
@@ -6870,7 +7013,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.container.maxNrOfInstances := v_maxNrOfInstances;
 						
 						v_ae1.start(f_CSE_DMR_UPD_015(int3, m_createContainerBase, v_updateRequest));//Container
@@ -6904,7 +7047,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.container.maxByteSize := v_maxByteSize;
 						
 						v_ae1.start(f_CSE_DMR_UPD_015(int3, m_createContainerBase, v_updateRequest));//Container
@@ -6933,12 +7076,12 @@ 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;
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;					
 						var XSD.NonNegativeInteger v_maxInstanceAge := 1;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.container.maxInstanceAge := v_maxInstanceAge;
 						
 						v_ae1.start(f_CSE_DMR_UPD_015(int3, m_createContainerBase, v_updateRequest));//Container
@@ -6972,7 +7115,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.accessControlPolicy.labels := v_labels;
 						
 						v_ae1.start(f_CSE_DMR_UPD_015(int1, m_createAcpBase, v_updateRequest));//AccessControlPolicy
@@ -7006,7 +7149,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var RequestPrimitive v_updateRequestPrimitive;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest, true));//Subscription
 						v_ae1.done;
 						
@@ -7040,7 +7183,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.subscription.labels := v_labels;
 						v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
 						v_ae1.done;
@@ -7073,7 +7216,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.group_.labels := v_labels;
 						v_ae1.start(f_CSE_DMR_UPD_015(int9, m_createGroupBase, v_updateRequest));//Group
 						v_ae1.done;
@@ -7106,7 +7249,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var RequestPrimitive v_updateRequestPrimitive;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_ae1.start(f_CSE_DMR_UPD_015(int9, m_createGroupBase, v_updateRequest, true));//Group
 						v_ae1.done;
 						
@@ -7140,7 +7283,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.group_.membersAccessControlPolicyIDs := v_membersAccessControlPolicyIDs;
 						v_ae1.start(f_CSE_DMR_UPD_015(int9, m_createGroupBase, v_updateRequest));//Group
 						v_ae1.done;
@@ -7173,7 +7316,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.group_.groupName := v_groupName;
 						v_ae1.start(f_CSE_DMR_UPD_015(int9, m_createGroupBase, v_updateRequest));//Group
 						v_ae1.done;
@@ -7213,7 +7356,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.remoteCSE.expirationTime := v_expirationTime;
 						
 						v_ae1.start(f_CSE_DMR_UPD_016(int16, m_createRemoteCSEBase, v_updateRequest));//Remote CSE
@@ -7247,7 +7390,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.remoteCSE.requestReachability := v_requestReachability;
 						
 						v_ae1.start(f_CSE_DMR_UPD_016(int16, m_createRemoteCSEBase, v_updateRequest));//Remote CSE
@@ -7279,7 +7422,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateAeBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.aE.expirationTime := v_expirationTime;
 						
 						v_ae1.start(f_CSE_DMR_UPD_016(int2, m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM), v_updateRequest));//AE
@@ -7313,7 +7456,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateAeBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.aE.requestReachability := v_requestReachability;
 
 						v_ae1.start(f_CSE_DMR_UPD_016(int2, m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM), v_updateRequest));//AE
@@ -7347,7 +7490,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.container.expirationTime := v_expirationTime;
 						
 						v_ae1.start(f_CSE_DMR_UPD_016(int3, m_createContainerBase, v_updateRequest));//Container
@@ -7381,7 +7524,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.accessControlPolicy.expirationTime := v_expirationTime;
 						
 						v_ae1.start(f_CSE_DMR_UPD_016(int1, m_createAcpBase, v_updateRequest));//AccessControlPolicy
@@ -7415,7 +7558,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.accessControlPolicy.privileges := v_privileges_1;
 						v_ae1.start(f_CSE_DMR_UPD_016(int1, m_createAcpBase, v_updateRequest));//AccessControlPolicy
 						v_ae1.done;
@@ -7448,7 +7591,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.accessControlPolicy.selfPrivileges := v_privileges_1;
 						v_ae1.start(f_CSE_DMR_UPD_016(int1, m_createAcpBase, v_updateRequest));//AccessControlPolicy
 						v_ae1.done;
@@ -7481,7 +7624,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.subscription.expirationTime := v_expirationTime;
 						
 						v_ae1.start(f_CSE_DMR_UPD_016(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
@@ -7516,7 +7659,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-											
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);					
 						v_updateRequest.primitiveContent.subscription.notificationURI := v_notificationURI;
 						
 						v_ae1.start(f_CSE_DMR_UPD_016(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
@@ -7550,7 +7693,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.subscription.notificationContentType := v_notificationContentType;
 						
 						v_ae1.start(f_CSE_DMR_UPD_016(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
@@ -7584,7 +7727,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.group_.expirationTime := v_expirationTime;
 						
 						v_ae1.start(f_CSE_DMR_UPD_016(int9, m_createGroupBase, v_updateRequest));//Group
@@ -7618,7 +7761,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.group_.maxNrOfMembers := v_maxNrOfMembers;
 						
 						v_ae1.start(f_CSE_DMR_UPD_016(int9, m_createGroupBase, v_updateRequest));//Group
@@ -7652,7 +7795,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.group_.memberIDs := v_memberIDs;
 						
 						v_ae1.start(f_CSE_DMR_UPD_016(int9, m_createGroupBase, v_updateRequest));//Group
@@ -7695,6 +7838,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;
@@ -7707,6 +7851,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;
@@ -7715,6 +7860,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;
@@ -7723,6 +7869,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;
@@ -7731,6 +7878,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;
@@ -7747,6 +7895,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;
@@ -7755,6 +7904,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;
@@ -7763,6 +7913,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;
@@ -7771,6 +7922,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;
@@ -7811,7 +7963,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 {
@@ -7834,7 +7986,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 {
@@ -7967,7 +8119,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 {
@@ -7989,7 +8141,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 {
@@ -8052,7 +8204,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 {
@@ -8074,7 +8226,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 {
@@ -8115,6 +8267,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());
 				  	  	
@@ -8148,7 +8301,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 {
@@ -8188,6 +8341,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());
 					  	  	
@@ -8221,7 +8375,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 {
@@ -8265,6 +8419,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());
 					  	  	
@@ -8299,7 +8454,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 {
@@ -8343,6 +8498,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());
 					  	  	
@@ -8371,7 +8527,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
@@ -8415,6 +8571,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());
 					  	  	
@@ -8477,6 +8634,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());
 					  	  	
@@ -8520,7 +8678,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 {
@@ -8560,6 +8718,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());
 					  	  	
@@ -8605,7 +8764,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 {
@@ -8646,6 +8805,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());
 						  	  	
@@ -8691,7 +8851,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 {
@@ -8746,6 +8906,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());
 						  	  	
@@ -8784,7 +8945,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 {
@@ -8829,6 +8990,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());
 							  	  	
@@ -8867,7 +9029,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 {
@@ -8913,6 +9075,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());
 							  	  	
@@ -8944,7 +9107,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 {
@@ -8996,6 +9159,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());
 							  	  	
@@ -9023,7 +9187,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 {
@@ -9073,6 +9237,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());
 							  	  	
@@ -9121,7 +9286,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 {
@@ -9165,6 +9330,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());
 							  	  	
@@ -9213,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(int4103))) -> value v_response {
@@ -9262,6 +9428,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;
@@ -9271,6 +9438,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 							var template RequestPrimitive v_updateRequest := m_updateAeBase;
 							var Labels v_labels_1:= {"VALUE_1"};
+							f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 							v_updateRequest.primitiveContent.aE.labels := v_labels_1;
 
 							v_ae1.start(f_CSE_SEC_ACP_001(v_updateRequest));	
@@ -9279,6 +9447,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;
@@ -9286,6 +9455,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;
@@ -9301,6 +9471,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;
@@ -9308,16 +9479,18 @@ 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;
+						
 							var template RequestPrimitive v_updateRequest := m_updateAeBase;
 							var Labels v_labels_1:= {"VALUE_1"};
 							v_updateRequest.primitiveContent.aE.labels := v_labels_1;
-
+							f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 							v_ae1.start(f_CSE_SEC_ACP_002(v_updateRequest, int2004));	
 							v_ae1.done;
 						}//end TC_CSE_SEC_ACP_002_UPD
 	
 						testcase TC_CSE_SEC_ACP_002_RET() runs on Tester system CseSystem { //Retrieve
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+							f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 							v_ae1.start(f_CSE_SEC_ACP_002(m_retrieve("Temporary", "Temporary"), int2000));	
 							v_ae1.done;
@@ -9325,6 +9498,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;
@@ -9340,6 +9514,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;
@@ -9347,8 +9522,10 @@ 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;
+						
 							var template RequestPrimitive v_updateRequest := m_updateAeBase;
 							var Labels v_labels_1:= {"VALUE_1"};
+							f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 							v_updateRequest.primitiveContent.aE.labels := v_labels_1;
 
 							v_ae1.start(f_CSE_SEC_ACP_003(v_updateRequest, int2004));	
@@ -9357,6 +9534,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;
@@ -9364,6 +9542,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;
@@ -9379,6 +9558,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;
@@ -9386,8 +9566,10 @@ 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;
+						
 							var template RequestPrimitive v_updateRequest := m_updateAeBase;
 							var Labels v_labels_1:= {"VALUE_1"};
+							f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 							v_updateRequest.primitiveContent.aE.labels := v_labels_1;
 
 							v_ae1.start(f_CSE_SEC_ACP_004(v_updateRequest, int2004));	
@@ -9396,6 +9578,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;
@@ -9403,6 +9586,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;
@@ -9418,6 +9602,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;
@@ -9425,16 +9610,18 @@ 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;
+						
 							var template RequestPrimitive v_updateRequest := m_updateAeBase;
 							var Labels v_labels_1:= {"VALUE_1"};
 							v_updateRequest.primitiveContent.aE.labels := v_labels_1;
-
+							f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 							v_ae1.start(f_CSE_SEC_ACP_005(v_updateRequest, int2004));	
 							v_ae1.done;
 						}//end TC_CSE_SEC_ACP_005_UPD
 		
 						testcase TC_CSE_SEC_ACP_005_RET() runs on Tester system CseSystem { //Retrieve
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 							v_ae1.start(f_CSE_SEC_ACP_005(m_retrieve("Temporary", "Temporary"), int2000));	
 							v_ae1.done;
@@ -9442,6 +9629,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;
@@ -9457,23 +9645,26 @@ 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;
 						}//end TC_CSE_SEC_ACP_006_CRE
 		
 						testcase TC_CSE_SEC_ACP_006_UPD() runs on Tester system CseSystem { //Update
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
 							var template RequestPrimitive v_updateRequest := m_updateAeBase;
 							var Labels v_labels_1:= {"VALUE_1"};
 							v_updateRequest.primitiveContent.aE.labels := v_labels_1;
-
+							f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 							v_ae1.start(f_CSE_SEC_ACP_006(v_updateRequest, int2004));	
 							v_ae1.done;
 						}//end TC_CSE_SEC_ACP_006_UPD
 		
 						testcase TC_CSE_SEC_ACP_006_RET() runs on Tester system CseSystem { //Retrieve
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 							v_ae1.start(f_CSE_SEC_ACP_006(m_retrieve("Temporary", "Temporary"), int2000));	
 							v_ae1.done;
@@ -9481,6 +9672,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;
@@ -9496,6 +9688,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;
@@ -9503,16 +9696,18 @@ 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;
+						
 							var template RequestPrimitive v_updateRequest := m_updateAeBase;
 							var Labels v_labels_1:= {"VALUE_1"};
 							v_updateRequest.primitiveContent.aE.labels := v_labels_1;
-
+							f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 							v_ae1.start(f_CSE_SEC_ACP_007(v_updateRequest, int2004));	
 							v_ae1.done;
 						}//end TC_CSE_SEC_ACP_007_UPD
 		
 						testcase TC_CSE_SEC_ACP_007_RET() runs on Tester system CseSystem { //Retrieve
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 							v_ae1.start(f_CSE_SEC_ACP_007(m_retrieve("Temporary", "Temporary"), int2000));	
 							v_ae1.done;
@@ -9520,6 +9715,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;
@@ -9535,6 +9731,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;
@@ -9542,16 +9739,18 @@ 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;
+						
 							var template RequestPrimitive v_updateRequest := m_updateAeBase;
 							var Labels v_labels_1:= {"VALUE_1"};
 							v_updateRequest.primitiveContent.aE.labels := v_labels_1;
-
+							f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 							v_ae1.start(f_CSE_SEC_ACP_008(v_updateRequest, int2004));	
 							v_ae1.done;
 						}//end TC_CSE_SEC_ACP_008_UPD
 		
 						testcase TC_CSE_SEC_ACP_008_RET() runs on Tester system CseSystem { //Retrieve
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 							v_ae1.start(f_CSE_SEC_ACP_008(m_retrieve("Temporary", "Temporary"), int2000));	
 							v_ae1.done;
@@ -9559,6 +9758,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;
@@ -9574,6 +9774,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;
@@ -9581,16 +9782,18 @@ 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;
+						
 							var template RequestPrimitive v_updateRequest := m_updateAeBase;
 							var Labels v_labels_1:= {"VALUE_1"};
 							v_updateRequest.primitiveContent.aE.labels := v_labels_1;
-
+							f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 							v_ae1.start(f_CSE_SEC_ACP_009(v_updateRequest, int2004));	
 							v_ae1.done;
 						}//end TC_CSE_SEC_ACP_009_UPD
 		
 						testcase TC_CSE_SEC_ACP_009_RET() runs on Tester system CseSystem { //Retrieve
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 							v_ae1.start(f_CSE_SEC_ACP_009(m_retrieve("Temporary", "Temporary"), int2000));	
 							v_ae1.done;
@@ -9598,6 +9801,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;
@@ -9613,6 +9817,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;
@@ -9620,16 +9825,18 @@ 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;
+						
 							var template RequestPrimitive v_updateRequest := m_updateAeBase;
 							var Labels v_labels_1:= {"VALUE_1"};
 							v_updateRequest.primitiveContent.aE.labels := v_labels_1;
-
+							f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 							v_ae1.start(f_CSE_SEC_ACP_010(v_updateRequest, int2004));	
 							v_ae1.done;
 						}//end TC_CSE_SEC_ACP_010_UPD
 		
 						testcase TC_CSE_SEC_ACP_010_RET() runs on Tester system CseSystem { //Retrieve
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+							f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 							v_ae1.start(f_CSE_SEC_ACP_010(m_retrieve("Temporary", "Temporary"), int2000));	
 							v_ae1.done;
@@ -9637,6 +9844,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;
@@ -9652,6 +9860,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;
@@ -9659,16 +9868,18 @@ 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;
+						
 							var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 							var Labels v_labels_1:= {"VALUE_1"};
 							v_updateRequest.primitiveContent.container.labels := v_labels_1;
-
+							f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 							v_ae1.start(f_CSE_SEC_ACP_011(v_updateRequest, int2004));	
 							v_ae1.done;
 						}//end TC_CSE_SEC_ACP_011_UPD
 	
 						testcase TC_CSE_SEC_ACP_011_RET() runs on Tester system CseSystem { //Retrieve
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 							v_ae1.start(f_CSE_SEC_ACP_011(m_retrieve("Temporary", "Temporary"), int2000));	
 							v_ae1.done;
@@ -9676,6 +9887,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;
@@ -9691,6 +9903,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;
@@ -9698,16 +9911,18 @@ 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;
+						
 							var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 							var Labels v_labels_1:= {"VALUE_1"};
 							v_updateRequest.primitiveContent.container.labels := v_labels_1;
-
+							f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 							v_ae1.start(f_CSE_SEC_ACP_012(v_updateRequest, int59));
 							v_ae1.done;
 						}//end TC_CSE_SEC_ACP_012_UPD
 	
 						testcase TC_CSE_SEC_ACP_012_RET() runs on Tester system CseSystem { //Retrieve
 							var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 							v_ae1.start(f_CSE_SEC_ACP_012(m_retrieve("Temporary", "Temporary"), int61));
 							v_ae1.done;
@@ -9715,6 +9930,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;
@@ -9737,6 +9953,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());
 							  	  	
@@ -9765,7 +9982,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)){
@@ -9799,6 +10016,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());
 								  	  	
@@ -9831,7 +10049,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 {
@@ -9871,6 +10089,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());
 								  	  	
@@ -9902,7 +10121,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 {
@@ -9942,6 +10161,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());
 								  	  	
@@ -9972,7 +10192,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 {
@@ -10013,6 +10233,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());
 								  	  	
@@ -10048,7 +10269,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))) {
@@ -10082,6 +10303,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());
 								  	  	
@@ -10113,7 +10335,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 {
 				
@@ -10148,6 +10370,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());
 								  	  	
@@ -10179,7 +10402,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 {
 				
@@ -10217,8 +10440,9 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					//Local variables
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
 					var FilterCriteria v_filterCriteria := valueof(m_filterCriteria);
-					
+					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 					v_filterCriteria.createdBefore := "20171231T012345";
 					v_filterCriteria.createdAfter := "20181231T012345";
 					v_filterCriteria.filterUsage := int1;
@@ -10232,8 +10456,9 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					//Local variables
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
 					var FilterCriteria v_filterCriteria := valueof(m_filterCriteria);
-	
+					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 					v_filterCriteria.unmodifiedSince := "20171231T012345";
 					v_filterCriteria.modifiedSince := "20181231T012345";
 					v_filterCriteria.filterUsage := int1;
@@ -10247,8 +10472,9 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					//Local variables
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
 					var FilterCriteria v_filterCriteria := valueof(m_filterCriteria);
-	
+					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 					v_filterCriteria.stateTagSmaller := 1;
 					v_filterCriteria.stateTagBigger := 2;
 					v_filterCriteria.filterUsage := int1;
@@ -10262,8 +10488,9 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					//Local variables
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
 					var FilterCriteria v_filterCriteria := valueof(m_filterCriteria);
-
+					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 					v_filterCriteria.expireBefore := "20171231T012345";
 					v_filterCriteria.expireAfter := "20181231T012345";
 					v_filterCriteria.filterUsage := int1;
@@ -10282,6 +10509,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());
 								  	  	
@@ -10320,7 +10548,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 {
@@ -10366,6 +10594,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());
 								  	  	
@@ -10408,7 +10637,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 {
@@ -10453,6 +10682,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());
 									  	  	
@@ -10494,7 +10724,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 {
@@ -10537,6 +10767,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());
 									  	  	
@@ -10567,7 +10798,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 {
@@ -10604,6 +10835,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());
 									  	  	
@@ -10632,7 +10864,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 {
@@ -10671,6 +10903,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());
 									  	  	
@@ -10699,7 +10932,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 {
@@ -10749,6 +10982,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());
 									  	  	
@@ -10781,7 +11015,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 {
@@ -10831,6 +11065,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());
 									  	  	
@@ -10863,7 +11098,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 {
@@ -10902,6 +11137,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());
 									  	  	
@@ -10952,7 +11188,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 {
@@ -11007,6 +11243,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());
 									  	  	
@@ -11052,7 +11289,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 {
@@ -11087,6 +11324,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());
 										  	  	
@@ -11125,7 +11363,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 {
@@ -11181,6 +11419,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());
 										  	  	
@@ -11215,7 +11454,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 {
@@ -11267,6 +11506,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());
 										  	  	
@@ -11305,7 +11545,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 {
@@ -11373,6 +11613,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());
 										  	  	
@@ -11412,7 +11653,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 {
@@ -11482,6 +11723,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());
 										  	  	
@@ -11519,7 +11761,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 {
@@ -11553,6 +11795,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());
 										  	  	
@@ -11601,7 +11844,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 {
@@ -11645,6 +11888,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());
 										  	  	
@@ -11683,7 +11927,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 {
@@ -11727,6 +11971,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());
 										  	  	
@@ -11779,7 +12024,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 {
@@ -11839,6 +12084,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());
 										  	  	
@@ -11897,7 +12143,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 {
@@ -11936,6 +12182,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;
@@ -11943,16 +12190,18 @@ 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;
+						
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var Labels v_labels_1:= {"VALUE_1"};
 						v_updateRequest.primitiveContent.container.labels := v_labels_1;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_ae1.start(f_CSE_GMG_001(v_updateRequest, int2004));
 						v_ae1.done;
 					}//end TC_CSE_GMG_001_UPD
 	
 					testcase TC_CSE_GMG_001_RET() runs on Tester system CseSystem { //Retrieve
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						
 						v_ae1.start(f_CSE_GMG_001(m_retrieve("Temporary", "Temporary"), int2000));
 						v_ae1.done;
@@ -11960,6 +12209,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;
@@ -11975,6 +12225,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;
@@ -11982,16 +12233,18 @@ 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;
+						
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var Labels v_labels_1:= {"VALUE_1"};
 						v_updateRequest.primitiveContent.container.labels := v_labels_1;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_ae1.start(f_CSE_GMG_002(v_updateRequest, int59));//c_CRDNDi
 						v_ae1.done;
 					}//end TC_CSE_GMG_002_UPD
 	
 					testcase TC_CSE_GMG_002_RET() runs on Tester system CseSystem { //Retrieve
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 						v_ae1.start(f_CSE_GMG_002(m_retrieve("Temporary", "Temporary"), int61));//c_CUDNDi
 						v_ae1.done;
@@ -11999,6 +12252,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;
@@ -12014,6 +12268,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;
@@ -12021,16 +12276,18 @@ 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;
+						
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var Labels v_labels_1:= {"VALUE_1"};
 						v_updateRequest.primitiveContent.container.labels := v_labels_1;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_ae1.start(f_CSE_GMG_003(v_updateRequest, int2004));
 						v_ae1.done;
 					}//end TC_CSE_GMG_003_UPD
 	
 					testcase TC_CSE_GMG_003_RET() runs on Tester system CseSystem { //Retrieve
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 						v_ae1.start(f_CSE_GMG_003(m_retrieve("Temporary", "Temporary"), int2000));
 						v_ae1.done;
@@ -12038,6 +12295,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;
@@ -12053,6 +12311,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;
@@ -12060,16 +12319,18 @@ 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;
+						
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var Labels v_labels_1:= {"VALUE_1"};
 						v_updateRequest.primitiveContent.container.labels := v_labels_1;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_ae1.start(f_CSE_GMG_004(v_updateRequest, int59));//c_CRDNDi
 						v_ae1.done;
 					}//end TC_CSE_GMG_004_UPD
 	
 					testcase TC_CSE_GMG_004_RET() runs on Tester system CseSystem { //Retrieve
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 						v_ae1.start(f_CSE_GMG_004(m_retrieve("Temporary", "Temporary"), int61));//c_CUDNDi
 						v_ae1.done;
@@ -12077,6 +12338,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;
@@ -12092,18 +12354,21 @@ 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;
+						
 						var template PrimitiveContent v_contentResponse;
 						v_contentResponse.container := mw_contentContainer_rc1;
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_ae1.start(f_CSE_GMG_005(m_createContainerBase, v_contentResponse, int2001));
 						v_ae1.done;
 					}//end TC_CSE_GMG_005_CRE
 	
 					testcase TC_CSE_GMG_005_UPD() runs on Tester system CseSystem { //Update
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var template PrimitiveContent v_contentResponse;
 						var Labels v_labels_1:= {"VALUE_1"};
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.container := mw_contentContainerBase;
 						v_contentResponse.container.labels := ?;
 						v_updateRequest.primitiveContent.container.labels := v_labels_1;
@@ -12114,7 +12379,9 @@ 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;
+						
 						var template PrimitiveContent v_contentResponse;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.container := mw_contentContainerBase;
 						
 						v_ae1.start(f_CSE_GMG_005(m_retrieve("Temporary", "Temporary"), v_contentResponse, int2000));
@@ -12125,7 +12392,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
 						v_contentResponse.container := mw_contentContainerBase;// TODO see with wath should it be matched
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_ae1.start(f_CSE_GMG_005(m_delete("Temporary", "Temporary"), v_contentResponse, int2002));	
 						v_ae1.done;
 					}//end TC_CSE_GMG_005_DEL
@@ -12140,7 +12407,9 @@ 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;
+						
 						var template PrimitiveContent v_contentResponse;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.container := mw_contentContainer_rc1;
 						
 						v_ae1.start(f_CSE_GMG_006(m_createContainerBase, v_contentResponse, int2001));
@@ -12152,6 +12421,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var template PrimitiveContent v_contentResponse;
 						var Labels v_labels_1:= {"VALUE_1"};
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.container := mw_contentContainerBase;
 						v_contentResponse.container.labels := ?;
 						v_updateRequest.primitiveContent.container.labels := v_labels_1;
@@ -12162,7 +12432,9 @@ 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;
+						
 						var template PrimitiveContent v_contentResponse;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.container := mw_contentContainerBase;
 						
 						v_ae1.start(f_CSE_GMG_006(m_retrieve("Temporary", "Temporary"), v_contentResponse, int2000));
@@ -12171,7 +12443,9 @@ 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;
+						
 						var template PrimitiveContent v_contentResponse;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.container := mw_contentContainerBase;// TODO see with wath should it be matched
 						
 						v_ae1.start(f_CSE_GMG_006(m_delete("Temporary", "Temporary"), v_contentResponse, int2002));	
diff --git a/OneM2M_Testcases_CSE_Release_2.ttcn b/OneM2M_Testcases_CSE_Release_2.ttcn
index f4bd2fa2fc70a1c00b724a5424ea654a191458c0..4a5e2e9b76750b543d4d78c7609609a8bd486faa 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 {
@@ -109,7 +109,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_REG_CRE_012_AE_NL() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_create.primitiveContent.aE.nodeLink := "http://127.0.0.1/";
 						v_ae1.start(f_CSE_REG_CRE_012(v_create));
 						v_ae1.done;
@@ -118,7 +118,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_REG_CRE_012_AE_OR() runs on Tester system CseSystem {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_create.primitiveContent.aE.ontologyRef := "MyOntologyRef";
 						v_ae1.start(f_CSE_REG_CRE_012(v_create));
 						v_ae1.done;
@@ -229,9 +229,10 @@ 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;
+						
 						 var RequestPrimitive v_request;
 						 var template PrimitiveContent v_contentResponse;
-						 
+						 f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						 v_request := valueof(m_createRemoteCSEBase);
 						 v_request.primitiveContent.remoteCSE.cseType := int2;	//MN_CSE
 						 v_request.primitiveContent.remoteCSE.resourceName := c_defaultRemoteCSEResourceName;
@@ -248,9 +249,10 @@ 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;
+						
 						 var RequestPrimitive v_request;
 						 var template PrimitiveContent v_contentResponse;
-		 
+						 f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						 v_request := valueof(m_createRemoteCSEBase);
 						 v_request.primitiveContent.remoteCSE.cseType := int2;	//MN_CSE
 						 v_request.primitiveContent.remoteCSE.expirationTime := "20301231T012345";
@@ -281,9 +283,10 @@ 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;
+						
 						 var template RequestPrimitive v_createRequest := m_createAe(PX_APP_ID);
 						 var template PrimitiveContent v_contentResponse;
-						 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						 v_createRequest.primitiveContent.aE.nodeLink := "http://127.0.0.1/";
 
 						 v_contentResponse.aE := mw_contentAeBase;
@@ -296,9 +299,10 @@ 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;
+						
 						 var template RequestPrimitive v_createRequest := m_createAe(PX_APP_ID);
 						 var template PrimitiveContent v_contentResponse;
-						 
+						 f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						 v_createRequest.primitiveContent.aE.contentSerialization := {applicationxml};
 
 						 v_contentResponse.aE := mw_contentAeBase;
@@ -326,6 +330,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;	
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
     						
 						v_updateRequest.primitiveContent.remoteCSE.expirationTime := "20301231T012345";
 	
@@ -338,6 +343,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;	
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 
 						v_updateRequest.primitiveContent.remoteCSE.requestReachability := true;
 
@@ -375,6 +381,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 +402,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 +423,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 +444,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 +467,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 +487,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 +507,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 +529,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 +550,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 +571,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 +591,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 +613,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 +634,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
@@ -631,6 +650,78 @@ module OneM2M_Testcases_CSE_Release_2 {
 						
 					}
 					
+					testcase TC_CSE_DMR_CRE_001_TS_CB() runs on Tester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+	
+						v_createRequest.primitiveContent.timeSeries.resourceName := omit;
+						v_ae1.start(f_CSE_DMR_CRE_001(int29, v_createRequest, -));//TimeSeries
+						v_ae1.done; 
+												
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							if(not ispresent(v_responsePrimitive.primitiveContent.timeSeries.resourceName)){
+								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+							}
+						}
+	
+					}
+					
+					testcase TC_CSE_DMR_CRE_001_TS_AE() runs on Tester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;	
+	
+						v_createRequest.primitiveContent.timeSeries.resourceName := omit;
+
+						v_ae1.start(f_CSE_DMR_CRE_001(int29, v_createRequest, m_createAeAux(omit,omit)));//TimeSeries
+						v_ae1.done;	 
+							
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							if(not ispresent(v_responsePrimitive.primitiveContent.timeSeries.resourceName)){
+								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+							}
+						}
+	
+					}
+					
+					testcase TC_CSE_DMR_CRE_001_TS_CSR() runs on Tester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+	
+						v_createRequest.primitiveContent.timeSeries.resourceName := omit;
+						v_cse1.start(f_CSE_DMR_CRE_001_cseSimu(int29, v_createRequest));//TimeSeries
+						v_cse1.done;	 
+							
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_cse1);
+							if(not ispresent(v_responsePrimitive.primitiveContent.timeSeries.resourceName)){
+								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+							}
+						}		
+					}
+					
+					testcase TC_CSE_DMR_CRE_001_TSI_TS() runs on Tester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+	
+						v_createRequest.primitiveContent.timeSeriesInstance.resourceName := omit;
+						v_ae1.start(f_CSE_DMR_CRE_001(int30, v_createRequest, m_createTimeSeriesBase));//TimeSeriesInstance
+						v_ae1.done;	 
+							
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							if(not ispresent(v_responsePrimitive.primitiveContent.timeSeriesInstance.resourceName)){
+								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+							}
+						}
+
+					}
+					
 				} // end g_CSE_DMR_CRE_001
 								
 				group g_CSE_DMR_CRE_002 {
@@ -643,6 +734,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;
@@ -659,10 +751,12 @@ module OneM2M_Testcases_CSE_Release_2 {
 							}
 						}
 					}
+					
 					testcase TC_CSE_DMR_CRE_002_PCH() runs on Tester system CseSystem {
 						// 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;
@@ -680,6 +774,25 @@ module OneM2M_Testcases_CSE_Release_2 {
 						}
 					}
 					
+					testcase TC_CSE_DMR_CRE_002_TS() runs on Tester system CseSystem {
+						// Local variables
+						var ResponsePrimitive v_responsePrimitive;
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+						v_ae1.start(f_CSE_DMR_CRE_002(int29, m_createTimeSeriesBase));//TimeSeries
+						v_ae1.done;	 
+							
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							if(not ispresent(v_responsePrimitive.primitiveContent.timeSeries.resourceName)){
+								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+							} else {
+								if(v_responsePrimitive.primitiveContent.timeSeries.resourceName != c_defaultTimeSeriesResourceName){
+									setverdict(fail, __SCOPE__, ": Error, resourceName attribute not correct");
+								}
+							}
+						}
+					}
+					
 				}// end group g_CSE_DMR_CRE_002
 				
 				group g_CSE_DMR_CRE_003 {
@@ -691,19 +804,29 @@ 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;
 					}
+					
 					testcase TC_CSE_DMR_CRE_003_PCH() runs on Tester system CseSystem {
-						// Local variables
-                        
+						// 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;
 					}
 					
+					testcase TC_CSE_DMR_CRE_003_TS() runs on Tester system CseSystem {
+						// Local variables    
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+						v_ae1.start(f_CSE_DMR_CRE_003(int29, m_createTimeSeriesBase));//TimeSeries
+						v_ae1.done;
+					}
+					
 				}// end group g_CSE_DMR_CRE_003
 				
 				group g_CSE_DMR_CRE_004 {
@@ -716,21 +839,223 @@ 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;
 					}
+					
 					testcase TC_CSE_DMR_CRE_004_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_CRE_004(int15, m_createPollingChannelBase));//Pollingchannel
 						v_ae1.done;
 					}
 					
+					testcase TC_CSE_DMR_CRE_004_TS() runs on Tester system CseSystem {
+						// Local variables
+    
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+						v_ae1.start(f_CSE_DMR_CRE_004(int29, m_createTimeSeriesBase));//TimeSeries
+						v_ae1.done;
+					}
+					
 				}// end group g_CSE_DMR_CRE_004
 				
+				group g_CSE_DMR_CRE_006 {
+					
+					/**
+					 * @desc Check that the IUT returns a default value to RW ATTRIBUTE in the response of a RESOURCE_TYPE resource CREATE Request where no a RW ATTRIBUTE is provided by AE
+					 * 
+					 */
+					testcase TC_CSE_DMR_CRE_006_CNT_MNI() runs on Tester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createContainerBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+		
+						v_ae1.start(f_CSE_DMR_CRE_006(int3, v_createRequest));		
+						v_ae1.done;		 
+														
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							if(not ispresent(v_responsePrimitive.primitiveContent.container.maxNrOfInstances)){
+								setverdict(fail, __SCOPE__, ": Error, maxNrOfInstances attribute not provided");
+							} 
+						}	
+					}
+	
+					testcase TC_CSE_DMR_CRE_006_CNT_MBS() runs on Tester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createContainerBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+		
+						v_ae1.start(f_CSE_DMR_CRE_006(int3, v_createRequest));
+						v_ae1.done;
+																				
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							if(not ispresent(v_responsePrimitive.primitiveContent.container.maxByteSize)){
+								setverdict(fail, __SCOPE__, ": Error, maxByteSize attribute not provided");
+							} 
+						}	
+		  
+					}
+	
+					testcase TC_CSE_DMR_CRE_006_CNT_MIA() runs on Tester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createContainerBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+								
+						v_ae1.start(f_CSE_DMR_CRE_006(int3, v_createRequest));
+						v_ae1.done;		 
+														
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							if(not ispresent(v_responsePrimitive.primitiveContent.container.maxInstanceAge)){
+								setverdict(fail, __SCOPE__, ": Error, maxInstanceAge attribute not provided");
+							} 
+						}	
+					}
+					
+					testcase TC_CSE_DMR_CRE_006_TS_MNI() runs on Tester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+						v_ae1.start(f_CSE_DMR_CRE_006(int29, v_createRequest));		
+						v_ae1.done;		 
+									
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							if(not ispresent(v_responsePrimitive.primitiveContent.timeSeries.maxNrOfInstances)){
+								setverdict(fail, __SCOPE__, ": Error, maxNrOfInstances attribute not provided");
+							} 
+						}	
+					}
+
+					testcase TC_CSE_DMR_CRE_006_TS_MBS() runs on Tester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+						v_ae1.start(f_CSE_DMR_CRE_006(int29, v_createRequest));
+						v_ae1.done;
+															
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							if(not ispresent(v_responsePrimitive.primitiveContent.timeSeries.maxByteSize)){
+								setverdict(fail, __SCOPE__, ": Error, maxByteSize attribute not provided");
+							} 
+						}	
+  
+								}
+
+					testcase TC_CSE_DMR_CRE_006_TS_MIA() runs on Tester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+			
+						v_ae1.start(f_CSE_DMR_CRE_006(int29, v_createRequest));
+						v_ae1.done;		 
+									
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							if(not ispresent(v_responsePrimitive.primitiveContent.timeSeries.maxInstanceAge)){
+								setverdict(fail, __SCOPE__, ": Error, maxInstanceAge attribute not provided");
+							} 
+						}	
+					}
+
+				}// end group g_CSE_DMR_CRE_006
+				
+				group g_CSE_DMR_CRE_007 {
+					
+					/**
+					 * @desc Checks that the IUT accepts a newly created RESOURCE_TYPE when the currentNrOfInstances exceeds the field value set in maxNrOfInstances in the PARENT_RESOURCE_TYPE resource by removing enough of the oldest RESOURCE_TYPE resources to allow the creation of the new RESOURCE_TYPE resource
+					 * 
+					 */
+					testcase TC_CSE_DMR_CRE_007_CNT_CIN() runs on Tester system CseSystem {
+						// Local variables		
+						var template RequestPrimitive v_createRequestContainer := m_createContainerBase;
+						var template RequestPrimitive v_createRequestContentInstance1 := m_createContentInstanceBase;
+						var template RequestPrimitive v_createRequestContentInstance2 := m_createContentInstanceBase;
+						const integer c_maxNumberOfInstances := 1;	
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						v_createRequestContainer.primitiveContent.container.maxNrOfInstances := c_maxNumberOfInstances;
+						v_createRequestContentInstance2.primitiveContent.contentInstance.resourceName := c_defaultContentInstanceResourceName & "2";	//Resource 2
+
+						v_ae1.start(f_CSE_DMR_CRE_007(int3, v_createRequestContainer, int4, v_createRequestContentInstance1, v_createRequestContentInstance2, c_defaultContentInstanceResourceName));//ContentInstance under Container
+						v_ae1.done;
+					}
+	
+					testcase TC_CSE_DMR_CRE_007_TS_TSI() runs on Tester system CseSystem {
+						//Local variables		
+						var template RequestPrimitive v_createRequestTimeSeries := m_createTimeSeriesBase;
+						var template RequestPrimitive v_createRequestTimeSeriesInstance1 := m_createTimeSeriesInstanceBase;
+						var template RequestPrimitive v_createRequestTimeSeriesInstance2 := m_createTimeSeriesInstanceBase;
+						const integer c_maxNumberOfInstances := 1;	
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						v_createRequestTimeSeries.primitiveContent.timeSeries.maxNrOfInstances := c_maxNumberOfInstances;
+						v_createRequestTimeSeriesInstance2.primitiveContent.timeSeriesInstance.resourceName := c_defaultTimeSeriesInstanceResourceName & "2";	//Resource 2
+
+						v_ae1.start(f_CSE_DMR_CRE_007(int29, v_createRequestTimeSeries, int30, v_createRequestTimeSeriesInstance1, v_createRequestTimeSeriesInstance2, c_defaultTimeSeriesInstanceResourceName));//TimeSeriesInstance under TimeSeries
+						v_ae1.done;
+					}
+	
+				}// end group g_CSE_DMR_CRE_007
+				
+				group g_CSE_DMR_CRE_008 {
+					
+					/**
+					 * @desc Checks that the IUT accepts a newly created RESOURCE_TYPE when the currentNrOfInstances exceeds the field value set in maxNrOfInstances in the PARENT_RESOURCE_TYPE resource by removing enough of the oldest RESOURCE_TYPE resources to allow the creation of the new RESOURCE_TYPE resource
+					 * 
+					 */
+					testcase TC_CSE_DMR_CRE_008_CNT_CIN() runs on Tester system CseSystem {
+						// Local variables		
+						var template RequestPrimitive v_createRequestContainer := m_createContainerBase;
+						var template RequestPrimitive v_createRequestContentInstance1 := m_createContentInstanceBase;
+						var template RequestPrimitive v_createRequestContentInstance2 := m_createContentInstanceBase;
+						const integer c_maxByteSize := 10;	
+						const XSD.String c_primitiveContent1 := "Content1";
+						const XSD.String c_primitiveContent2 := "Content2";		
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+		
+						v_createRequestContainer.primitiveContent.container.maxByteSize := c_maxByteSize;
+						v_createRequestContentInstance1.primitiveContent.contentInstance.content := c_primitiveContent1;	//ContentInstance 1
+						v_createRequestContentInstance2.primitiveContent.contentInstance.content := c_primitiveContent2;	//ContentInstance 2
+						v_createRequestContentInstance2.primitiveContent.contentInstance.resourceName := c_defaultContentInstanceResourceName & "2";	//ContentInstance 2
+
+						v_ae1.start(f_CSE_DMR_CRE_007(int3, v_createRequestContainer, int4, v_createRequestContentInstance1, v_createRequestContentInstance2, c_defaultContentInstanceResourceName));//ContentInstance under Container
+						v_ae1.done;
+					}
+
+					testcase TC_CSE_DMR_CRE_008_TS_TSI() runs on Tester system CseSystem {
+						//Local variables		
+						var template RequestPrimitive v_createRequestTimeSeries := m_createTimeSeriesBase;
+						var template RequestPrimitive v_createRequestTimeSeriesInstance1 := m_createTimeSeriesInstanceBase;
+						var template RequestPrimitive v_createRequestTimeSeriesInstance2 := m_createTimeSeriesInstanceBase;
+						const integer c_maxByteSize := 10;	
+						const XSD.String c_primitiveContent1 := "Content1";
+						const XSD.String c_primitiveContent2 := "Content2";		
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+						v_createRequestTimeSeries.primitiveContent.container.maxByteSize := c_maxByteSize;
+						v_createRequestTimeSeriesInstance1.primitiveContent.timeSeriesInstance.content := c_primitiveContent1;	//ContentInstance 1
+						v_createRequestTimeSeriesInstance2.primitiveContent.timeSeriesInstance.content := c_primitiveContent2;	//ContentInstance 2
+						v_createRequestTimeSeriesInstance2.primitiveContent.timeSeriesInstance.resourceName := c_defaultTimeSeriesInstanceResourceName & "2";	//ContentInstance 2
+
+						v_ae1.start(f_CSE_DMR_CRE_008(int29, v_createRequestTimeSeries, int30, v_createRequestTimeSeriesInstance1, v_createRequestTimeSeriesInstance2, c_defaultTimeSeriesInstanceResourceName));//TimeSeriesInstance under TimeSeries
+						v_ae1.done;
+					}
+
+				}// end group g_CSE_DMR_CRE_008
+				
 				group g_CSE_DMR_CRE_012 {
 					
 					/**
@@ -740,9 +1065,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_CRE_012_CNT_ET() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						const AttributeList c_optionalAttribute := {"expirationTime"};
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.container.expirationTime := "20301231T012345";
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int3, v_createRequest, c_optionalAttribute));
@@ -753,9 +1079,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_CRE_012_CIN_ET() runs on Tester system CseSystem {//TODO
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
 						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
 						const AttributeList c_optionalAttribute := {"expirationTime"};
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.contentInstance.expirationTime := "20301231T012345";
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int4, v_createRequest, c_optionalAttribute));			
@@ -765,9 +1092,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_CRE_012_CIN_OR() runs on Tester system CseSystem {//TODO
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+					
 						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
 						const AttributeList c_optionalAttribute := {"ontologyRef"};
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.contentInstance.ontologyRef := "MyOntologyRef";
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int4, v_createRequest, c_optionalAttribute));
@@ -778,9 +1106,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_CRE_012_ACP_ET() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
 						var template RequestPrimitive v_createRequest := m_createAcpBase;
 						const AttributeList c_optionalAttribute := {"expirationTime"};
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.accessControlPolicy.expirationTime := "20301231T012345";
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int1, v_createRequest, c_optionalAttribute));
@@ -791,9 +1120,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_CRE_012_SUB_ET() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"expirationTime"};
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.subscription.expirationTime := "20301231T012345";
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
@@ -804,9 +1134,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_CRE_012_SUB_ENC() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"eventNotificationCriteria"};
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.subscription.eventNotificationCriteria := valueof(m_eventNotificationCriteria({int1}, -));
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
@@ -817,9 +1148,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_CRE_012_SUB_EXC() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"expirationCounter"};
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.subscription.expirationCounter := 1;
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
@@ -830,9 +1162,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_CRE_012_SUB_GPI() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"groupID"};
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.subscription.groupID := "MyGroupID";
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
@@ -843,9 +1176,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_CRE_012_SUB_NFU() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"notificationForwardingURI"};
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.subscription.notificationForwardingURI := "MyForwardingURI";
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
@@ -856,9 +1190,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_CRE_012_SUB_BN() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"batchNotify"};
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.subscription.batchNotify := {0, "PT1S"};
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
@@ -868,9 +1203,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_CRE_012_SUB_RL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"rateLimit"};
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.subscription.rateLimit := {0, omit};
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
@@ -881,9 +1217,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_CRE_012_SUB_PSN() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"preSubscriptionNotify"};
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.subscription.preSubscriptionNotify := 1;
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
@@ -894,9 +1231,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_CRE_012_SUB_PN() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"pendingNotification"};
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.subscription.pendingNotification := int1;
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));			
@@ -906,9 +1244,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_CRE_012_SUB_NSP() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"notificationStoragePriority"};
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.subscription.notificationStoragePriority := 1;
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
@@ -919,9 +1258,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_CRE_012_SUB_LN() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"latestNotify"};
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.subscription.latestNotify := true;
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
@@ -932,9 +1272,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_CRE_012_SUB_NCT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"notificationContentType"};
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.subscription.notificationContentType := int1;
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
@@ -945,9 +1286,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_CRE_012_SUB_NEC() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"notificationEventCat"};
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.subscription.notificationEventCat := {alt_1 := 100};
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
@@ -958,54 +1300,310 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_CRE_012_SUB_SU() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						const AttributeList c_optionalAttribute := {"subscriberURI"};
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.subscription.subscriberURI := "NotInitialized";
 						
 						v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
 						v_ae1.done;
 						
 					}
-				
-				}// end group g_CSE_DMR_CRE_012	
-
-				group g_CSE_DMR_CRE_015 {
 					
-					/**
-					 * @desc Check that the IUT returns successfully after a CREATE request an empty content of created resource when the ResultContent set to 0 (Nothing)
-					 * 
-					 */
-					testcase TC_CSE_DMR_CRE_015_CNT() runs on Tester system CseSystem {
+					testcase TC_CSE_DMR_CRE_012_TS_ACPI() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						                        
-						v_ae1.start(f_CSE_DMR_CRE_015(int3, m_createContainerBase));//Container
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						const AttributeList c_optionalAttribute := {"accessControlPolicyIDs"};
+	
+						v_createRequest.primitiveContent.timeSeries.accessControlPolicyIDs := {"NotInitialized"};
+	
+						v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, c_optionalAttribute));			
 						v_ae1.done;
 					}
-
-					testcase TC_CSE_DMR_CRE_015_GRP() runs on Tester system CseSystem {
+					
+					testcase TC_CSE_DMR_CRE_012_TS_ET() runs on Tester system CseSystem {
 						// Local variables
-						
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						                        
-						v_ae1.start(f_CSE_DMR_CRE_015(int9, m_createGroupBase));//Group
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						const AttributeList c_optionalAttribute := {"expirationTime"};
+	
+						v_createRequest.primitiveContent.timeSeries.expirationTime := "20301231T012345";
+	
+						v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, c_optionalAttribute));
 						v_ae1.done;
+	  
 					}
 					
-					testcase TC_CSE_DMR_CRE_015_ACP() runs on Tester system CseSystem {
+					testcase TC_CSE_DMR_CRE_012_TS_LBL() runs on Tester system CseSystem {
 						// Local variables
-							
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						                        
-						v_ae1.start(f_CSE_DMR_CRE_015(int1, m_createAcpBase));//AccessControlPolicy
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						const AttributeList c_optionalAttribute := {"labels"};
+	
+						v_createRequest.primitiveContent.timeSeries.labels := {"MyLabel"};
+	
+						v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, c_optionalAttribute));
 						v_ae1.done;
+	
 					}
-				
-					testcase TC_CSE_DMR_CRE_015_SCH() runs on Tester system CseSystem {
+					
+					testcase TC_CSE_DMR_CRE_012_TS_CR() runs on Tester system CseSystem { 
 						// Local variables
-							
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var AttributeList v_optionalAttribute := {"creator"};
+	
+						v_createRequest.primitiveContent.timeSeries.creator := "NullValue";
+	
+						v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, v_optionalAttribute));
+						v_ae1.done;
+	
+					}	
+					
+					testcase TC_CSE_DMR_CRE_012_TS_MNI() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						const AttributeList c_optionalAttribute := {"maxNrOfInstances"};
+	
+						v_createRequest.primitiveContent.timeSeries.maxNrOfInstances := 0;
+	
+						v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, c_optionalAttribute));
+						v_ae1.done;
+	
+					}
+
+					testcase TC_CSE_DMR_CRE_012_TS_MBS() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						const AttributeList c_optionalAttribute := {"maxByteSize"};
+	
+						v_createRequest.primitiveContent.timeSeries.maxByteSize := 0;
+	
+						v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, c_optionalAttribute));
+						v_ae1.done;
+	
+					}
+
+					testcase TC_CSE_DMR_CRE_012_TS_MIA() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						const AttributeList c_optionalAttribute := {"maxInstanceAge"};
+	
+						v_createRequest.primitiveContent.timeSeries.maxInstanceAge := 0;
+	
+						v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, c_optionalAttribute));
+						v_ae1.done;
+	
+					}	
+					
+					testcase TC_CSE_DMR_CRE_012_TS_PEI() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						const AttributeList c_optionalAttribute := {"periodicInterval"};
+
+						v_createRequest.primitiveContent.timeSeries.periodicInterval := 0;
+
+						v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, c_optionalAttribute));
+						v_ae1.done;
+
+					}	
+					
+					testcase TC_CSE_DMR_CRE_012_TS_MDD() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						const AttributeList c_optionalAttribute := {"missingDataDetect"};
+
+						v_createRequest.primitiveContent.timeSeries.missingDataDetect := true;
+
+						v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, c_optionalAttribute));
+						v_ae1.done;
+
+					}	
+					
+					testcase TC_CSE_DMR_CRE_012_TS_MDN() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						const AttributeList c_optionalAttribute := {"missingDataMaxNr"};
+
+						v_createRequest.primitiveContent.timeSeries.missingDataMaxNr := 0;
+
+						v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, c_optionalAttribute));
+						v_ae1.done;
+
+					}	
+					
+					testcase TC_CSE_DMR_CRE_012_TS_MDT() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						const AttributeList c_optionalAttribute := {"missingDataDetectTimer"};
+
+						v_createRequest.primitiveContent.timeSeries.missingDataDetectTimer := 0;
+
+						v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, c_optionalAttribute));
+						v_ae1.done;
+
+					}	
+					
+					testcase TC_CSE_DMR_CRE_012_TS_OR() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						const AttributeList c_optionalAttribute := {"ontologyRef"};
+	
+						v_createRequest.primitiveContent.timeSeries.ontologyRef := "MyOntologyRef";
+	
+						v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, c_optionalAttribute));
+						v_ae1.done;
+	
+					}
+					
+					testcase TC_CSE_DMR_CRE_012_TSI_ET() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
+						const AttributeList c_optionalAttribute := {"expirationTime"};
+
+						v_createRequest.primitiveContent.timeSeriesInstance.expirationTime := "20301231T012345";
+
+						v_ae1.start(f_CSE_DMR_CRE_012(int30, v_createRequest, c_optionalAttribute));
+						v_ae1.done;
+  
+					}
+					
+					testcase TC_CSE_DMR_CRE_012_TSI_LBL() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
+						const AttributeList c_optionalAttribute := {"labels"};
+	
+						v_createRequest.primitiveContent.timeSeriesInstance.labels := {"MyLabel"};
+	
+						v_ae1.start(f_CSE_DMR_CRE_012(int30, v_createRequest, c_optionalAttribute));
+						v_ae1.done;
+	
+					}
+					
+					testcase TC_CSE_DMR_CRE_012_TSI_SNR() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
+						const AttributeList c_optionalAttribute := {"labels"};
+
+						v_createRequest.primitiveContent.timeSeriesInstance.sequenceNr := 0;
+
+						v_ae1.start(f_CSE_DMR_CRE_012(int30, v_createRequest, c_optionalAttribute));
+						v_ae1.done;
+
+					}
+				
+				}// end group g_CSE_DMR_CRE_012	
+				
+				group g_CSE_DMR_CRE_013 {
+					
+					/**
+					 * @desc Check that the IUT rejects the CREATE Request of a RESOURCE_TYPE resource with error “NOT_ACCEPTABLE” when contentSize exceeds maxByteSize of the PARENT_RESOURCE_TYPE
+					 * 
+					 */
+					testcase TC_CSE_DMR_CRE_013_CNT_CIN() runs on Tester system CseSystem {
+						// Local variables		
+						var template RequestPrimitive v_createRequestContainer := m_createContainerBase;
+						var template RequestPrimitive v_createRequestContentInstance := m_createContentInstanceBase;
+						const integer c_maxByteSize := 1;		
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+		
+						v_createRequestContainer.primitiveContent.container.maxByteSize := c_maxByteSize;
+
+						v_ae1.start(f_CSE_DMR_CRE_013(int3, v_createRequestContainer, int4, v_createRequestContentInstance));//ContentInstance under Container
+						v_ae1.done;
+					}
+
+					testcase TC_CSE_DMR_CRE_013_TS_TSI() runs on Tester system CseSystem {
+						//Local variables		
+						var template RequestPrimitive v_createRequestTimeSeries := m_createTimeSeriesBase;
+						var template RequestPrimitive v_createRequestTimeSeriesInstance := m_createTimeSeriesInstanceBase;
+						const integer c_maxByteSize := 1;		
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+						v_createRequestTimeSeries.primitiveContent.timeSeries.maxByteSize := c_maxByteSize;
+
+						v_ae1.start(f_CSE_DMR_CRE_013(int29, v_createRequestTimeSeries, int30, v_createRequestTimeSeriesInstance));//TimeSeriesInstance under TimeSeries
+						v_ae1.done;
+					}
+
+				}// end group g_CSE_DMR_CRE_013
+				
+				group g_CSE_DMR_CRE_014 {
+				
+					/**
+					 * @desc Check that the IUT updates the currentByteSize attribute in a PARENT_RESOURCE_TYPE when a new RESOURCE_TYPE is created. 
+					 * 
+					 */
+					testcase TC_CSE_DMR_CRE_014_TS_TSI() runs on Tester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_parentResourceRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_childResourceRequest := m_createTimeSeriesInstanceBase;//Default content: "AnyValue" (8 bytes length)
+						var ResponsePrimitive v_responsePrimitive;
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						const integer c_maxByteSize := 512;	
+		
+						v_parentResourceRequest.primitiveContent.timeSeries.maxByteSize := c_maxByteSize;
+		
+						v_ae1.start(f_CSE_DMR_CRE_014(int29, v_parentResourceRequest, int30, v_childResourceRequest));		
+						v_ae1.done;
+		
+					}
+				
+				}// end group g_CSE_DMR_CRE_014
+
+				group g_CSE_DMR_CRE_015 {
+					
+					/**
+					 * @desc Check that the IUT returns successfully after a CREATE request an empty content of created resource when the ResultContent set to 0 (Nothing)
+					 * 
+					 */
+					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;
+					}
+
+					testcase TC_CSE_DMR_CRE_015_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_CRE_015(int9, m_createGroupBase));//Group
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_DMR_CRE_015_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_CRE_015(int1, m_createAcpBase));//AccessControlPolicy
+						v_ae1.done;
+					}
+				
+					testcase TC_CSE_DMR_CRE_015_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_015(int18, m_createScheduleBase));//Schedule
 						v_ae1.done;
@@ -1015,6 +1613,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 +1623,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 +1641,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 +1653,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 +1665,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 +1677,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 +1689,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,12 +1701,24 @@ 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;
 
 						v_ae1.start(f_CSE_DMR_CRE_016(int23, m_createSubscriptionBase, v_contentResponse));//Subscription
 						v_ae1.done;
 					}
+					
+					testcase TC_CSE_DMR_CRE_016_TS() runs on Tester system CseSystem {
+						// Local variables
+						var template PrimitiveContent v_contentResponse;
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						v_contentResponse.uRI := mw_contentTimeSeries_rc2;
+
+						v_ae1.start(f_CSE_DMR_CRE_016(int29, m_createTimeSeriesBase, v_contentResponse));//TimeSeries
+						v_ae1.done;
+					}
 				
 				} // end g_CSE_DMR_CRE_016	
 							
@@ -1115,6 +1732,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 +1744,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 +1756,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 +1768,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 +1780,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,12 +1792,24 @@ 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;
 
 						v_ae1.start(f_CSE_DMR_CRE_017(int23, m_createSubscriptionBase, v_contentResponse));//Subscription
 						v_ae1.done;
 					}
+					
+					testcase TC_CSE_DMR_CRE_017_TS() runs on Tester system CseSystem {
+						// Local variables
+						var template PrimitiveContent v_contentResponse;
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+						v_contentResponse.resource := mw_contentTimeSeries_rc3;
+
+						v_ae1.start(f_CSE_DMR_CRE_017(int29, m_createTimeSeriesBase, v_contentResponse));//TimeSeries
+						v_ae1.done;
+					}
 				
 				} // end g_CSE_DMR_CRE_017
 				
@@ -1189,8 +1823,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_CRE_020_ACP() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template RequestPrimitive v_createRequest := m_createAcpBase;
 						
+						var template RequestPrimitive v_createRequest := m_createAcpBase;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.accessControlPolicy.announceTo := {f_getAnnouncementTargetPoA()};
 						                    
 						v_ae1.start(f_CSE_DMR_CRE_020(int1, v_createRequest, mw_createAccessControlPolicyAnnc));//AccessControlPolicy
@@ -1200,8 +1835,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_CRE_020_CNT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						
+						var template RequestPrimitive v_createRequest := m_createContainerBase;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.container.announceTo := {f_getAnnouncementTargetPoA()};
 					
 						v_ae1.start(f_CSE_DMR_CRE_020(int3, v_createRequest, mw_createContainerAnncBase));//Container
@@ -1212,7 +1848,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.contentInstance.announceTo := {f_getAnnouncementTargetPoA()};
 						
 						v_ae1.start(f_CSE_DMR_CRE_020(int4, v_createRequest, mw_createContentInstanceAnncBase));//ContentInstance
@@ -1222,8 +1858,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_CRE_020_GRP() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template RequestPrimitive v_createRequest := m_createGroupBase;
 						
+						var template RequestPrimitive v_createRequest := m_createGroupBase;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.group_.announceTo := {f_getAnnouncementTargetPoA()};
 						
 						v_ae1.start(f_CSE_DMR_CRE_020(int9, v_createRequest, mw_createGroupAnncBase));//Group
@@ -1233,8 +1870,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_CRE_020_LCP() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template RequestPrimitive v_createRequest := m_createLocationPolicy(int1, omit, omit, omit, omit);
 						
+						var template RequestPrimitive v_createRequest := m_createLocationPolicy(int1, omit, omit, omit, omit);
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.locationPolicy.announceTo := {f_getAnnouncementTargetPoA()};
 						
 						v_ae1.start(f_CSE_DMR_CRE_020(int10, v_createRequest, mw_createLocationPolicyAnncBase));//LocationPolicy
@@ -1244,8 +1882,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_CRE_020_MGO() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template RequestPrimitive v_createRequest := m_createMgmtObjBase;
 						
+						var template RequestPrimitive v_createRequest := m_createMgmtObjBase;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.mgmtResource.announceTo := {f_getAnnouncementTargetPoA()};
 
 						v_ae1.start(f_CSE_DMR_CRE_020(int13, v_createRequest, mw_createMgmtObjAnncBase));//MgmtObj
@@ -1255,8 +1894,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_CRE_020_NOD() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template RequestPrimitive v_createRequest := m_createNodeBase;
 						
+						var template RequestPrimitive v_createRequest := m_createNodeBase;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.node.announceTo := {f_getAnnouncementTargetPoA()};
 						
 						v_ae1.start(f_CSE_DMR_CRE_020(int14, v_createRequest, mw_createNodeAnnc));//Node
@@ -1266,13 +1906,36 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_CRE_020_SCH() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template RequestPrimitive v_createRequest := m_createScheduleBase;
 						
+						var template RequestPrimitive v_createRequest := m_createScheduleBase;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.schedule.announceTo := {f_getAnnouncementTargetPoA()};
 
 						v_ae1.start(f_CSE_DMR_CRE_020(int18, v_createRequest, mw_createScheduleAnncBase));//Schedule
 						v_ae1.done;
 					}
+					
+					testcase TC_CSE_DMR_CRE_020_TS() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+	
+						v_createRequest.primitiveContent.timeSeries.announceTo := {f_getAnnouncementTargetPoA()};
+	
+						v_ae1.start(f_CSE_DMR_CRE_020(int29, v_createRequest, mw_createTimeSeriesAnncBase));//TimeSeries
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_DMR_CRE_020_TSI() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
+
+						v_createRequest.primitiveContent.timeSeriesInstance.announceTo := {f_getAnnouncementTargetPoA()};
+
+						v_ae1.start(f_CSE_DMR_CRE_020(int30, v_createRequest, mw_createTimeSeriesInstanceAnncBase));//TimeSeriesInstance
+						v_ae1.done;
+					}
 				
 				} // end g_CSE_DMR_CRE_020		
 				
@@ -1285,10 +1948,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_CRE_021_CNT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var RequestPrimitive v_requestPrimitive;
 						var XSD.NonNegativeInteger maxByteSize := 512;		//Correct value? Shall be indicated in TP?
-		
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						//v_createRequest.primitiveContent.container.announceTo := {f_getAnnouncementTargetPoA()};
 						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.container.maxByteSize := maxByteSize;						
@@ -1315,10 +1979,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_CRE_021_CIN() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
 						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
 						var RequestPrimitive v_requestPrimitive;
 						var XSD.NonNegativeInteger v_contentSize := 512;			//Correct value? Shall be indicated in TP?
-		
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						//v_createRequest.primitiveContent.contentInstance.announceTo := {f_getAnnouncementTargetPoA()};
 						v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.contentInstance.contentSize := v_contentSize;						
@@ -1345,10 +2010,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_CRE_021_GRP() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
 						var RequestPrimitive v_requestPrimitive;
 						var XSD.PositiveInteger maxNrOfMembers := 10;						//Correct value? Shall be indicated in TP?
-		
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.group_.announceTo := {f_getAnnouncementTargetPoA()};
 						v_createRequest.primitiveContent.group_.maxNrOfMembers := maxNrOfMembers;
 						v_createRequest.primitiveContent.group_.announcedAttribute := {"maxNrOfMembers"};	//Correct value? Shall be indicated in TP?
@@ -1374,10 +2040,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_CRE_021_LCP() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
 						var template RequestPrimitive v_createRequest := m_createLocationPolicy(int1, omit, omit, omit, omit);
 						var RequestPrimitive v_requestPrimitive;
 						var LocationSource locationSource := int1;//Network-based		//Correct value? Shall be indicated in TP?
-		
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.locationPolicy.announceTo := {f_getAnnouncementTargetPoA()};
 						v_createRequest.primitiveContent.locationPolicy.locationSource := locationSource;
 						v_createRequest.primitiveContent.locationPolicy.announcedAttribute := {"locationSource"};		//Correct value? Shall be indicated in TP?
@@ -1403,10 +2070,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_CRE_021_MGO() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
 						var template RequestPrimitive v_createRequest := m_createMgmtObjBase;
 						var RequestPrimitive v_requestPrimitive;
 						var XSD.String description := "Description of mgmtObj";	//Correct value? Shall be indicated in TP?
-		
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.mgmtResource.announceTo := {f_getAnnouncementTargetPoA()};
 						v_createRequest.primitiveContent.mgmtResource.description := description;			
 						v_createRequest.primitiveContent.mgmtResource.announcedAttribute := {"description"};			//Correct value? Shall be indicated in TP?
@@ -1432,9 +2100,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_CRE_021_NOD() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
 						var template RequestPrimitive v_createRequest := m_createNodeBase;
 						var RequestPrimitive v_requestPrimitive;
-		
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.node.announceTo := {f_getAnnouncementTargetPoA()};
 						
 						//TODO node to be done. hostedCSELink attribute (OA) to be added!!!
@@ -1446,10 +2115,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_CRE_021_SCH() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
 						var template RequestPrimitive v_createRequest := m_createScheduleBase;
 						var RequestPrimitive v_requestPrimitive;
 						var ScheduleEntries scheduleElement := {{"0 0 0,1,2 1 1 * *"}};
-		
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.schedule.announceTo := {f_getAnnouncementTargetPoA()};
 						v_createRequest.primitiveContent.schedule.scheduleElement := scheduleElement;			//Correct value? Shall be indicated in TP?
 						v_createRequest.primitiveContent.schedule.announcedAttribute := {"scheduleElement"};			//Correct value? Shall be indicated in TP?
@@ -1471,38 +2141,100 @@ module OneM2M_Testcases_CSE_Release_2 {
 							}
 						}
 					}
-
-				} // end g_CSE_DMR_CRE_021	
-				
-			}//end group Create
-			
-			group Retrieve {
-				
-				group g_CSE_DMR_RET_001 {
 					
-					/**
-					 * @desc Check that the IUT returns successfully the TARGET_RESOURCE_ADDRESS resource 
-					 * 
-					 */
-					testcase TC_CSE_DMR_RET_001_SCH() runs on Tester system CseSystem {
+					testcase TC_CSE_DMR_CRE_021_TS() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var ResponsePrimitive v_responsePrimitive;
-						var template PrimitiveContent v_contentResponse;
-					
-						v_contentResponse.schedule := mw_contentSchedule_rc1;
-						
-						v_ae1.start(f_CSE_DMR_RET_001(int18, m_createScheduleBase, v_contentResponse));//Schedule
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var RequestPrimitive v_requestPrimitive;
+						var XSD.NonNegativeInteger v_maxByteSize := 512;		//Correct value? Shall be indicated in TP?
+
+						//v_createRequest.primitiveContent.container.announceTo := {f_getAnnouncementTargetPoA()};
+						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
+						v_createRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize;						
+						v_createRequest.primitiveContent.timeSeries.announcedAttribute := {"maxByteSize"};		//Correct value? Shall be indicated in TP?
+
+						v_ae1.start(f_CSE_DMR_CRE_021(int29, v_createRequest, mw_createTimeSeriesAnncBase()));//TimeSeries
 						v_ae1.done;
-						
-					}
-					
-					testcase TC_CSE_DMR_RET_001_PCH() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var ResponsePrimitive v_responsePrimitive;
-						var template PrimitiveContent v_contentResponse;
-					
+	
+						if(getverdict == pass){ 
+							//Check if maxByteSize attribute has been announced
+							v_requestPrimitive := f_getRequestPrimitive(v_ae1);
+							if (ispresent(v_requestPrimitive.primitiveContent.timeSeriesAnnc.maxByteSize)){
+								if(v_requestPrimitive.primitiveContent.timeSeriesAnnc.maxByteSize != v_maxByteSize){
+									setverdict(fail, __SCOPE__ & ": Error: Value of maxByteSize has not been announced successfully");
+								}else{
+									setverdict(pass, __SCOPE__ & ": Value of maxByteSize has been announced successfully");
+								}
+							}else{
+								setverdict(fail, __SCOPE__ & ": Error: maxByteSize has not been announced");
+							}
+						}
+					}
+					
+					testcase TC_CSE_DMR_CRE_021_TSI() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
+						var RequestPrimitive v_requestPrimitive;
+						var XSD.NonNegativeInteger v_sequenceNr := 8;		//Correct value? Shall be indicated in TP?
+
+						//v_createRequest.primitiveContent.container.announceTo := {f_getAnnouncementTargetPoA()};
+						v_createRequest.primitiveContent.timeSeriesInstance.announceTo := {PX_CSE1_ID};
+						v_createRequest.primitiveContent.timeSeriesInstance.sequenceNr := v_sequenceNr;						
+						v_createRequest.primitiveContent.timeSeriesInstance.announcedAttribute := {"sequenceNr"};		//Correct value? Shall be indicated in TP?
+
+						v_ae1.start(f_CSE_DMR_CRE_021(int30, v_createRequest, mw_createTimeSeriesInstanceAnncBase()));//TimeSeriesInstance
+						v_ae1.done;
+
+						if(getverdict == pass){ 
+							//Check if maxByteSize attribute has been announced
+							v_requestPrimitive := f_getRequestPrimitive(v_ae1);
+							if (ispresent(v_requestPrimitive.primitiveContent.timeSeriesInstanceAnnc.sequenceNr)){
+								if(v_requestPrimitive.primitiveContent.timeSeriesInstanceAnnc.sequenceNr != v_sequenceNr){
+									setverdict(fail, __SCOPE__ & ": Error: Value of sequenceNr has not been announced successfully");
+								}else{
+									setverdict(pass, __SCOPE__ & ": Value of sequenceNr has been announced successfully");
+								}
+							}else{
+								setverdict(fail, __SCOPE__ & ": Error: sequenceNr has not been announced");
+							}
+						}
+					}
+
+				} // end g_CSE_DMR_CRE_021	
+				
+			}//end group Create
+			
+			group Retrieve {
+				
+				group g_CSE_DMR_RET_001 {
+					
+					/**
+					 * @desc Check that the IUT returns successfully the TARGET_RESOURCE_ADDRESS resource 
+					 * 
+					 */
+					testcase TC_CSE_DMR_RET_001_SCH() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						var ResponsePrimitive v_responsePrimitive;
+						var template PrimitiveContent v_contentResponse;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_contentResponse.schedule := mw_contentSchedule_rc1;
+						
+						v_ae1.start(f_CSE_DMR_RET_001(int18, m_createScheduleBase, v_contentResponse));//Schedule
+						v_ae1.done;
+						
+					}
+					
+					testcase TC_CSE_DMR_RET_001_PCH() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						var ResponsePrimitive v_responsePrimitive;
+						var template PrimitiveContent v_contentResponse;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.pollingChannel := mw_contentPollingChannelBase;
 						
 						v_ae1.start(f_CSE_DMR_RET_001(int15, m_createPollingChannelBase, v_contentResponse));//PollingChannel
@@ -1510,6 +2242,19 @@ module OneM2M_Testcases_CSE_Release_2 {
 						
 					}
 					
+					testcase TC_CSE_DMR_RET_001_TS() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var ResponsePrimitive v_responsePrimitive;
+						var template PrimitiveContent v_contentResponse;
+
+						v_contentResponse.timeSeries := mw_contentTimeSeries_rc1;
+
+						v_ae1.start(f_CSE_DMR_RET_001(int29, m_createTimeSeriesBase, v_contentResponse));//TimeSeries
+						v_ae1.done;
+
+					}
+					
 				} // end g_CSE_DMR_RET_001
 				
 				group g_CSE_DMR_RET_002 {
@@ -1521,6 +2266,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 +2303,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 +2343,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,11 +2352,20 @@ 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;
 					}
 					
+					testcase TC_CSE_DMR_RET_003_TS() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+						v_ae1.start(f_CSE_DMR_RET_003(int29, m_createTimeSeriesBase));//TimeSeries
+						v_ae1.done;
+					}
+					
 				} // end g_CSE_DMR_RET_003
 				
 				group g_CSE_DMR_RET_004 {
@@ -1621,8 +2377,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_004_CNT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
 						var template PrimitiveContent v_contentResponse;
-					
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.container := m_contentContainer_allOmit;
 						v_contentResponse.container.parentID := ?;
                         
@@ -1633,8 +2390,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_004_GRP() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
 						var template PrimitiveContent v_contentResponse;
-					
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.group_ := m_contentGroup_allOmit;
 						v_contentResponse.group_.parentID := ?;
 												
@@ -1645,8 +2403,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_004_ACP() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
 						var template PrimitiveContent v_contentResponse;
-					
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.accessControlPolicy := m_contentAcp_allOmit;
 						v_contentResponse.accessControlPolicy.parentID := ?;
 							
@@ -1658,6 +2417,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 +2430,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 +2443,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 := ?;
@@ -1689,6 +2451,18 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_ae1.start(f_CSE_DMR_RET_004(int23, m_createSubscriptionBase, v_contentResponse));//Subscription
 						v_ae1.done;
 					}
+					
+					testcase TC_CSE_DMR_RET_004_TS() runs on Tester system CseSystem {
+						// Local variables
+						var template PrimitiveContent v_contentResponse;
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+						v_contentResponse.timeSeries := m_contentTimeSeries_allOmit;
+						v_contentResponse.timeSeries.parentID := ?;
+		
+						v_ae1.start(f_CSE_DMR_RET_004(int29, m_createTimeSeriesBase, v_contentResponse));//TimeSeries
+						v_ae1.done;
+					}
 				
 				} // end g_CSE_DMR_RET_004
 				
@@ -1701,8 +2475,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_005_CNT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
 						var template PrimitiveContent v_contentResponse;
-					
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.container := m_contentContainer_allOmit;
 						v_contentResponse.container.parentID := ?;
 						                       
@@ -1713,8 +2488,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_005_GRP() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
 						var template PrimitiveContent v_contentResponse;
-					
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.group_ := m_contentGroup_allOmit;
 						v_contentResponse.group_.parentID := ?;
 																		
@@ -1725,8 +2501,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_005_ACP() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template PrimitiveContent v_contentResponse;
 					
+						var template PrimitiveContent v_contentResponse;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.accessControlPolicy := m_contentAcp_allOmit;
 						v_contentResponse.accessControlPolicy.parentID := ?;
 							
@@ -1738,7 +2515,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-					
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.schedule := m_contentSchedule_allOmit;
 						v_contentResponse.schedule.parentID := ?;
 								
@@ -1750,7 +2527,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-					
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.pollingChannel := m_contentPollingChannel_allOmit;
 						v_contentResponse.pollingChannel.parentID := ?;
 								
@@ -1761,14 +2538,27 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_005_SUB() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
 						var template PrimitiveContent v_contentResponse;
-					
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.subscription := m_contentSubscription_allOmit;
 						v_contentResponse.subscription.parentID := ?;
 								
 						v_ae1.start(f_CSE_DMR_RET_005(int23, m_createSubscriptionBase, v_contentResponse));//Subscription
 						v_ae1.done;
 					}
+					
+					testcase TC_CSE_DMR_RET_005_TS() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template PrimitiveContent v_contentResponse;
+
+						v_contentResponse.timeSeries := m_contentTimeSeries_allOmit;
+						v_contentResponse.timeSeries.parentID := ?;
+			
+						v_ae1.start(f_CSE_DMR_RET_005(int29, m_createTimeSeriesBase, v_contentResponse));//TimeSeries
+						v_ae1.done;
+					}
 
 					
 				} // end g_CSE_DMR_RET_005
@@ -1782,8 +2572,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_006_CNT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
 						var template PrimitiveContent v_contentResponse;
-					
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.container := m_contentContainer_allOmit;
 						v_contentResponse.container.parentID := ?;
 						v_contentResponse.container.creationTime := ?;
@@ -1795,8 +2586,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_006_GRP() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
 						var template PrimitiveContent v_contentResponse;
-					
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.group_ := m_contentGroup_allOmit;
 						v_contentResponse.group_.parentID := ?;
 						v_contentResponse.group_.creationTime := ?;
@@ -1808,8 +2600,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_006_ACP() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
 						var template PrimitiveContent v_contentResponse;
-					
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.accessControlPolicy := m_contentAcp_allOmit;
 						v_contentResponse.accessControlPolicy.parentID := ?;
 						v_contentResponse.accessControlPolicy.creationTime := ?;
@@ -1821,8 +2614,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_006_SCH() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
 						var template PrimitiveContent v_contentResponse;
-					
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.schedule := m_contentSchedule_allOmit;
 						v_contentResponse.schedule.parentID := ?;
 						v_contentResponse.schedule.creationTime := ?;
@@ -1834,8 +2628,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_006_PCH() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template PrimitiveContent v_contentResponse;
 					
+						var template PrimitiveContent v_contentResponse;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.pollingChannel := m_contentPollingChannel_allOmit;
 						v_contentResponse.pollingChannel.parentID := ?;
 						v_contentResponse.pollingChannel.creationTime := ?;
@@ -1847,8 +2642,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 					testcase TC_CSE_DMR_RET_006_SUB() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
 						var template PrimitiveContent v_contentResponse;
-					
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.subscription := m_contentSubscription_allOmit;
 						v_contentResponse.subscription.parentID := ?;
 						v_contentResponse.subscription.creationTime := ?;
@@ -1856,6 +2652,19 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_ae1.start(f_CSE_DMR_RET_006(int23, m_createSubscriptionBase, v_contentResponse));//Subscription
 						v_ae1.done;
 					}
+					
+					testcase TC_CSE_DMR_RET_006_TS() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template PrimitiveContent v_contentResponse;
+
+						v_contentResponse.timeSeries := m_contentTimeSeries_allOmit;
+						v_contentResponse.timeSeries.parentID := ?;
+						v_contentResponse.timeSeries.creationTime := ?;
+		
+						v_ae1.start(f_CSE_DMR_RET_006(int29, m_createTimeSeriesBase, v_contentResponse));//TimeSeries
+						v_ae1.done;
+					}
 
 					
 				} // end g_CSE_DMR_RET_006
@@ -1869,6 +2678,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 +2687,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 +2696,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 +2705,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,18 +2714,28 @@ 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;
 					}
 					
 					testcase TC_CSE_DMR_RET_007_SUB_LBL() runs on AeSimu system CseSystem {
-							// Local variables
+						// 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;
 					}
+					
+					testcase TC_CSE_DMR_RET_007_TS_LBL() runs on AeSimu system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+						v_ae1.start(f_CSE_DMR_RET_007(int29, m_createSubscriptionBase));//TimeSeries
+						v_ae1.done;
+					}
 
 				} // end g_CSE_DMR_RET_007
 				
@@ -1925,6 +2748,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 +2757,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 +2766,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 +2775,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,18 +2784,28 @@ 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;
 					}
 					
 					testcase TC_CSE_DMR_RET_008_SUB_AT() runs on Tester system CseSystem {
-							// Local variables
+						// 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;
 					}
+					
+					testcase TC_CSE_DMR_RET_008_TS_AT() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+						v_ae1.start(f_CSE_DMR_RET_008(int29, m_createTimeSeriesBase));//TimeSeries
+						v_ae1.done;
+					}
 
 				} // end f_CSE_DMR_RET_008
 				
@@ -1981,6 +2818,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 +2844,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 +2884,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 +2910,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,8 +2950,9 @@ 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;
+						
 						var template PrimitiveContent v_contentResponse;
-					
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.schedule := mw_contentSchedule_rc1;
 						
 						v_ae1.start(f_CSE_DMR_RET_013(int18, m_createScheduleBase, v_contentResponse));//Schedule
@@ -2120,6 +2960,18 @@ module OneM2M_Testcases_CSE_Release_2 {
 						
 					}
 					
+					testcase TC_CSE_DMR_RET_013_TS() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template PrimitiveContent v_contentResponse;
+
+						v_contentResponse.timeSeries := mw_contentTimeSeries_rc1;
+	
+						v_ae1.start(f_CSE_DMR_RET_013(int29, m_createTimeSeriesBase, v_contentResponse));//TimeSeries
+						v_ae1.done;
+	
+					}
+					
 				} // end g_CSE_DMR_RET_013
 
 				group g_CSE_DMR_RET_014 {
@@ -2131,10 +2983,19 @@ 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;
 					}
+					
+					testcase TC_CSE_DMR_RET_014_TS() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+						v_ae1.start(f_CSE_DMR_RET_014(int29, m_createTimeSeriesBase));//TimeSeries
+						v_ae1.done;
+					}
 										
 				} // end g_CSE_DMR_RET_014
 
@@ -2147,8 +3008,9 @@ 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;
-						var template PrimitiveContent v_contentResponse;
 					
+						var template PrimitiveContent v_contentResponse;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.accessControlPolicy := m_contentAcp_allOmit;
 						v_contentResponse.accessControlPolicy.parentID := ?;
 							
@@ -2159,8 +3021,9 @@ 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;
+						
 						var template PrimitiveContent v_contentResponse;
-					
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.aE := m_contentAe_allOmit;
 						v_contentResponse.aE.parentID := ?;
 							
@@ -2171,8 +3034,9 @@ 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;
+						
 						var template PrimitiveContent v_contentResponse;
-					
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.container := m_contentContainer_allOmit;
 						v_contentResponse.container.parentID := ?;
                         
@@ -2183,8 +3047,9 @@ 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;
+						
 						var template PrimitiveContent v_contentResponse;
-					
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.group_ := m_contentGroup_allOmit;
 						v_contentResponse.group_.parentID := ?;
 												
@@ -2195,8 +3060,9 @@ 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;
+						
 						var template PrimitiveContent v_contentResponse;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.remoteCSE := m_contentRemoteCSE_allOmit;
 						v_contentResponse.remoteCSE.parentID := ?;
 		
@@ -2208,7 +3074,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-					
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.schedule := m_contentSchedule_allOmit;
 						v_contentResponse.schedule.parentID := ?;
 							
@@ -2219,14 +3085,27 @@ 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;
+						
 						var template PrimitiveContent v_contentResponse;
-					
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.subscription := m_contentSubscription_allOmit;
 						v_contentResponse.subscription.parentID := ?;
 							
 						v_ae1.start(f_CSE_DMR_RET_015(int23, m_createSubscriptionBase, v_contentResponse));//Subscription
 						v_ae1.done;
 					}
+					
+					testcase TC_CSE_DMR_RET_015_TS() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template PrimitiveContent v_contentResponse;
+
+						v_contentResponse.timeSeries := m_contentTimeSeries_allOmit;
+						v_contentResponse.timeSeries.parentID := ?;
+		
+						v_ae1.start(f_CSE_DMR_RET_015(int29, m_createTimeSeriesBase, v_contentResponse));//TimeSeries
+						v_ae1.done;
+					}
 				
 				} // end g_CSE_DMR_RET_015
 
@@ -2239,8 +3118,9 @@ 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;
+						
 						var template PrimitiveContent v_contentResponse;
-					
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.accessControlPolicy := m_contentAcp_allOmit;
 						v_contentResponse.accessControlPolicy.parentID := ?;
 							
@@ -2251,8 +3131,9 @@ 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;
-						var template PrimitiveContent v_contentResponse;
 					
+						var template PrimitiveContent v_contentResponse;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.aE := m_contentAe_allOmit;
 						v_contentResponse.aE.parentID := ?;
 								
@@ -2263,8 +3144,9 @@ 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;
+						
 						var template PrimitiveContent v_contentResponse;
-					
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.container := m_contentContainer_allOmit;
 						v_contentResponse.container.parentID := ?;
 						                       
@@ -2275,8 +3157,9 @@ 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;
+						
 						var template PrimitiveContent v_contentResponse;
-					
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.group_ := m_contentGroup_allOmit;
 						v_contentResponse.group_.parentID := ?;
 																		
@@ -2287,8 +3170,9 @@ 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;
+						
 						var template PrimitiveContent v_contentResponse;
-					
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.remoteCSE := m_contentRemoteCSE_allOmit;
 						v_contentResponse.remoteCSE.parentID := ?;
 								
@@ -2300,7 +3184,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-					
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.schedule := m_contentSchedule_allOmit;
 						v_contentResponse.schedule.parentID := ?;
 								
@@ -2311,14 +3195,27 @@ 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;
-						var template PrimitiveContent v_contentResponse;
 					
+						var template PrimitiveContent v_contentResponse;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.subscription := m_contentSubscription_allOmit;
 						v_contentResponse.subscription.parentID := ?;
 								
 						v_ae1.start(f_CSE_DMR_RET_016(int23, m_createSubscriptionBase, v_contentResponse));//Subscription
 						v_ae1.done;
 					}
+					
+					testcase TC_CSE_DMR_RET_016_TS() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template PrimitiveContent v_contentResponse;
+
+						v_contentResponse.timeSeries := m_contentTimeSeries_allOmit;
+						v_contentResponse.timeSeries.parentID := ?;
+			
+						v_ae1.start(f_CSE_DMR_RET_016(int29, m_createTimeSeriesBase, v_contentResponse));//TimeSeries
+						v_ae1.done;
+					}
 
 				} // end g_CSE_DMR_RET_016
 
@@ -2331,8 +3228,9 @@ 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;
+						
 						var template PrimitiveContent v_contentResponse;
-					
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.accessControlPolicy := m_contentAcp_allOmit;
 						v_contentResponse.accessControlPolicy.parentID := ?;
 						v_contentResponse.accessControlPolicy.creationTime := ?;
@@ -2344,8 +3242,9 @@ 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;
+						
 						var template PrimitiveContent v_contentResponse;
-					
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.aE := m_contentAe_allOmit;
 						v_contentResponse.aE.parentID := ?;
 						v_contentResponse.aE.creationTime := ?;
@@ -2357,8 +3256,10 @@ 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;
+						
 						var template PrimitiveContent v_contentResponse;
-					
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						
 						v_contentResponse.container := m_contentContainer_allOmit;
 						v_contentResponse.container.parentID := ?;
 						v_contentResponse.container.creationTime := ?;
@@ -2370,6 +3271,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,8 +3285,9 @@ 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;
+						
 						var template PrimitiveContent v_contentResponse;
-					
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.group_ := m_contentGroup_allOmit;
 						v_contentResponse.group_.parentID := ?;
 						v_contentResponse.group_.creationTime := ?;
@@ -2396,8 +3299,9 @@ 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;
+						
 						var template PrimitiveContent v_contentResponse;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.locationPolicy := m_contentLocationPolicy_allOmit;
 						v_contentResponse.locationPolicy.parentID := ?;
 						v_contentResponse.locationPolicy.creationTime := ?;
@@ -2409,8 +3313,9 @@ 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;
+					
 						var template PrimitiveContent v_contentResponse;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.mgmtCmd := m_contentMgmtCmd_allOmit;
 						v_contentResponse.mgmtCmd.parentID := ?;
 						v_contentResponse.mgmtCmd.creationTime := ?;
@@ -2422,8 +3327,9 @@ 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;
+						
 						var template PrimitiveContent v_contentResponse;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.node := m_contentNode_allOmit;
 						v_contentResponse.node.parentID := ?;
 						v_contentResponse.node.creationTime := ?;
@@ -2435,8 +3341,9 @@ 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;
+						
 						var template PrimitiveContent v_contentResponse;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.remoteCSE := m_contentRemoteCSE_allOmit;
 						v_contentResponse.remoteCSE.parentID := ?;
 						v_contentResponse.remoteCSE.creationTime := ?;
@@ -2448,8 +3355,9 @@ 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;
-						var template PrimitiveContent v_contentResponse;
 					
+						var template PrimitiveContent v_contentResponse;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.schedule := m_contentSchedule_allOmit;
 						v_contentResponse.schedule.parentID := ?;
 						v_contentResponse.schedule.creationTime := ?;
@@ -2461,8 +3369,9 @@ 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;
+						
 						var template PrimitiveContent v_contentResponse;
-					
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.statsCollect := m_contentStatsCollect_allOmit;
 						v_contentResponse.statsCollect.parentID := ?;
 						v_contentResponse.statsCollect.creationTime := ?;
@@ -2474,8 +3383,9 @@ 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;
+						
 						var template PrimitiveContent v_contentResponse;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.statsConfig := m_contentStatsConfig_allOmit;
 						v_contentResponse.statsConfig.parentID := ?;
 						v_contentResponse.statsConfig.creationTime := ?;
@@ -2487,8 +3397,9 @@ 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;
+						
 						var template PrimitiveContent v_contentResponse;
-					
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.subscription := m_contentSubscription_allOmit;
 						v_contentResponse.subscription.parentID := ?;
 						v_contentResponse.subscription.creationTime := ?;
@@ -2496,6 +3407,19 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_ae1.start(f_CSE_DMR_RET_017(int23, m_createSubscriptionBase, v_contentResponse));//Subscription
 						v_ae1.done;
 					}
+					
+					testcase TC_CSE_DMR_RET_017_TS() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template PrimitiveContent v_contentResponse;
+
+						v_contentResponse.timeSeries := m_contentTimeSeries_allOmit;
+						v_contentResponse.timeSeries.parentID := ?;
+						v_contentResponse.timeSeries.creationTime := ?;
+		
+						v_ae1.start(f_CSE_DMR_RET_017(int23, m_createTimeSeriesBase, v_contentResponse));//TimeSeries
+						v_ae1.done;
+					}
 
 				} // end g_CSE_DMR_RET_017
 
@@ -2508,6 +3432,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 +3441,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 +3450,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 +3459,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 +3468,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,18 +3477,28 @@ 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;
 					}
 										
 					testcase TC_CSE_DMR_RET_018_SUB_LBL() runs on AeSimu system CseSystem {
-							// Local variables
+						// 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;
 					}
+					
+					testcase TC_CSE_DMR_RET_018_TS_LBL() runs on AeSimu system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+						v_ae1.start(f_CSE_DMR_RET_018(int29, m_createTimeSeriesBase));//TimeSeries
+						v_ae1.done;
+					}
 
 				} // end g_CSE_DMR_RET_018
 
@@ -2572,6 +3511,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 +3520,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 +3529,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 +3538,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 +3547,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,18 +3556,28 @@ 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;
 					}
 					
 					testcase TC_CSE_DMR_RET_019_SUB_LBL_AT() runs on Tester system CseSystem {
-							// Local variables
+						// 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;
 					}
+					
+					testcase TC_CSE_DMR_RET_019_TS_LBL_AT() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+						v_ae1.start(f_CSE_DMR_RET_019(int29, m_createTimeSeriesBase));//TimeSeries
+						v_ae1.done;
+					}
 
 				} // end f_CSE_DMR_RET_019
 				
@@ -2636,6 +3590,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 +3598,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 +3606,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,8 +3622,9 @@ 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;
+						
 						var template PrimitiveContent v_contentResponse;
-		
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.container := mw_contentContainer_rc1;
 		                        
 						v_ae1.start(f_CSE_DMR_RET_021(int3, m_createContainerBase, v_contentResponse, int3, m_createContainerBase));//Container
@@ -2676,8 +3634,9 @@ 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;
+						
 						var template PrimitiveContent v_contentResponse;
-		
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.group_ := mw_contentGroup_rc1;
 		
 						v_ae1.start(f_CSE_DMR_RET_021(int9, m_createGroupBase, v_contentResponse, int23, m_createSubscriptionBase));//Group
@@ -2687,8 +3646,9 @@ 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;
+						
 						var template PrimitiveContent v_contentResponse;
-		
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.accessControlPolicy := mw_contentAcp_rc1;
 			
 						v_ae1.start(f_CSE_DMR_RET_021(int1, m_createAcpBase,v_contentResponse, int23, m_createSubscriptionBase));//AccessControlPolicy
@@ -2698,8 +3658,9 @@ 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;
+						
 						var template PrimitiveContent v_contentResponse;
-		
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.schedule := mw_contentSchedule_rc1;
 			
 						v_ae1.start(f_CSE_DMR_RET_021(int18, m_createScheduleBase, v_contentResponse, int23, m_createSubscriptionBase));//Schedule 
@@ -2709,8 +3670,9 @@ 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;
+						
 						var template PrimitiveContent v_contentResponse;
-		
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.pollingChannel := mw_contentPollingChannelBase;
 			
 						v_ae1.start(f_CSE_DMR_RET_021(int15, m_createPollingChannelBase, v_contentResponse, omit, omit));//PollingChannel
@@ -2720,13 +3682,25 @@ 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;
+						
 						var template PrimitiveContent v_contentResponse;
-		
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.subscription := mw_contentSubscription_rc1;
 
 						v_ae1.start(f_CSE_DMR_RET_021(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase));//Subscription
 						v_ae1.done;
 					}
+					
+					testcase TC_CSE_DMR_RET_021_TS() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template PrimitiveContent v_contentResponse;
+
+						v_contentResponse.timeSeries := mw_contentTimeSeries_rc1;
+
+						v_ae1.start(f_CSE_DMR_RET_021(int29, m_createTimeSeriesBase, v_contentResponse, int23, m_createSubscriptionBase));//TimeSeries
+						v_ae1.done;
+					}
 	
 				} // end g_CSE_DMR_RET_021
 
@@ -2739,8 +3713,9 @@ 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;
+						
 						var template PrimitiveContent v_contentResponse;
-		
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.container := mw_contentContainer_rc4;
 		                        
 						v_ae1.start(f_CSE_DMR_RET_022(int3, m_createContainerBase, v_contentResponse, int3, m_createContainerBase));//Container
@@ -2750,8 +3725,9 @@ 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;
+						
 						var template PrimitiveContent v_contentResponse;
-		
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.group_ := mw_contentGroup_rc4;
 		
 						v_ae1.start(f_CSE_DMR_RET_022(int9, m_createGroupBase, v_contentResponse, int23, m_createSubscriptionBase));//Group
@@ -2761,8 +3737,9 @@ 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;
+						
 						var template PrimitiveContent v_contentResponse;
-		
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.accessControlPolicy := mw_contentAcp_rc4;
 			
 						v_ae1.start(f_CSE_DMR_RET_022(int1, m_createAcpBase,v_contentResponse, int23, m_createSubscriptionBase));//AccessControlPolicy
@@ -2772,8 +3749,9 @@ 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;
+						
 						var template PrimitiveContent v_contentResponse;
-		
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.schedule := mw_contentSchedule_rc4;
 			
 						v_ae1.start(f_CSE_DMR_RET_022(int18, m_createScheduleBase, v_contentResponse, int23, m_createSubscriptionBase));//Schedule
@@ -2783,8 +3761,9 @@ 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;
+						
 						var template PrimitiveContent v_contentResponse;
-		
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.pollingChannel := mw_contentPollingChannelBase;
 			
 						v_ae1.start(f_CSE_DMR_RET_022(int15, m_createPollingChannelBase, v_contentResponse, omit, omit));//PollingChannel
@@ -2794,13 +3773,25 @@ 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;
+						
 						var template PrimitiveContent v_contentResponse;
-		
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.subscription := mw_contentSubscription_rc4;
 
 						v_ae1.start(f_CSE_DMR_RET_022(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase));//Subscription
 						v_ae1.done;
 					}
+					
+					testcase TC_CSE_DMR_RET_022_TS() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template PrimitiveContent v_contentResponse;
+
+						v_contentResponse.timeSeries := mw_contentTimeSeries_rc4;
+
+						v_ae1.start(f_CSE_DMR_RET_022(int29, m_createTimeSeriesBase, v_contentResponse, int23, m_createSubscriptionBase));//TimeSeries
+						v_ae1.done;
+					}
 	
 				} // end g_CSE_DMR_RET_022
 
@@ -2813,8 +3804,9 @@ 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;
+						
 						var template PrimitiveContent v_contentResponse;
-		
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.container := mw_contentContainer_rc5;
 		                        
 						v_ae1.start(f_CSE_DMR_RET_023(int3, m_createContainerBase, v_contentResponse, int3, m_createContainerBase));//Container
@@ -2824,8 +3816,9 @@ 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;
+						
 						var template PrimitiveContent v_contentResponse;
-		
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.group_ := mw_contentGroup_rc5;
 		
 						v_ae1.start(f_CSE_DMR_RET_023(int9, m_createGroupBase, v_contentResponse, int23, m_createSubscriptionBase));//Group
@@ -2835,8 +3828,9 @@ 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;
+						
 						var template PrimitiveContent v_contentResponse;
-		
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.accessControlPolicy := mw_contentAcp_rc5;
 			
 						v_ae1.start(f_CSE_DMR_RET_023(int1, m_createAcpBase,v_contentResponse, int23, m_createSubscriptionBase));//AccessControlPolicy
@@ -2846,8 +3840,9 @@ 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;
+						
 						var template PrimitiveContent v_contentResponse;
-		
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.schedule := mw_contentSchedule_rc5;
 			
 						v_ae1.start(f_CSE_DMR_RET_023(int18, m_createScheduleBase, v_contentResponse, int23, m_createSubscriptionBase));//Schedule 
@@ -2858,7 +3853,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-		
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.pollingChannel := mw_contentPollingChannelBase;
 			
 						v_ae1.start(f_CSE_DMR_RET_023(int15, m_createPollingChannelBase, v_contentResponse, omit, omit));//PollingChannel
@@ -2869,12 +3864,23 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-		
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.subscription := mw_contentSubscription_rc5;
 
 						v_ae1.start(f_CSE_DMR_RET_023(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase));//Subscription
 						v_ae1.done;
 					}
+					
+					testcase TC_CSE_DMR_RET_023_TS() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template PrimitiveContent v_contentResponse;
+
+						v_contentResponse.timeSeries := mw_contentTimeSeries_rc5;
+
+						v_ae1.start(f_CSE_DMR_RET_023(int29, m_createTimeSeriesBase, v_contentResponse, int23, m_createSubscriptionBase));//TimeSeries
+						v_ae1.done;
+					}
 	
 				} // end g_CSE_DMR_RET_023
 
@@ -2888,7 +3894,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-		
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.container := mw_contentContainer_rc6;
 		                        
 						v_ae1.start(f_CSE_DMR_RET_024(int3, m_createContainerBase, v_contentResponse, int3, m_createContainerBase));//Container
@@ -2899,7 +3905,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-		
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.group_ := mw_contentGroup_rc6;
 		
 						v_ae1.start(f_CSE_DMR_RET_024(int9, m_createGroupBase, v_contentResponse, int23, m_createSubscriptionBase));//Group
@@ -2910,7 +3916,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-		
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.accessControlPolicy := mw_contentAcp_rc6;
 			
 						v_ae1.start(f_CSE_DMR_RET_024(int1, m_createAcpBase,v_contentResponse, int23, m_createSubscriptionBase));//AccessControlPolicy
@@ -2921,7 +3927,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-		
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.schedule := mw_contentSchedule_rc6;
 			
 						v_ae1.start(f_CSE_DMR_RET_024(int18, m_createScheduleBase, v_contentResponse, int23, m_createSubscriptionBase));//Schedule
@@ -2932,7 +3938,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-		
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.pollingChannel := mw_contentPollingChannelBase;
 			
 						v_ae1.start(f_CSE_DMR_RET_024(int15, m_createPollingChannelBase, v_contentResponse, omit, omit));//PollingChannel
@@ -2943,12 +3949,23 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-		
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.subscription := mw_contentSubscription_rc6;
 
 						v_ae1.start(f_CSE_DMR_RET_024(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase));//Subscription
 						v_ae1.done;
 					}
+					
+					testcase TC_CSE_DMR_RET_024_TS() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template PrimitiveContent v_contentResponse;
+
+						v_contentResponse.timeSeries := mw_contentTimeSeries_rc6;
+
+						v_ae1.start(f_CSE_DMR_RET_024(int29, m_createTimeSeriesBase, v_contentResponse, int23, m_createSubscriptionBase));//TimeSeries
+						v_ae1.done;
+					}
 	
 				} // end g_CSE_DMR_RET_024
 
@@ -2962,7 +3979,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-		
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.container := mw_contentContainer_rc8;
 		                        
 						v_ae1.start(f_CSE_DMR_RET_025(int3, m_createContainerBase, v_contentResponse, int3, m_createContainerBase));//Container
@@ -2973,7 +3990,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-		
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.group_ := mw_contentGroup_rc8;
 		
 						v_ae1.start(f_CSE_DMR_RET_025(int9, m_createGroupBase, v_contentResponse, int23, m_createSubscriptionBase));//Group
@@ -2984,7 +4001,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-		
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.accessControlPolicy := mw_contentAcp_rc8;
 			
 						v_ae1.start(f_CSE_DMR_RET_025(int1, m_createAcpBase,v_contentResponse, int23, m_createSubscriptionBase));//AccessControlPolicy
@@ -2995,7 +4012,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-		
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.schedule := mw_contentSchedule_rc8;
 			
 						v_ae1.start(f_CSE_DMR_RET_025(int18, m_createScheduleBase, v_contentResponse, int23, m_createSubscriptionBase));//Schedule 
@@ -3006,7 +4023,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-		
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.pollingChannel := mw_contentPollingChannelBase;
 			
 						v_ae1.start(f_CSE_DMR_RET_025(int15, m_createPollingChannelBase, v_contentResponse, omit, omit));//PollingChannel
@@ -3017,12 +4034,23 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template PrimitiveContent v_contentResponse;
-		
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_contentResponse.subscription := mw_contentSubscription_rc8;
 
 						v_ae1.start(f_CSE_DMR_RET_025(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase));//Subscription
 						v_ae1.done;
 					}
+					
+					testcase TC_CSE_DMR_RET_025_TS() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template PrimitiveContent v_contentResponse;
+
+						v_contentResponse.timeSeries := mw_contentTimeSeries_rc8;
+
+						v_ae1.start(f_CSE_DMR_RET_025(int29, m_createTimeSeriesBase, v_contentResponse, int23, m_createSubscriptionBase));//TimeSeries
+						v_ae1.done;
+					}
 	
 				} // end g_CSE_DMR_RET_025
 			
@@ -3044,7 +4072,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.schedule.labels := v_labels_1;
 						v_updateRequest.primitiveContent.schedule.labels := v_labels_2;
 
@@ -3078,13 +4106,14 @@ 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;
+						
 						var Labels v_labels_1 := {"VALUE_1"};
 						var Labels v_labels_2 := {"VALUE_2"};
 						var template RequestPrimitive v_createRequest := m_createPollingChannelBase;
 						var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.pollingChannel.labels := v_labels_1;
 						v_updateRequest.primitiveContent.pollingChannel.labels := v_labels_2;
 
@@ -3114,6 +4143,45 @@ module OneM2M_Testcases_CSE_Release_2 {
 						}
 					}
 					
+					testcase TC_CSE_DMR_UPD_001_TS_LBL() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var Labels v_labels_1 := {"VALUE_1"};
+						var Labels v_labels_2 := {"VALUE_2"};
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+
+						v_createRequest.primitiveContent.timeSeries.labels := v_labels_1;
+						v_updateRequest.primitiveContent.timeSeries.labels := v_labels_2;
+
+						v_ae1.start(f_CSE_DMR_UPD_001(int29, v_createRequest, v_updateRequest));//TimeSeries
+						v_ae1.done;
+	
+	 
+													
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							//Check attribute 1
+							if(ispresent(v_responsePrimitive.primitiveContent)) {
+								if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
+									if(v_responsePrimitive.primitiveContent.timeSeries.labels != v_labels_2){
+										setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
+									}
+								}
+							}
+	
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+
+							//Check that the resource has been udpated correctly
+							if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) {
+								if(v_primitiveContentRetrieveResource.timeSeries.labels != v_labels_2){
+									setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
+								}
+							}
+						}
+					}
+					
 				} // end g_CSE_DMR_UPD_001
 				
 				group g_CSE_DMR_UPD_002 {
@@ -3129,7 +4197,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.schedule.labels := v_labels_1;
 						
 						v_ae1.start(f_CSE_DMR_UPD_002(int18, m_createScheduleBase,v_updateRequest));//Schedule
@@ -3161,11 +4229,12 @@ 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;
+						
 						var Labels v_labels_1 := {"VALUE_1"};
 						var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.pollingChannel.labels := v_labels_1;
 						
 						v_ae1.start(f_CSE_DMR_UPD_002(int15, m_createPollingChannelBase,v_updateRequest));//PollingChannel
@@ -3194,6 +4263,42 @@ module OneM2M_Testcases_CSE_Release_2 {
 						}
 					}
 					
+					testcase TC_CSE_DMR_UPD_002_TS_LBL() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var Labels v_labels_1 := {"VALUE_1"};
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+
+						v_updateRequest.primitiveContent.timeSeries.labels := v_labels_1;
+	
+						v_ae1.start(f_CSE_DMR_UPD_002(int29, m_createTimeSeriesBase,v_updateRequest));//TimeSeries
+						v_ae1.done;
+	
+	 
+													
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							//Check attribute 1
+							if(ispresent(v_responsePrimitive.primitiveContent)) {
+								if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
+									if(v_responsePrimitive.primitiveContent.timeSeries.labels != v_labels_1){
+										setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
+									}
+								}
+							}
+		
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+		
+							//Check that the resource has been udpated correctly
+						  if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) {
+							  if(v_primitiveContentRetrieveResource.timeSeries.labels != v_labels_1){
+										  setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
+								}
+							}
+						}
+					}
+					
 				} // end g_CSE_DMR_UPD_002
 				
 				group g_CSE_DMR_UPD_003 {
@@ -3212,7 +4317,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createScheduleBase;
 						var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.schedule.labels := v_labels_1;
 						v_updateRequest.primitiveContent.schedule.labels := v_labels_2;
 						
@@ -3240,8 +4345,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 								if(ispresent(v_primitiveContentRetrieveResource.schedule.labels)) {
 								  if(not(match(v_primitiveContentRetrieveResource.schedule.labels,{""}))){
 									setverdict(fail, __SCOPE__ & ": Error: Labels attribute not deleted correctly")
-						}
-					}
+									}
+								}
 							}
 						}
 					}
@@ -3256,7 +4361,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createPollingChannelBase;
 						var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.pollingChannel.labels := v_labels_1;
 						v_updateRequest.primitiveContent.pollingChannel.labels := v_labels_2;
 						
@@ -3290,6 +4395,50 @@ module OneM2M_Testcases_CSE_Release_2 {
 						}
 					}
 					
+					testcase TC_CSE_DMR_UPD_003_TS_LBL() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var Labels v_labels_1 := {"VALUE_1"};
+						var Labels v_labels_2 := {"To be deleted"};
+						var AttributeAux_list v_nullFields;
+						var ResponsePrimitive v_responsePrimitive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+
+						v_createRequest.primitiveContent.timeSeries.labels := v_labels_1;
+						v_updateRequest.primitiveContent.timeSeries.labels := v_labels_2;
+	
+						v_nullFields := {{"labels", omit}};
+	
+						v_ae1.start(f_CSE_DMR_UPD_003(int29, v_createRequest, v_updateRequest, v_nullFields));//TimeSeries
+						v_ae1.done;
+	
+	 
+													
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							//Check attribute 1
+							if(ispresent(v_responsePrimitive.primitiveContent)) {
+								if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
+									if(ispresent(v_responsePrimitive.primitiveContent.timeSeries.labels)){
+										setverdict(fail, __SCOPE__ & ": Error: Labels attribute not deleted correctly")
+									}
+								}
+							}
+		
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+		
+							//Check that the resource has been udpated correctly
+							if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) {
+								if(ispresent(v_primitiveContentRetrieveResource.timeSeries.labels)) {
+								  if(not(match(v_primitiveContentRetrieveResource.timeSeries.labels,{""}))){
+									setverdict(fail, __SCOPE__ & ": Error: Labels attribute not deleted correctly")
+									}
+								}
+							}
+						}
+					}
+					
 				} // end g_CSE_DMR_UPD_003
 				
 				group g_CSE_DMR_UPD_004 {
@@ -3301,13 +4450,14 @@ 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;
+						
 						var Labels v_labels_1 := {"To be deleted"};
 						var AttributeAux_list v_nullFields;
 						var template RequestPrimitive v_createRequest := m_createScheduleBase;
 						var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.schedule.scheduleElement := {{"0 0 0,1,2 1 1 * *"}};//Attribute 1
 						v_updateRequest.primitiveContent.schedule.scheduleElement := {{"1 1 1,2 1 1 * *"}}; //Attribute 1
 						v_updateRequest.primitiveContent.schedule.announceTo := {f_getAnnouncementTargetPoA()};//Attribute 2
@@ -3368,7 +4518,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.pollingChannel.labels := v_labels_1;//Attribute 3
 						//No Attribute 1
 						//v_updateRequest.primitiveContent.pollingChannel.accessControlPolicyIDs := v_acp;//Attribute 2 TODO Find another alternative for Attribute 2
@@ -3403,8 +4553,67 @@ module OneM2M_Testcases_CSE_Release_2 {
 							  if(ischosen(v_primitiveContentRetrieveResource.pollingChannel)) {
 							   if(ispresent (v_primitiveContentRetrieveResource.pollingChannel.labels)){
 								setverdict(fail, __SCOPE__ & ": Error: Labels attribute not deleted correctly")
+								}
+							}
 						}
 					}
+					
+					testcase TC_CSE_DMR_UPD_004_TS_ET_MNI_LBL() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var Labels v_labels_1 := {"VALUE_1"};
+						var Labels v_labels_2 := {"To be deleted"};
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var AttributeAux_list v_nullFields;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+
+						v_createRequest.primitiveContent.timeSeries.labels := v_labels_1;//Attribute 3
+						v_updateRequest.primitiveContent.timeSeries.expirationTime := "20301231T012345";//Attribute 1
+						v_updateRequest.primitiveContent.timeSeries.maxNrOfInstances := 5;//Attribute 2
+						v_updateRequest.primitiveContent.timeSeries.labels := v_labels_2;//Attribute 3
+						
+						v_nullFields := {{"labels", omit}};
+						
+						v_ae1.start(f_CSE_DMR_UPD_004(int29, v_createRequest, v_updateRequest, v_nullFields));//TimeSeries
+						v_ae1.done;					 
+																		
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							if(ispresent(v_responsePrimitive.primitiveContent)) {
+								if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
+									//Check attribute 1
+									if(v_responsePrimitive.primitiveContent.timeSeries.expirationTime != valueof(v_updateRequest.primitiveContent.timeSeries.expirationTime)){
+										setverdict(fail, __SCOPE__ & ": Error: Expiration Time attribute not updated correctly")
+									}
+									//Check attribute 2
+									if(v_responsePrimitive.primitiveContent.timeSeries.maxNrOfInstances != valueof(v_updateRequest.primitiveContent.timeSeries.maxNrOfInstances)){
+										setverdict(fail, __SCOPE__ & ": Error: MaxNrOfInstances attribute not updated correctly")
+									}
+									//Check attribute 3
+									if(ispresent(v_responsePrimitive.primitiveContent.timeSeries.labels)){
+										setverdict(fail, __SCOPE__ & ": Error: Labels attribute not deleted correctly")
+									}
+								}
+							}
+							
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+							
+							//Check that the resource has been udpated correctly
+							  if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) {
+								  //Check attribute 1
+								  if(v_primitiveContentRetrieveResource.timeSeries.expirationTime != valueof(v_updateRequest.primitiveContent.timeSeries.expirationTime)){
+									  setverdict(fail, __SCOPE__ & ": Error: Expiration Time attribute not updated correctly")
+								  }
+								  //Check attribute 2
+								  if(v_primitiveContentRetrieveResource.timeSeries.maxNrOfInstances != valueof(v_updateRequest.primitiveContent.timeSeries.maxNrOfInstances)){
+									  setverdict(fail, __SCOPE__ & ": Error: MaxNrOfInstances attribute not updated correctly")
+								  }
+								  //Check attribute 3
+								  if(ispresent(v_primitiveContentRetrieveResource.timeSeries.labels)){
+									  setverdict(fail, __SCOPE__ & ": Error: Labels attribute not deleted correctly")
+								  }
+							  }
 						}
 					}
 					
@@ -3422,7 +4631,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var Labels v_labels_1 := {"VALUE_1"};
 						var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.schedule.labels := v_labels_1;
 										
 						v_ae1.start(f_CSE_DMR_UPD_006(int18, m_createScheduleBase, v_updateRequest));//Schedule
@@ -3445,7 +4654,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var Labels v_labels_1 := {"VALUE_1"};
 						var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.pollingChannel.labels := v_labels_1;
 							
 						v_ae1.start(f_CSE_DMR_UPD_006(int15, m_createPollingChannelBase, v_updateRequest));//PollingChannel
@@ -3463,6 +4672,30 @@ module OneM2M_Testcases_CSE_Release_2 {
 						}
 					}
 					
+					testcase TC_CSE_DMR_UPD_006_TS_LBL() runs on Tester system CseSystem {
+						// Local variable
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var Labels v_labels_1 := {"VALUE_1"};
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+
+						v_updateRequest.primitiveContent.timeSeries.labels := v_labels_1;
+		
+						v_ae1.start(f_CSE_DMR_UPD_006(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
+						v_ae1.done;
+	
+						if(getverdict == pass){ 
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+
+							//Check that the resource has NOT been udpated
+							  if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) {
+							   if(v_primitiveContentRetrieveResource.timeSeries.labels == v_labels_1){
+								 setverdict(fail, __SCOPE__ & ": Error: Labels attribute updated")
+								}
+							}
+						}
+					}
+					
 				} // end g_CSE_DMR_UPD_006				
 								
 				
@@ -3478,7 +4711,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var Timestamp v_creationTime := "21001231T012345";
 						var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent := {schedule_update_invalid := m_contentUpdateSchedule_invalid};
 						v_updateRequest.primitiveContent.schedule_update_invalid.creationTime := v_creationTime;
 										
@@ -3502,7 +4735,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var Timestamp v_creationTime := "21001231T012345";
 						var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent := {pollingChannel_update_invalid := m_contentUpdatePollingChannel_invalid};
 						v_updateRequest.primitiveContent.pollingChannel_update_invalid.creationTime := v_creationTime;
 							
@@ -3520,22 +4753,46 @@ module OneM2M_Testcases_CSE_Release_2 {
 						}
 					}
 					
-				} // end g_CSE_DMR_UPD_007			
-				
-				group g_CSE_DMR_UPD_008{
-					
-					/**
-					 * @desc Check that the IUT responds with an error when the AE tries to delete a mandatory RW attribute ATTRIBUTE_NAME of a TARGET_RESOURCE_ADDRESS resource
-					 * 
-					 */
-					testcase TC_CSE_DMR_UPD_008_SCH_ET() runs on Tester system CseSystem {
+					testcase TC_CSE_DMR_UPD_007_TS_CT() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var Timestamp v_expirationTime := "21001231T012345";
-						var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
-						var AttributeAux_list v_nullFields;
+						var Timestamp v_creationTime := "21001231T012345";
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 
+						v_updateRequest.primitiveContent := {timeSeries_update_invalid := m_contentUpdateTimeSeries_invalid};
+						v_updateRequest.primitiveContent.timeSeries_update_invalid.creationTime := v_creationTime;
+		
+						v_ae1.start(f_CSE_DMR_UPD_007(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
+						v_ae1.done;
+	
+						if(getverdict == pass){ 
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+							//Check that the resource has NOT been udpated
+							  if(ischosen(v_primitiveContentRetrieveResource.timeSeries_update_invalid)) {
+							   if(v_primitiveContentRetrieveResource.timeSeries_update_invalid.creationTime == v_creationTime){
+								 setverdict(fail, __SCOPE__ & ": Error: Creation Time attribute updated")
+								}
+							}
+						}
+					}
+					
+				} // end g_CSE_DMR_UPD_007			
+				
+				group g_CSE_DMR_UPD_008{
+					
+					/**
+					 * @desc Check that the IUT responds with an error when the AE tries to delete a mandatory RW attribute ATTRIBUTE_NAME of a TARGET_RESOURCE_ADDRESS resource
+					 * 
+					 */
+					testcase TC_CSE_DMR_UPD_008_SCH_ET() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var Timestamp v_expirationTime := "21001231T012345";
+						var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
+						var AttributeAux_list v_nullFields;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_nullFields := {{"expirationTime", omit}};
 						
 						v_updateRequest.primitiveContent.schedule.expirationTime := v_expirationTime;
@@ -3561,7 +4818,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
 						var AttributeAux_list v_nullFields;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_nullFields := {{"expirationTime", omit}};
 						
 						v_updateRequest.primitiveContent.pollingChannel.expirationTime := v_expirationTime;
@@ -3594,7 +4851,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var XSD.PositiveInteger v_expirationCounter := 1;
 						var template RequestPrimitive v_createRequest := m_createScheduleBase;
 						var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent := {schedule_update_invalid := m_contentUpdateSchedule_invalid};
 
 						v_updateRequest.primitiveContent.schedule_update_invalid.expirationCounter := v_expirationCounter;
@@ -3609,7 +4866,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var XSD.PositiveInteger v_expirationCounter := 1;
 						var template RequestPrimitive v_createRequest := m_createPollingChannelBase;
 						var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent := {pollingChannel_update_invalid := m_contentUpdatePollingChannel_invalid};
 						
 						v_updateRequest.primitiveContent.pollingChannel_update_invalid.expirationCounter := v_expirationCounter;
@@ -3618,7 +4875,140 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_ae1.done;
 					}
 					
-				} // end g_CSE_DMR_UPD_009				
+					testcase TC_CSE_DMR_UPD_009_TS_EXC() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var XSD.PositiveInteger v_expirationCounter := 1;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
+
+						v_updateRequest.primitiveContent := {timeSeries_update_invalid := m_contentUpdateTimeSeries_invalid};
+	
+						v_updateRequest.primitiveContent.timeSeries_update_invalid.expirationCounter := v_expirationCounter;
+		
+						v_ae1.start(f_CSE_DMR_UPD_009(int29, v_createRequest, v_updateRequest));//TimeSeries
+						v_ae1.done;
+					}
+					
+				} // end g_CSE_DMR_UPD_009		
+				
+				group g_CSE_DMR_UPD_010{
+					
+					/**
+					 * @desc Check that the stateTag attribute of a RESOURCE_TYPE resource is increased when an update operation has been performed on its child resource
+					 * 
+					 */
+					testcase TC_CSE_DMR_UPD_010_CNT() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var RequestPrimitive v_updateRequest := valueof(m_updateContainerBase);
+						var template RequestPrimitive v_createRequest := m_createContainerBase;
+						var Labels v_labels_1:= {"VALUE_1"};
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+						
+						v_updateRequest.primitiveContent.container.labels := v_labels_1;
+		
+						v_ae1.start(f_CSE_DMR_UPD_010(int3, v_createRequest, v_updateRequest));//Container
+						v_ae1.done;
+	
+						if(getverdict == pass){ 
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+							//Check that stateTag has been incremented
+							  if(ischosen(v_primitiveContentRetrieveResource.container)) {
+							   if(v_primitiveContentRetrieveResource.container.stateTag == 1){
+									setverdict(pass, __SCOPE__ & ": The stateTag attribute is incremented");	
+							   }else{
+									setverdict(fail, __SCOPE__ & ": Error the stateTag attribute is not incremented");
+							   }
+							}
+						}
+					}
+	
+					testcase TC_CSE_DMR_UPD_010_TS() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var RequestPrimitive v_updateRequest := valueof(m_updateTimeSeriesBase);
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var Labels v_labels_1:= {"VALUE_1"};
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+						
+						v_updateRequest.primitiveContent.timeSeries.labels := v_labels_1;
+		
+						v_ae1.start(f_CSE_DMR_UPD_010(int29, v_createRequest, v_updateRequest));//TimeSeries
+						v_ae1.done;
+	
+						if(getverdict == pass){ 
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+							//Check that stateTag has been incremented
+							  if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) {
+							   if(v_primitiveContentRetrieveResource.timeSeries.stateTag == 1){
+									setverdict(pass, __SCOPE__ & ": The stateTag attribute is incremented");	
+							   }else{
+									setverdict(fail, __SCOPE__ & ": Error the stateTag attribute is not incremented");
+							   }
+							}
+						}
+					}
+	
+				} // end g_CSE_DMR_UPD_010		
+				
+				group g_CSE_DMR_UPD_011{
+					
+					/**
+					 * @desc Check that the IUT rejects the UPDATE Request of an existing RESOURCE_TYPE resource with error “OPERATION_NOT_ALLOWED”
+					 * 
+					 */
+					testcase TC_CSE_DMR_UPD_011_CNT_CNI() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_updateRequest := m_updateContentInstanceBase;
+						var Labels v_labels:= {"LABEL"};
+						var template RequestPrimitive v_createParentRequest := m_createContainerBase;
+						var template RequestPrimitive v_createChildRequest := m_createContentInstanceBase;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+		
+						v_updateRequest.primitiveContent.contentInstance.labels := v_labels;
+
+						v_ae1.start(f_CSE_DMR_UPD_011(int3, v_createParentRequest, int4, v_createChildRequest, v_updateRequest));//ContentInstance under Container
+						v_ae1.done;
+
+						if(getverdict == pass){ 
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+							//Check that the resource has NOT been udpated
+							if(ischosen(v_primitiveContentRetrieveResource.contentInstance)) {
+								if(v_primitiveContentRetrieveResource.contentInstance.labels == v_labels){
+							   		setverdict(fail, __SCOPE__ & ": Error: Labels attribute updated")
+						  		}
+							}
+						}
+					}
+
+					testcase TC_CSE_DMR_UPD_011_TS_TSI() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesInstanceBase;
+						var Labels v_labels:= {"LABEL"};
+						var template RequestPrimitive v_createParentRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_createChildRequest := m_createTimeSeriesInstanceBase;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+		
+						v_updateRequest.primitiveContent.timeSeriesInstance.labels := v_labels;
+
+						v_ae1.start(f_CSE_DMR_UPD_011(int29, v_createParentRequest, int30, v_createChildRequest, v_updateRequest));//TimeSeriesInstance under TimeSeries
+						v_ae1.done;
+
+						if(getverdict == pass){ 
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+							//Check that the resource has NOT been udpated
+							if(ischosen(v_primitiveContentRetrieveResource.timeSeriesInstance)) {
+								if(v_primitiveContentRetrieveResource.timeSeriesInstance.labels == v_labels){
+									setverdict(fail, __SCOPE__ & ": Error: Labels attribute updated")
+								}
+							}
+						}
+					}
+
+				} // end g_CSE_DMR_UPD_011
 
 				group g_CSE_DMR_UPD_014 {
 					
@@ -3634,7 +5024,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createAcpBase;
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 						var ResponsePrimitive v_responsePrimitive;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.accessControlPolicy.expirationTime := v_expirationTime_1;
 						v_updateRequest.primitiveContent.accessControlPolicy.expirationTime := v_expirationTime_2;
 
@@ -3665,7 +5055,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.container.expirationTime := v_expirationTime_1;
 						v_updateRequest.primitiveContent.container.expirationTime := v_expirationTime_2;
 
@@ -3695,7 +5085,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 	
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
-	
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.container.ontologyRef := v_ontologyRef_1;
 						v_updateRequest.primitiveContent.container.ontologyRef := v_ontologyRef_2;
 	
@@ -3724,7 +5114,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.subscription.accessControlPolicyIDs := v_accessControlPolicyIDs_1;
 						v_updateRequest.primitiveContent.subscription.accessControlPolicyIDs := v_accessControlPolicyIDs_2;
 
@@ -3754,7 +5144,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.subscription.batchNotify := v_batchNotify_1;
 						v_updateRequest.primitiveContent.subscription.batchNotify := v_batchNotify_2;
 
@@ -3779,12 +5169,13 @@ 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;
+						
 						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;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.subscription.eventNotificationCriteria := v_eventNotificationCriteria_1;
 						v_updateRequest.primitiveContent.subscription.eventNotificationCriteria := v_eventNotificationCriteria_2;
 
@@ -3809,12 +5200,13 @@ 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;
+						
 						var Timestamp v_expirationTime_1 := "20301231T012345";
 						var Timestamp v_expirationTime_2 := "20401020T012345";
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.subscription.expirationTime := v_expirationTime_1;
 						v_updateRequest.primitiveContent.subscription.expirationTime := v_expirationTime_2;
 
@@ -3839,12 +5231,13 @@ 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;
+						
 						var XSD.PositiveInteger v_expirationCounter_1 := 10;
 						var XSD.PositiveInteger v_expirationCounter_2 := 20;
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.subscription.expirationCounter := v_expirationCounter_1;
 						v_updateRequest.primitiveContent.subscription.expirationCounter := v_expirationCounter_2;
 
@@ -3869,12 +5262,13 @@ 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;
+						
 						var XSD.AnyURI v_groupID_1 := "MyGroupID_1";
 						var XSD.AnyURI v_groupID_2 := "MyGroupID_2";
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.subscription.groupID := v_groupID_1;
 						v_updateRequest.primitiveContent.subscription.groupID := v_groupID_2;
 
@@ -3899,12 +5293,13 @@ 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;
+						
 						var XSD.Boolean v_latestNotify_1 := true;
 						var XSD.Boolean v_latestNotify_2 := false;
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.subscription.latestNotify := v_latestNotify_1;
 						v_updateRequest.primitiveContent.subscription.latestNotify := v_latestNotify_2;
 
@@ -3929,12 +5324,13 @@ 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;
+					
 						var NotificationContentType v_notificationContentType_1 := int1;
 						var NotificationContentType v_notificationContentType_2 := int2;
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.subscription.notificationContentType := v_notificationContentType_1;
 						v_updateRequest.primitiveContent.subscription.notificationContentType := v_notificationContentType_2;
 
@@ -3959,12 +5355,13 @@ 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;
+						
 						var EventCat v_notificationEventCat_1 := {alt_1 := 100};
 						var EventCat v_notificationEventCat_2 := {alt_1 := 101};
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.subscription.notificationEventCat := v_notificationEventCat_1;
 						v_updateRequest.primitiveContent.subscription.notificationEventCat := v_notificationEventCat_2;
 
@@ -3989,12 +5386,13 @@ 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;
+						
 						var XSD.AnyURI v_notificationForwardingURI_1 := "MyForwardingURI_1";
 						var XSD.AnyURI v_notificationForwardingURI_2 := "MyForwardingURI_2";
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.subscription.notificationForwardingURI := v_notificationForwardingURI_1;
 						v_updateRequest.primitiveContent.subscription.notificationForwardingURI := v_notificationForwardingURI_2;
 
@@ -4019,12 +5417,13 @@ 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;
+						
 						var XSD.PositiveInteger v_notificationStoragePriority_1 := 1;
 						var XSD.PositiveInteger v_notificationStoragePriority_2 := 2;
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.subscription.notificationStoragePriority := v_notificationStoragePriority_1;
 						v_updateRequest.primitiveContent.subscription.notificationStoragePriority := v_notificationStoragePriority_2;
 
@@ -4049,12 +5448,13 @@ 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;
+						
 						var PendingNotification v_pendingNotification_1 := int1;
 						var PendingNotification v_pendingNotification_2 := int2;
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.subscription.pendingNotification := v_pendingNotification_1;
 						v_updateRequest.primitiveContent.subscription.pendingNotification := v_pendingNotification_2;
 
@@ -4079,12 +5479,13 @@ 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;
+						
 						var RateLimit v_rateLimit_1 := {0, omit};
 						var RateLimit v_rateLimit_2 := {1, omit};
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
-
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.subscription.rateLimit := v_rateLimit_1;
 						v_updateRequest.primitiveContent.subscription.rateLimit := v_rateLimit_2;
 
@@ -4105,113 +5506,395 @@ module OneM2M_Testcases_CSE_Release_2 {
 						}
 
 					}
-	
-				} // end g_CSE_DMR_UPD_014
-
-				group g_CSE_DMR_UPD_015{
-			  		
-					/**
-					 * @desc Check that the IUT updates successfully the value of the optional attribute OPTIONAL_ATTRIBUTE of the RESOURCE_TYPE resource under CSEBase
-					 */
-					testcase TC_CSE_DMR_UPD_015_NOD_LBL() runs on Tester system CseSystem {
+					
+					testcase TC_CSE_DMR_UPD_014_TS_ACPI() runs on Tester system CseSystem {
+						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var Labels v_labels := {"MyLabel"};
-						var template RequestPrimitive v_updateRequest := m_updateNodeBase;
+						var AcpType v_accessControlPolicyIDs_1 := {"NotInitialized_1"};
+						var AcpType v_accessControlPolicyIDs_2 := {"NotInitialized_2"};
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
 						var ResponsePrimitive v_responsePrimitive;
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-						
-						v_updateRequest.primitiveContent.node.labels := v_labels;
-						
-						v_ae1.start(f_CSE_DMR_UPD_015(int9, m_createNodeBase, v_updateRequest));//Node
-						v_ae1.done;
-						
-						 
-
+	
+						v_createRequest.primitiveContent.timeSeries.accessControlPolicyIDs := v_accessControlPolicyIDs_1;
+						v_updateRequest.primitiveContent.timeSeries.accessControlPolicyIDs := v_accessControlPolicyIDs_2;
+	
+						v_ae1.start(f_CSE_DMR_UPD_014(int29, v_createRequest, v_updateRequest));//TimeSeries
+						v_ae1.done;	 
+	
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							 //Check attribute 1
-							 if(ispresent(v_responsePrimitive.primitiveContent)) {
-								 if(ischosen(v_responsePrimitive.primitiveContent.node)) {
-									 if(v_responsePrimitive.primitiveContent.node.labels != v_labels){
-										 setverdict(fail, __SCOPE__, ": Error: Labels attribute not updated correctly")
-									 }
-								 }
-							 }
-							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
-							 
-							//Check that the resource has been udpated correctly
-							  if(ischosen(v_primitiveContentRetrieveResource.node)) {
-							   if(v_primitiveContentRetrieveResource.node.labels != v_labels){
-								setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
-							  }
+							//Check attribute 1
+							if(ispresent(v_responsePrimitive.primitiveContent)) {
+								if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
+									if(v_responsePrimitive.primitiveContent.timeSeries.accessControlPolicyIDs != v_accessControlPolicyIDs_2){
+										setverdict(fail, __SCOPE__ & ": Error: AccessControlPolicyIDs attribute not updated correctly")
+									}
+								}
 							}
-						 }
+						}
+	
 					}
 					
-					testcase TC_CSE_DMR_UPD_015_NOD_ACPI() runs on Tester system CseSystem {
+					testcase TC_CSE_DMR_UPD_014_TS_LBL() runs on Tester system CseSystem {
+						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template RequestPrimitive v_updateRequest := m_updateNodeBase;
-						var RequestPrimitive v_updateRequestPrimitive;
+						var Labels v_labels_1 := {"VALUE_1"};
+						var Labels v_labels_2 := {"VALUE_2"};
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
 						var ResponsePrimitive v_responsePrimitive;
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-						
-						
-						v_ae1.start(f_CSE_DMR_UPD_015(int9, m_createNodeBase, v_updateRequest, true));//Node
-						v_ae1.done;
-						
-						 
 
-						if(getverdict == pass){
-							 v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							 
-							 v_updateRequestPrimitive := f_getRequestPrimitive(v_ae1);	
-							 //Check attribute 1
-							 if(ispresent(v_responsePrimitive.primitiveContent)) {
-								 if(ischosen(v_responsePrimitive.primitiveContent.node)) {
-									 if(v_responsePrimitive.primitiveContent.node.accessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.node.accessControlPolicyIDs)){
-										 setverdict(fail, __SCOPE__, ": Error: Access Control Policy attribute not updated correctly")
-									 }
-								 }
-							 }
-							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);						
-	 
-							//Check that the resource has been udpated correctly
-							  if(ischosen(v_primitiveContentRetrieveResource.node)) {
-							   if(v_primitiveContentRetrieveResource.node.accessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.node.accessControlPolicyIDs)){
-								setverdict(fail, __SCOPE__ & ": Error: Access Control Policy attribute not updated correctly")
-							  }
+						v_createRequest.primitiveContent.timeSeries.labels := v_labels_1;
+						v_updateRequest.primitiveContent.timeSeries.labels := v_labels_2;
+
+						v_ae1.start(f_CSE_DMR_UPD_014(int29, v_createRequest, v_updateRequest));//TimeSeries
+						v_ae1.done;	 
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							//Check attribute 1
+							if(ispresent(v_responsePrimitive.primitiveContent)) {
+								if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
+									if(v_responsePrimitive.primitiveContent.timeSeries.labels != v_labels_2){
+										setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
+									}
+								}
 							}
-						 }
-					}
-					
-					testcase TC_CSE_DMR_UPD_015_NOD_HCL() runs on Tester system CseSystem {
-						
-						/* TO BE DONE */
+						}
+
 					}
 					
-					testcase TC_CSE_DMR_UPD_015_AE_OR() runs on Tester system CseSystem {
+					testcase TC_CSE_DMR_UPD_014_TS_MBS() runs on Tester system CseSystem {
+						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var XSD.AnyURI v_ontoLogyRef := "MyOntologyRef";
-						var template RequestPrimitive v_updateRequest := m_updateAeBase;
+						var XSD.NonNegativeInteger v_maxByteSize_1 := 256;
+						var XSD.NonNegativeInteger v_maxByteSize_2 := 512;
 						var ResponsePrimitive v_responsePrimitive;
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-						
-						v_updateRequest.primitiveContent.aE.ontologyRef := v_ontoLogyRef;
-						v_ae1.start(f_CSE_DMR_UPD_015(int2, m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM), v_updateRequest));//AE
-						v_ae1.done;
-						
-						 
+
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
+
+						v_createRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize_1;
+						v_updateRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize_2;
+
+						v_ae1.start(f_CSE_DMR_UPD_014(int29, v_createRequest, v_updateRequest));//TimeSeries
+						v_ae1.done;	 
 
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
-							 //Check attribute 1
-							 if(ispresent(v_responsePrimitive.primitiveContent)) {
-								 if(ischosen(v_responsePrimitive.primitiveContent.aE)) {
-									 if(v_responsePrimitive.primitiveContent.aE.ontologyRef != v_ontoLogyRef){
-										 setverdict(fail, __SCOPE__, ": Error: Ontology Ref attribute not updated correctly")
-									 }
-								 }
-							 }
- 							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
- 
+							//Check attribute 1
+							if(ispresent(v_responsePrimitive.primitiveContent)) {
+								if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
+									if(v_responsePrimitive.primitiveContent.timeSeries.maxByteSize != v_maxByteSize_2){
+										setverdict(fail, __SCOPE__ & ": Error: MaxByteSize attribute not updated correctly")
+									}
+								}
+							}
+						}
+					}
+
+					testcase TC_CSE_DMR_UPD_014_TS_MIA() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var XSD.NonNegativeInteger v_maxInstanceAge_1 := 60;
+						var XSD.NonNegativeInteger v_maxInstanceAge_2 := 120;
+						var ResponsePrimitive v_responsePrimitive;
+
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
+
+						v_createRequest.primitiveContent.timeSeries.maxInstanceAge := v_maxInstanceAge_1;
+						v_updateRequest.primitiveContent.timeSeries.maxInstanceAge := v_maxInstanceAge_2;
+
+						v_ae1.start(f_CSE_DMR_UPD_014(int29, v_createRequest, v_updateRequest));//TimeSeries
+						v_ae1.done;	 
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							//Check attribute 1
+							if(ispresent(v_responsePrimitive.primitiveContent)) {
+								if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
+									if(v_responsePrimitive.primitiveContent.timeSeries.maxInstanceAge != v_maxInstanceAge_2){
+										setverdict(fail, __SCOPE__ & ": Error: MaxInstanceAge attribute not updated correctly")
+									}
+								}
+							}
+						}
+					}
+
+					testcase TC_CSE_DMR_UPD_014_TS_MNI() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var XSD.NonNegativeInteger v_maxNrOfInstances_1 := 1;
+						var XSD.NonNegativeInteger v_maxNrOfInstances_2 := 2;
+						var ResponsePrimitive v_responsePrimitive;
+
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
+
+						v_createRequest.primitiveContent.timeSeries.maxNrOfInstances := v_maxNrOfInstances_1;
+						v_updateRequest.primitiveContent.timeSeries.maxNrOfInstances := v_maxNrOfInstances_2;
+
+						v_ae1.start(f_CSE_DMR_UPD_014(int29, v_createRequest, v_updateRequest));//TimeSeries
+						v_ae1.done;	 
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							//Check attribute 1
+							if(ispresent(v_responsePrimitive.primitiveContent)) {
+								if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
+									if(v_responsePrimitive.primitiveContent.timeSeries.maxNrOfInstances != v_maxNrOfInstances_2){
+										setverdict(fail, __SCOPE__ & ": Error: MaxNrOfInstances attribute not updated correctly")
+									}
+								}
+							}
+						}
+					}
+					
+					testcase TC_CSE_DMR_UPD_014_TS_PEI() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var XSD.NonNegativeInteger v_periodicInterval_1 := 1;
+						var XSD.NonNegativeInteger v_periodicInterval_2 := 2;
+						var ResponsePrimitive v_responsePrimitive;
+
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
+
+						v_createRequest.primitiveContent.timeSeries.periodicInterval := v_periodicInterval_1;
+						v_updateRequest.primitiveContent.timeSeries.periodicInterval := v_periodicInterval_2;
+
+						v_ae1.start(f_CSE_DMR_UPD_014(int29, v_createRequest, v_updateRequest));//TimeSeries
+						v_ae1.done;	 
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							//Check attribute 1
+							if(ispresent(v_responsePrimitive.primitiveContent)) {
+								if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
+									if(v_responsePrimitive.primitiveContent.timeSeries.periodicInterval != v_periodicInterval_2){
+										setverdict(fail, __SCOPE__ & ": Error: PeriodicInterval attribute not updated correctly")
+									}
+								}
+							}
+						}
+					}
+					
+					testcase TC_CSE_DMR_UPD_014_TS_MDD() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var XSD.Boolean v_missingDataDetect_1 := true;
+						var XSD.Boolean v_missingDataDetect_2 := false;
+						var ResponsePrimitive v_responsePrimitive;
+	
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
+	
+						v_createRequest.primitiveContent.timeSeries.missingDataDetect := v_missingDataDetect_1;
+						v_updateRequest.primitiveContent.timeSeries.missingDataDetect := v_missingDataDetect_2;
+	
+						v_ae1.start(f_CSE_DMR_UPD_014(int29, v_createRequest, v_updateRequest));//TimeSeries
+						v_ae1.done;	 
+	
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							//Check attribute 1
+							if(ispresent(v_responsePrimitive.primitiveContent)) {
+								if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
+									if(v_responsePrimitive.primitiveContent.timeSeries.missingDataDetect != v_missingDataDetect_2){
+										setverdict(fail, __SCOPE__ & ": Error: MissingDataDetect attribute not updated correctly")
+									}
+								}
+							}
+						}
+					}
+					
+					testcase TC_CSE_DMR_UPD_014_TS_MDN() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var XSD.NonNegativeInteger v_missingDataMaxNr_1 := 1;
+						var XSD.NonNegativeInteger v_missingDataMaxNr_2 := 2;
+						var ResponsePrimitive v_responsePrimitive;
+
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
+
+						v_createRequest.primitiveContent.timeSeries.missingDataMaxNr := v_missingDataMaxNr_1;
+						v_updateRequest.primitiveContent.timeSeries.missingDataMaxNr := v_missingDataMaxNr_2;
+
+						v_ae1.start(f_CSE_DMR_UPD_014(int29, v_createRequest, v_updateRequest));//TimeSeries
+						v_ae1.done;	 
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							//Check attribute 1
+							if(ispresent(v_responsePrimitive.primitiveContent)) {
+								if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
+									if(v_responsePrimitive.primitiveContent.timeSeries.missingDataMaxNr != v_missingDataMaxNr_2){
+										setverdict(fail, __SCOPE__ & ": Error: MissingDataMaxNr attribute not updated correctly")
+									}
+								}
+							}
+						}
+					}
+					
+					testcase TC_CSE_DMR_UPD_014_TS_MDT() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var XSD.NonNegativeInteger v_missingDataDetectTimer_1 := 1;
+						var XSD.NonNegativeInteger v_missingDataDetectTimer_2 := 2;
+						var ResponsePrimitive v_responsePrimitive;
+
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
+
+						v_createRequest.primitiveContent.timeSeries.missingDataDetectTimer := v_missingDataDetectTimer_1;
+						v_updateRequest.primitiveContent.timeSeries.missingDataDetectTimer := v_missingDataDetectTimer_2;
+
+						v_ae1.start(f_CSE_DMR_UPD_014(int29, v_createRequest, v_updateRequest));//TimeSeries
+						v_ae1.done;	 
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							//Check attribute 1
+							if(ispresent(v_responsePrimitive.primitiveContent)) {
+								if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
+									if(v_responsePrimitive.primitiveContent.timeSeries.missingDataDetectTimer != v_missingDataDetectTimer_2){
+										setverdict(fail, __SCOPE__ & ": Error: MissingDataDetectTimer attribute not updated correctly")
+									}
+								}
+							}
+						}
+					}
+					
+					testcase TC_CSE_DMR_UPD_014_TS_OR() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var XSD.AnyURI v_ontologyRef_1 := "MyOntologyRef_1";
+						var XSD.AnyURI v_ontologyRef_2 := "MyOntologyRef_2";
+						var ResponsePrimitive v_responsePrimitive;
+
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
+
+						v_createRequest.primitiveContent.timeSeries.ontologyRef := v_ontologyRef_1;
+						v_updateRequest.primitiveContent.timeSeries.ontologyRef := v_ontologyRef_2;
+
+						v_ae1.start(f_CSE_DMR_UPD_014(int29, v_createRequest, v_updateRequest));//TimeSeries
+						v_ae1.done;	 
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							//Check attribute 1
+							if(ispresent(v_responsePrimitive.primitiveContent)) {
+								if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
+									if(v_responsePrimitive.primitiveContent.timeSeries.ontologyRef != v_ontologyRef_2){
+										setverdict(fail, __SCOPE__ & ": Error: OntologyRef attribute not updated correctly")
+									}
+								}
+							}
+						}
+					}
+	
+				} // end g_CSE_DMR_UPD_014
+
+				group g_CSE_DMR_UPD_015{
+			  		
+					/**
+					 * @desc Check that the IUT updates successfully the value of the optional attribute OPTIONAL_ATTRIBUTE of the RESOURCE_TYPE resource under CSEBase
+					 */
+					testcase TC_CSE_DMR_UPD_015_NOD_LBL() runs on Tester system CseSystem {
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						var Labels v_labels := {"MyLabel"};
+						var template RequestPrimitive v_updateRequest := m_updateNodeBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_updateRequest.primitiveContent.node.labels := v_labels;
+						
+						v_ae1.start(f_CSE_DMR_UPD_015(int9, m_createNodeBase, v_updateRequest));//Node
+						v_ae1.done;
+						
+						 
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							 //Check attribute 1
+							 if(ispresent(v_responsePrimitive.primitiveContent)) {
+								 if(ischosen(v_responsePrimitive.primitiveContent.node)) {
+									 if(v_responsePrimitive.primitiveContent.node.labels != v_labels){
+										 setverdict(fail, __SCOPE__, ": Error: Labels attribute not updated correctly")
+									 }
+								 }
+							 }
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
+							 
+							//Check that the resource has been udpated correctly
+							  if(ischosen(v_primitiveContentRetrieveResource.node)) {
+							   if(v_primitiveContentRetrieveResource.node.labels != v_labels){
+								setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
+							  }
+							}
+						 }
+					}
+					
+					testcase TC_CSE_DMR_UPD_015_NOD_ACPI() runs on Tester system CseSystem {
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						
+						var template RequestPrimitive v_updateRequest := m_updateNodeBase;
+						var RequestPrimitive v_updateRequestPrimitive;
+						var ResponsePrimitive v_responsePrimitive;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_ae1.start(f_CSE_DMR_UPD_015(int9, m_createNodeBase, v_updateRequest, true));//Node
+						v_ae1.done;
+						
+						 
+
+						if(getverdict == pass){
+							 v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							 
+							 v_updateRequestPrimitive := f_getRequestPrimitive(v_ae1);	
+							 //Check attribute 1
+							 if(ispresent(v_responsePrimitive.primitiveContent)) {
+								 if(ischosen(v_responsePrimitive.primitiveContent.node)) {
+									 if(v_responsePrimitive.primitiveContent.node.accessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.node.accessControlPolicyIDs)){
+										 setverdict(fail, __SCOPE__, ": Error: Access Control Policy attribute not updated correctly")
+									 }
+								 }
+							 }
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);						
+	 
+							//Check that the resource has been udpated correctly
+							  if(ischosen(v_primitiveContentRetrieveResource.node)) {
+							   if(v_primitiveContentRetrieveResource.node.accessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.node.accessControlPolicyIDs)){
+								setverdict(fail, __SCOPE__ & ": Error: Access Control Policy attribute not updated correctly")
+							  }
+							}
+						 }
+					}
+					
+					testcase TC_CSE_DMR_UPD_015_NOD_HCL() runs on Tester system CseSystem {
+						
+						/* TO BE DONE */
+					}
+					
+					testcase TC_CSE_DMR_UPD_015_AE_OR() runs on Tester system CseSystem {
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var XSD.AnyURI v_ontoLogyRef := "MyOntologyRef";
+						var template RequestPrimitive v_updateRequest := m_updateAeBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+						v_updateRequest.primitiveContent.aE.ontologyRef := v_ontoLogyRef;
+						v_ae1.start(f_CSE_DMR_UPD_015(int2, m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM), v_updateRequest));//AE
+						v_ae1.done;
+						
+						 
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							 //Check attribute 1
+							 if(ispresent(v_responsePrimitive.primitiveContent)) {
+								 if(ischosen(v_responsePrimitive.primitiveContent.aE)) {
+									 if(v_responsePrimitive.primitiveContent.aE.ontologyRef != v_ontoLogyRef){
+										 setverdict(fail, __SCOPE__, ": Error: Ontology Ref attribute not updated correctly")
+									 }
+								 }
+							 }
+ 							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
+ 
 							  //Check that the resource has been udpated correctly
 							  if(ischosen(v_primitiveContentRetrieveResource.aE)) {
 							   if(v_primitiveContentRetrieveResource.aE.ontologyRef != v_ontoLogyRef){
@@ -4223,11 +5906,12 @@ 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;
+						
 						var XSD.AnyURI v_ontoLogyRef := "MyOntologyRef";
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.container.ontologyRef := v_ontoLogyRef;
 						
 						v_ae1.start(f_CSE_DMR_UPD_015(int3, m_createContainerBase, v_updateRequest));//Container
@@ -4257,11 +5941,12 @@ 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;
+						
 						var XSD.AnyURI v_locationID := "MyLocationID";
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.container.locationID := v_locationID;
 						
 						v_ae1.start(f_CSE_DMR_UPD_015(int3, m_createContainerBase, v_updateRequest));//Container
@@ -4291,11 +5976,12 @@ 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;
+						
 						var EventNotificationCriteria v_eventNotificationCriteria:= valueof(m_eventNotificationCriteria({int3}, -));
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.subscription.eventNotificationCriteria:=v_eventNotificationCriteria ;
 						v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
 						v_ae1.done;
@@ -4324,11 +6010,12 @@ 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;
+						
 						var XSD.PositiveInteger v_expirationCounter:=10;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.subscription.expirationCounter:=v_expirationCounter;
 						v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
 						v_ae1.done;
@@ -4357,11 +6044,12 @@ 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;
+						
 						var XSD.AnyURI v_groupID := "MyGroupID";
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.subscription.groupID:=v_groupID;
 						v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
 						v_ae1.done;
@@ -4390,11 +6078,12 @@ 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;
+						
 						var XSD.AnyURI v_notificationForwardingURI:= "MyNotificationForwardingURI";
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.subscription.notificationForwardingURI:=v_notificationForwardingURI;
 						v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
 						v_ae1.done;
@@ -4423,11 +6112,12 @@ 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;
+						
 						var BatchNotify v_batchNotify:= {1, "PT1S"};
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.subscription.batchNotify:=v_batchNotify;
 						v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
 						v_ae1.done;
@@ -4456,11 +6146,12 @@ 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;
+						
 						var RateLimit v_rateLimit:= {2, "PT1S"};
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.subscription.rateLimit:=v_rateLimit;
 						v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
 						v_ae1.done;
@@ -4489,11 +6180,12 @@ 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;
+						
 						var PendingNotification v_pendingNotification:=int2;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.subscription.pendingNotification:=v_pendingNotification;
 						v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
 						v_ae1.done;
@@ -4522,11 +6214,12 @@ 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;
+						
 						var XSD.PositiveInteger v_notificationStoragePriority:=10;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.subscription.notificationStoragePriority:=v_notificationStoragePriority;
 						v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
 						v_ae1.done;
@@ -4555,11 +6248,12 @@ 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;
+						
 						var XSD.Boolean v_latestNotify:=true;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.subscription.latestNotify:=v_latestNotify;
 						v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
 						v_ae1.done;
@@ -4588,6 +6282,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;
+						
 						var EventCat v_eventCat:= {alt_1:= 300};
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
@@ -4595,9 +6290,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						
 						v_updateRequest.primitiveContent.subscription.notificationEventCat:=v_eventCat;
 						v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
-						v_ae1.done;
-						
-						 
+						v_ae1.done;						 
 
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							 //Check attribute 1
@@ -4619,7 +6312,327 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 }
 					}
 					
-				} // end group g_CSE_DMR_UPD_017
+					testcase TC_CSE_DMR_UPD_015_TS_ACPI() runs on Tester system CseSystem {
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
+						var RequestPrimitive v_updateRequestPrimitive;
+						var ResponsePrimitive v_responsePrimitive;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+	
+						v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest, true));//TimeSeries
+						v_ae1.done;	 
+
+						if(getverdict == pass){
+							 v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							 v_updateRequestPrimitive := f_getRequestPrimitive(v_ae1);	
+							 //Check attribute 1
+							 if(ispresent(v_responsePrimitive.primitiveContent)) {
+								 if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
+									 if(v_responsePrimitive.primitiveContent.timeSeries.accessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.timeSeries.accessControlPolicyIDs)){
+										 setverdict(fail, __SCOPE__, ": Error: Access Control Policy IDs attribute not updated correctly")
+									 }
+								 }
+							 }
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
+ 
+							//Check that the resource has been udpated correctly
+							  if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) {
+							   if(v_primitiveContentRetrieveResource.timeSeries.accessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.timeSeries.accessControlPolicyIDs)){
+								setverdict(fail, __SCOPE__ & ": Error: Access Control Policy IDs attribute not updated correctly")
+							  }
+							}
+						 }
+					}
+					
+					testcase TC_CSE_DMR_UPD_015_TS_LBL() runs on Tester system CseSystem {
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var Labels v_labels := {"MyLabel"};
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+	
+						v_updateRequest.primitiveContent.timeSeries.labels := v_labels;
+	
+						v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
+						v_ae1.done;	 
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							 //Check attribute 1
+							 if(ispresent(v_responsePrimitive.primitiveContent)) {
+								 if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
+									 if(v_responsePrimitive.primitiveContent.timeSeries.labels != v_labels){
+										 setverdict(fail, __SCOPE__, ": Error: Labels attribute not updated correctly")
+									 }
+								 }
+							 }
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
+		 
+							//Check that the resource has been udpated correctly
+							  if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) {
+							   if(v_primitiveContentRetrieveResource.timeSeries.labels != v_labels){
+								setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
+							  }
+							}
+						 }
+					}
+					
+					testcase TC_CSE_DMR_UPD_015_TS_MNI() runs on Tester system CseSystem {
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var XSD.NonNegativeInteger v_maxNrOfInstances := 5;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+	
+						v_updateRequest.primitiveContent.timeSeries.maxNrOfInstances := v_maxNrOfInstances;
+	
+						v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
+						v_ae1.done;	 
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							 //Check attribute 1
+							 if(ispresent(v_responsePrimitive.primitiveContent)) {
+								 if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
+									 if(v_responsePrimitive.primitiveContent.timeSeries.maxNrOfInstances != v_maxNrOfInstances){
+										 setverdict(fail, __SCOPE__, ": Error: Maximum number of instances attribute not updated correctly")
+									 }
+								 }
+							 }
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
+ 
+							//Check that the resource has been udpated correctly
+							  if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) {
+							   if(v_primitiveContentRetrieveResource.timeSeries.maxNrOfInstances != v_maxNrOfInstances){
+								setverdict(fail, __SCOPE__ & ": Error: Maximum number of instances attribute not updated correctly")
+							  }
+							}
+						 }
+					}
+
+					testcase TC_CSE_DMR_UPD_015_TS_MBS() runs on Tester system CseSystem {
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var XSD.NonNegativeInteger v_maxByteSize := 512;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+	
+						v_updateRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize;
+	
+						v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
+						v_ae1.done;	 
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							 //Check attribute 1
+							 if(ispresent(v_responsePrimitive.primitiveContent)) {
+								 if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
+									 if(v_responsePrimitive.primitiveContent.timeSeries.maxByteSize != v_maxByteSize){
+										 setverdict(fail, __SCOPE__, ": Error: Maximum Byte size attribute not updated correctly")
+									 }
+								 }
+							 }
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
+ 
+												  //Check that the resource has been udpated correctly
+							  if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) {
+							   if(v_primitiveContentRetrieveResource.timeSeries.maxByteSize != v_maxByteSize){
+								setverdict(fail, __SCOPE__ & ": Error: Maximum Byte Size attribute not updated correctly")
+							  }
+							}
+						 }
+					}
+
+					testcase TC_CSE_DMR_UPD_015_TS_MIA() runs on Tester system CseSystem {
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var XSD.NonNegativeInteger v_maxInstanceAge := 1;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+	
+						v_updateRequest.primitiveContent.timeSeries.maxInstanceAge := v_maxInstanceAge;
+	
+						v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
+						v_ae1.done;	 
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							 //Check attribute 1
+							 if(ispresent(v_responsePrimitive.primitiveContent)) {
+								 if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
+									 if(v_responsePrimitive.primitiveContent.timeSeries.maxInstanceAge != v_maxInstanceAge){
+										 setverdict(fail, __SCOPE__, ": Error: Maximum Instance Age attribute not updated correctly")
+									 }
+								 }
+							 }
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
+ 
+							//Check that the resource has been udpated correctly
+							  if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) {
+							   if(v_primitiveContentRetrieveResource.timeSeries.maxInstanceAge != v_maxInstanceAge){
+								setverdict(fail, __SCOPE__ & ": Error: Maximum Instance Age attribute not updated correctly")
+							  }
+							}
+						 }
+					}
+					
+					testcase TC_CSE_DMR_UPD_015_TS_PEI() runs on Tester system CseSystem {
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var XSD.NonNegativeInteger v_periodicInterval := 1;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+
+						v_updateRequest.primitiveContent.timeSeries.periodicInterval := v_periodicInterval;
+
+						v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
+						v_ae1.done;	 
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							 //Check attribute 1
+							 if(ispresent(v_responsePrimitive.primitiveContent)) {
+								 if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
+									 if(v_responsePrimitive.primitiveContent.timeSeries.periodicInterval != v_periodicInterval){
+										 setverdict(fail, __SCOPE__, ": Error: Periodic Interval attribute not updated correctly")
+									 }
+								 }
+							 }
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
+ 
+												//Check that the resource has been udpated correctly
+							  if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) {
+							   if(v_primitiveContentRetrieveResource.timeSeries.periodicInterval != v_periodicInterval){
+								setverdict(fail, __SCOPE__ & ": Error: Periodic Interval attribute not updated correctly")
+							  }
+							}
+						 }
+					}
+					
+					testcase TC_CSE_DMR_UPD_015_TS_MDD() runs on Tester system CseSystem {
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var XSD.Boolean v_missingDataDetect := true;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+
+						v_updateRequest.primitiveContent.timeSeries.missingDataDetect := v_missingDataDetect;
+
+						v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
+						v_ae1.done;	 
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							 //Check attribute 1
+							 if(ispresent(v_responsePrimitive.primitiveContent)) {
+								 if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
+									 if(v_responsePrimitive.primitiveContent.timeSeries.missingDataDetect != v_missingDataDetect){
+										 setverdict(fail, __SCOPE__, ": Error: MissingDataDetect attribute not updated correctly")
+									 }
+								 }
+							 }
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
+ 
+																	//Check that the resource has been udpated correctly
+							  if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) {
+							   if(v_primitiveContentRetrieveResource.timeSeries.missingDataDetect != v_missingDataDetect){
+								setverdict(fail, __SCOPE__ & ": Error: MissingDataDetect attribute not updated correctly")
+							  }
+							}
+						 }
+					}
+					
+					testcase TC_CSE_DMR_UPD_015_TS_MDN() runs on Tester system CseSystem {
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var XSD.NonNegativeInteger v_missingDataMaxNr := 1;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+
+						v_updateRequest.primitiveContent.timeSeries.missingDataMaxNr := v_missingDataMaxNr;
+
+						v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
+						v_ae1.done;	 
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							 //Check attribute 1
+							 if(ispresent(v_responsePrimitive.primitiveContent)) {
+								 if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
+									 if(v_responsePrimitive.primitiveContent.timeSeries.missingDataMaxNr != v_missingDataMaxNr){
+										 setverdict(fail, __SCOPE__, ": Error: MissingDataMaxNr attribute not updated correctly")
+									 }
+								 }
+							 }
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
+ 
+							//Check that the resource has been udpated correctly
+							  if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) {
+							   if(v_primitiveContentRetrieveResource.timeSeries.missingDataMaxNr != v_missingDataMaxNr){
+								setverdict(fail, __SCOPE__ & ": Error: MissingDataMaxNr attribute not updated correctly")
+							  }
+							}
+						 }
+					}
+					
+					testcase TC_CSE_DMR_UPD_015_TS_MDT() runs on Tester system CseSystem {
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var XSD.NonNegativeInteger v_missingDataDetectTimer := 1;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+
+						v_updateRequest.primitiveContent.timeSeries.missingDataDetectTimer := v_missingDataDetectTimer;
+
+						v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
+						v_ae1.done;	 
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							 //Check attribute 1
+							 if(ispresent(v_responsePrimitive.primitiveContent)) {
+								 if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
+									 if(v_responsePrimitive.primitiveContent.timeSeries.missingDataDetectTimer != v_missingDataDetectTimer){
+										 setverdict(fail, __SCOPE__, ": Error: MissingDataDetectTimer attribute not updated correctly")
+									 }
+								 }
+							 }
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
+ 
+												//Check that the resource has been udpated correctly
+							  if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) {
+							   if(v_primitiveContentRetrieveResource.timeSeries.missingDataDetectTimer != v_missingDataDetectTimer){
+								setverdict(fail, __SCOPE__ & ": Error: MissingDataDetectTimer attribute not updated correctly")
+							  }
+							}
+						 }
+					}
+					
+					testcase TC_CSE_DMR_UPD_015_TS_OR() runs on Tester system CseSystem {
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var XSD.AnyURI v_ontoLogyRef := "MyOntologyRef";
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+	
+						v_updateRequest.primitiveContent.timeSeries.ontologyRef := v_ontoLogyRef;
+	
+						v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
+						v_ae1.done;	 
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							 //Check attribute 1
+							 if(ispresent(v_responsePrimitive.primitiveContent)) {
+								 if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
+									 if(v_responsePrimitive.primitiveContent.timeSeries.ontologyRef != v_ontoLogyRef){
+										 setverdict(fail, __SCOPE__, ": Error: Ontology Ref attribute not updated correctly")
+									 }
+								 }
+							 }
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
+ 
+											  //Check that the resource has been udpated correctly
+							  if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) {
+							   if(v_primitiveContentRetrieveResource.timeSeries.ontologyRef != v_ontoLogyRef){
+								setverdict(fail, __SCOPE__ & ": Error: Ontology Ref attribute not updated correctly")
+							  }
+							}
+						 }
+					}
+					
+				} // end group g_CSE_DMR_UPD_015
 			  	
 				group g_CSE_DMR_UPD_016 {
 			  		
@@ -4628,11 +6641,12 @@ 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;
+						
 						var Timestamp v_expirationTime := "21001231T012345";
 						var template RequestPrimitive v_updateRequest := m_updateNodeBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.node.expirationTime := v_expirationTime;
 						
 						v_ae1.start(f_CSE_DMR_UPD_016(int9, m_createNodeBase, v_updateRequest));//Node
@@ -4662,11 +6676,12 @@ 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;
+					
 						var template RequestPrimitive v_updateRequest := m_updateNodeBase;
 						var XSD.Token v_targetId := "TARGET-ID";
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
-						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.node.nodeID := v_targetId;
 						
 						v_ae1.start(f_CSE_DMR_UPD_016(int9, m_createNodeBase, v_updateRequest));//Node
@@ -4677,20 +6692,52 @@ module OneM2M_Testcases_CSE_Release_2 {
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
-								if(ischosen(v_responsePrimitive.primitiveContent.node)) {
-									if(v_responsePrimitive.primitiveContent.node.nodeID != v_targetId){
-										setverdict(fail, __SCOPE__, ": Error: NodeID attribute not updated correctly")
+								if(ischosen(v_responsePrimitive.primitiveContent.node)) {
+									if(v_responsePrimitive.primitiveContent.node.nodeID != v_targetId){
+										setverdict(fail, __SCOPE__, ": Error: NodeID attribute not updated correctly")
+									}
+								}
+							}
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
+							
+							//Check that the resource has been udpated correctly
+							if(ischosen(v_primitiveContentRetrieveResource.node)) {
+							  if(v_primitiveContentRetrieveResource.node.nodeID != v_targetId){
+								setverdict(fail, __SCOPE__ & ": Error: NodeID attribute not updated correctly")
+							  }
+							}	
+						}
+					}
+					
+					testcase TC_CSE_DMR_UPD_016_TS_ET() runs on Tester system CseSystem {
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var Timestamp v_expirationTime := "21001231T012345";
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+	
+						v_updateRequest.primitiveContent.timeSeries.expirationTime := v_expirationTime;
+	
+						v_ae1.start(f_CSE_DMR_UPD_016(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries
+						v_ae1.done;	 
+
+						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							//Check attribute 1
+							if(ispresent(v_responsePrimitive.primitiveContent)) {
+								if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
+									if(v_responsePrimitive.primitiveContent.timeSeries.expirationTime != v_expirationTime){
+										setverdict(fail, __SCOPE__, ": Error: Expiration time attribute not updated correctly")
 									}
 								}
 							}
 							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);							
-							
-							//Check that the resource has been udpated correctly
-							if(ischosen(v_primitiveContentRetrieveResource.node)) {
-							  if(v_primitiveContentRetrieveResource.node.nodeID != v_targetId){
-								setverdict(fail, __SCOPE__ & ": Error: NodeID attribute not updated correctly")
-							  }
-							}	
+		
+						  //Check that the resource has been udpated correctly
+						  if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) {
+							if(v_primitiveContentRetrieveResource.timeSeries.expirationTime != v_expirationTime){
+							  setverdict(fail, __SCOPE__ & ": Error: Expiration time attribute not updated correctly")
+							}
+						  }
 						}
 					}
 					
@@ -4709,6 +6756,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,10 +6765,27 @@ 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;
 					};
+					
+					testcase TC_CSE_DMR_DEL_001_TS() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+						v_ae1.start(f_CSE_DMR_DEL_001(int29, m_createTimeSeriesBase));//TimeSeries
+						v_ae1.done;
+					};
+					
+					testcase TC_CSE_DMR_DEL_001_TSI() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+						v_ae1.start(f_CSE_DMR_DEL_001(int30, m_createTimeSeriesInstanceBase));//TimeSeriesInstance
+						v_ae1.done;
+					};
                 
 				};//end of group g_CSE_DMR_DEL_001
                 
@@ -4733,6 +6798,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,10 +6807,19 @@ 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;
 					};
+					
+					testcase TC_CSE_DMR_DEL_002_TS() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+						v_ae1.start(f_CSE_DMR_DEL_002(int29, m_createTimeSeriesBase));//TimeSeries
+						v_ae1.done;
+					};
                 
 				};//end of group g_CSE_DMR_DEL_002
                 
@@ -4757,6 +6832,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 +6865,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 +6903,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 +6912,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 +6921,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 +6930,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;
@@ -4859,12 +6939,97 @@ 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;
 					};	
+					
+					testcase TC_CSE_DMR_DEL_004_TS() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+						v_ae1.start(f_CSE_DMR_DEL_004(int29, m_createTimeSeriesBase, int23, m_createSubscriptionBase));//TimeSeries
+						v_ae1.done;
+					};	
                 
 				};//end of group g_CSE_DMR_DEL_004
+				
+				group g_CSE_DMR_DEL_005{
+                	
+					/**
+					 * @desc Check that the stateTag attribute of a RESOURCE_TYPE resource is increased when a child resource is deleted
+					 * 
+					 */
+					testcase TC_CSE_DMR_DEL_005_CNT() runs on Tester system CseSystem {
+						// Local variables
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+		
+						v_ae1.start(f_CSE_DMR_DEL_005(int3, m_createContainerBase, int3, m_createContainerBase));//Container
+						v_ae1.done;
+						
+						if(getverdict == pass){ 
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+							//Check that stateTag has been incremented
+							  if(ischosen(v_primitiveContentRetrieveResource.container)) {
+							   if(v_primitiveContentRetrieveResource.container.stateTag == 2){	//(Create and Delete)
+									setverdict(pass, __SCOPE__ & ": The stateTag attribute is incremented");	
+							   }else{
+									setverdict(fail, __SCOPE__ & ": Error the stateTag attribute is not incremented");
+							   }
+							}
+						}
+					};
+
+					testcase TC_CSE_DMR_DEL_005_TS() runs on Tester system CseSystem {
+						// Local variables
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+		
+						v_ae1.start(f_CSE_DMR_DEL_005(int29, m_createTimeSeriesBase, int30, m_createTimeSeriesInstanceBase));//TimeSeries
+						v_ae1.done;
+						
+						if(getverdict == pass){ 
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+							//Check that stateTag has been incremented
+							  if(ischosen(v_primitiveContentRetrieveResource.container)) {
+							   if(v_primitiveContentRetrieveResource.timeSeries.stateTag == 2){	//(Create and Delete)
+									setverdict(pass, __SCOPE__ & ": The stateTag attribute is incremented");	
+							   }else{
+									setverdict(fail, __SCOPE__ & ": Error the stateTag attribute is not incremented");
+							   }
+							}
+						}
+					};
+
+				};//end of group g_CSE_DMR_DEL_005
+				
+				group g_CSE_DMR_DEL_006{
+                	
+					/**
+					 * @desc Check that the IUT decreases the field value of attribute currentNrOfInstances and currentByteSize of parent RESOURCE_TYPE when a latest RESOURCE_TYPE resource is deleted successfully
+					 * 
+					 */
+					testcase TC_CSE_DMR_DEL_006_CNT_CIN() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+						v_ae1.start(f_CSE_DMR_DEL_006(int3, m_createContainerBase, int4, m_createContentInstanceBase));//ContentInstance under Container
+						v_ae1.done;
+	
+					};
+
+					testcase TC_CSE_DMR_DEL_006_TS_TSI() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+						v_ae1.start(f_CSE_DMR_DEL_006(int29, m_createTimeSeriesBase, int30, m_createTimeSeriesInstanceBase));//TimeSeriesInstance under TimeSeries
+						v_ae1.done;
+						
+					};
+
+				};//end of group g_CSE_DMR_DEL_006
 
 				group g_CSE_DMR_DEL_008{
 
@@ -4875,6 +7040,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());
 											  	  	
@@ -4905,7 +7071,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 {
@@ -4943,6 +7109,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());
 											  	  	
@@ -4973,7 +7140,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 {
@@ -5012,6 +7179,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());
 													  	  	
@@ -5036,7 +7204,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
@@ -5080,6 +7248,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());
 														  	  	
@@ -5108,7 +7277,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 {
@@ -5155,6 +7324,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());
 														  	  	
@@ -5191,7 +7361,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 {
@@ -5235,6 +7405,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());
 														  	  	
@@ -5262,7 +7433,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 {
@@ -5306,6 +7477,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());
 														  	  	
@@ -5339,7 +7511,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 {
@@ -5378,6 +7550,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());
 														  	  	
@@ -5411,7 +7584,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{
@@ -5454,6 +7627,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());
 														  	  	
@@ -5486,7 +7660,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 {
@@ -5532,6 +7706,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());
 														  	  	
@@ -5563,7 +7738,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 {
@@ -5609,6 +7784,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());
 														  	  	
@@ -5647,7 +7823,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{
@@ -5683,6 +7859,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());
 														  	  	
@@ -5720,7 +7897,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{
@@ -5756,6 +7933,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());
 														  	  	
@@ -5792,7 +7970,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{
@@ -5843,6 +8021,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());
 														  	  	
@@ -5879,7 +8058,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{
@@ -5913,6 +8092,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());
 														  	  	
@@ -5943,7 +8123,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{
@@ -5986,6 +8166,52 @@ module OneM2M_Testcases_CSE_Release_2 {
 	
 			group Create {
 				
+				group g_CSE_SUB_CRE_001 {
+				
+					/**
+					 * @desc Check that the IUT rejects the creation of the <subscription> resource when the target subscribed-to RESOURCE_TYPE resource is not subscribable. 
+					 * 
+					 */
+					testcase TC_CSE_SUB_CRE_001_CIN() runs on Tester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_parentResourceRequest := m_createContainerBase;
+						var template RequestPrimitive v_childResourceRequest := m_createContentInstanceBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						const XSD.String c_content := "Random Value";	
+
+						v_childResourceRequest.primitiveContent.contentInstance.content := "Random Value";
+
+						v_ae1.start(f_CSE_SUB_CRE_001(int3, v_parentResourceRequest, int4, v_childResourceRequest));		
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_SUB_CRE_001_SUB() runs on Tester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_parentResourceRequest := m_createSubscriptionBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+						v_ae1.start(f_CSE_SUB_CRE_001(int23, v_parentResourceRequest, int23, v_parentResourceRequest));		
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_SUB_CRE_001_TSI() runs on Tester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_parentResourceRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_childResourceRequest := m_createTimeSeriesInstanceBase;
+						var ResponsePrimitive v_responsePrimitive;
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						const XSD.String c_content := "Random Value";	
+	
+						v_childResourceRequest.primitiveContent.timeSeriesInstance.content := "Random Value";
+	
+						v_ae1.start(f_CSE_SUB_CRE_001(int29, v_parentResourceRequest, int30, v_childResourceRequest));		
+						v_ae1.done;
+					}
+
+				}// end group g_CSE_DMR_CRE_014
+				
 			}//end group Create
 			
 			group Notify{
@@ -5997,6 +8223,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());
 											  	  	
@@ -6027,7 +8254,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 {
@@ -6072,6 +8299,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());
 												  	  	
@@ -6102,7 +8330,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 {
@@ -6147,6 +8375,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());
 												  	  	
@@ -6231,6 +8460,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());
 												  	  	
@@ -6281,7 +8511,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 {
@@ -6318,6 +8548,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());
 													  	  	
@@ -6364,7 +8595,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 {
@@ -6401,6 +8632,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());
 													  	  	
@@ -6452,7 +8684,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 {
@@ -6495,6 +8727,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());
 													  	  	
@@ -6543,7 +8776,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 {
@@ -6581,6 +8814,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());
 													  	  	
@@ -6627,7 +8861,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 {
@@ -6664,6 +8898,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());
 													  	  	
@@ -6736,6 +8971,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());
 													  	  	
@@ -6812,6 +9048,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());
 													  	  	
@@ -6860,7 +9097,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 {
@@ -6903,6 +9140,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());
 													  	  	
@@ -6947,7 +9185,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 {
@@ -6986,6 +9224,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());
 													  	  	
@@ -7031,7 +9270,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 {
@@ -7094,9 +9333,10 @@ 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;
+						
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
-  
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
                   
 						v_ae1.start(f_CSE_ANNC_001(int1, v_createRequestAnnc, omit, v_updateRequest));//AccessControlPolicy
@@ -7106,9 +9346,10 @@ 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;
+						
 						var template RequestPrimitive v_createRequest := m_createAcpBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
-  
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
   
 						v_ae1.start(f_CSE_ANNC_001(int1, v_createRequestAnnc, v_createRequest, omit));//AccessControlPolicy
@@ -7118,9 +9359,10 @@ 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;
+						
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
-  
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
   
 						v_ae1.start(f_CSE_ANNC_001(int3, v_createRequestAnnc, omit, v_updateRequest));//Container
@@ -7130,9 +9372,10 @@ 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;
+						
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
-  
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
   
 						v_ae1.start(f_CSE_ANNC_001(int3, v_createRequestAnnc, v_createRequest, omit));//Container
@@ -7142,9 +9385,10 @@ 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;
+						
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
-  
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
   
 						v_ae1.start(f_CSE_ANNC_001(int9, v_createRequestAnnc, omit, v_updateRequest));//Group
@@ -7154,9 +9398,10 @@ 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;
+						
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
-  
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
   
 						v_ae1.start(f_CSE_ANNC_001(int9, v_createRequestAnnc, v_createRequest, omit));//Group
@@ -7166,14 +9411,51 @@ 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;
+						
 						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnncBase;
-  
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};
   
 						v_ae1.start(f_CSE_ANNC_001(int4, v_createRequestAnnc, v_createRequest, omit));//ContentInstance
 						v_ae1.done;
 					}
+					
+					testcase TC_CSE_ANNC_001_TS_UPD() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
+  
+						v_updateRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
+  
+						v_ae1.start(f_CSE_ANNC_001(int29, v_createRequestAnnc, omit, v_updateRequest));//TimeSeries
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_ANNC_001_TS_CRE() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
+  
+						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
+  
+						v_ae1.start(f_CSE_ANNC_001(int29, v_createRequestAnnc, v_createRequest, omit));//TimeSeries
+						v_ae1.done;
+					}
+					
+					testcase TC_CSE_ANNC_001_TSI_CRE() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnncBase;
+  
+						v_createRequest.primitiveContent.timeSeriesInstance.announceTo := {PX_CSE1_ID};
+  
+						v_ae1.start(f_CSE_ANNC_001(int30, v_createRequestAnnc, v_createRequest, omit));//TimeSeriesInstance
+						v_ae1.done;
+					}
 			
 				}// end group g_CSE_ANNC_001
 		
@@ -7234,6 +9516,18 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_cse1.start(f_CSE_ANNC_CRE_002(int9, v_createRequestAnnc, v_updateRequest));//Group
 						v_cse1.done;
 					}
+					
+					testcase TC_CSE_ANNC_CRE_002_TS() runs on Tester system CseSystem {
+						// Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
+  
+						v_updateRequest.primitiveContent.timeSeries.announceTo := {f_getAnnouncementTargetPoA()};
+  
+						v_cse1.start(f_CSE_ANNC_CRE_002(int29, v_createRequestAnnc, v_updateRequest));//TimeSeries
+						v_cse1.done;
+					}
 				} //end group g_CSE_ANNC_CRE_002
 				
 				group g_CSE_ANNC_CRE_003 {
@@ -7303,6 +9597,18 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_cse1.done;
 					}
 					
+					testcase TC_CSE_ANNC_CRE_004_TS() runs on Tester system CseSystem {
+						// Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
+  
+						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
+  
+						v_cse1.start(f_CSE_ANNC_CRE_004_CseSimu(int29, v_createRequestAnnc, v_createRequest));//TimeSeries
+						v_cse1.done;
+					}
+					
 				}// end group g_CSE_ANNC_CRE_004
 				
 				group g_CSE_ANNC_CRE_005 {
@@ -7356,6 +9662,30 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 v_cse1.done;
 					}
 					
+					testcase TC_CSE_ANNC_CRE_005_TS() runs on Tester system CseSystem {
+						//Local variables
+						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						 var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
+  
+						 v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
+  
+						 v_cse1.start(f_CSE_ANNC_CRE_005_CseSimu(int29, v_createRequestAnnc, v_createRequest));//TimeSeries
+						 v_cse1.done;
+					}
+					
+					testcase TC_CSE_ANNC_CRE_005_TSI() runs on Tester system CseSystem {
+						//Local variables
+						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						 var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnncBase;
+  
+						 v_createRequest.primitiveContent.timeSeriesInstance.announceTo := {PX_CSE1_ID};
+  
+						 v_cse1.start(f_CSE_ANNC_CRE_005_CseSimu(int30, v_createRequestAnnc, v_createRequest));//TimeSeriesInstance
+						 v_cse1.done;
+					}
+					
 				} //end group g_CSE_ANNC_CRE_005
 				
 				group g_CSE_ANNC_CRE_006 {
@@ -7408,6 +9738,30 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 v_cse1.start(f_CSE_ANNC_CRE_006_CseSimu(int9, v_createRequestAnnc, v_createRequest));//Group
 						 v_cse1.done;
 					}
+					
+					testcase TC_CSE_ANNC_CRE_006_TS() runs on Tester system CseSystem {
+						//Local variables
+						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						 var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
+	  
+						 v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
+	  
+						 v_cse1.start(f_CSE_ANNC_CRE_006_CseSimu(int29, v_createRequestAnnc, v_createRequest));//TimeSeries
+						 v_cse1.done;
+					}
+					
+					testcase TC_CSE_ANNC_CRE_006_TSI() runs on Tester system CseSystem {
+						//Local variables
+						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						 var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnncBase;
+  
+						 v_createRequest.primitiveContent.timeSeriesInstance.announceTo := {PX_CSE1_ID};
+  
+						 v_cse1.start(f_CSE_ANNC_CRE_006_CseSimu(int30, v_createRequestAnnc, v_createRequest));//TimeSeriesInstance
+						 v_cse1.done;
+					}
 	
 				} //end group g_CSE_ANNC_CRE_006
 				
@@ -7461,62 +9815,99 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 v_cse1.start(f_CSE_ANNC_CRE_007_CseSimu(int9, v_createRequestAnnc, v_createRequest));//Group
 						 v_cse1.done;
 					}
-	
-				} //end group g_CSE_ANNC_CRE_007
-				
-				group g_CSE_ANNC_CRE_008 {
 					
-					testcase TC_CSE_ANNC_CRE_008_ACP_MBS() runs on Tester system CseSystem {
+					testcase TC_CSE_ANNC_CRE_007_TS() runs on Tester system CseSystem {
 						//Local variables
 						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						 var template RequestPrimitive v_createRequest := m_createAcpBase;
-						 var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
+						 var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
   
-						 v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
-						 v_createRequest.primitiveContent.accessControlPolicy.announcedAttribute := {"maxByteSize"};
+						 v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
   
-						 v_cse1.start(f_CSE_ANNC_CRE_008_CseSimu(int1, v_createRequestAnnc, v_createRequest));//AccessControlPolicy
+						 v_cse1.start(f_CSE_ANNC_CRE_007_CseSimu(int29, v_createRequestAnnc, v_createRequest));//TimeSeries
 						 v_cse1.done;
 					}
-
-					testcase TC_CSE_ANNC_CRE_007_CNT_CNF() runs on Tester system CseSystem {
+					
+					testcase TC_CSE_ANNC_CRE_007_TSI() runs on Tester system CseSystem {
+						//Local variables
+						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						 var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnncBase;
+  
+						 v_createRequest.primitiveContent.timeSeriesInstance.announceTo := {PX_CSE1_ID};
+  
+						 v_cse1.start(f_CSE_ANNC_CRE_007_CseSimu(int30, v_createRequestAnnc, v_createRequest));//TimeSeriesInstance
+						 v_cse1.done;
+					}
+	
+				} //end group g_CSE_ANNC_CRE_007
+				
+				group g_CSE_ANNC_CRE_008 {
+					
+					testcase TC_CSE_ANNC_CRE_008_CNT_MBS() runs on Tester system CseSystem {
 						//Local variables
 						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						 var template RequestPrimitive v_createRequest := m_createContainerBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
   
 						 v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
-						 v_createRequest.primitiveContent.container.announcedAttribute := {"contentInfo"};
+						 v_createRequest.primitiveContent.container.announcedAttribute := {"maxByteSize"};
   
 						 v_cse1.start(f_CSE_ANNC_CRE_008_CseSimu(int3, v_createRequestAnnc, v_createRequest));//Container
 						 v_cse1.done;
 					}
 
-					testcase TC_CSE_ANNC_CRE_007_CIN_MT() runs on Tester system CseSystem {
+					testcase TC_CSE_ANNC_CRE_008_CIN_CNF() runs on Tester system CseSystem {
 						//Local variables
 						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						 var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnnc;
   
 						 v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};
-						 v_createRequest.primitiveContent.container.announcedAttribute := {"memberType"};
+						 v_createRequest.primitiveContent.contentInstance.announcedAttribute := {"contentInfo"};
   
 						 v_cse1.start(f_CSE_ANNC_CRE_008_CseSimu(int4, v_createRequestAnnc, v_createRequest));//ContentInstance
 						 v_cse1.done;
-
 					}
 
-					testcase TC_CSE_ANNC_CRE_007_GRP_LOI() runs on Tester system CseSystem {
+					testcase TC_CSE_ANNC_CRE_008_GRP_MT() runs on Tester system CseSystem {
 						//Local variables
 						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						 var template RequestPrimitive v_createRequest := m_createGroupBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
   
 						 v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
-						 v_createRequest.primitiveContent.container.announcedAttribute := {"locationContainerID"};
-   
+						 v_createRequest.primitiveContent.group_.announcedAttribute := {"memberType"};
+  
 						 v_cse1.start(f_CSE_ANNC_CRE_008_CseSimu(int9, v_createRequestAnnc, v_createRequest));//Group
 						 v_cse1.done;
+
+					}
+					
+					testcase TC_CSE_ANNC_CRE_008_TS_MBS() runs on Tester system CseSystem {
+						//Local variables
+						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						 var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
+  
+						 v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
+						 v_createRequest.primitiveContent.timeSeries.announcedAttribute := {"maxByteSize"};
+  
+						 v_cse1.start(f_CSE_ANNC_CRE_008_CseSimu(int29, v_createRequestAnnc, v_createRequest));//TimeSeries
+						 v_cse1.done;
+					}
+					
+					testcase TC_CSE_ANNC_CRE_008_TSI_CS() runs on Tester system CseSystem {
+						//Local variables
+						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						 var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnncBase;
+	  
+						 v_createRequest.primitiveContent.timeSeriesInstance.announceTo := {PX_CSE1_ID};
+						 v_createRequest.primitiveContent.timeSeriesInstance.announcedAttribute := {"contentSize"};
+	  
+						 v_cse1.start(f_CSE_ANNC_CRE_008_CseSimu(int30, v_createRequestAnnc, v_createRequest));//TimeSeriesInstance
+						 v_cse1.done;
 					}
 
 				} //end group g_CSE_ANNC_CRE_008
@@ -7562,23 +9953,43 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 v_ae1.done;
 					}
 					
-					testcase TC_CSE_ANNC_RET_001_CIN() runs on Tester system CseSystem {
+					testcase TC_CSE_ANNC_RET_001_CIN() runs on Tester system CseSystem {
+						 //Local variables
+						 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						 var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnnc;
+  
+						 v_ae1.start(f_CSE_ANNC_RET_001(int4, v_createRequestAnnc, v_createRequest));//ContentInstance
+						 v_ae1.done;
+					}
+					
+					testcase TC_CSE_ANNC_RET_001_GRP() runs on Tester system CseSystem {
+						 //Local variables
+						 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						 var template RequestPrimitive v_createRequest := m_createGroupBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
+  
+						 v_ae1.start(f_CSE_ANNC_RET_001(int9, v_createRequestAnnc, v_createRequest));//Group
+						 v_ae1.done;
+					}
+					
+					testcase TC_CSE_ANNC_RET_001_TS() runs on Tester system CseSystem {
 						 //Local variables
 						 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						 var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
-						 var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnnc;
+						 var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
   
-						 v_ae1.start(f_CSE_ANNC_RET_001(int4, v_createRequestAnnc, v_createRequest));//ContentInstance
+						 v_ae1.start(f_CSE_ANNC_RET_001(int29, v_createRequestAnnc, v_createRequest));//TimeSeries
 						 v_ae1.done;
 					}
 					
-					testcase TC_CSE_ANNC_RET_001_GRP() runs on Tester system CseSystem {
+					testcase TC_CSE_ANNC_RET_001_TSI() runs on Tester system CseSystem {
 						 //Local variables
 						 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						 var template RequestPrimitive v_createRequest := m_createGroupBase;
-						 var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
+						 var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnncBase;
   
-						 v_ae1.start(f_CSE_ANNC_RET_001(int9, v_createRequestAnnc, v_createRequest));//Group
+						 v_ae1.start(f_CSE_ANNC_RET_001(int30, v_createRequestAnnc, v_createRequest));//TimeSeriesInstance
 						 v_ae1.done;
 					}
 					
@@ -7626,6 +10037,26 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 v_ae1.done;
 					}
 					
+					testcase TC_CSE_ANNC_RET_002_TS() runs on Tester system CseSystem {
+						 //Local variables
+						 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						 var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
+	  
+						 v_ae1.start(f_CSE_ANNC_RET_002(int29, v_createRequestAnnc, v_createRequest));//TimeSeries
+						 v_ae1.done;
+					}
+					
+					testcase TC_CSE_ANNC_RET_002_TSI() runs on Tester system CseSystem {
+						 //Local variables
+						 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						 var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnncBase;
+  
+						 v_ae1.start(f_CSE_ANNC_RET_002(int30, v_createRequestAnnc, v_createRequest));//TimeSeriesInstance
+						 v_ae1.done;
+					}
+					
 				} //end group g_CSE_ANNC_RET_002
 				
 			} //end group Retrieve
@@ -7672,6 +10103,19 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_cse1.start(f_CSE_ANNC_UPD_001(int9, v_createRequest, v_createRequestAnnc, v_updateRequest));//Group
 						v_cse1.done;
 					}
+					
+					testcase TC_CSE_ANNC_UPD_001_TS() runs on Tester system CseSystem {
+						// Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;	
+
+						v_updateRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
+  
+						v_cse1.start(f_CSE_ANNC_UPD_001(int29, v_createRequest, v_createRequestAnnc, v_updateRequest));//TimeSeries
+						v_cse1.done;
+					}
 
 				}// end group g_CSE_ANNC_UPD_001
 	
@@ -7730,6 +10174,24 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_cse1.start(f_CSE_ANNC_UPD_002(int9, v_createRequest, v_createRequestAnnc, v_updateRequest, v_nullFields));//Group
 						v_cse1.done;
 					}
+					
+					testcase TC_CSE_ANNC_UPD_002_TS() runs on Tester system CseSystem {
+						// Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;	
+						var AttributeAux_list v_nullFields;
+						var ListOfURIs v_announceTo := {"To be deleted"};
+
+						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
+	
+						v_updateRequest.primitiveContent.timeSeries.announceTo := v_announceTo;
+						v_nullFields := {{"announceTo", omit}};
+  
+						v_cse1.start(f_CSE_ANNC_UPD_002(int29, v_createRequest, v_createRequestAnnc, v_updateRequest, v_nullFields));//TimeSeries
+						v_cse1.done;
+					}
 
 				}// end group g_CSE_ANNC_UPD_002
 	
@@ -7856,6 +10318,46 @@ module OneM2M_Testcases_CSE_Release_2 {
 							}
 						}	
 					}
+					
+					testcase TC_CSE_ANNC_UPD_003_TS() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;	
+						var ResponsePrimitive v_responsePrimitive;	
+						var AttributeAux_list v_nullFields;
+						var ListOfURIs v_announceTo := {"To be deleted"};
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+  
+						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
+	
+						v_updateRequest.primitiveContent.timeSeries.announceTo := v_announceTo;
+						v_nullFields := {{"announceTo", omit}};
+  
+						v_ae1.start(f_CSE_ANNC_UPD_003(int29, v_createRequestAnnc, v_createRequest, v_updateRequest, v_nullFields));//TimeSeries
+						v_ae1.done;
+
+						if(getverdict == pass){
+							v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							if(ispresent(v_responsePrimitive.primitiveContent)) {
+								if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
+									if(ispresent(v_responsePrimitive.primitiveContent.timeSeries.announceTo)){
+										setverdict(fail, __SCOPE__ & ": Error: announceTo attribute is not set to NULL");
+									}
+								}
+							}
+		
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+
+							//Check that the resource has been udpated correctly
+							if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) {
+								if(ispresent(v_primitiveContentRetrieveResource.timeSeries.announceTo)){
+									setverdict(fail, __SCOPE__ & ": Error: announceTo attribute not updated correctly");
+								}
+							}
+						}	
+					}
 
 				}// end group g_CSE_ANNC_UPD_003
 				
@@ -7905,6 +10407,21 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_cse1.start(f_CSE_ANNC_UPD_004(int9, v_createRequest, v_createRequestAnnc, v_updateRequest));//Group
 						v_cse1.done;
 					}
+					
+					testcase TC_CSE_ANNC_UPD_004_TS() runs on Tester system CseSystem {
+						// Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;	
+
+						v_updateRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
+						v_updateRequest.primitiveContent.timeSeries.announcedAttribute := {"ToBeDeleted"};
+						v_updateRequest.primitiveContent.timeSeries.parentID := PX_CSE1_ID;
+  
+						v_cse1.start(f_CSE_ANNC_UPD_004(int29, v_createRequest, v_createRequestAnnc, v_updateRequest));//TimeSeries
+						v_cse1.done;
+					}
 				} // end group g_CSE_ANNC_UPD_004
 	
 				group g_CSE_ANNC_UPD_005 {
@@ -7985,6 +10502,19 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_cse1.start(f_CSE_ANNC_UPD_006(int9, v_createRequest, v_createRequestAnnc, v_updateRequest));//Group
 						v_cse1.done;
 					}
+					
+					testcase TC_CSE_ANNC_UPD_006_TS() runs on Tester system CseSystem {
+						//Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
+
+						v_updateRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
+
+						v_cse1.start(f_CSE_ANNC_UPD_006(int29, v_createRequest, v_createRequestAnnc, v_updateRequest));//TimeSeries
+						v_cse1.done;
+					}
 				}// end group g_CSE_ANNC_UPD_006
 				
 				group g_CSE_ANNC_UPD_007 {
@@ -8027,6 +10557,19 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_cse1.start(f_CSE_ANNC_UPD_007(int9, v_createRequest, v_createRequestAnnc, v_updateRequest));//Group
 						v_cse1.done;
 					}
+					
+					testcase TC_CSE_ANNC_UPD_007_TS() runs on Tester system CseSystem {
+						//Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
+
+						v_updateRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
+
+						v_cse1.start(f_CSE_ANNC_UPD_007(int29, v_createRequest, v_createRequestAnnc, v_updateRequest));//TimeSeries
+						v_cse1.done;
+					}
 				} //end group g_CSE_ANNC_UPD_007
 				
 				group g_CSE_ANNC_UPD_008 {
@@ -8122,6 +10665,52 @@ module OneM2M_Testcases_CSE_Release_2 {
 							}
 						}
 					}
+					
+					testcase TC_CSE_ANNC_UPD_008_TS_MBS() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;	
+						var ResponsePrimitive v_responsePrimitive;	
+						var AttributeAux_list v_nullFields;
+						var ListOfNCNames v_announcedAttribute := {"ToBeDeleted"};
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+						var XSD.NonNegativeInteger v_maxByteSize := 512;
+  
+						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
+						v_createRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize;
+						v_createRequest.primitiveContent.timeSeries.announcedAttribute := v_announcedAttribute;
+
+						v_updateRequest.primitiveContent.timeSeries.announcedAttribute := {"maxByteSize"};
+  
+						v_ae1.start(f_CSE_ANNC_UPD_008(int29, v_createRequestAnnc, v_createRequest, v_updateRequest));//TimeSeries
+						v_ae1.done;
+
+						if(getverdict == pass){
+							v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							if(ispresent(v_responsePrimitive.primitiveContent)) {
+								if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
+									if(ispresent(v_responsePrimitive.primitiveContent.timeSeries.announcedAttribute)){
+										setverdict(pass, __SCOPE__ & ": announcedAttribute attribute is present");
+									} else {
+										setverdict(fail, __SCOPE__ & ": announcedAttribute attribute is not present");
+									}
+								}
+							}
+
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+
+							//Check that the resource has been udpated correctly
+							if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) {
+								if(ispresent(v_primitiveContentRetrieveResource.timeSeries.announcedAttribute)){
+									setverdict(pass, __SCOPE__ & "announcedAttribute attribute updated correctly");
+								} else {
+									setverdict(fail, __SCOPE__ & "announcedAttribute attribute not updated correctly");
+								}
+							}
+						}	
+					}
 				} //end group g_CSE_ANNC_UPD_008
 				
 				group g_CSE_ANNC_UPD_009{
@@ -8169,6 +10758,28 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_cse1.start(f_CSE_ANNC_UPD_009(int9, v_createRequest, v_createRequestAnnc, v_updateRequest, v_updateRequestAnnc));//Group
 						v_cse1.done;
 					}
+					
+					testcase TC_CSE_ANNC_UPD_009_TS_MBS() runs on Tester system CseSystem {
+						// Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;	
+						var template RequestPrimitive v_updateRequestAnnc := mw_updateTimeSeriesAnnc;
+						var XSD.NonNegativeInteger v_maxByteSize := 512;
+
+						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
+						v_createRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize;	
+	
+						v_createRequestAnnc.primitiveContent.timeSeriesAnnc.maxByteSize := v_maxByteSize;
+	
+						v_updateRequest.primitiveContent.timeSeries.announcedAttribute := {"maxByteSize"};
+	
+						v_updateRequestAnnc.primitiveContent.timeSeriesAnnc.maxByteSize := v_maxByteSize;
+  
+						v_cse1.start(f_CSE_ANNC_UPD_009(int29, v_createRequest, v_createRequestAnnc, v_updateRequest, v_updateRequestAnnc));//TimeSeries
+						v_cse1.done;
+					}
 
 				}// end group g_CSE_ANNC_UPD_009
 				
@@ -8242,6 +10853,29 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_cse1.start(f_CSE_ANNC_UPD_010(int9, v_createRequest, v_createRequestAnnc, v_updateRequest, v_updateRequestAnnc));//Group
 						v_cse1.done;
 					}
+					
+					testcase TC_CSE_ANNC_UPD_010_TS() runs on Tester system CseSystem {
+						// Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;	
+						var template RequestPrimitive v_updateRequestAnnc := mw_updateTimeSeriesAnnc;
+						var Timestamp v_expirationTime_1 := "21001231T012345";
+						var Timestamp v_expirationTime_2 := "21101231T012345";
+
+						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
+						v_createRequest.primitiveContent.timeSeries.expirationTime := v_expirationTime_1;
+
+						v_createRequestAnnc.primitiveContent.timeSeriesAnnc.expirationTime := v_expirationTime_1;
+
+						v_updateRequest.primitiveContent.timeSeries.expirationTime := v_expirationTime_2;
+
+						v_updateRequestAnnc.primitiveContent.timeSeriesAnnc.expirationTime := v_expirationTime_2;
+  
+						v_cse1.start(f_CSE_ANNC_UPD_010(int29, v_createRequest, v_createRequestAnnc, v_updateRequest, v_updateRequestAnnc));//TimeSeries
+						v_cse1.done;
+					}
 
 				}// end group g_CSE_ANNC_UPD_010
 				
@@ -8294,6 +10928,30 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_cse1.start(f_CSE_ANNC_UPD_011(int9, v_createRequest, v_createRequestAnnc, v_updateRequest, v_updateRequestAnnc));//Group
 						v_cse1.done;
 					}
+					
+					testcase TC_CSE_ANNC_UPD_011_TS_MBS() runs on Tester system CseSystem {
+						// Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;	
+						var template RequestPrimitive v_updateRequestAnnc := mw_updateTimeSeriesAnnc;
+						var XSD.NonNegativeInteger v_maxByteSize_1 := 512;
+						var XSD.NonNegativeInteger v_maxByteSize_2 := 1024;
+
+						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
+						v_createRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize_1;
+						v_createRequest.primitiveContent.timeSeries.announcedAttribute := {"maxByteSize"};	
+
+						v_createRequestAnnc.primitiveContent.timeSeriesAnnc.maxByteSize := v_maxByteSize_1;
+
+						v_updateRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize_2;
+
+						v_updateRequestAnnc.primitiveContent.timeSeriesAnnc.maxByteSize := v_maxByteSize_2;
+  
+						v_cse1.start(f_CSE_ANNC_UPD_011(int29, v_createRequest, v_createRequestAnnc, v_updateRequest, v_updateRequestAnnc));//TimeSeries
+						v_cse1.done;
+					}
 
 				}// end group g_CSE_ANNC_UPD_011
 				
@@ -8373,6 +11031,44 @@ module OneM2M_Testcases_CSE_Release_2 {
 
 						}	
 					}
+					
+					testcase TC_CSE_ANNC_UPD_012_TS_MBS() runs on Tester system CseSystem {
+						// Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;	
+						var template RequestPrimitive v_updateRequestAnnc := mw_updateTimeSeriesAnnc;
+						var RequestPrimitive v_requestPrimitive;	
+						var XSD.NonNegativeInteger v_maxByteSize := 512;
+						var AttributeAux_list v_nullFields;
+						var ListOfNCNames v_announcedAttribute := {"ToBeDeleted"};
+
+						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
+						v_createRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize;
+						v_createRequest.primitiveContent.timeSeries.announcedAttribute := {"maxByteSize"};	
+
+						v_createRequestAnnc.primitiveContent.timeSeriesAnnc.maxByteSize := v_maxByteSize;
+	
+						v_updateRequest.primitiveContent.timeSeries.announcedAttribute := v_announcedAttribute;
+						v_nullFields := {{"announcedAttribute", omit}};
+  
+						v_cse1.start(f_CSE_ANNC_UPD_012(int29, v_createRequest, v_createRequestAnnc, v_updateRequest, v_updateRequestAnnc, v_nullFields));//TimeSeries
+						v_cse1.done;
+	
+						if(getverdict == pass){
+							v_requestPrimitive := f_getRequestPrimitive(v_cse1);
+							if(ispresent(v_requestPrimitive.primitiveContent)) {
+								if(ischosen(v_requestPrimitive.primitiveContent.timeSeriesAnnc)) {
+									if(ispresent(v_requestPrimitive.primitiveContent.timeSeriesAnnc.maxByteSize)){
+										setverdict(fail, __SCOPE__ & ": Error: maxByteSize attribute is not set to NULL");
+									}
+								}
+							}
+
+						}	
+	
+					}
 
 				}// end group g_CSE_ANNC_UPD_012
 				
@@ -8464,6 +11160,50 @@ module OneM2M_Testcases_CSE_Release_2 {
 							}
 						}	
 					}
+					
+					testcase TC_CSE_ANNC_UPD_013_TS_MBS() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
+						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;	
+						var ResponsePrimitive v_responsePrimitive;	
+						var AttributeAux_list v_nullFields;
+						var ListOfNCNames v_announcedAttribute := {"ToBeDeleted"};
+						var PrimitiveContent v_primitiveContentRetrieveResource;
+						var XSD.NonNegativeInteger v_maxByteSize := 512;
+  
+						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
+						v_createRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize;
+						v_createRequest.primitiveContent.timeSeries.announcedAttribute := {"maxByteSize"};
+
+						v_updateRequest.primitiveContent.container.announcedAttribute := v_announcedAttribute;
+						v_nullFields := {{"announcedAttribute", omit}};
+  
+						v_ae1.start(f_CSE_ANNC_UPD_013(int29, v_createRequestAnnc, v_createRequest, v_updateRequest, v_nullFields));//TimeSeries
+						v_ae1.done;
+
+						if(getverdict == pass){
+							v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+							if(ispresent(v_responsePrimitive.primitiveContent)) {
+								if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) {
+									if(ispresent(v_responsePrimitive.primitiveContent.timeSeries.announcedAttribute)){
+										setverdict(fail, __SCOPE__ & ": Error: announcedAttribute attribute is not set to NULL");
+									}
+								}
+							}
+
+							v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+
+							//Check that the resource has been udpated correctly
+							if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) {
+								if(ispresent(v_primitiveContentRetrieveResource.timeSeries.announcedAttribute)){
+									setverdict(fail, __SCOPE__ & ": Error: announcedAttribute attribute not updated correctly");
+								}
+							}
+						}	
+
+					}
 	
 				}// end group g_CSE_ANNC_UPD_013
 				
@@ -8535,6 +11275,18 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_ae1.start(f_CSE_ANNC_DEL_001(int9, v_createRequestAnnc, v_createRequest));//Group
 						v_ae1.done;
 					}
+					
+					testcase TC_CSE_ANNC_DEL_001_TS() runs on Tester system CseSystem {
+						// Local variables
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
+  
+						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
+  
+						v_ae1.start(f_CSE_ANNC_DEL_001(int29, v_createRequestAnnc, v_createRequest));//TimeSeries
+						v_ae1.done;
+					}
 
 				}// end group g_CSE_ANNC_DEL_001
 	
@@ -8575,6 +11327,18 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_cse1.start(f_CSE_ANNC_DEL_002(int9, v_createRequestAnnc, v_createRequest));//Group
 						v_cse1.done;
 					}
+					
+					testcase TC_CSE_ANNC_DEL_002_TS() runs on Tester system CseSystem {
+						// Local variables
+						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
+  
+						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
+  
+						v_cse1.start(f_CSE_ANNC_DEL_002(int29, v_createRequestAnnc, v_createRequest));//TimeSeries
+						v_cse1.done;
+					}
 
 				}// end group g_CSE_ANNC_DEL_002
 			}//end group Delete
@@ -8633,10 +11397,82 @@ module OneM2M_Testcases_CSE_Release_2 {
 				v_cse1.done;
 			}
 			
-			/**
-			 * @desc Check that the IUT rejects a <pollingChannel> OPERATION of the AE when AE-ID is not same as the AE-ID of the parent resource
-			 * 
-			 */
+			function f_CSE_PCH_004() runs on CseSimu {
+				//Local variables
+			   	var integer v_localResourceIndex := -1;
+			   	var MsgIn v_request_req1, v_request_req3;
+			   	var RequestPrimitive v_request_req2;
+			   	var ResponsePrimitive v_response_rsp1;
+			   	var template UtTriggerPrimitive v_utRequest1 := m_utCreatePollingChannel;
+			  	var template UtTriggerPrimitive v_utRequest2;
+			   	var charstring v_action1 := "Please, send a Polling Channel CREATE request";
+			   	var charstring v_action2 := "Please, send a Polling request (Retrieve PollingChannelURI request)";
+			   	var RequestPrimitive v_requestNotify;
+			   
+			   	//Test control
+
+ 			  	 // Test component configuration
+			   	f_cf02UpCseSimuMaster();
+
+			   	// Test adapter configuration
+
+			  	 // Preamble
+			   	vc_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSEBase);
+			   
+			   	//send triggering primitive to SUT
+			   	v_localResourceIndex := f_cse_createLocalResource(v_utRequest1,v_action1);
+			   
+			  	//Check that the created resource is a PollingChannel
+			  	if(not(vc_localResourcesList[v_localResourceIndex].resourceType == int15)) {
+			  		setverdict(inconc, __SCOPE__&":INFO: Polling Channel resource not creaded");
+			  		f_checkCseSimuStatus();
+			  	}
+			   
+			   	//Trigger IUT for sending a polling request (req1)
+				v_utRequest2 := valueof(m_utRetrievePollingChannelUri(f_getLocalResourceAddress(v_localResourceIndex) & "/" & c_resourceShortNamePollingChannelUri));
+				f_sendUtPrimitive(v_utRequest2,v_action2);
+				
+				tc_ac.start;
+			   	alt {
+				   	[] mccPortIn.receive(mw_request(mw_retrieve(f_getResourceAddress(v_localResourceIndex) & "/" & c_resourceShortNamePollingChannelUri))) -> value v_request_req1 {
+						tc_ac.stop;
+						setverdict(pass, __SCOPE__&":INFO: Polling request received successfuly");
+						v_response_rsp1 := valueof(m_responsePrimitive(int2000,v_request_req1.primitive.requestPrimitive.requestIdentifier));
+						v_response_rsp1.from_ := PX_CSE1_ID;
+						v_response_rsp1.to_ := v_request_req1.primitive.requestPrimitive.from_;
+						//Put in the primitiveContent a Notify request (req2) (simulated) from another node CSE
+						v_request_req2 := valueof(m_notify(f_getResourceAddress(vc_remoteCseIndex)));
+						v_response_rsp1.primitiveContent := { requestPrimitive := v_request_req2 };
+						mccPortIn.send(m_response(v_response_rsp1));
+				   }
+				   [] tc_ac.timeout {
+					   setverdict(inconc, __SCOPE__&":INFO: No request received for creating resource type Polling Channel");
+				   }
+				}
+				
+				tc_ac.start;
+				alt {
+					[] mccPortIn.receive(mw_request(mw_notifyResponsePrimitive(?))) -> value v_request_req3 {
+						tc_ac.stop;
+						//Check that primitiveContent carries the response to req2 (resp2)
+						if(v_request_req3.primitive.requestPrimitive.primitiveContent.responsePrimitive.requestIdentifier == v_request_req2.requestIdentifier) {
+							setverdict(pass, __SCOPE__ & ": NOTIFY request received carrying response (rsp2) to the Notify request (req2)");
+						} else {
+							setverdict(fail, __SCOPE__ & ": NOTIFY request received not carryng the expected response (rsp2) to the Notify request (req2)");
+						}
+					}
+					[] tc_ac.timeout {
+						setverdict(fail, __SCOPE__ & ": No message while expecting NOTIFY request");
+					}
+				 }
+				
+				//Postamble
+				f_cse_postamble_deleteResourcesCSE();
+					
+			    // Tear down
+				f_cf02DownCseSimuMaster();
+			}
+			
 			group g_CSE_PCH_005 {
 				
 			  testcase TC_CSE_PCH_005_CRE() runs on Tester system CseSystem {