diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index e47f3556b95d8cd98ffb2426777bc2cc5fcb08e6..1040f31bc85429f3b64fc0e80e252d78aad33447 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -84,7 +84,6 @@ module OneM2M_Functions {
 			vc_cse1 := CseSimu.create("CSE1") alive;
 			vc_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 			vc_cse1.done;
-
 				
 			// Map
 			map(self:mcaPort, system:mcaPort);
@@ -1791,7 +1790,7 @@ module OneM2M_Functions {
 							setverdict(pass, __SCOPE__ & ":INFO: Notification received");
 							
 							//Send response in any case
-							v_responsePrimitive := valueof(m_responseNotification(int2001, omit));
+							v_responsePrimitive := valueof(m_responseNotification(int2000, omit));
 							v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
 							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 							tc_ac.start;
@@ -1912,7 +1911,7 @@ module OneM2M_Functions {
 								setverdict(fail, __SCOPE__ & ": Number of Notification in Aggregatednotification isn't right");
 							}
 							//Send response in any case
-							v_responsePrimitive := valueof(m_responseNotification(int2001, omit));
+							v_responsePrimitive := valueof(m_responseNotification(int2000, omit));
 							v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
 							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 						}
@@ -1925,7 +1924,7 @@ module OneM2M_Functions {
 								setverdict(fail, __SCOPE__ & ":ERROR: Notification received but the content doesn't match");
 							}
 							//Send response in any case
-							v_responsePrimitive := valueof(m_responseNotification(int2001, omit));
+							v_responsePrimitive := valueof(m_responseNotification(int2000, omit));
 							v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
 							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 							v_notificationsReceived := v_notificationsReceived + 1;
@@ -1960,7 +1959,7 @@ module OneM2M_Functions {
 					alt {
 						[] mcaPortIn.receive(mw_request(mw_notifyNotification(p_notification))) -> value vc_request {
 							tc_ac.stop;
-							v_responsePrimitive := valueof(m_responseNotification(int2001, omit));
+							v_responsePrimitive := valueof(m_responseNotification(int2000, omit));
 							v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
 							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 							if(not(match(vc_request.primitive.requestPrimitive.primitiveContent.notification.subscriptionDeletion, true))) {
@@ -2456,7 +2455,7 @@ module OneM2M_Functions {
 
 				tc_ac.start;
 				alt {
-					[] mccPortIn.receive(mw_request(p_requestPrimitive)) -> value v_request {
+					[not v_remoteCSERegistered] mccPortIn.receive(mw_request(p_requestPrimitive)) -> value v_request {
 						tc_ac.stop;
 						setverdict(pass, __SCOPE__&":INFO: Resource type remoteCSE created successfuly");
 						v_remoteCSEResource := f_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, vc_cSEBaseIndex, int16);//TODO Get index from v_request.primitive.requestPrimitive.to_
@@ -2471,7 +2470,7 @@ module OneM2M_Functions {
 						vc_remoteCseIndex := f_setResource(valueof(m_primitiveContentRemoteCSE(m_contentMyRemoteCSEResource)), int16, -1);
 						v_resourceIndex := vc_remoteCseIndex;
 						v_remoteCSERegistered:=true;
-						tc_ac.start;
+						tc_ac.start(10.0);
 						repeat;
 					}
 					[] tc_ac.timeout {
@@ -2559,7 +2558,7 @@ module OneM2M_Functions {
 				if(p_resourceType == int5) {	//CSEBase
 					v_myResource.cSEBase.resourceName := PX_CSE1_NAME;
 					v_myResource.cSEBase.resourceType := p_resourceType;
-					v_myResource.cSEBase.resourceID := f_resourceIdCleaner(PX_CSE1_ID);
+					v_myResource.cSEBase.resourceID := f_resourceIdCleaner(PX_CSE1_RESOURCE_ID);
 					v_myResource.cSEBase.parentID := "";//Following TS-0001, it must be NULL. Set to a value for Codec to set it to null
 					v_myResource.cSEBase.creationTime := fx_generateTimestamp();
 					v_myResource.cSEBase.creationTime := "20171231T012345";
@@ -2922,20 +2921,8 @@ module OneM2M_Functions {
 					log(__SCOPE__&": WARNING: Unexpected CREATE message received");
 					tc_ac.stop;
 					
-					v_parentResourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
-					if(v_parentResourceIndex == -1) {
-						log(__SCOPE__&": ERROR: Target resource not found");
-						v_response := valueof(m_responsePrimitive(int4004,v_request.primitive.requestPrimitive.requestIdentifier));
-						
-					} else {
-						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_localResourceIndex := f_processCreateRequestPrimitive(v_request.primitive.requestPrimitive);
 	
-						v_response := valueof(m_responsePrimitive(int2001,v_request.primitive.requestPrimitive.requestIdentifier));
-						v_response.primitiveContent := vc_localResourcesList[v_localResourceIndex].resource;
-					}
-					v_response.from_ := PX_CSE1_ID;
-					v_response.to_ := v_request.primitive.requestPrimitive.from_;
 					mccPortIn.send(f_getMsgOutPrimitive(m_response(v_response)));
 					tc_ac.start(10.0);
 					repeat;
@@ -2944,25 +2931,11 @@ module OneM2M_Functions {
 					tc_ac.stop;
 					log(__SCOPE__&": WARNING: Unexpected RETRIEVE message received");
 					
-					v_localResourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
-					if(v_localResourceIndex == -1)
-					{ 
-						log(__SCOPE__&": ERROR: Resource Index not valid");
-						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(f_getMsgOutPrimitive(m_response(v_response)));
+					f_processRetrieveRequestPrimitive(v_request.primitive.requestPrimitive);
+					if(ischosen(vc_response.primitive.responsePrimitive.primitiveContent.cSEBase)) {
+						mccPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive, {{"parentID", omit}}))); 
 					} 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(f_getMsgOutPrimitive(m_response(v_response, {{"parentID", omit}}))); 
-						} else {
-							mccPortIn.send(f_getMsgOutPrimitive(m_response(v_response)));
-						}
-						
+						mccPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
 					}
 					tc_ac.start(10.0);
 					repeat;
@@ -2971,22 +2944,8 @@ module OneM2M_Functions {
 					tc_ac.stop;
 					log(__SCOPE__&": WARNING: Unexpected UPDATE message received");
 
-					v_localResourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
-					if(v_localResourceIndex == -1)
-					{ 
-						log(__SCOPE__&": ERROR: Resource Index not valid");
-						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(f_getMsgOutPrimitive(m_response(v_response)));
-					} else {
-						v_response := valueof(m_responsePrimitive(int2004,v_request.primitive.requestPrimitive.requestIdentifier));
-						v_response.from_ := PX_CSE1_ID;
-						v_response.to_ := v_request.primitive.requestPrimitive.from_;
-						f_updateLocalResource(v_localResourceIndex, v_request.primitive.requestPrimitive.primitiveContent);
-						v_response.primitiveContent := vc_localResourcesList[v_localResourceIndex].resource;
-						mccPortIn.send(f_getMsgOutPrimitive(m_response(v_response)));
-					}
+					f_processUpdateRequestPrimitive(v_request.primitive.requestPrimitive);
+					mccPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
 					tc_ac.start(10.0);
 					repeat;
 				}
@@ -2994,20 +2953,19 @@ module OneM2M_Functions {
 					tc_ac.stop;
 					log(__SCOPE__&": WARNING: Unexpected DELETE message received");
 
-					v_localResourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
-					if(v_localResourceIndex == -1)
-					{ 
-						log(__SCOPE__&": ERROR: Resource Index not valid");
-						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(f_getMsgOutPrimitive(m_response(v_response)));
-					} else {
-						v_response := valueof(m_responsePrimitive(int2002,v_request.primitive.requestPrimitive.requestIdentifier));
-						v_response.from_ := PX_CSE1_ID;
-						v_response.to_ := v_request.primitive.requestPrimitive.from_;
-						mccPortIn.send(f_getMsgOutPrimitive(m_response(v_response)));
-					}
+					f_processDeleteRequestPrimitive(v_request.primitive.requestPrimitive);
+					mccPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
+					tc_ac.start(10.0);
+					repeat;
+				}
+				[] mccPortIn.receive(mw_request(mw_notify)) -> value v_request {
+					tc_ac.stop;
+					log(__SCOPE__&": WARNING: Unexpected NOTIFY message received");
+
+					//Send response in any case
+					v_response := valueof(m_responseNotification(int2000, omit));
+					v_response.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
+					mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_response)));
 					tc_ac.start(10.0);
 					repeat;
 				}
@@ -3714,10 +3672,10 @@ module OneM2M_Functions {
     		
 			} else {
 				
-				log("Non Hierarchical method: " & v_cleanedURI);
 				for(i:=0; i < lengthof(vc_localResourcesList); i := i+1){
 					if(v_cleanedURI == f_getResourceId(vc_localResourcesList[i].resource)){
 						v_resourceIndex := i;
+						log("Non Hierarchical method: " & v_cleanedURI);
 						break;
 					} 
 				}
@@ -3726,6 +3684,10 @@ module OneM2M_Functions {
 			//Try CSEBase
 			if(v_resourceIndex == -1) {
 				if(v_cleanedURI == f_getResourceName(vc_localResourcesList[vc_cSEBaseIndex].resource)) {
+					log("Hierarchical method: " & v_cleanedURI);
+					v_resourceIndex := vc_cSEBaseIndex;
+				} else if (v_cleanedURI == f_getResourceId(vc_localResourcesList[vc_cSEBaseIndex].resource)) {
+					log("Non Hierarchical method: " & v_cleanedURI);
 					v_resourceIndex := vc_cSEBaseIndex;
 				}
 			}
@@ -3957,7 +3919,7 @@ module OneM2M_Functions {
 			else if (ischosen(p_requestPrimitive.primitiveContent.statsConfig)){
 				p_requestPrimitive.primitiveContent.statsConfig.accessControlPolicyIDs := p_accessControlPolicyIDs;
 			} else {
-				log( __SCOPE__, ":INFO: Resource not having acpi attribute. Not possible to set acpi")
+				log( __SCOPE__ & ":INFO: Resource not having acpi attribute. Not possible to set acpi")
 			}
 			return valueof(p_requestPrimitive);					
 		}
@@ -4068,9 +4030,9 @@ module OneM2M_Functions {
 		} // end f_getAnnouncedResourceType
 		
 		/**
-		 * @desc   Proccessing of the request primitive
+		 * @desc   Proccessing of the CREATE request primitive
 		 * @param  p_request          Request primitive to be processed
-		 * @return p_response 		Response primitive to be sent back
+		 * @return Local resource index
 		 */
 		function f_processCreateRequestPrimitive(in RequestPrimitive p_request) runs on CseSimu return integer {			
 			var integer v_parentIndex := -1;
@@ -4095,7 +4057,73 @@ module OneM2M_Functions {
 				
 			return v_localResourceIndex;
 		}
+		
+		/**
+		 * @desc   Proccessing of the UPDATE request primitive
+		 * @param  p_request          Request primitive to be processed
+		 */
+		function f_processUpdateRequestPrimitive(in RequestPrimitive p_request) runs on CseSimu {			
+			var integer v_targetLocalResourceIndex := -1;
+				
+			v_targetLocalResourceIndex := f_getResourceIndex(p_request.to_);
+			if(v_targetLocalResourceIndex == -1) {
+				setverdict(inconc,__SCOPE__&": ERROR: Target resource not found");
+				vc_response.primitive.responsePrimitive := valueof(m_responsePrimitive(int4004,p_request.requestIdentifier));
+		
+			} else {
+				setverdict(pass, __SCOPE__&":INFO: Resource updated successfuly");
+				f_updateLocalResource(v_targetLocalResourceIndex, p_request.primitiveContent);
+				vc_response.primitive.responsePrimitive := valueof(m_responsePrimitive(int2004,p_request.requestIdentifier));
+				vc_response.primitive.responsePrimitive.primitiveContent := vc_localResourcesList[v_targetLocalResourceIndex].resource;
+			}
+			vc_response.primitive.responsePrimitive.from_ := PX_CSE1_ID;
+			vc_response.primitive.responsePrimitive.to_ := p_request.from_;
+		
+		}
+	
+		/**
+		 * @desc   Proccessing of the RETRIEVE request primitive
+		 * @param  p_request          Request primitive to be processed
+		 */
+		function f_processRetrieveRequestPrimitive(in RequestPrimitive p_request) runs on CseSimu {			
+			var integer v_targetLocalResourceIndex := -1;
+				
+			v_targetLocalResourceIndex := f_getResourceIndex(p_request.to_);
+			if(v_targetLocalResourceIndex == -1) {
+				setverdict(inconc,__SCOPE__&": ERROR: Target resource not found");
+				vc_response.primitive.responsePrimitive := valueof(m_responsePrimitive(int4004,p_request.requestIdentifier));
+		
+			} else {
+				setverdict(pass, __SCOPE__&":INFO: Resource retrieved successfuly");
+				vc_response.primitive.responsePrimitive := valueof(m_responsePrimitive(int2000,p_request.requestIdentifier));
+				vc_response.primitive.responsePrimitive.primitiveContent := vc_localResourcesList[v_targetLocalResourceIndex].resource;
+			}
+			vc_response.primitive.responsePrimitive.from_ := PX_CSE1_ID;
+			vc_response.primitive.responsePrimitive.to_ := p_request.from_;
+		
+		}
     				
+		/**
+		 * @desc   Proccessing of the DELETE request primitive
+		 * @param  p_request          Request primitive to be processed
+		 */
+		function f_processDeleteRequestPrimitive(in RequestPrimitive p_request) runs on CseSimu {			
+			var integer v_targetLocalResourceIndex := -1;
+				
+			v_targetLocalResourceIndex := f_getResourceIndex(p_request.to_);
+			if(v_targetLocalResourceIndex == -1) {
+				setverdict(inconc,__SCOPE__&": ERROR: Target resource not found");
+				vc_response.primitive.responsePrimitive := valueof(m_responsePrimitive(int4004,p_request.requestIdentifier));
+		
+			} else {
+				setverdict(pass, __SCOPE__&":INFO: Resource deleted successfuly");
+				vc_response.primitive.responsePrimitive := valueof(m_responsePrimitive(int2002,p_request.requestIdentifier));
+			}
+			vc_response.primitive.responsePrimitive.from_ := PX_CSE1_ID;
+			vc_response.primitive.responsePrimitive.to_ := p_request.from_;
+		
+		}
+
 	}//end group getSetFunctions
 	
 	group CheckingFunctions {
@@ -4355,14 +4383,14 @@ module OneM2M_Functions {
 				alt{
 					[] utPort.receive(mw_utResponseOK) {
 						tc_wait.stop;
-						setverdict(pass, __SCOPE__, " : Triggering message is successfully received!");
+						setverdict(pass, __SCOPE__ & " : Triggering message is successfully received!");
 					}
 					[] utPort.receive(mw_utResponseKO) {
 						tc_wait.stop;
-						setverdict(inconc, __SCOPE__, " : Error while receiving Triggering message!");
+						setverdict(inconc, __SCOPE__ & " : Error while receiving Triggering message!");
 					}
 					[] tc_wait.timeout{
-						setverdict(inconc, __SCOPE__, " : Timeout due to no response received from requested SUT!");
+						setverdict(inconc, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 					}
 				}
 				
diff --git a/LibOneM2M/OneM2M_Pixits.ttcn b/LibOneM2M/OneM2M_Pixits.ttcn
index fa83245b0fffa9711a69aff76fb275c7f3c5d04e..2832df7cf6462189391a1d6bd5e06dd82c7f4ad3 100644
--- a/LibOneM2M/OneM2M_Pixits.ttcn
+++ b/LibOneM2M/OneM2M_Pixits.ttcn
@@ -217,7 +217,7 @@ module OneM2M_Pixits {
 			/**
 			 * @desc Resources to be deleted by TC_DELETE_RESOURCES 
 			 */			
-			modulepar XSD.IDREFS PX_RESOURCES_TO_BE_DELETED := {"MyAe"};
+			modulepar XSD.IDREFS PX_RESOURCES_TO_BE_DELETED := { "MyAe", "MyAccessControlPolicyResource", "SubscriptionVerificationAcp", "MyAcp", "MyRemoteCSEResource" };
 	
 			/**
 			 * @desc To enable run postamble (for debugging) 
diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index f22717ec0a97ac94822a7402a1849e30d5a5a885..2a19d2af36e5eb8648f8083442b52742b2341f97 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -31,17 +31,13 @@ module OneM2M_PermutationFunctions {
 						
 					function f_AE_GEN_CRE_001(PrimitiveScope p_primitiveScope) runs on CseSimu {
 						
-						var ResponsePrimitive v_responsePrimitive;
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
-						var UtTriggerAckPrimitive v_trigger_response;
-						var integer v_parentIndex := -1;
 						var integer v_resourceIndex := -1;
 						var MsgIn v_request;
-						var PrimitiveContent v_resource;
-						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for container containing To set to " & f_getLocalResourceAddress(0, e_nonHierarchical, p_primitiveScope);
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for container to ";
 						
 						if(not(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
-							setverdict(inconc, __SCOPE__, ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 
@@ -49,27 +45,24 @@ module OneM2M_PermutationFunctions {
 						
 						//Send Trigger Message
 						v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(-, e_nonHierarchical, p_primitiveScope);
-						f_sendUtPrimitive(v_utRequest, v_action);
+						f_sendUtPrimitive(v_utRequest, v_action & f_getLocalResourceAddress(-, e_nonHierarchical, p_primitiveScope));
 						
 						tc_ac.start;
 						alt {
 							[] mcaPortIn.receive(mw_request(mw_createContainer(-,v_utRequest.requestPrimitive.to_))) -> value v_request {
 								tc_ac.stop;
-								setverdict(pass, __SCOPE__, " : Container creation request received successfuly");
-								v_parentIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
-								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(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+								setverdict(pass, __SCOPE__ & " : Container creation request received successfuly");
+								v_resourceIndex := f_processCreateRequestPrimitive(v_request.primitive.requestPrimitive);	
+								mcaPortIn.send(f_getMsgOutPrimitive(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))));
 							}
-							[] mcaPortIn.receive(mw_request(?)) {
+							[] mcaPortIn.receive(mw_request(mw_createContainer())) -> value v_request {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__, " : Error while creating container");
+								setverdict(fail, __SCOPE__ & " : Create Request with unexpected target");
 								mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 								stop;
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, __SCOPE__, " : No answer while creating resource");
+								setverdict(fail, __SCOPE__ & " : No answer while creating resource");
 								stop;
 							}
 						}
@@ -79,18 +72,14 @@ module OneM2M_PermutationFunctions {
 					}
 					function f_AE_GEN_CRE_002(PrimitiveScope p_primitiveScope) runs on CseSimu {
 						var MsgIn v_request;
-						var Integer v_parentIndex := -1;
 						var Integer v_resourceIndex := -1;
-						var ResponsePrimitive v_responsePrimitive;
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
-						var UtTriggerAckPrimitive v_trigger_response;
-						var PrimitiveContent v_resource;
-						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for container containing To set to " & f_getLocalResourceAddress(-, e_hierarchical, p_primitiveScope);
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for container to ";
 						
 						
 						//Test Control
 						if(not(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
-							setverdict(inconc, __SCOPE__, ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 	
@@ -98,28 +87,25 @@ module OneM2M_PermutationFunctions {
 	
 						//Send Trigger Message
 						v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(-, e_hierarchical, p_primitiveScope);
-						f_sendUtPrimitive(v_utRequest,v_action);
+						f_sendUtPrimitive(v_utRequest,v_action  & f_getLocalResourceAddress(-, e_hierarchical, p_primitiveScope));
 							
 	
 						tc_ac.start;
 						alt {
-							[] mcaPortIn.receive(mw_request(mw_createContainer(-,v_utRequest.requestPrimitive.to_))) -> value (v_request) {
+							[] mcaPortIn.receive(mw_request(mw_createContainer(-,v_utRequest.requestPrimitive.to_))) -> value v_request {
 								tc_ac.stop;
-								setverdict(pass, __SCOPE__, " : Container creation request received successfuly");
-								v_parentIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
-								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(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+								setverdict(pass, __SCOPE__ & " : Container creation request received successfuly");
+								v_resourceIndex := f_processCreateRequestPrimitive(v_request.primitive.requestPrimitive);	
+								mcaPortIn.send(f_getMsgOutPrimitive(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))));
 							}
-							[] mcaPortIn.receive(mw_request(?)) {
+							[] mcaPortIn.receive(mw_request(mw_createContainer())) -> value v_request {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__, " : Error while creating container");
+								setverdict(fail, __SCOPE__ & " : Create Request with unexpected target");
 								mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 								stop;
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, __SCOPE__, " : No answer while creating resource");
+								setverdict(fail, __SCOPE__ & " : No answer while creating resource");
 								stop;
 							}
 						}
@@ -134,16 +120,14 @@ module OneM2M_PermutationFunctions {
 						
 					function f_AE_GEN_UPD_001(PrimitiveScope p_primitiveScope) runs on CseSimu {
 						var MsgIn v_request;
-						var ResponsePrimitive v_responsePrimitive;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
-						var UtTriggerAckPrimitive v_trigger_response;
 						var integer v_resourceIndex;
 						var PrimitiveContent v_localResource;
-						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for container containing To set to " & f_getLocalResourceAddress(-, e_nonHierarchical, p_primitiveScope);
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for container to ";
 						
 						
 						if(not(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
-							setverdict(inconc, __SCOPE__, ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -153,26 +137,24 @@ module OneM2M_PermutationFunctions {
 						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);
+						f_sendUtPrimitive(v_utRequest,v_action  & f_getLocalResourceAddress(v_resourceIndex, e_nonHierarchical, p_primitiveScope));
 						
 						tc_ac.start;
 						alt {
 							[] mcaPortIn.receive(mw_request(mw_updateContainer(-,v_utRequest.requestPrimitive.to_))) -> value v_request {
 								tc_ac.stop;
-								setverdict(pass, __SCOPE__, " : Container update request received successfuly");
-								v_resourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
-								f_updateLocalResource(v_resourceIndex, v_request.primitive.requestPrimitive.primitiveContent);
-								v_responsePrimitive := valueof(m_responsePrimitive(int2004, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
-								mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+								setverdict(pass, __SCOPE__ & " : Container update request received successfuly");
+								f_processUpdateRequestPrimitive(v_request.primitive.requestPrimitive);
+								mcaPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
 							}
-							[] mcaPortIn.receive(mw_request(?)) {
+							[] mcaPortIn.receive(mw_request(mw_updateContainer())) {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__, " : Error while updating container");
+								setverdict(fail, __SCOPE__ & " : Update Request with unexpected target");
 								mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 								stop;
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, __SCOPE__, " : No answer while updating resource");
+								setverdict(fail, __SCOPE__ & " : No answer while updating resource");
 								stop;
 							}
 						}
@@ -182,15 +164,13 @@ module OneM2M_PermutationFunctions {
 					}
 					function f_AE_GEN_UPD_002(PrimitiveScope p_primitiveScope) runs on CseSimu {
 						var MsgIn v_request;
-						var ResponsePrimitive v_responsePrimitive;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
-						var UtTriggerAckPrimitive v_trigger_response;
 						var integer v_resourceIndex := -1;
 						var PrimitiveContent v_localResource;
-						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for container containing To set to " & f_getLocalResourceAddress(-, e_hierarchical, p_primitiveScope);
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for container to ";
 						
 						if(not(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
-							setverdict(inconc, __SCOPE__, ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 	
@@ -200,26 +180,24 @@ module OneM2M_PermutationFunctions {
 						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);
+						f_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_resourceIndex, e_hierarchical, p_primitiveScope));
 								
 						tc_ac.start;
 						alt {
 							[] mcaPortIn.receive(mw_request(mw_updateContainer(-,v_utRequest.requestPrimitive.to_))) -> value (v_request) {
 								tc_ac.stop;
-								setverdict(pass, __SCOPE__, " : Container update request received successfuly");
-								v_resourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
-								f_updateLocalResource(v_resourceIndex, v_request.primitive.requestPrimitive.primitiveContent);
-								v_responsePrimitive := valueof(m_responsePrimitive(int2004, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
-								mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+								setverdict(pass, __SCOPE__ & " : Container update request received successfuly");
+								f_processUpdateRequestPrimitive(v_request.primitive.requestPrimitive);
+								mcaPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
 							}
-							[] mcaPortIn.receive(mw_request(?)) {
+							[] mcaPortIn.receive(mw_request(mw_updateContainer())) {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__, " : Error while updating container");
+								setverdict(fail, __SCOPE__ & " : Update Request with unexpected target");
 								mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 								stop;
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, __SCOPE__, " : No answer while updating resource");
+								setverdict(fail, __SCOPE__ & " : No answer while updating resource");
 								stop;
 							}
 						}
@@ -234,16 +212,13 @@ module OneM2M_PermutationFunctions {
 						
 					function f_AE_GEN_RET_001(PrimitiveScope p_primitiveScope) runs on CseSimu {
 						var MsgIn v_request;
-						var ResponsePrimitive v_responsePrimitive;
-						var template UtTriggerPrimitive v_utRequestTemplate;
-                        var UtTriggerPrimitive v_utRequest;
-						var UtTriggerAckPrimitive v_trigger_response;
-						var integer v_resourceIndex := -1;
+						var template UtTriggerPrimitive v_utRequest;
+                        var integer v_resourceIndex := -1;
 						var PrimitiveContent v_localResource;
-						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for container containing To set to " & f_getLocalResourceAddress(-, e_nonHierarchical, p_primitiveScope);
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for container to ";
 						
 						if(not(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
-							setverdict(inconc, __SCOPE__, ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 			
@@ -252,27 +227,25 @@ module OneM2M_PermutationFunctions {
 						//Send Trigger Message
 						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);
-                        v_utRequest := valueof(v_utRequestTemplate);
-			
+						v_utRequest := m_utRetrieve(f_getLocalResourceAddress(v_resourceIndex, e_nonHierarchical, p_primitiveScope));
+						f_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_resourceIndex, e_nonHierarchical, p_primitiveScope));
+                        
 						tc_ac.start;
 						alt {
-							[] mcaPortIn.receive(mw_request(mw_retrieve(v_utRequest.requestPrimitive.to_))) -> value (v_request) {
+							[] mcaPortIn.receive(mw_request(mw_retrieve(v_utRequest.requestPrimitive.to_))) -> value v_request {
 								tc_ac.stop;
-								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(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+								setverdict(pass, __SCOPE__ & " : Container retrieve request received successfuly");
+								f_processRetrieveRequestPrimitive(v_request.primitive.requestPrimitive);
+								mcaPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
 							}
-							[] mcaPortIn.receive(mw_request(?)) {
+							[] mcaPortIn.receive(mw_request(mw_retrieve(?))) -> value v_request {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__, " : Error while retrieving container");
+								setverdict(fail, __SCOPE__ & " : Retrieve request with unexpected target");
 								mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 								stop;
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, __SCOPE__, " : No answer while retrieving resource");
+								setverdict(fail, __SCOPE__ & " : No answer while retrieving resource");
 								stop;
 							}
 						}
@@ -282,16 +255,13 @@ module OneM2M_PermutationFunctions {
 					}
 					function f_AE_GEN_RET_002(PrimitiveScope p_primitiveScope) runs on CseSimu {
 						var MsgIn v_request;
-						var ResponsePrimitive v_responsePrimitive;
-						var template UtTriggerPrimitive v_utRequestTemplate;
-                        var UtTriggerPrimitive v_utRequest;
-						var UtTriggerAckPrimitive v_trigger_response;
-						var integer v_resourceIndex := -1;
+						var template UtTriggerPrimitive v_utRequest;
+                        var integer v_resourceIndex := -1;
 						var PrimitiveContent v_localResource;
-						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for container containing To set to " & f_getLocalResourceAddress(-, e_hierarchical, p_primitiveScope);
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for container to ";
 						
 						if(not(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
-							setverdict(inconc, __SCOPE__, ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 
@@ -300,27 +270,25 @@ module OneM2M_PermutationFunctions {
 						//Send Trigger Message
 						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);
-						f_sendUtPrimitive(v_utRequest,v_action);
-
+						v_utRequest := m_utRetrieve(f_getLocalResourceAddress(v_resourceIndex, e_hierarchical, p_primitiveScope));
+                        f_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_resourceIndex, e_hierarchical, p_primitiveScope));
+						
 						tc_ac.start;
 						alt {
 							[] mcaPortIn.receive(mw_request(mw_retrieve(v_utRequest.requestPrimitive.to_))) -> value (v_request) {
 								tc_ac.stop;
-								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(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+								setverdict(pass, __SCOPE__ & " : Container retrieve request received successfuly");
+								f_processRetrieveRequestPrimitive(v_request.primitive.requestPrimitive);
+								mcaPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
 							}
-							[] mcaPortIn.receive(mw_request(?)) {
+							[] mcaPortIn.receive(mw_request(mw_retrieve(?))) -> value v_request {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__, " : Error while retrieving container");
+								setverdict(fail, __SCOPE__ & " : Retrieve request with unexpected target");
 								mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 								stop;
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, __SCOPE__, " : No answer while retrieving resource");
+								setverdict(fail, __SCOPE__ & " : No answer while retrieving resource");
 								stop;
 							}
 						}
@@ -335,15 +303,13 @@ module OneM2M_PermutationFunctions {
 						
 					function f_AE_GEN_DEL_001(PrimitiveScope p_primitiveScope) runs on CseSimu {
 						var MsgIn v_request;
-						var ResponsePrimitive v_responsePrimitive;
 						var template UtTriggerPrimitive v_utRequest := m_utDelete;
-						var UtTriggerAckPrimitive v_trigger_response;
 						var integer v_auxInteger;
 						var PrimitiveContent v_localResource;
-						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid DELETE Request for container containing To set to " & f_getLocalResourceAddress(-, e_nonHierarchical, p_primitiveScope);
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid DELETE Request for container to ";
 
 						if(not(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
-							setverdict(inconc, __SCOPE__, ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 			
@@ -353,24 +319,24 @@ module OneM2M_PermutationFunctions {
 						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);
+						f_sendUtPrimitive(v_utRequest,v_action  & f_getLocalResourceAddress(v_auxInteger, e_nonHierarchical, p_primitiveScope));
 			
 						tc_ac.start;
 						alt {
-							[] mcaPortIn.receive(mw_request(mw_delete(v_utRequest.requestPrimitive.to_))) -> value (v_request) {
+							[] mcaPortIn.receive(mw_request(mw_delete(v_utRequest.requestPrimitive.to_))) -> value v_request {
 								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(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+								setverdict(pass, __SCOPE__ & " : Container delete request received successfuly");
+								f_processDeleteRequestPrimitive(v_request.primitive.requestPrimitive);
+								mcaPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
 							}
-							[] mcaPortIn.receive(mw_request(?)) {
+							[] mcaPortIn.receive(mw_request(mw_delete(?))) -> value v_request {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__, " : Error while updating container");
+								setverdict(fail, __SCOPE__ & " : Delete request with unexpected target");
 								mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 								stop;
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, __SCOPE__, " : No answer while updating resource");
+								setverdict(fail, __SCOPE__ & " : No answer while updating resource");
 								stop;
 							}
 						}
@@ -380,43 +346,41 @@ module OneM2M_PermutationFunctions {
 					}
 					function f_AE_GEN_DEL_002(PrimitiveScope p_primitiveScope) runs on CseSimu {
 						var MsgIn v_request;
-						var ResponsePrimitive v_responsePrimitive;
 						var template UtTriggerPrimitive v_utRequest := m_utDelete;
-						var UtTriggerAckPrimitive v_trigger_response;
 						var integer v_auxInteger;
 						var PrimitiveContent v_localResource;
-						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid DELETE Request for container containing To set to " & f_getLocalResourceAddress(-, e_hierarchical, p_primitiveScope);
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid DELETE Request for container to ";
 						
 						if(not(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
-							setverdict(inconc, __SCOPE__, ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 
 						f_cf03Up();
 
 						//Send Trigger Message
-                        v_localResource := f_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_hierarchical, p_primitiveScope);
-						f_sendUtPrimitive(v_utRequest,v_action);
+						f_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_auxInteger, e_hierarchical, p_primitiveScope));
 				
 
 						tc_ac.start;
 						alt {
-							[] mcaPortIn.receive(mw_request(mw_delete(v_utRequest.requestPrimitive.to_))) -> value (v_request) {
+							[] mcaPortIn.receive(mw_request(mw_delete(v_utRequest.requestPrimitive.to_))) -> value v_request {
 								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(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+								setverdict(pass, __SCOPE__ & " : Container delete request received successfuly");
+								f_processDeleteRequestPrimitive(v_request.primitive.requestPrimitive);
+								mcaPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
 							}
-							[] mcaPortIn.receive(mw_request(?)) {
+							[] mcaPortIn.receive(mw_request(mw_delete(?))) -> value v_request {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__, " : Error while updating container");
+								setverdict(fail, __SCOPE__ & " : Delete request with unexpected target");
 								mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 								stop;
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, __SCOPE__, " : No answer while updating resource");
+								setverdict(fail, __SCOPE__ & " : No answer while updating resource");
 								stop;
 							}
 						}
@@ -447,29 +411,26 @@ module OneM2M_PermutationFunctions {
 					   //Send Trigger Message
 					   p_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(-, -, -);
 					   p_request.to_ := p_utRequest.requestPrimitive.to_;
-					   f_sendUtPrimitive(p_utRequest,p_action);
+					   f_sendUtPrimitive(p_utRequest,p_action & f_getLocalResourceAddress(-, -, -));
 	
 					   //Test behavior
 					   tc_ac.start;
 					   alt{
 							[] mcaPortIn.receive(mw_request(p_request)) -> value v_request {
 							   tc_ac.stop;
-							   setverdict(pass, __SCOPE__, " : AE registration request is accepted!!");
-							   v_parentIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
-							   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));
-	
+							   setverdict(pass, __SCOPE__ & " : AE registration request is accepted!!");
+							   v_resourceIndex := f_processCreateRequestPrimitive(v_request.primitive.requestPrimitive);	
+							
 							   //send back responsePrimitive
-								mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+							   mcaPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
 						   }
-							[] mcaPortIn.receive(mw_request(mw_createAe(*,?,m_contentCreateAe_Invalid))) -> value v_request {
+							[] mcaPortIn.receive(mw_request(mw_createAe())) -> value v_request {
 							   tc_ac.stop;
-							   setverdict(fail, __SCOPE__, " : AE registration request is rejected due to not including the optional attribute!");
+							   setverdict(fail, __SCOPE__ & " : Unexpected AE registration request");
 								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!");
+							   setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 						   }
 	
 					   }
@@ -492,48 +453,40 @@ module OneM2M_PermutationFunctions {
 			
 					function f_AE_DMR_CRE_003(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request, in universal charstring p_action) runs on CseSimu {
 						var MsgIn v_request;
-						var integer v_parentIndex := -1;
 						var integer v_resourceIndex := -1;
-						var PrimitiveContent v_resource;
 						var PrimitiveContent v_localResource;
 						var integer v_containerIndex := -1;
-						var ResponsePrimitive v_responsePrimitive;
-	
+						
 						//Test component configuration
 						f_cf03Up();
 	
-						//send triggering message
-                        v_localResource := f_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
+						//send triggering
+						v_localResource := f_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_;
-						f_sendUtPrimitive(p_utRequest,p_action);
+						f_sendUtPrimitive(p_utRequest,p_action & f_getLocalResourceAddress(v_containerIndex, -, -));
 	
 						//Test behavior
 						tc_ac.start;
 						alt{
 	
 							//receive MsgIn requestPrimitive
-							[] mcaPortIn.receive(mw_request(p_request)) -> value (v_request) {
+							[] mcaPortIn.receive(mw_request(p_request)) -> value v_request {
 								tc_ac.stop;
-								setverdict(pass, __SCOPE__, " : ContentInstance creation request is accepted!!");
-								v_parentIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
-								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));
-	
+								setverdict(pass, __SCOPE__ & " : ContentInstance creation request is accepted!!");
+								v_resourceIndex := f_processCreateRequestPrimitive(v_request.primitive.requestPrimitive);	
 								//send back responsePrimitive
-								mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+								mcaPortIn.send(f_getMsgOutPrimitive(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))));
 							}
 	
-							[] mcaPortIn.receive {
+							[] mcaPortIn.receive(mw_request(mw_create)) -> value v_request{
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__, " : ContentInstance creation request is rejected due to not including the attribute!");
+								setverdict(fail, __SCOPE__ & " : Unexpected CREATE request ");
 								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!");
+								setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 							}
 						}
 	
@@ -542,18 +495,15 @@ module OneM2M_PermutationFunctions {
 					}
 					function f_AE_DMR_CRE_004(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request, in universal charstring p_action) runs on CseSimu {
 						var MsgIn v_request;
-						var integer v_parentIndex := -1;
 						var integer v_resourceIndex := -1;
-						var PrimitiveContent v_resource;
-						var ResponsePrimitive v_responsePrimitive;
-	
+						
 						//Test component configuration
 						f_cf03Up();
 	
 						//send triggering primitive to SUT
 						p_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(-, -, -);
 						p_request.to_ := p_utRequest.requestPrimitive.to_;
-						f_sendUtPrimitive(p_utRequest,p_action);
+						f_sendUtPrimitive(p_utRequest,p_action & f_getLocalResourceAddress(-, -, -));
 	
 						//Test behavior
 						tc_ac.start;
@@ -562,22 +512,18 @@ module OneM2M_PermutationFunctions {
 							//receive MsgIn requestPrimitive
 							[] mcaPortIn.receive(mw_request(p_request)) -> value (v_request) {
 								tc_ac.stop;
-								setverdict(pass, __SCOPE__, " : Container creation request is accepted!!");
-								v_parentIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
-								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));
-	
+								setverdict(pass, __SCOPE__ & " : Container creation request is accepted!!");
+								v_resourceIndex := f_processCreateRequestPrimitive(v_request.primitive.requestPrimitive);	
 								//send back responsePrimitive
-								mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+								mcaPortIn.send(f_getMsgOutPrimitive(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))));
 							}
-							[] mcaPortIn.receive {
+							[] mcaPortIn.receive(mw_request(mw_create)) {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__, " : Container creation request is rejected due to not including the attribute!");
+								setverdict(fail, __SCOPE__ & " : Unexpected CREATE request ");
 								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!");
+								setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 							}
 						}
 	
@@ -595,17 +541,16 @@ module OneM2M_PermutationFunctions {
 					   	var MsgIn v_request;
 						var integer v_resourceIndex := -1;
 					   	var PrimitiveContent v_localResource;
-					   	var ResponsePrimitive v_responsePrimitive;
-	
+					   	
 					   	f_cf03Up();
 					   
 					   	//Preamble
 						
-					   	//Send Triggering message
-                        v_localResource := f_generateLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))), vc_cSEBaseIndex, int2);
+					   	//Send Tr
+					    v_localResource := f_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);
+					   	f_sendUtPrimitive(p_utRequest,p_action & f_getLocalResourceAddress(v_resourceIndex));
 	
 					   //Test behavior
 					   
@@ -613,19 +558,17 @@ module OneM2M_PermutationFunctions {
 					   alt{
 							[] mcaPortIn.receive(mw_request(p_expectedUpdateRequest)) -> value v_request {
 							   tc_ac.stop;
-							   setverdict(pass, __SCOPE__, " : AE update request is accepted!");
-							   v_resourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
-							   f_updateLocalResource(v_resourceIndex, v_request.primitive.requestPrimitive.primitiveContent);
-							   v_responsePrimitive := valueof(m_responsePrimitive(int2004, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
-							   mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
-						   }
-							[] mcaPortIn.receive(mw_request(?)) -> value v_request {
+							   setverdict(pass, __SCOPE__ & " : AE update request is accepted!");
+							   f_processUpdateRequestPrimitive(v_request.primitive.requestPrimitive);
+							   mcaPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
+							}
+							[] mcaPortIn.receive(mw_request(mw_update)) -> value v_request {
 							   tc_ac.stop;
-							   setverdict(fail, __SCOPE__, " : AE update request is rejected due to not including the optional attribute!");
+							   setverdict(fail, __SCOPE__ & " : Unexpected UPDATE request");
 								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!");
+							   setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 						   }
 	
 					   }
@@ -636,18 +579,17 @@ module OneM2M_PermutationFunctions {
 	
 					function f_AE_DMR_UPD_002(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request, in universal charstring p_action) runs on CseSimu {
 						var MsgIn v_request;
-						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_localResource;
 						var integer v_resourceIndex := -1;
 
 						//Test component configuration
 						f_cf03Up();
 
-						//send triggering message
-                        v_localResource := f_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
+						//send triggering 
+						v_localResource := f_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);
+						f_sendUtPrimitive(p_utRequest,p_action & f_getLocalResourceAddress(v_resourceIndex));
 
 						//Test behavior
 						tc_ac.start;
@@ -656,21 +598,17 @@ module OneM2M_PermutationFunctions {
 							//receive MsgIn requestPrimitive
 							[] mcaPortIn.receive(mw_request(p_request)) -> value (v_request) {
 								tc_ac.stop;
-								setverdict(pass, __SCOPE__, " : Container update request is accepted!!");
-								v_resourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
-								f_updateLocalResource(v_resourceIndex, v_request.primitive.requestPrimitive.primitiveContent);
-								v_responsePrimitive := valueof(m_responsePrimitive(int2004, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
-								mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+								setverdict(pass, __SCOPE__ & " : Container update request is accepted!!");
+								f_processUpdateRequestPrimitive(v_request.primitive.requestPrimitive);
+								mcaPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
 							}
-
-							[] mcaPortIn.receive {
+							[] mcaPortIn.receive(mw_request(mw_update)) {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__, " : Container update request is rejected due to not including the attribute!");
+								setverdict(fail, __SCOPE__ & " : Unexpected UPDATE request");
 								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!");
+								setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 							}
 						}
 
@@ -682,7 +620,7 @@ module OneM2M_PermutationFunctions {
 
 			group Retrieve {
 				
-					function f_AE_DMR_RET_001(ResourceType p_resourceType, template PrimitiveContent p_primitiveContent, in universal charstring p_action) runs on CseSimu {
+					function f_AE_DMR_RET_001(ResourceType p_resourceType, in template (omit) PrimitiveContent p_primitiveContent, in universal charstring p_action) runs on CseSimu {
 		
 						//variables
 						var template UtTriggerPrimitive v_utRequest;
@@ -690,33 +628,36 @@ module OneM2M_PermutationFunctions {
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_localResource;
 						var integer v_resourceIndex := -1;
-		
+						
 						//Test component configuration
 						f_cf03Up();
 		
 						//send triggering message
-                        v_localResource := f_generateLocalResource(valueof(p_primitiveContent), vc_cSEBaseIndex, p_resourceType);
-						v_resourceIndex := f_setLocalResource(v_localResource, p_resourceType, vc_cSEBaseIndex);
+					    if(p_resourceType != int5) {
+					    	v_localResource := f_generateLocalResource(p_primitiveContent, vc_cSEBaseIndex, p_resourceType);
+					    	v_resourceIndex := f_setLocalResource(v_localResource, p_resourceType, vc_cSEBaseIndex);
+					    } else {
+					    	v_resourceIndex := vc_cSEBaseIndex;
+					    }
 						v_utRequest := m_utRetrieve(f_getLocalResourceAddress(v_resourceIndex));
-						f_sendUtPrimitive(v_utRequest,p_action);
+						f_sendUtPrimitive(v_utRequest,p_action & f_getLocalResourceAddress(v_resourceIndex));
 						
 						//Test behavior
 						tc_ac.start;
 						alt{
 							[] mcaPortIn.receive(mw_request(mw_retrieve(f_getLocalResourceAddress(v_resourceIndex)))) -> value v_request {
 								tc_ac.stop;
-								setverdict(pass, __SCOPE__, " : retrieve resource type request is accepted!!");
-								v_resourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
+								setverdict(pass, __SCOPE__ & " : retrieve resource type request is accepted!!");
 								v_responsePrimitive := valueof(m_responsePrimitive(int2000, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
 								mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 							}
-							[] mcaPortIn.receive {
+							[] mcaPortIn.receive (mw_request(mw_retrieve(?))){
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__, " : error while retrieving resource !");
+								setverdict(fail, __SCOPE__ & " : Retrieve request for unexpected target");
 								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!");
+								setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 							}
 						}
 		
@@ -756,7 +697,7 @@ module OneM2M_PermutationFunctions {
 						alt{
 							[] mcaPortIn.receive(mw_request(p_request)) -> value v_request {
 								tc_ac.stop;
-								setverdict(pass, __SCOPE__, " : Subscription creation request is accepted!");
+								setverdict(pass, __SCOPE__ & " : Subscription creation request is accepted!");
 								v_parentIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
 								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);	
@@ -766,11 +707,11 @@ module OneM2M_PermutationFunctions {
 							}
 							[] mcaPortIn.receive {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__, " : Subscription creation request is rejected due to not including the optional attribute!");
+								setverdict(fail, __SCOPE__ & " : Subscription creation request is rejected due to not including the optional attribute!");
 								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!");
+								setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 							}
 						}
 
@@ -5228,18 +5169,18 @@ module OneM2M_PermutationFunctions {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value vc_response {
 								tc_ac.stop;
-								setverdict(pass, __SCOPE__, ": Attribute of resource type " & int2str(enum2int(p_resourceType)) & " updated successfully");
+								setverdict(pass, __SCOPE__ & ": Attribute of resource type " & int2str(enum2int(p_resourceType)) & " updated successfully");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__, ": Wrong response status code");
+								setverdict(fail, __SCOPE__ & ": Wrong response status code");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value vc_response {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__, ": Error while updating optional attribute");
+								setverdict(fail, __SCOPE__ & ": Error while updating optional attribute");
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, __SCOPE__, ": No answer while updating resource type " & int2str(enum2int(p_resourceType)));
+								setverdict(fail, __SCOPE__ & ": No answer while updating resource type " & int2str(enum2int(p_resourceType)));
 							}
 						}
 					  
@@ -5318,15 +5259,15 @@ module OneM2M_PermutationFunctions {
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value vc_response {
 								tc_ac.stop;
-								setverdict(pass, __SCOPE__, ": Attribute of resource type " & int2str(enum2int(p_resourceType)) & " updated successfully");
+								setverdict(pass, __SCOPE__ & ": Attribute of resource type " & int2str(enum2int(p_resourceType)) & " updated successfully");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__, ": Wrong response status code");
+								setverdict(fail, __SCOPE__ & ": Wrong response status code");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value vc_response {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__, ": Error while updating mandatory attribute");
+								setverdict(fail, __SCOPE__ & ": Error while updating mandatory attribute");
 							}
 							[] mcaPortIn.receive(mw_request(mw_notifyNotification(mw_contentNotificationVerification))) -> value vc_request {
 								tc_ac.stop;
@@ -5338,7 +5279,7 @@ module OneM2M_PermutationFunctions {
 								repeat;
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, __SCOPE__, ": No answer while updating resource type " & int2str(enum2int(p_resourceType)));
+								setverdict(fail, __SCOPE__ & ": No answer while updating resource type " & int2str(enum2int(p_resourceType)));
 							}
 						}
 						
@@ -5922,12 +5863,12 @@ module OneM2M_PermutationFunctions {
 								setverdict(pass, __SCOPE__ & ": creation successfull by using fanOutPoint in group resource");
 	                
 								if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list)){
-									setverdict(fail, __SCOPE__, ": Error, aggregatedResponse attribute not provided");
+									setverdict(fail, __SCOPE__ & ": Error, aggregatedResponse attribute not provided");
 								}
 								else {
 									for(i:=0; i<lengthof(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list); i := i+1){
 										if(not match(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list[i], mw_responsePrimitiveOK)){
-											setverdict(fail, __SCOPE__, ": Error, one responsePrimitve of aggregatedResponse_list is not successful");
+											setverdict(fail, __SCOPE__ & ": Error, one responsePrimitve of aggregatedResponse_list is not successful");
 										}
 									}
 								}                       
@@ -6066,12 +6007,12 @@ module OneM2M_PermutationFunctions {
 								setverdict(pass, __SCOPE__ & ": creation successfull by using fanOutPoint in group resource");
 	    
 								if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list)){
-									setverdict(fail, __SCOPE__, ": Error, aggregatedResponse attribute not provided");
+									setverdict(fail, __SCOPE__ & ": Error, aggregatedResponse attribute not provided");
 								}
 								else {
 									for(i:=0; i<lengthof(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list); i := i+1){
 										if(not match(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list[i], mw_responsePrimitiveOK)){
-											setverdict(fail, __SCOPE__, ": Error, one responsePrimitve of aggregatedResponse_list is not successful");
+											setverdict(fail, __SCOPE__ & ": Error, one responsePrimitve of aggregatedResponse_list is not successful");
 										}
 									}
 								}                       
@@ -6206,16 +6147,16 @@ module OneM2M_PermutationFunctions {
 								setverdict(pass, __SCOPE__ & ": creation successfull by using fanOutPoint in group resource");
 	                            
 								if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list)){
-									setverdict(fail, __SCOPE__, ": Error, aggregatedResponse attribute not provided");
+									setverdict(fail, __SCOPE__ & ": Error, aggregatedResponse attribute not provided");
 								}
 								else{
 									if(lengthof(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list) != c_numberOfResponsePrimitive){
-										setverdict(fail, __SCOPE__, ": Error, length of aggregatedResponse is not valid");
+										setverdict(fail, __SCOPE__ & ": Error, length of aggregatedResponse is not valid");
 									}
 									else{
 										for(i:=0; i<c_numberOfResponsePrimitive; i:=i+1){
 											if(not match(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list[i].primitiveContent, p_contentResponse)){
-												setverdict(fail, __SCOPE__, ": Error, aggregatedResponse doesn't match with template expected");
+												setverdict(fail, __SCOPE__ & ": Error, aggregatedResponse doesn't match with template expected");
 											}
 										}
 									}
@@ -6293,16 +6234,16 @@ module OneM2M_PermutationFunctions {
 								setverdict(pass, __SCOPE__ & ": creation successfull by using fanOutPoint in group resource");
 	                
 								if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list)){
-									setverdict(fail, __SCOPE__, ": Error, aggregatedResponse attribute not provided");
+									setverdict(fail, __SCOPE__ & ": Error, aggregatedResponse attribute not provided");
 								}
 								else{
 									if(lengthof(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list) != c_numberOfResponsePrimitive){
-										setverdict(fail, __SCOPE__, ": Error, length of aggregatedResponse is not valid");
+										setverdict(fail, __SCOPE__ & ": Error, length of aggregatedResponse is not valid");
 									}
 									else{
 										for(i:=0; i<c_numberOfResponsePrimitive; i:=i+1){
 											if(not match(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list[i].primitiveContent, v_contentResponse)){
-												setverdict(fail, __SCOPE__, ": Error, aggregatedResponse doesn't match with template expected");
+												setverdict(fail, __SCOPE__ & ": Error, aggregatedResponse doesn't match with template expected");
 											}
 										}
 									}
@@ -7307,14 +7248,14 @@ module OneM2M_PermutationFunctions {
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(v_responsePrimitive.responseStatusCode))) -> value v_response {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__, ": Operation for resource " & int2str(enum2int(p_resourceType)) & " performed successfully");	
+							setverdict(pass, __SCOPE__ & ": Operation for resource " & int2str(enum2int(p_resourceType)) & " performed successfully");	
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__, ": Wrong response status code");
+							setverdict(fail, __SCOPE__ & ": Wrong response status code");
 						}
 						[] tc_ac.timeout {
-							setverdict(fail, __SCOPE__, ": No answer while updating resource type " & int2str(enum2int(p_resourceType)));
+							setverdict(fail, __SCOPE__ & ": No answer while updating resource type " & int2str(enum2int(p_resourceType)));
 						}
 					}
 					
diff --git a/OneM2M_Testcases_AE_Release_1.ttcn b/OneM2M_Testcases_AE_Release_1.ttcn
index ee3c3d4d9cb9bed6b0ea1261b937eed9706bbe3b..e63ec36a32670dd649172e72ca66f36764778932 100644
--- a/OneM2M_Testcases_AE_Release_1.ttcn
+++ b/OneM2M_Testcases_AE_Release_1.ttcn
@@ -44,7 +44,7 @@ module OneM2M_Testcases_AE_Release_1 {
 												
 						// Test control
 						if(not(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE)) {
-							setverdict(inconc, __SCOPE__, ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -60,7 +60,7 @@ module OneM2M_Testcases_AE_Release_1 {
 												
 						// Test control
 						if(not(PICS_PRIMITIVE_SCOPE_SP_RELATIVE)) {
-							setverdict(inconc, __SCOPE__, ": Unstructured-SP-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Unstructured-SP-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -76,7 +76,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						
 						// Test control
 						if(not(PICS_PRIMITIVE_SCOPE_ABSOLUTE)) {
-							setverdict(inconc, __SCOPE__, ": Unstructured-Absolute-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Unstructured-Absolute-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						v_cse1.start(f_AE_GEN_CRE_001(e_absolute));
@@ -98,7 +98,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						v_cse1.done;
 						
 						if(not(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE)) {
-							setverdict(inconc, __SCOPE__, ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -113,7 +113,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						v_cse1.done;
 						
 						if(not(PICS_PRIMITIVE_SCOPE_SP_RELATIVE)) {
-							setverdict(inconc, __SCOPE__, ": Structured-SP-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Structured-SP-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -128,7 +128,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						v_cse1.done;
 						
 						if(not(PICS_PRIMITIVE_SCOPE_ABSOLUTE)) {
-							setverdict(inconc, __SCOPE__, ": Structured-Absolute-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Structured-Absolute-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -156,7 +156,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						
 						// Test control
 						if(not(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE)) {
-							setverdict(inconc, __SCOPE__, ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -172,7 +172,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						
 					//Test control
 					if(not(PICS_PRIMITIVE_SCOPE_SP_RELATIVE)) {
-						setverdict(inconc, __SCOPE__, ": Unstructured-SP-Relative-Resource-ID format support is required to run this test case");
+						setverdict(inconc, __SCOPE__ & ": Unstructured-SP-Relative-Resource-ID format support is required to run this test case");
 						stop;
 					}
 						
@@ -188,7 +188,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_ABSOLUTE)) {
-							setverdict(inconc, __SCOPE__, ": Unstructured-Absolute-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Unstructured-Absolute-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -212,7 +212,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE)) {
-							setverdict(inconc, __SCOPE__, ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -228,7 +228,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_SP_RELATIVE)) {
-							setverdict(inconc, __SCOPE__, ": Structured-SP-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Structured-SP-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -244,7 +244,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_ABSOLUTE)) {
-							setverdict(inconc, __SCOPE__, ": Structured-Absolute-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Structured-Absolute-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -272,7 +272,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						
 						// Test control
 						if(not(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE)) {
-							setverdict(inconc, __SCOPE__, ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -288,7 +288,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_SP_RELATIVE)) {
-							setverdict(inconc, __SCOPE__, ": Unstructured-SP-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Unstructured-SP-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -304,7 +304,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_ABSOLUTE)) {
-							setverdict(inconc, __SCOPE__, ": Unstructured-Absolute-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Unstructured-Absolute-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -328,7 +328,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE)) {
-							setverdict(inconc, __SCOPE__, ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -344,7 +344,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_SP_RELATIVE)) {
-							setverdict(inconc, __SCOPE__, ": Structured-SP-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Structured-SP-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -360,7 +360,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_ABSOLUTE)) {
-							setverdict(inconc, __SCOPE__, ": Structured-Absolute-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Structured-Absolute-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -388,7 +388,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE)) {
-							setverdict(inconc, __SCOPE__, ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -404,7 +404,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_SP_RELATIVE)) {
-							setverdict(inconc, __SCOPE__, ": Unstructured-SP-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Unstructured-SP-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -420,7 +420,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_ABSOLUTE)) {
-							setverdict(inconc, __SCOPE__, ": Unstructured-Absolute-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Unstructured-Absolute-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -444,7 +444,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE)) {
-							setverdict(inconc, __SCOPE__, ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -460,7 +460,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_SP_RELATIVE)) {
-							setverdict(inconc, __SCOPE__, ": Structured-SP-Relative-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Structured-SP-Relative-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -476,7 +476,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						
 						//Test control
 						if(not(PICS_PRIMITIVE_SCOPE_ABSOLUTE)) {
-							setverdict(inconc, __SCOPE__, ": Structured-Absolute-Resource-ID format support is required to run this test case");
+							setverdict(inconc, __SCOPE__ & ": Structured-Absolute-Resource-ID format support is required to run this test case");
 							stop;
 						}
 						
@@ -528,29 +528,26 @@ module OneM2M_Testcases_AE_Release_1 {
 					//Send Trigger Message
 					v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(-, -, -);
 					v_requestPrimitive.to_ := v_utRequest.requestPrimitive.to_;
-					f_sendUtPrimitive(v_utRequest, v_action);
+					f_sendUtPrimitive(v_utRequest, v_action & f_getLocalResourceAddress(-, -, -));
 
 					//Test behavior
 					tc_ac.start;
 					alt{
 						[] mcaPortIn.receive(mw_request(v_requestPrimitive)) -> value v_request {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__, " : AE registration request is accepted!!");
-							v_parentIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
-							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));
+							setverdict(pass, __SCOPE__ & " : AE registration request is accepted!!");
+							v_resourceIndex := f_processCreateRequestPrimitive(v_request.primitive.requestPrimitive);	
 							
 							//send back responsePrimitive
-							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+							mcaPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
 						}
-						[] mcaPortIn.receive(mw_request(mw_createAe(*,?,m_contentCreateAe_Invalid))) -> value v_request {
+						[] mcaPortIn.receive(mw_request(mw_createAe())) -> value v_request {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__, " : AE registration request is rejected due to not including mandatory attributes!!");
+							setverdict(fail, __SCOPE__ & " : Unexpected AE registration request");
 							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!");
+							setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 						}
 	
 					}
@@ -731,8 +728,8 @@ module OneM2M_Testcases_AE_Release_1 {
 				testcase TC_AE_REG_DEL_001() runs on Tester system AeSystem {
 						
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-					v_cse1.done;
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 					
 					v_cse1.start(f_AE_REG_DEL_001());
 					
@@ -757,26 +754,26 @@ module OneM2M_Testcases_AE_Release_1 {
 					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);
+					f_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_auxInteger, -, -));
 	
 					//Test behavior
 					tc_ac.start;
 					alt{
 						[] mcaPortIn.receive(mw_request(mw_delete(v_utRequest.requestPrimitive.to_))) -> value v_request {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__, " : AE deregistration request is accepted!");
+							setverdict(pass, __SCOPE__ & " : AE deregistration request is accepted!");
 							v_responsePrimitive := valueof(m_responsePrimitive(int2002, v_request.primitive.requestPrimitive.requestIdentifier, omit));
 	
 							//send back responsePrimitive
 							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 						}
-						[] mcaPortIn.receive {
+						[] mcaPortIn.receive (mw_request(mw_delete(?)))  {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__, " : Error while AE deregistration");
+							setverdict(fail, __SCOPE__ & " : Unexpected DELETE request");
 							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!");
+							setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 						}
 	
 					}
@@ -799,8 +796,8 @@ module OneM2M_Testcases_AE_Release_1 {
 				testcase TC_AE_DMR_CRE_001() runs on Tester system AeSystem {
 						
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-					v_cse1.done;
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 					
 					v_cse1.start(f_AE_DMR_CRE_001());
 					
@@ -812,41 +809,34 @@ module OneM2M_Testcases_AE_Release_1 {
 					//variables
 					var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
 					var MsgIn v_request;
-					var integer v_parentIndex := -1;
 					var integer v_resourceIndex := -1;
-					var PrimitiveContent v_resource;
 					var template RequestPrimitive v_requestPrimitive := mw_createContainer;
-					var ResponsePrimitive v_responsePrimitive;
-					var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for container";
+					var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for container to ";
 					
 					f_cf03Up();
 	
 					//send triggering primitive to SUT
 					v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(-, -, -);
 					v_requestPrimitive.to_ := v_utRequest.requestPrimitive.to_;
-					f_sendUtPrimitive(v_utRequest,v_action);
+					f_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(-, -, -));
 					
 					//Test behavior
 					tc_ac.start;
 					alt{
 						[] mcaPortIn.receive(mw_request(v_requestPrimitive)) -> value v_request {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__, " : Container creation request is accepted!");
-							v_parentIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
-							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));
-							
+							setverdict(pass, __SCOPE__ & " : Container creation request is accepted!");
+							v_resourceIndex := f_processCreateRequestPrimitive(v_request.primitive.requestPrimitive);	
 							//send back responsePrimitive
-							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+							mcaPortIn.send(f_getMsgOutPrimitive(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))));
 						}
-						[] mcaPortIn.receive {
+						[] mcaPortIn.receive(mw_request(mw_create)) -> value v_request{
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__, " : Container creation request is rejected due to not including mandatory attributes!!");
+							setverdict(fail, __SCOPE__ & " : Unexpected CREATE request ");
 							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!");
+							setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 						}
 					}
 	
@@ -860,8 +850,8 @@ module OneM2M_Testcases_AE_Release_1 {
 				testcase TC_AE_DMR_CRE_002() runs on Tester system AeSystem {
 						
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-					v_cse1.done;
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 					
 					v_cse1.start(f_AE_DMR_CRE_002());
 					
@@ -872,14 +862,11 @@ module OneM2M_Testcases_AE_Release_1 {
 	
 					var template UtTriggerPrimitive v_utRequest := m_utCreateContentInstance;
 					var MsgIn v_request;
-					var integer v_parentIndex := -1;
 					var integer v_resourceIndex := -1;
-					var PrimitiveContent v_resource;
 					var PrimitiveContent v_localResource;
 					var integer v_containerIndex := -1;
 					var template RequestPrimitive v_requestPrimitive := mw_createContentInstance;
-					var ResponsePrimitive v_responsePrimitive;
-					var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance";
+					var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance to ";
 	
 					//Test component configuration
 					f_cf03Up();
@@ -889,7 +876,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					v_containerIndex := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
 					v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_containerIndex, -, -);
 					v_requestPrimitive.to_ := v_utRequest.requestPrimitive.to_;
-					f_sendUtPrimitive(v_utRequest,v_action);
+					f_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_containerIndex, -, -));
 	
 					//Test behavior
 					tc_ac.start;
@@ -898,23 +885,18 @@ module OneM2M_Testcases_AE_Release_1 {
 						//receive MsgIn requestPrimitive
 						[] mcaPortIn.receive(mw_request(v_requestPrimitive)) -> value v_request {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__, " : ContentInstance creation request is accepted!!");
-							v_parentIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
-							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));
-	
+							setverdict(pass, __SCOPE__ & " : ContentInstance creation request is accepted!!");
+							v_resourceIndex := f_processCreateRequestPrimitive(v_request.primitive.requestPrimitive);	
 							//send back responsePrimitive
-							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+							mcaPortIn.send(f_getMsgOutPrimitive(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))));
 						}
-						[] mcaPortIn.receive {
+						[] mcaPortIn.receive(mw_request(mw_create)) -> value v_request {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__, " : ContentInstance creation request is rejected due to not including mandatory attributes!!");
+							setverdict(fail, __SCOPE__ & " : Unexpected CREATE request ");
 							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!");
+							setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 						}
 					}
 					
@@ -933,7 +915,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						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";
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute ContentInfo to ";
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.contentInstance.contentInfo := "UNINITIALIZED";
@@ -947,7 +929,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						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";
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute ResourceName to ";
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.contentInstance.resourceName := "UNINITIALIZED";
@@ -961,7 +943,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						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";
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute ExpirationTime to";
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.contentInstance.expirationTime := "20301231T012345";
@@ -976,7 +958,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						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";
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute Labels to ";
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.contentInstance.labels := {"UNINITIALIZED"};
@@ -990,7 +972,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						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";
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute Creator to ";
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.contentInstance.creator := "UNINITIALIZED";
@@ -1014,7 +996,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						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";
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute AccessControlPolicyIDs to";
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.container.accessControlPolicyIDs := {"UNINITIALIZED"};
@@ -1028,7 +1010,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						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";
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute MaxNrOfInstances to ";
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.container.maxNrOfInstances := 1;
@@ -1043,7 +1025,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						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";
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute MaxByteSize to ";
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.container.maxByteSize := 1;
@@ -1058,7 +1040,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						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";
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute MaxInstanceAge to ";
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.container.maxInstanceAge := 1;
@@ -1073,7 +1055,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						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";
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute OntologyRef to ";
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.container.ontologyRef := "UNINITIALIZED";
@@ -1087,7 +1069,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						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";
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute ResourceName to ";
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.container.resourceName := "UNINITIALIZED";
@@ -1101,7 +1083,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						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";
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute ExpirationTime to ";
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.container.expirationTime := "20301231T012345";
@@ -1116,7 +1098,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						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";
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute Labels to ";
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.container.labels := {"UNINITIALIZED"};
@@ -1130,7 +1112,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						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";
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute Creator to ";
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.container.creator := "UNINITIALIZED";
@@ -1156,7 +1138,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						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 universal charstring v_action := "Please, send a valid UPDATE Request for AE updating attribute expirationTime to ";
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateAe;
 						
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
@@ -1175,7 +1157,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						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";
+						var universal charstring v_action := "Please, send a valid UPDATE Request for AE updating attribute labels to ";
 						
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
@@ -1195,7 +1177,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 appName";
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute appName to ";
 						
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
@@ -1214,7 +1196,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 pointOfAccess";
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute pointOfAccess to ";
 						
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
@@ -1233,7 +1215,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";
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute ontologyRef to ";
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.aE.ontologyRef := "UNINITIALIZED";
@@ -1251,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 nodeLink";
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute nodeLink to ";
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.aE.nodeLink := "UNINITIALIZED";
@@ -1268,7 +1250,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						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 :=  __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute requestReachability";
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute requestReachability to ";
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.aE.requestReachability := true;
@@ -1286,7 +1268,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						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 :=  __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute contentSerialization";
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute contentSerialization to ";
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.aE.contentSerialization := {applicationxml};
@@ -1312,7 +1294,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						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";
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute expirationTime to ";
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.container.expirationTime := "20301231T012345";
@@ -1326,7 +1308,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						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";
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute labels to ";
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.container.labels := {"UNINITIALIZED"};
@@ -1340,7 +1322,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						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";
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute maxNrOfInstances to ";
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.container.maxNrOfInstances := 1;
@@ -1355,7 +1337,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						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";
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute maxByteSize to ";
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
 						v_utRequest.requestPrimitive.primitiveContent.container.maxByteSize := 1;
@@ -1370,7 +1352,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						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";
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute maxInstanceAge to ";
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
                         v_utRequest.requestPrimitive.primitiveContent.container.maxInstanceAge := 1;
@@ -1395,7 +1377,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_DMR_RET_001_CB() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for CSEBase";
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for CSEBase to ";
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
 						v_cse1.start(f_AE_DMR_RET_001(int5, m_primitiveContentCSEBase(m_contentCreateCSEBase),v_action));
@@ -1405,7 +1387,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_DMR_RET_001_AE() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for AE";
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for AE to ";
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
 						v_cse1.start(f_AE_DMR_RET_001(int2, m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit)),v_action));
@@ -1415,7 +1397,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					testcase TC_AE_DMR_RET_001_CNT() runs on Tester system AeSystem {
 						
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
-						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for Container";
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for Container to ";
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
 						v_cse1.start(f_AE_DMR_RET_001(int3, m_primitiveContentContainer(m_contentCreateContainer()),v_action));
@@ -1432,7 +1414,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-					v_cse1.done;
+						v_cse1.done;
 					
 					v_cse1.start(f_AE_DMR_RET_002());
 					
@@ -1441,41 +1423,43 @@ module OneM2M_Testcases_AE_Release_1 {
 
 				function f_AE_DMR_RET_002() runs on CseSimu {
 	
-					var integer v_resourceIndex := -1;
+					var integer v_resourceIndex, v_containerResourceIndex := -1;
 					var PrimitiveContent v_localResource;
 	
 					//variables
 					var template UtTriggerPrimitive v_utRequest := m_utRetrieve("NotInitialized");
 					var MsgIn v_request;
 					var ResponsePrimitive v_responsePrimitive;
-					var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for retrieving the 'oldest' attribute from Container";
+					var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for retrieving the 'oldest' child resource of Container at ";
 	
 					//Test component configuration
 					f_cf03Up();
 	
 					//send triggering primitive to SUT
 					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);
+					v_containerResourceIndex := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
+					v_localResource := f_generateLocalResource(valueof(m_primitiveContentContentInstance(m_contentCreateContentInstance)), vc_cSEBaseIndex, int4);
+					v_resourceIndex := f_setLocalResource(v_localResource, int4, v_containerResourceIndex);
+					
+					v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_containerResourceIndex) & "/" & c_resourceShortNameOldest;
+					f_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_containerResourceIndex));
 	
 					//Test behavior
 					tc_ac.start;
 					alt{
 						[] mcaPortIn.receive(mw_request(mw_retrieve(v_utRequest.requestPrimitive.to_ ))) -> value v_request {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__, " : retrieve attribute oldest request is accepted!");
-							v_resourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
+							setverdict(pass, __SCOPE__ & " : retrieve attribute oldest request is accepted!");
 							v_responsePrimitive := valueof(m_responsePrimitive(int2000, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
 							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 						}
-						[] mcaPortIn.receive {
+						[] mcaPortIn.receive(mw_request(mw_retrieve(?))) -> value v_request {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__, " : error while retrieving attribute !");
+							setverdict(fail, __SCOPE__ & " : Retrieve Request for unexpected target");
 							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!");
+							setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 						}
 					}
 	
@@ -1491,7 +1475,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-					v_cse1.done;
+						v_cse1.done;
 					
 					v_cse1.start(f_AE_DMR_RET_003());
 					
@@ -1500,41 +1484,44 @@ module OneM2M_Testcases_AE_Release_1 {
 
 				function f_AE_DMR_RET_003() runs on CseSimu {
 	
-					var integer v_resourceIndex := -1;
+					var integer v_resourceIndex, v_containerResourceIndex := -1;
 					var PrimitiveContent v_localResource;
 	
 					//variables
 					var template UtTriggerPrimitive v_utRequest := m_utRetrieve("NotInitialized");
 					var MsgIn v_request;
 					var ResponsePrimitive v_responsePrimitive;
-					var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for retrieving the 'latest' attribute from Container";
+					var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for retrieving the 'latest' attribute from Container at ";
 	
 					//Test component configuration
 					f_cf03Up();
 	
 					//send triggering primitive to SUT
 					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);
+					v_containerResourceIndex := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
+					v_localResource := f_generateLocalResource(valueof(m_primitiveContentContentInstance(m_contentCreateContentInstance)), vc_cSEBaseIndex, int4);
+					v_resourceIndex := f_setLocalResource(v_localResource, int4, v_containerResourceIndex);
+					
+					v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_containerResourceIndex) & "/" & c_resourceShortNameLatest;
+					f_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_containerResourceIndex));
+	
 	
 					//Test behavior
 					tc_ac.start;
 					alt{
 						[] mcaPortIn.receive(mw_request(mw_retrieve(v_utRequest.requestPrimitive.to_))) -> value v_request {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__, " : retrieve attribute latest request is accepted!!");
-							v_resourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
+							setverdict(pass, __SCOPE__ & " : retrieve attribute latest request is accepted!!");
 							v_responsePrimitive := valueof(m_responsePrimitive(int2000, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
 							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 						}
-						[] mcaPortIn.receive {
+						[] mcaPortIn.receive(mw_request(mw_retrieve(?))) -> value v_request {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__, " : error while retrieving attribute !");
+							setverdict(fail, __SCOPE__ & " : Retrieve Request for unexpected target");
 							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!");
+							setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 						}
 					}
 	
@@ -1550,7 +1537,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-					v_cse1.done;
+						v_cse1.done;
 					
 					v_cse1.start(f_AE_DMR_RET_004());
 					
@@ -1566,7 +1553,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					var template UtTriggerPrimitive v_utRequest := m_utRetrieve("NotInitialized");
 					var MsgIn v_request;
 					var ResponsePrimitive v_responsePrimitive;
-					var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for retrieving the Container";
+					var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for retrieving the Container to ";
 
 					//Test component configuration
 					f_cf03Up();
@@ -1575,25 +1562,24 @@ module OneM2M_Testcases_AE_Release_1 {
 					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);
+					f_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_resourceIndex));
 	
 					//Test behavior
 					tc_ac.start;
 					alt{
 						[] mcaPortIn.receive(mw_request(mw_retrieve(v_utRequest.requestPrimitive.to_))) -> value v_request {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__, " : retrieve resource type request is accepted!!");
-							v_resourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
+							setverdict(pass, __SCOPE__ & " : retrieve resource type request is accepted!!");
 							v_responsePrimitive := valueof(m_responsePrimitive(int2000, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
 							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 						}
-						[] mcaPortIn.receive {
+						[] mcaPortIn.receive(mw_request(mw_retrieve(?))) -> value v_request {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__, " : error while retrieving resource !");
+							setverdict(fail, __SCOPE__ & " : Retrieve Request for unexpected target");
 							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!");
+							setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 						}
 					}
 
@@ -1609,7 +1595,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-					v_cse1.done;
+						v_cse1.done;
 					
 					v_cse1.start(f_AE_DMR_RET_005());
 					
@@ -1625,34 +1611,35 @@ module OneM2M_Testcases_AE_Release_1 {
 					var template UtTriggerPrimitive v_utRequest := m_utRetrieve("NotInitialized");
 					var MsgIn v_request;
 					var ResponsePrimitive v_responsePrimitive;
-					var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for retrieving the contentInstance";
+					var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for retrieving the contentInstance to ";
 
 					//Test component configuration
 					f_cf03Up();
 
 					//send triggering primitive to SUT
-					v_localResource := f_generateLocalResource(valueof(m_primitiveContentContentInstance(m_contentCreateContentInstance)), vc_cSEBaseIndex, int4);
-					v_resourceIndex := f_setLocalResource(v_localResource, int4, vc_cSEBaseIndex);
+					v_localResource := f_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
+					v_resourceIndex := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
+					v_localResource := f_generateLocalResource(valueof(m_primitiveContentContentInstance(m_contentCreateContentInstance)), v_resourceIndex, int4);
+					v_resourceIndex := f_setLocalResource(v_localResource, int4, v_resourceIndex);
 					v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_resourceIndex);
-					f_sendUtPrimitive(v_utRequest,v_action);
+					f_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_resourceIndex));
 
 					//Test behavior
 					tc_ac.start;
 					alt{
 						[] mcaPortIn.receive(mw_request(mw_retrieve(v_utRequest.requestPrimitive.to_))) -> value v_request {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__, " : retrieve resource type request is accepted!!");
-							v_resourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
+							setverdict(pass, __SCOPE__ & " : retrieve resource type request is accepted!!");
 							v_responsePrimitive := valueof(m_responsePrimitive(int2000, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
 							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 						}
-						[] mcaPortIn.receive {
+						[] mcaPortIn.receive(mw_request(mw_retrieve(?))) -> value v_request {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__, " : error while retrieving resource !");
+							setverdict(fail, __SCOPE__ & " : Retrieve Request for unexpected target");
 							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!");
+							setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 						}
 					}
 
@@ -1672,7 +1659,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-					v_cse1.done;
+						v_cse1.done;
 					
 					v_cse1.start(f_AE_DMR_DEL_001());
 					
@@ -1688,7 +1675,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					var template UtTriggerPrimitive v_utRequest := m_utDelete;
 					var MsgIn v_request;
 					var ResponsePrimitive v_responsePrimitive;
-					var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid DELETE Request for deleting the 'oldest' attribute from contentInstance";
+					var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid DELETE Request for deleting the 'oldest' resource from container to ";
 
 					//Test component configuration
 					f_cf03Up();
@@ -1697,14 +1684,14 @@ module OneM2M_Testcases_AE_Release_1 {
 					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);
+					f_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_resourceIndex));
 
 					//Test behavior
 					tc_ac.start;
 					alt{
 						[] mcaPortIn.receive(mw_request(mw_delete(v_utRequest.requestPrimitive.to_))) -> value v_request {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__, " : delete attribute oldest request is accepted!!");
+							setverdict(pass, __SCOPE__ & " : Delete oldest ContentInstance resource is accepted");
 
 							//set responseStatusCode back to SUT
 							v_responsePrimitive := valueof(m_responsePrimitive(int2002, v_request.primitive.requestPrimitive.requestIdentifier, omit));
@@ -1713,12 +1700,13 @@ module OneM2M_Testcases_AE_Release_1 {
 							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 							tc_ac.stop;
 						}
-						[] mcaPortIn.receive {
+						[] mcaPortIn.receive (mw_request(mw_delete(?))) -> value v_request {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__, " : error while deleting attribute !");
+							setverdict(fail, __SCOPE__ & " : Delete request for unexpected target");
+							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!");
+							setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 						}
 					}
 
@@ -1734,7 +1722,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-					v_cse1.done;
+						v_cse1.done;
 					
 					v_cse1.start(f_AE_DMR_DEL_002());
 					
@@ -1750,7 +1738,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					var template UtTriggerPrimitive v_utRequest := m_utDelete;
 					var MsgIn v_request;
 					var ResponsePrimitive v_responsePrimitive;
-					var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid DELETE Request for deleting the 'latest' attribute from contentInstance";
+					var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid DELETE Request for deleting the 'latest' resource from container to ";
 
 					//Test component configuration
 					f_cf03Up();
@@ -1759,14 +1747,14 @@ module OneM2M_Testcases_AE_Release_1 {
 					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);
+					f_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_resourceIndex));
 
 					//Test behavior
 					tc_ac.start;
 					alt{
 						[] mcaPortIn.receive(mw_request(mw_delete(v_utRequest.requestPrimitive.to_))) -> value v_request {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__, " : delete attribute latest request is accepted!!");
+							setverdict(pass, __SCOPE__ & " : delete attribute latest resource ContentInstance is accepted");
 
 							//set responseStatusCode back to SUT
 							v_responsePrimitive := valueof(m_responsePrimitive(int2002, v_request.primitive.requestPrimitive.requestIdentifier, omit));
@@ -1775,12 +1763,13 @@ module OneM2M_Testcases_AE_Release_1 {
 							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 							tc_ac.stop;
 						}
-						[] mcaPortIn.receive {
+						[] mcaPortIn.receive (mw_request(mw_delete(?))) -> value v_request {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__, " : error while deleting attribute !");
+							setverdict(fail, __SCOPE__ & " : Delete request for unexpected target");
+							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!");
+							setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 						}
 					}
 
@@ -1796,7 +1785,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-					v_cse1.done;
+						v_cse1.done;
 					
 					v_cse1.start(f_AE_DMR_DEL_003());
 					
@@ -1812,7 +1801,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					var template UtTriggerPrimitive v_utRequest := m_utDelete;
 					var MsgIn v_request;
 					var ResponsePrimitive v_responsePrimitive;
-					var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid DELETE Request for deleting the container resource";
+					var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid DELETE Request for deleting the container resource to ";
 
 					//Test component configuration
 					f_cf03Up();
@@ -1821,14 +1810,14 @@ module OneM2M_Testcases_AE_Release_1 {
 					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);
+					f_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_resourceIndex));
 
 					//Test behavior
 					tc_ac.start;
 					alt{
 						[] mcaPortIn.receive(mw_request(mw_delete(v_utRequest.requestPrimitive.to_))) -> value v_request {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__, " : delete resource type request is accepted!!");
+							setverdict(pass, __SCOPE__ & " : delete resource type request is accepted!!");
 
 							//set responseStatusCode back to SUT
 							v_responsePrimitive := valueof(m_responsePrimitive(int2002, v_request.primitive.requestPrimitive.requestIdentifier, omit));
@@ -1837,12 +1826,13 @@ module OneM2M_Testcases_AE_Release_1 {
 							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 							tc_ac.stop;
 						}
-						[] mcaPortIn.receive {
+						[] mcaPortIn.receive (mw_request(mw_delete(?))) -> value v_request {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__, " : error while deleting resource !");
+							setverdict(fail, __SCOPE__ & " : Delete request for unexpected target");
+							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!");
+							setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 						}
 					}
 
@@ -1858,7 +1848,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-					v_cse1.done;
+						v_cse1.done;
 					
 					v_cse1.start(f_AE_DMR_DEL_004());
 					
@@ -1867,30 +1857,32 @@ module OneM2M_Testcases_AE_Release_1 {
 
 				function f_AE_DMR_DEL_004() runs on CseSimu {
 
-					var integer v_resourceIndex := -1;
+					var integer v_resourceIndex, v_containerResourceIndex := -1;
 					var PrimitiveContent v_localResource;
 
 					//variables
 					var template UtTriggerPrimitive v_utRequest := m_utDelete;
 					var MsgIn v_request;
 					var ResponsePrimitive v_responsePrimitive;
-					var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid DELETE Request for deleting the contentInstance resource";
+					var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid DELETE Request for deleting the contentInstance resource to ";
 
 					//Test component configuration
 					f_cf03Up();
 
 					//send triggering primitive to SUT
-					v_localResource := f_generateLocalResource(valueof(m_primitiveContentContentInstance(m_contentCreateContentInstance)), vc_cSEBaseIndex, int4);
-					v_resourceIndex := f_setLocalResource(v_localResource, int4, vc_cSEBaseIndex);
+					v_localResource := f_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
+					v_containerResourceIndex := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
+					v_localResource := f_generateLocalResource(valueof(m_primitiveContentContentInstance(m_contentCreateContentInstance)), v_containerResourceIndex, int4);
+					v_resourceIndex := f_setLocalResource(v_localResource, int4, v_containerResourceIndex);
 					v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_resourceIndex);
-					f_sendUtPrimitive(v_utRequest,v_action);
+					f_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_resourceIndex));
 
 					//Test behavior
 					tc_ac.start;
 					alt{
 						[] mcaPortIn.receive(mw_request(mw_delete(v_utRequest.requestPrimitive.to_ ))) -> value v_request {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__, " : delete resource type request is accepted!!");
+							setverdict(pass, __SCOPE__ & " : delete resource type request is accepted!!");
 
 							//set responseStatusCode back to SUT
 							v_responsePrimitive := valueof(m_responsePrimitive(int2002, v_request.primitive.requestPrimitive.requestIdentifier, omit));
@@ -1899,12 +1891,13 @@ module OneM2M_Testcases_AE_Release_1 {
 							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 							tc_ac.stop;
 						}
-						[] mcaPortIn.receive {
+						[] mcaPortIn.receive (mw_request(mw_delete(?))) -> value v_request {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__, " : error while deleting resource !");
+							setverdict(fail, __SCOPE__ & " : Delete request for unexpected target");
+							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!");
+							setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 						}
 					}
 
@@ -1929,7 +1922,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-					v_cse1.done;
+						v_cse1.done;
 					
 					v_cse1.start(f_AE_SUB_CRE_001());
 					
@@ -1958,7 +1951,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					alt{
 						[] mcaPortIn.receive(mw_request(mw_createSubscription)) -> value v_request {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__, " : Subscription creation request is accepted!");
+							setverdict(pass, __SCOPE__ & " : Subscription creation request is accepted!");
 							v_parentIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
 							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);	
@@ -1969,11 +1962,11 @@ module OneM2M_Testcases_AE_Release_1 {
 						}
 						[] mcaPortIn.receive {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__, " : Subscription creation request is rejected due to not including mandatory attributes!!");
+							setverdict(fail, __SCOPE__ & " : Subscription creation request is rejected due to not including mandatory attributes!!");
 							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!");
+							setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 						}
 					}
 
@@ -2002,7 +1995,7 @@ module OneM2M_Testcases_AE_Release_1 {
 	
 						v_cse1.start(f_AE_SUB_CRE_002(v_utRequest, v_requestT, v_action));
 						
-						v_cse1.stop;
+						v_cse1.done;
 					}
 					
 					testcase TC_AE_SUB_CRE_002_ENC() runs on Tester system AeSystem {
@@ -2022,7 +2015,7 @@ module OneM2M_Testcases_AE_Release_1 {
 	
 						v_cse1.start(f_AE_SUB_CRE_002(v_utRequest, v_requestT, v_action));
 					
-						v_cse1.stop;
+						v_cse1.done;
 					}
 					
 					testcase TC_AE_SUB_CRE_002_EXC() runs on Tester system AeSystem {
@@ -2041,7 +2034,7 @@ module OneM2M_Testcases_AE_Release_1 {
 	
 						v_cse1.start(f_AE_SUB_CRE_002(v_utRequest, v_requestT, v_action));
 						
-						v_cse1.stop;
+						v_cse1.done;
 					}
 					
 					testcase TC_AE_SUB_CRE_002_NFU() runs on Tester system AeSystem {
@@ -2059,7 +2052,7 @@ module OneM2M_Testcases_AE_Release_1 {
 	
 						v_cse1.start(f_AE_SUB_CRE_002(v_utRequest, v_requestT, v_action));
 						
-						v_cse1.stop;
+						v_cse1.done;
 					}
 					
 					testcase TC_AE_SUB_CRE_002_NCT() runs on Tester system AeSystem {
@@ -2078,7 +2071,7 @@ module OneM2M_Testcases_AE_Release_1 {
 	
 						v_cse1.start(f_AE_SUB_CRE_002(v_utRequest, v_requestT, v_action));
 						
-						v_cse1.stop;
+						v_cse1.done;
 					}
 					 
 					testcase TC_AE_SUB_CRE_002_NEC() runs on Tester system AeSystem {
@@ -2097,7 +2090,7 @@ module OneM2M_Testcases_AE_Release_1 {
 	
 						v_cse1.start(f_AE_SUB_CRE_002(v_utRequest, v_requestT, v_action));
 						
-						v_cse1.stop;
+						v_cse1.done;
 					}
 					
 					testcase TC_AE_SUB_CRE_002_SU() runs on Tester system AeSystem {
@@ -2115,7 +2108,7 @@ module OneM2M_Testcases_AE_Release_1 {
 	
 						v_cse1.start(f_AE_SUB_CRE_002(v_utRequest, v_requestT, v_action));
 						
-						v_cse1.stop;
+						v_cse1.done;
 					}
 
 				}//End AE_SUB_CRE_002
@@ -2160,7 +2153,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					alt{
 						[] mcaPortIn.receive(mw_request(mw_createAe)) -> value v_request {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__, " : AE registration request is accepted!!");
+							setverdict(pass, __SCOPE__ & " : AE registration request is accepted!!");
 							v_parentIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
 							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);	
@@ -2171,11 +2164,11 @@ module OneM2M_Testcases_AE_Release_1 {
 						}
 						[] 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!!");
+							setverdict(inconc, __SCOPE__ & " : AE registration request is rejected due to not including mandatory attributes!!");
 							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!");
+							setverdict(inconc, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 						}
 
 					}
@@ -2192,7 +2185,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					alt{
 						[] mcaPortIn.receive(mw_request(mw_createSubscription)) -> value v_request {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__, " : Subscription creation request is accepted!");
+							setverdict(pass, __SCOPE__ & " : Subscription creation request is accepted!");
 							v_parentIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
 							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);	
@@ -2203,11 +2196,11 @@ module OneM2M_Testcases_AE_Release_1 {
 						}
 						[] mcaPortIn.receive {
 							tc_ac.stop;
-							setverdict(inconc, __SCOPE__, " : Subscription creation request is rejected due to not including mandatory attributes!!");
+							setverdict(inconc, __SCOPE__ & " : Subscription creation request is rejected due to not including mandatory attributes!!");
 							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!");
+							setverdict(inconc, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 						}
 					}
 					
@@ -2220,14 +2213,14 @@ module OneM2M_Testcases_AE_Release_1 {
 					alt{
 						[] mcaPortIn.receive(mw_response(mw_responsePrimitiveOK)) {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__, " : Notification response is accepted!");
+							setverdict(pass, __SCOPE__ & " : Notification response is accepted!");
 						}
 						[] mcaPortIn.receive {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__, " : Notification response is rejected due to not including mandatory attributes!");
+							setverdict(fail, __SCOPE__ & " : Notification response is rejected due to not including mandatory attributes!");
 						}
 						[] tc_ac.timeout{
-							setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
+							setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 						}
 					}
  
@@ -2271,7 +2264,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					alt{
 						[] mcaPortIn.receive(mw_request(mw_createAe)) -> value v_request {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__, " : AE registration request is accepted!!");
+							setverdict(pass, __SCOPE__ & " : AE registration request is accepted!!");
 							v_parentIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
 							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);	
@@ -2282,11 +2275,11 @@ module OneM2M_Testcases_AE_Release_1 {
 						}
 						[] 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!!");
+							setverdict(inconc, __SCOPE__ & " : AE registration request is rejected due to not including mandatory attributes!!");
 							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!");
+							setverdict(inconc, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 						}
 
 					}
@@ -2303,7 +2296,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					alt{
 						[] mcaPortIn.receive(mw_request(mw_createSubscription)) -> value v_request {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__, " : Subscription creation request is accepted!");
+							setverdict(pass, __SCOPE__ & " : Subscription creation request is accepted!");
 							v_parentIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
 							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);	
@@ -2314,11 +2307,11 @@ module OneM2M_Testcases_AE_Release_1 {
 						}
 						[] mcaPortIn.receive {
 							tc_ac.stop;
-							setverdict(inconc, __SCOPE__, " : Subscription creation request is rejected due to not including mandatory attributes!!");
+							setverdict(inconc, __SCOPE__ & " : Subscription creation request is rejected due to not including mandatory attributes!!");
 							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!");
+							setverdict(inconc, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 						}
 					}
 					
@@ -2331,14 +2324,14 @@ module OneM2M_Testcases_AE_Release_1 {
 					alt{
 						[] mcaPortIn.receive(mw_response(mw_responsePrimitiveOK)) {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__, " : Notification response is accepted!");
+							setverdict(pass, __SCOPE__ & " : Notification response is accepted!");
 						}
 						[] mcaPortIn.receive {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__, " : Notification response is rejected due to not including mandatory attributes!");
+							setverdict(fail, __SCOPE__ & " : Notification response is rejected due to not including mandatory attributes!");
 						}
 						[] tc_ac.timeout{
-							setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
+							setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 						}
 					}
  
diff --git a/OneM2M_Testcases_CSE_Release_1.ttcn b/OneM2M_Testcases_CSE_Release_1.ttcn
index a4845fded71e78db6f0f5a21294ad4b4cad19c5c..df3a37e81a8a21c5a4e5d5a94a144f54670924b1 100644
--- a/OneM2M_Testcases_CSE_Release_1.ttcn
+++ b/OneM2M_Testcases_CSE_Release_1.ttcn
@@ -62,21 +62,21 @@ module OneM2M_Testcases_CSE_Release_1 {
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
 							t_ac.stop;
 							log(__SCOPE__ & ":Resource deleted");
-							setverdict(pass);
+							//setverdict(pass);
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 							t_ac.stop;
 							log(__SCOPE__ & ":Error while deleting resource");
-							setverdict(fail);
+							//setverdict(fail);
 						}
 						[] mcaPort.receive {
 							t_ac.stop;
 							log(__SCOPE__ & ":Unexpected message received");
-							setverdict(inconc);
+							//setverdict(inconc);
 						}
 						[] t_ac.timeout {
 							log(__SCOPE__ & ":No answer while deleting resource");
-							setverdict(inconc);
+							//setverdict(inconc);
 						}	
 					}	
 				}
@@ -808,8 +808,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 				testcase TC_CSE_REG_CRE_007() runs on Tester system CseSystem {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-					v_ae1.done;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
 						
 					v_ae1.start(f_CSE_REG_CRE_007());
 			  	  	
@@ -1230,7 +1230,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
-											
+                        						
 						v_createRequest.primitiveContent.remoteCSE.labels := {"MyLabel"};
 						
 						v_cse1.start(f_CSE_REG_CRE_013(v_createRequest, c_optionalAttribute));
@@ -1245,7 +1245,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
-											
+												
 						v_createRequest.primitiveContent.remoteCSE.cseType := int1;
 						
 						v_cse1.start(f_CSE_REG_CRE_013(v_createRequest, c_optionalAttribute));
@@ -1258,6 +1258,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						const AttributeAux c_optionalAttribute := {"pointOfAccess", omit};
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 	
 						v_createRequest.primitiveContent.remoteCSE.pointOfAccess := {"http://" & PX_CSE1_ADDRESS & "/"};
 	
@@ -1273,7 +1274,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
-					
+
 						v_createRequest.primitiveContent.remoteCSE.nodeLink := c_defaultNodeID;
 
 						v_cse1.start(f_CSE_REG_CRE_013(v_createRequest, c_optionalAttribute));
@@ -1394,7 +1395,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-					v_cse1.done;
+						v_cse1.done;
 							
 					v_cse1.start(f_CSE_REG_CRE_018());
 				  	  	
@@ -1822,7 +1823,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 				function f_CSE_REG_CRE_024() runs on CseSimu {
   
 					// Local variables
-					var ResponsePrimitive v_responsePrimitive;
+					var ResponsePrimitive v_response;
+					var MsgIn v_request;
+					var PrimitiveContent v_localResource;
+					var integer v_parentResourceIndex := -1;
+					var integer v_localResourceIndex := -1;
 					var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
 					var universal charstring v_action :=  __SCOPE__ & ": Please, send a CSE registration request with attributes multiplicity equals to 1";
 	   
@@ -1844,22 +1849,30 @@ module OneM2M_Testcases_CSE_Release_1 {
 					// Test Body
 					tc_ac.start;
 					alt {
-						[] mccPortIn.receive(mw_request(mw_createRemoteCSEBase)) {
+						[] mccPortIn.receive(mw_request(mw_createRemoteCSEBase)) -> value v_request {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__&":INFO: Resource type remoteCSE created successfuly");
-							
-							//set responseStatusCode back to SUT
-							v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
-
-							//send back responsePrimitive
-							mccPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
-						}
+							setverdict(pass, __SCOPE__&":INFO: CREATE remoteCSE request received");
+							v_parentResourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
+							if(v_parentResourceIndex == -1) {
+								log(__SCOPE__&": ERROR: Target resource not found");
+								v_response := valueof(m_responsePrimitive(int4004,v_request.primitive.requestPrimitive.requestIdentifier));
+						
+							} else {
+								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));
+								v_response.primitiveContent := vc_localResourcesList[v_localResourceIndex].resource;
+							}
+							v_response.from_ := PX_CSE1_ID;
+							v_response.to_ := v_request.primitive.requestPrimitive.from_;
+							mccPortIn.send(f_getMsgOutPrimitive(m_response(v_response)));				}
 						[] mccPortIn.receive {
 							tc_ac.stop;
-							setverdict(inconc, __SCOPE__&":INFO: Unexpected message received");
+							setverdict(fail, __SCOPE__&":INFO: Unexpected message received");
 						}
 						[] tc_ac.timeout {
-							setverdict(inconc, __SCOPE__&":INFO: No request received for creating resource type remoteCSE");
+							setverdict(fail, __SCOPE__&":INFO: No request received for creating resource type remoteCSE");
 						}
 					}	
 					// Postamble
@@ -1950,77 +1963,71 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a CSE registration request with optional attribute resourceName";
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
-						
 						v_utRequest.requestPrimitive.primitiveContent.remoteCSE.resourceName := "UNINITIALIZED";
 						v_request.primitiveContent.remoteCSE.resourceName := ?;
 						v_cse1.start(f_CSE_REG_CRE_026(v_utRequest,v_request,v_action));
 						v_cse1.done;
 					}
 					
-					testcase TC_CSE_REG_CRE_026_ET() runs on CseSimu system CseSystem {
+					testcase TC_CSE_REG_CRE_026_ET() 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 expirationTime";
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
-					
 						v_utRequest.requestPrimitive.primitiveContent.remoteCSE.expirationTime := "20301231T012345";
 						v_request.primitiveContent.remoteCSE.expirationTime := ?;
 						v_cse1.start(f_CSE_REG_CRE_026(v_utRequest,v_request,v_action));
 						v_cse1.done;
 					}
 					
-					testcase TC_CSE_REG_CRE_026_LBL() runs on CseSimu system CseSystem {
+					testcase TC_CSE_REG_CRE_026_LBL() 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 labels";
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
-					
 						v_utRequest.requestPrimitive.primitiveContent.remoteCSE.labels := {"UNINITIALIZED"};
 						v_request.primitiveContent.remoteCSE.labels := ?;
 						v_cse1.start(f_CSE_REG_CRE_026(v_utRequest,v_request,v_action));
 						v_cse1.done;
 					}
 					
-					testcase TC_CSE_REG_CRE_026_POA() runs on CseSimu system CseSystem {
+					testcase TC_CSE_REG_CRE_026_POA() 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 pointOfAccess";
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
-						
 						v_utRequest.requestPrimitive.primitiveContent.remoteCSE.pointOfAccess := {"UNINITIALIZED"};
 						v_request.primitiveContent.remoteCSE.pointOfAccess := ?;
 						v_cse1.start(f_CSE_REG_CRE_026(v_utRequest,v_request,v_action));
 						v_cse1.done;
 					}
 					
-					testcase TC_CSE_REG_CRE_026_NL() runs on CseSimu system CseSystem {
+					testcase TC_CSE_REG_CRE_026_NL() 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 nodeLink";
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
-						
 						v_utRequest.requestPrimitive.primitiveContent.remoteCSE.nodeLink := "UNINITIALIZED";
 						v_request.primitiveContent.remoteCSE.nodeLink := ?;
 						v_cse1.start(f_CSE_REG_CRE_026(v_utRequest,v_request,v_action));
 						v_cse1.done;
 					}
 					
-					testcase TC_CSE_REG_CRE_026_CST() runs on CseSimu system CseSystem {
+					testcase TC_CSE_REG_CRE_026_CST() 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 cseType";
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
-						
 						v_utRequest.requestPrimitive.primitiveContent.remoteCSE.cseType := int1;//TODO It should be marked as "UNITIALIZED"
 						v_request.primitiveContent.remoteCSE.cseType := ?;
 						v_cse1.start(f_CSE_REG_CRE_026(v_utRequest,v_request,v_action));
@@ -2037,7 +2044,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-					v_cse1.done;
+						v_cse1.done;
 							
 					v_cse1.start(f_CSE_REG_CRE_027());
 				  	  	
@@ -2095,9 +2102,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						 var RequestPrimitive v_request;
 						 var template PrimitiveContent v_contentResponse;
 						 var Labels v_labels_1 := {"VALUE_1"};
-						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						 v_cse1.done;
-						 
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						 v_request := valueof(m_createRemoteCSEBase);
 						 v_request.primitiveContent.remoteCSE.cseType := int2;	//MN_CSE
 						 v_request.primitiveContent.remoteCSE.labels := v_labels_1;
@@ -2117,9 +2123,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 						
 						 var RequestPrimitive v_request;
 						 var template PrimitiveContent v_contentResponse;
-						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						 v_cse1.done;
-						 
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
 						 v_request := valueof(m_createRemoteCSEBase);
 						 v_request.primitiveContent.remoteCSE.cseType := int2;	//MN_CSE
 						 v_request.primitiveContent.remoteCSE.pointOfAccess := {"http://" & PX_CSE1_ADDRESS & "/"};
@@ -2139,10 +2144,9 @@ module OneM2M_Testcases_CSE_Release_1 {
 						
 						 var RequestPrimitive v_request;
 						 var template PrimitiveContent v_contentResponse;
-						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						 v_cse1.done;
-					 	 
-					 	 v_request := valueof(m_createRemoteCSEBase);
+						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						v_cse1.done;
+						 v_request := valueof(m_createRemoteCSEBase);
 						 v_request.primitiveContent.remoteCSE.cseType := int2;	//MN_CSE
 						 v_request.primitiveContent.remoteCSE.nodeLink := c_defaultNodeID;
 	
@@ -2485,7 +2489,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-					v_cse1.done;
+						v_cse1.done;
 							
 					v_cse1.start(f_CSE_REG_RET_006());
 				  	  	
@@ -2591,7 +2595,6 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template PrimitiveContent v_contentResponse;
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
-						
 						v_createRequest.primitiveContent.remoteCSE.labels := v_labels_1;
 
 						v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
@@ -2609,7 +2612,6 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template PrimitiveContent v_contentResponse;
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
-						
 						v_createRequest.primitiveContent.remoteCSE.cseType := int1;
 
 						v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
@@ -2627,7 +2629,6 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template PrimitiveContent v_contentResponse;
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
-						
 						v_createRequest.primitiveContent.remoteCSE.pointOfAccess := {"http://" & PX_CSE1_ADDRESS & "/"};
 
 						v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
@@ -2645,7 +2646,6 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var template PrimitiveContent v_contentResponse;
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
-					
 						v_createRequest.primitiveContent.remoteCSE.nodeLink := c_defaultNodeID;
 
 						v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
@@ -2664,7 +2664,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;
-					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
 									
 					v_ae1.start(f_CSE_REG_RET_008());
@@ -2746,7 +2746,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-					v_cse1.done;
+						v_cse1.done;
 								
 					v_cse1.start(f_CSE_REG_RET_009());
 					  	  	
@@ -2755,14 +2755,14 @@ module OneM2M_Testcases_CSE_Release_1 {
 				}
 							
 				function f_CSE_REG_RET_009() runs on CseSimu {
-					//Local variables
 					 //Local variables
-					 var MsgIn v_response;
-					 var RequestPrimitive v_request;
+					 var MsgIn v_request;
 					 var ResourceType v_resourceType := int16;	//remoteCSE
+					 var ResponsePrimitive v_response;
 					 var template PrimitiveContent v_contentResponse;
 					 var template UtTriggerPrimitive v_utRequest;
-					 var universal charstring v_action := __SCOPE__ & ": Please, send a valid RETRIEVE Request containing To set to " & PX_CSE1_ADDRESS;
+					 var integer v_localResourceIndex := -1;
+					 var universal charstring v_action := __SCOPE__ & ": Please, send a valid RETRIEVE Request for remoteCSE to ";
 	 		
 					 // Test control
 					 if(not(PICS_MN_CSE)) {
@@ -2780,13 +2780,28 @@ module OneM2M_Testcases_CSE_Release_1 {
 					 
 					 //Send Trigger Message
 					 v_utRequest := m_utRetrieve(f_getLocalResourceAddress(vc_localRemoteCseIndex));
- 				     f_sendUtPrimitive(v_utRequest, v_action);
+ 				     f_sendUtPrimitive(v_utRequest, v_action & f_getLocalResourceAddress(vc_localRemoteCseIndex));
 					 
 					 tc_ac.start;
 					 alt {
- 						[] mccPortIn.receive(mw_request(mw_retrieve(f_getResourceAddress()))) -> value v_response {
-							tc_ac.stop;
-							setverdict(pass, __SCOPE__ & ": Retrieve Request received successfully");
+ 						[] mccPortIn.receive(mw_request(mw_retrieve(?))) -> value v_request {
+							tc_ac.stop;
+							v_localResourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
+							if(v_localResourceIndex == -1)
+							{ 
+								log(__SCOPE__&": ERROR: Retrieve request target not found");
+								v_response := valueof(m_responsePrimitive(int4004,v_request.primitive.requestPrimitive.requestIdentifier));
+							} else if(v_localResourceIndex != vc_remoteCseIndex) { 
+								log(__SCOPE__&": ERROR: Retrieve request target not expected");
+								v_response := valueof(m_responsePrimitive(int4004,v_request.primitive.requestPrimitive.requestIdentifier));
+							} else {
+								setverdict(pass, __SCOPE__ & ": Retrieve Request received successfully");
+								v_response := valueof(m_responsePrimitive(int2000,v_request.primitive.requestPrimitive.requestIdentifier));
+								v_response.primitiveContent := vc_localResourcesList[v_localResourceIndex].resource;
+							}
+							v_response.from_ := PX_CSE1_ID;
+							v_response.to_ := v_request.primitive.requestPrimitive.from_;
+							mccPortIn.send(f_getMsgOutPrimitive(m_response(v_response)));
 						}
 						[] mccPortIn.receive {
 							tc_ac.stop;
@@ -2812,7 +2827,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-					v_cse1.done;
+						v_cse1.done;
 								
 					v_cse1.start(f_CSE_REG_RET_010());
 					  	  	
@@ -2956,7 +2971,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
-						
+    						
 						v_updateRequest.primitiveContent.remoteCSE.labels := {"MyLabel"};
 	
 						v_cse1.start(f_CSE_REG_UPD_002(v_updateRequest));
@@ -2970,7 +2985,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
-					
+    					
 						v_updateRequest.primitiveContent.remoteCSE.pointOfAccess := {"http://" & PX_CSE1_ADDRESS & "/"};
 	
 						v_cse1.start(f_CSE_REG_UPD_002(v_updateRequest));
@@ -2984,7 +2999,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
-						
+    						
 						v_updateRequest.primitiveContent.remoteCSE.nodeLink := c_defaultNodeID;
 	
 						v_cse1.start(f_CSE_REG_UPD_002(v_updateRequest));
@@ -3007,7 +3022,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
-					
+			
 						v_updateRequest.primitiveContent.remoteCSE.labels := {"MyLabel"};
 						c_optionalAttribute := {"labels"};
 
@@ -3023,7 +3038,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
-					
+		
 						v_updateRequest.primitiveContent.remoteCSE.pointOfAccess := {"http://" & PX_CSE1_ADDRESS & "/"};
 						c_optionalAttribute := {"pointofAccess"};
 
@@ -3039,7 +3054,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
-					
+			
 						v_updateRequest.primitiveContent.remoteCSE.nodeLink := c_defaultNodeID;
 						c_optionalAttribute := {"nodeLink"};
 
@@ -3055,7 +3070,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
-					
+			
 						v_updateRequest.primitiveContent.remoteCSE.expirationTime := "20301231T012345";
 						c_optionalAttribute := {"expirationTime"};
 	
@@ -3071,7 +3086,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
-					
+	
 						v_updateRequest.primitiveContent.remoteCSE.requestReachability := true;
 						c_optionalAttribute := {"requestReachability"};
 	
@@ -3093,7 +3108,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;
-					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
 									
 					v_ae1.start(f_CSE_REG_DEL_001());
@@ -3152,7 +3167,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-					v_cse1.done;
+						v_cse1.done;
 								
 					v_cse1.start(f_CSE_REG_DEL_002());
 					  	  	
@@ -3289,7 +3304,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 					v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-					v_cse1.done;
+						v_cse1.done;
 								
 					v_cse1.start(f_CSE_REG_DEL_004());
 					  	  	
@@ -3298,11 +3313,14 @@ module OneM2M_Testcases_CSE_Release_1 {
 				}
 							
 				function f_CSE_REG_DEL_004() runs on CseSimu {
-					//Local variables	
+					//Local variables
+					var MsgIn v_request;
 					var template UtTriggerPrimitive v_utRequest := m_utDelete;
 					var UtTriggerAckPrimitive v_trigger_response;
+					var ResponsePrimitive v_response;
 					var integer v_auxInteger;
-					var universal charstring v_action := __SCOPE__ & ": Please, send a valid DELETE Request containing To set to " & PX_CSE1_ADDRESS;
+					var integer v_localResourceIndex := -1;
+					var universal charstring v_action := __SCOPE__ & ": Please, send a valid DELETE Request for remoteCSE to ";
 					
 					//Test control
 					if(not(PICS_MN_CSE)) {
@@ -3319,16 +3337,29 @@ module OneM2M_Testcases_CSE_Release_1 {
 					vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSE);
 					
 					//Send Trigger Message
-					v_auxInteger := f_setResource(valueof(m_primitiveContentRemoteCSE(m_contentCreateRemoteCSE(omit,omit,-,-))), int16);
-					v_utRequest.requestPrimitive.to_ := f_getResourceAddress(v_auxInteger);
-					f_sendUtPrimitive(v_utRequest, v_action);	
+					v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(vc_localRemoteCseIndex);
+					f_sendUtPrimitive(v_utRequest, v_action & f_getLocalResourceAddress(vc_localRemoteCseIndex));	
 
 					// Test Body
 					tc_ac.start;
 					alt {
-						[] mccPortIn.receive(mw_request(mw_delete( f_getResourceAddress(vc_remoteCseIndex), PX_CSE_ID))) {
-							tc_ac.stop;
-							setverdict(pass, __SCOPE__ & ": <remoteCSE> delete request has been received");
+						[] mccPortIn.receive(mw_request(mw_delete(?, PX_CSE_ID))) -> value v_request {
+							tc_ac.stop;
+							v_localResourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
+							if(v_localResourceIndex == -1)
+							{ 
+								log(__SCOPE__&": ERROR: Delete request target not found");
+								v_response := valueof(m_responsePrimitive(int4004,v_request.primitive.requestPrimitive.requestIdentifier));
+							} else if(v_localResourceIndex != vc_remoteCseIndex) { 
+								log(__SCOPE__&": ERROR: Delete request target not expected");
+								v_response := valueof(m_responsePrimitive(int4004,v_request.primitive.requestPrimitive.requestIdentifier));
+							} else {
+								setverdict(pass, __SCOPE__ & ": <remoteCSE> delete request has been received");
+								v_response := valueof(m_responsePrimitive(int2002,v_request.primitive.requestPrimitive.requestIdentifier));
+							}	
+							v_response.from_ := PX_CSE1_ID;
+							v_response.to_ := v_request.primitive.requestPrimitive.from_;
+							mccPortIn.send(f_getMsgOutPrimitive(m_response(v_response)));
 						}
 						[] mccPortIn.receive {
 							tc_ac.stop;
@@ -3375,7 +3406,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.container.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
 						}
 						
@@ -3398,7 +3429,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							if(getverdict == pass){ 
 								v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 								if(not ispresent(v_responsePrimitive.primitiveContent.container.resourceName)){
-									setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+									setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 								}
 							}
 						
@@ -3421,7 +3452,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.container.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 					}
 						}
 
@@ -3444,7 +3475,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.group_.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 						}
 						}
 						
@@ -3467,7 +3498,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.group_.resourceName)){
-									setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+									setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 								}
 							}
 						
@@ -3490,7 +3521,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.accessControlPolicy.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 						}
 						}
 						
@@ -3513,7 +3544,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.accessControlPolicy.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
 						}
 						
@@ -3535,7 +3566,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.subscription.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
 						}
 					
@@ -3557,7 +3588,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.subscription.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
 						}
 	
@@ -3579,7 +3610,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.subscription.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
 						}
 
@@ -3601,7 +3632,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.subscription.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
 						}
 					}
@@ -3613,7 +3644,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
-					
+						
 						v_createRequest.primitiveContent.subscription.resourceName := omit;
 						v_cse1.start(f_CSE_DMR_CRE_001_cseSimu(int23, v_createRequest));//Subscription
 						v_cse1.done;
@@ -3622,7 +3653,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_cse1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.subscription.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
 						}		
 					}
@@ -3643,7 +3674,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.contentInstance.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
 						}
 
@@ -3672,10 +3703,10 @@ module OneM2M_Testcases_CSE_Release_1 {
 						
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.container.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							} else {
 								if(v_responsePrimitive.primitiveContent.container.resourceName != c_defaultContainerResourceName){
-									setverdict(fail, __SCOPE__, ": Error, resourceName attribute not correct");
+									setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not correct");
 								}
 							}
 						}
@@ -3696,10 +3727,10 @@ module OneM2M_Testcases_CSE_Release_1 {
 																		
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.group_.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							} else {
 								if(v_responsePrimitive.primitiveContent.group_.resourceName != c_defaultGroupResourceName){
-									setverdict(fail, __SCOPE__, ": Error, resourceName attribute not correct");
+									setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not correct");
 								}
 							}
 						}
@@ -3719,10 +3750,10 @@ module OneM2M_Testcases_CSE_Release_1 {
 																		
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.accessControlPolicy.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							} else {
 								if(v_responsePrimitive.primitiveContent.accessControlPolicy.resourceName != c_defaultAccessControlPolicyResourceName){
-									setverdict(fail, __SCOPE__, ": Error, resourceName attribute not correct");
+									setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not correct");
 								}
 							}
 						}
@@ -3742,10 +3773,10 @@ module OneM2M_Testcases_CSE_Release_1 {
 																		
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.subscription.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							} else {
 								if(v_responsePrimitive.primitiveContent.subscription.resourceName != c_defaultSubscriptionResourceName){
-									setverdict(fail, __SCOPE__, ": Error, resourceName attribute not correct");
+									setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not correct");
 								}
 							}
 						}
@@ -3932,7 +3963,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 																		
 						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");
+								setverdict(fail, __SCOPE__ & ": Error, maxNrOfInstances attribute not provided");
 							} 
 						}	
 					}
@@ -3952,7 +3983,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 																		
 						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");
+								setverdict(fail, __SCOPE__ & ": Error, maxByteSize attribute not provided");
 							} 
 						}	
 						  
@@ -3973,386 +4004,425 @@ module OneM2M_Testcases_CSE_Release_1 {
 																		
 						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");
+								setverdict(fail, __SCOPE__ & ": Error, maxInstanceAge attribute not provided");
 							} 
 						}	
 					}
 				
 				}// end group g_CSE_DMR_CRE_006
 				
-				group g_CSE_DMR_CRE_007 {
-					
-					/**
-					 * @desc Check that the IUT responds with error when the newly created <contentInstance> results in that the field value of attribute currentNrOfInstances exceeds the field value of maxNrOfInstances in the parent container resource.
-					 * 
-					 */
-					testcase TC_CSE_DMR_CRE_007() runs on AeSimu system CseSystem {
-						// Local variables
-						var template RequestPrimitive v_createRequestContainer := m_createContainerBase;
-						var template RequestPrimitive v_createRequestContentInstance := m_createContentInstanceBase;
-						var MsgIn v_response;
-						var RequestPrimitive v_request;
-						var integer v_aeIndex := -1;
-						var integer v_containerIndex := -1;
-						var integer v_contentInstanceIndex := -1;
-						const integer c_maxNumberOfInstances := 1;				   
-						// Test control
-				
-						// Test component configuration
-						f_cf01Up();
+				/**
+				 * @desc Check that the IUT responds with error when the newly created <contentInstance> results in that the field value of attribute currentNrOfInstances exceeds the field value of maxNrOfInstances in the parent container resource.
+				 * 
+				 */
+				testcase TC_CSE_DMR_CRE_007() runs on Tester system CseSystem {
 				
-						// Test adapter configuration
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
+								
+					v_ae1.start(f_CSE_DMR_CRE_007());
+					  	  	
+					v_ae1.done;
+					  	  		
+				}
 				
-						// Preamble
-						v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
-						
-						v_createRequestContainer.primitiveContent.container.maxNrOfInstances := c_maxNumberOfInstances;
-												
-						v_containerIndex := f_cse_createResource(int3, v_createRequestContainer, v_aeIndex);		//Container
-						
-						v_contentInstanceIndex := f_cse_createResource(int4, m_createContentInstanceBase, v_containerIndex);	//ContentInstance
+				function f_CSE_DMR_CRE_007() runs on AeSimu system CseSystem {
+					// Local variables
+					var template RequestPrimitive v_createRequestContainer := m_createContainerBase;
+					var template RequestPrimitive v_createRequestContentInstance := m_createContentInstanceBase;
+					var MsgIn v_response;
+					var RequestPrimitive v_request;
+					var integer v_aeIndex := -1;
+					var integer v_containerIndex := -1;
+					var integer v_contentInstanceIndex := -1;
+					const integer c_maxNumberOfInstances := 1;				   
+					// Test control
+			
+					// Test component configuration
+					f_cf01Up();
+			
+					// Test adapter configuration
+			
+					// Preamble
+					v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
 					
-						// Test Body
-						
-						v_createRequestContentInstance.primitiveContent.contentInstance.resourceName := c_defaultContentInstanceResourceName & "2";	//ContentInstance 2
-						v_request := f_getCreateRequestPrimitive(int4, v_createRequestContentInstance, v_containerIndex);
+					v_createRequestContainer.primitiveContent.container.maxNrOfInstances := c_maxNumberOfInstances;
+											
+					v_containerIndex := f_cse_createResource(int3, v_createRequestContainer, v_aeIndex);		//Container
 					
-						mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
-						tc_ac.start;
-						alt {
-							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
-								tc_ac.stop;
-								setverdict(pass, __SCOPE__ & ": ContentInstance 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 contentInstance");
-								
-							}
-							[] tc_ac.timeout {
-								setverdict(fail, __SCOPE__ & ": No answer while creating resource type contentInstance");
-							}
-						}	
-								
-						f_checkAeSimuStatus();
-    					
-						//Check to see if the resource is NOT present
-						if(f_isResourceNotPresent(v_containerIndex, c_defaultContentInstanceResourceName)){
-						  setverdict(pass, __SCOPE__ & ":INFO: Oldest contentInstance has been removed to allow the creation of the new contentInstance");
-						} else {
-						  setverdict(fail, __SCOPE__ & ":ERROR: Oldest contentInstance has not been removed to allow the creation of the new contentInstance");
-						}
-												
-						// Postamble
-						f_cse_postamble_deleteResources();
-						
-						// Tear down
-						f_cf01Down();
-					    				
-					}//end TC_CSE_DMR_CRE_007
-						
-				}// end group g_CSE_DMR_CRE_007		
+					v_contentInstanceIndex := f_cse_createResource(int4, m_createContentInstanceBase, v_containerIndex);	//ContentInstance
 				
-				group g_CSE_DMR_CRE_008 {
+					// Test Body
 					
-					/**
-					 * @desc Checks that the IUT accepts a newly created contentInstance when the currentByteSize exceeds the field value set in maxByteSize in the parent container resource by removing enough of the oldest <contentInstance> resources to allow the creation of the new <contentInstance> resource.
-					 * 
-					 */
-					testcase TC_CSE_DMR_CRE_008() runs on AeSimu system CseSystem {
-						//Local variables
-						var template RequestPrimitive v_createRequestContainer := m_createContainerBase;
-						var template RequestPrimitive v_createRequestContentInstance := m_createContentInstanceBase;
-						var MsgIn v_response;
-						var RequestPrimitive v_request;
-						var integer v_aeIndex := -1;
-						var integer v_containerIndex := -1;
-						var integer v_contentInstanceIndex := -1;
-						const integer c_maxByteSize := 10;	
-						const XSD.String c_primitiveContent1 := "Content1";
-						const XSD.String c_primitiveContent2 := "Content2";			   
-						// Test control
-	
-						// Test component configuration
-						f_cf01Up();
-	
-						// Test adapter configuration
-	
-						// Preamble
-						v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
-	
-						v_createRequestContainer.primitiveContent.container.maxByteSize := c_maxByteSize;
+					v_createRequestContentInstance.primitiveContent.contentInstance.resourceName := c_defaultContentInstanceResourceName & "2";	//ContentInstance 2
+					v_request := f_getCreateRequestPrimitive(int4, v_createRequestContentInstance, v_containerIndex);
+				
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
+					tc_ac.start;
+					alt {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
+							tc_ac.stop;
+							setverdict(pass, __SCOPE__ & ": ContentInstance 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 contentInstance");
 							
-						v_containerIndex := f_cse_createResource(int3, v_createRequestContainer, v_aeIndex);		//Container
-	
-						v_contentInstanceIndex := f_cse_createResource(int4, m_createContentInstance(f_getResourceAddress(v_containerIndex), c_primitiveContent1), v_containerIndex);//ContentInstance
-	
-						// Test Body
-	
-						v_createRequestContentInstance.primitiveContent.contentInstance.content := c_primitiveContent2;	//ContentInstance 2
-						v_createRequestContentInstance.primitiveContent.contentInstance.resourceName := c_defaultContentInstanceResourceName & "2";
-						v_request := f_getCreateRequestPrimitive(int4, v_createRequestContentInstance, v_containerIndex);
-	
-						mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
-						tc_ac.start;
-						alt {
-							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
-								tc_ac.stop;
-								setverdict(pass, __SCOPE__ & ": ContentInstance 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 contentInstance");
-			
-							}
-							[] tc_ac.timeout {
-								setverdict(fail, __SCOPE__ & ": No answer while creating resource type contentInstance");
-							}
-						}	
-			
-						f_checkAeSimuStatus();
-	
-						//Check to see if the resource is NOT present
-						if(f_isResourceNotPresent(v_containerIndex, c_defaultContentInstanceResourceName)){
-						  setverdict(pass, __SCOPE__ & ":INFO: Oldest contentInstance has been removed to allow the creation of the new contentInstance");
-						} else {
-						  setverdict(fail, __SCOPE__ & ":ERROR: Oldest contentInstance has not been removed to allow the creation of the new contentInstance");
 						}
+						[] tc_ac.timeout {
+							setverdict(fail, __SCOPE__ & ": No answer while creating resource type contentInstance");
+						}
+					}	
 							
-						// Postamble
-						f_cse_postamble_deleteResources();
-	
-						// Tear down
-						f_cf01Down();
-					    				
-					}//end TC_CSE_DMR_CRE_008
-						
-				}// end group g_CSE_DMR_CRE_008			
-
-				group g_CSE_DMR_CRE_009 {
+					f_checkAeSimuStatus();
 				
-					/**
-					 * @desc Check that the IUT increaments and then copies the field value of attribute stateTag in parent container resource when contentInstance resource is created as the direct child of the parent container
-					 * 
-					 */
-					testcase TC_CSE_DMR_CRE_009() runs on AeSimu system CseSystem {
-						// Local variables
-						var template RequestPrimitive v_createRequest := m_createContainerBase;
-						var MsgIn v_response;
-						var integer v_aeIndex := -1;
-						var integer v_containerIndex := -1;
-						var integer v_contentInstanceIndex := -1;
-						var template PrimitiveContent v_contentResponse;
+					//Check to see if the resource is NOT present
+					if(f_isResourceNotPresent(v_containerIndex, c_defaultContentInstanceResourceName)){
+					  setverdict(pass, __SCOPE__ & ":INFO: Oldest contentInstance has been removed to allow the creation of the new contentInstance");
+					} else {
+					  setverdict(fail, __SCOPE__ & ":ERROR: Oldest contentInstance has not been removed to allow the creation of the new contentInstance");
+					}
+											
+					// Postamble
+					f_cse_postamble_deleteResources();
 					
-						// Test control
-				
-						// Test component configuration
-						f_cf01Up();
-				
-						// Test adapter configuration
-				
-						// Preamble
-						v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+					// Tear down
+					f_cf01Down();
+				    				
+				}//end f_CSE_DMR_CRE_007
 						
-						v_containerIndex := f_cse_createResource(int3, v_createRequest, v_aeIndex);
-						
-						v_contentInstanceIndex := f_cse_createResource(int4, m_createContentInstanceBase, v_containerIndex);
-					
-						// Test Body
-						mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_containerIndex), f_getOriginator(v_containerIndex)))));
-						
-						v_contentResponse.container := mw_contentContainerBase;
-						
-						tc_ac.start;
-						alt {
-							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, v_contentResponse))) -> value v_response {
-								tc_ac.stop;
-								setverdict(pass, __SCOPE__ & ": Response OK for retrieving");
-								if(v_response.primitive.responsePrimitive.primitiveContent.container.stateTag == vc_resourcesList[v_containerIndex].resource.container.stateTag + 1) {
-									setverdict(pass, __SCOPE__ & ": stateTag attribute increased after creation of contentInstance resource");
-								} else {
-									setverdict(fail, __SCOPE__ & ": stateTag attribute not incremented correctly after creation of contentInstance resource");
-								}
-							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(v_contentResponse))) -> 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__ & ": Error, resource elements provided not matching expected resource elements");
-							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
-								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
-							}
-							[] tc_ac.timeout {
-								setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
-							}
-						}	
+				/**
+				 * @desc Checks that the IUT accepts a newly created contentInstance when the currentByteSize exceeds the field value set in maxByteSize in the parent container resource by removing enough of the oldest <contentInstance> resources to allow the creation of the new <contentInstance> resource.
+				 * 
+				 */
+				testcase TC_CSE_DMR_CRE_008() runs on Tester system CseSystem {
+				
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
 								
-						// Postamble
-						f_cse_postamble_deleteResources();
+					v_ae1.start(f_CSE_DMR_CRE_008());
+					  	  	
+					v_ae1.done;
+					  	  		
+				}		
+				function f_CSE_DMR_CRE_008() runs on AeSimu system CseSystem {
+					//Local variables
+					var template RequestPrimitive v_createRequestContainer := m_createContainerBase;
+					var template RequestPrimitive v_createRequestContentInstance := m_createContentInstanceBase;
+					var MsgIn v_response;
+					var RequestPrimitive v_request;
+					var integer v_aeIndex := -1;
+					var integer v_containerIndex := -1;
+					var integer v_contentInstanceIndex := -1;
+					const integer c_maxByteSize := 10;	
+					const XSD.String c_primitiveContent1 := "Content1";
+					const XSD.String c_primitiveContent2 := "Content2";			   
+					// Test control
+
+					// Test component configuration
+					f_cf01Up();
+
+					// Test adapter configuration
+
+					// Preamble
+					v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+
+					v_createRequestContainer.primitiveContent.container.maxByteSize := c_maxByteSize;
 						
-						// Tear down
-						f_cf01Down();
-					    				
-					}//end TC_CSE_DMR_CRE_009
+					v_containerIndex := f_cse_createResource(int3, v_createRequestContainer, v_aeIndex);		//Container
+
+					v_contentInstanceIndex := f_cse_createResource(int4, m_createContentInstance(f_getResourceAddress(v_containerIndex), c_primitiveContent1), v_containerIndex);//ContentInstance
+
+					// Test Body
+
+					v_createRequestContentInstance.primitiveContent.contentInstance.content := c_primitiveContent2;	//ContentInstance 2
+					v_createRequestContentInstance.primitiveContent.contentInstance.resourceName := c_defaultContentInstanceResourceName & "2";
+					v_request := f_getCreateRequestPrimitive(int4, v_createRequestContentInstance, v_containerIndex);
+
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
+					tc_ac.start;
+					alt {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
+							tc_ac.stop;
+							setverdict(pass, __SCOPE__ & ": ContentInstance 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 contentInstance");
+		
+						}
+						[] tc_ac.timeout {
+							setverdict(fail, __SCOPE__ & ": No answer while creating resource type contentInstance");
+						}
+					}	
+		
+					f_checkAeSimuStatus();
+
+					//Check to see if the resource is NOT present
+					if(f_isResourceNotPresent(v_containerIndex, c_defaultContentInstanceResourceName)){
+					  setverdict(pass, __SCOPE__ & ":INFO: Oldest contentInstance has been removed to allow the creation of the new contentInstance");
+					} else {
+					  setverdict(fail, __SCOPE__ & ":ERROR: Oldest contentInstance has not been removed to allow the creation of the new contentInstance");
+					}
 						
-				}// end group g_CSE_DMR_CRE_009		
-				
-				group g_CSE_DMR_CRE_010 {
-					
-					/**
-					 * @desc Check that the IUT rejects the CREATE Request of a container resource named “la” as a direct child of a container resource 
-					 * 
-					 */
-					testcase TC_CSE_DMR_CRE_010() runs on AeSimu system CseSystem {
-						// Local variables
-						var template RequestPrimitive v_createRequest := m_createContainerBase;
-						var MsgIn v_response;
-						var RequestPrimitive v_request;
-						var integer v_aeIndex := -1;
-						var integer v_containerIndex := -1;
+					// Postamble
+					f_cse_postamble_deleteResources();
+
+					// Tear down
+					f_cf01Down();
+				    				
+				}//end f_CSE_DMR_CRE_008
 						
-						// Test control
+				/**
+				 * @desc Check that the IUT increaments and then copies the field value of attribute stateTag in parent container resource when contentInstance resource is created as the direct child of the parent container
+				 * 
+				 */
+				testcase TC_CSE_DMR_CRE_009() runs on Tester system CseSystem {
 				
-						// Test component configuration
-						f_cf01Up();
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
+								
+					v_ae1.start(f_CSE_DMR_CRE_009());
+					  	  	
+					v_ae1.done;
+					  	  		
+				}
 				
-						// Test adapter configuration
+				function f_CSE_DMR_CRE_009() runs on AeSimu system CseSystem {
+					// Local variables
+					var template RequestPrimitive v_createRequest := m_createContainerBase;
+					var MsgIn v_response;
+					var integer v_aeIndex := -1;
+					var integer v_containerIndex := -1;
+					var integer v_contentInstanceIndex := -1;
+					var template PrimitiveContent v_contentResponse;
 				
-						// Preamble
-						v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
-						
-						v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
+					// Test control
+			
+					// Test component configuration
+					f_cf01Up();
+			
+					// Test adapter configuration
+			
+					// Preamble
+					v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
 					
-						// Test Body
-						v_createRequest.primitiveContent.container.resourceName := c_resourceShortNameLatest;
-						
-						v_request := f_getCreateRequestPrimitive(int3, v_createRequest, v_containerIndex);
+					v_containerIndex := f_cse_createResource(int3, v_createRequest, v_aeIndex);
 					
-						mcaPort.send(f_getMsgOutPrimitive(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 create a contentInstance resource named 'la'");
-								
-							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
-								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Rejected creation of contentInstance named 'la' with wrong ResponseStatusCode");
-							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
-								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Accepted creation of contentInstance named 'la'");
-								
-							}
-							[] tc_ac.timeout {
-								setverdict(fail, __SCOPE__ & ": No answer while creating resource type 4");
+					v_contentInstanceIndex := f_cse_createResource(int4, m_createContentInstanceBase, v_containerIndex);
+				
+					// Test Body
+					mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_containerIndex), f_getOriginator(v_containerIndex)))));
+					
+					v_contentResponse.container := mw_contentContainerBase;
+					
+					tc_ac.start;
+					alt {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, v_contentResponse))) -> value v_response {
+							tc_ac.stop;
+							setverdict(pass, __SCOPE__ & ": Response OK for retrieving");
+							if(v_response.primitive.responsePrimitive.primitiveContent.container.stateTag == vc_resourcesList[v_containerIndex].resource.container.stateTag + 1) {
+								setverdict(pass, __SCOPE__ & ": stateTag attribute increased after creation of contentInstance resource");
+							} else {
+								setverdict(fail, __SCOPE__ & ": stateTag attribute not incremented correctly after creation of contentInstance resource");
 							}
-						}	
-								
-						f_checkAeSimuStatus();
-    					
-						//Check to see if the resource is NOT present
-						if(f_isResourceNotPresent(v_containerIndex, f_getResourceName(v_request.primitiveContent))){
-						  setverdict(pass, __SCOPE__ & ":INFO: Resource not created");
-						} else {
-						  setverdict(fail, __SCOPE__ & ":ERROR: Resource created");
 						}
-								
-						// Postamble
-						f_cse_postamble_deleteResources();
-						
-						// Tear down
-						f_cf01Down();
-					    				
-					}//end TC_CSE_DMR_CRE_010
-						
-				}// end group g_CSE_DMR_CRE_010	
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(v_contentResponse))) -> 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__ & ": Error, resource elements provided not matching expected resource elements");
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
+						}
+						[] tc_ac.timeout {
+							setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
+						}
+					}	
+							
+					// Postamble
+					f_cse_postamble_deleteResources();
+					
+					// Tear down
+					f_cf01Down();
+				    				
+				}//end f_CSE_DMR_CRE_009
+					
+				/**
+				 * @desc Check that the IUT rejects the CREATE Request of a container resource named “la” as a direct child of a container resource 
+				 * 
+				 */
+				testcase TC_CSE_DMR_CRE_010() runs on Tester system CseSystem {
+			
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
+							
+					v_ae1.start(f_CSE_DMR_CRE_010());
+				  	  	
+					v_ae1.done;
+				  	  		
+				}					
 				
-				group g_CSE_DMR_CRE_011 {
+				function f_CSE_DMR_CRE_010() runs on AeSimu system CseSystem {
+					// Local variables
+					var template RequestPrimitive v_createRequest := m_createContainerBase;
+					var MsgIn v_response;
+					var RequestPrimitive v_request;
+					var integer v_aeIndex := -1;
+					var integer v_containerIndex := -1;
 					
-					/**
-					 * @desc Check that the IUT rejects the CREATE Request of a container resource named “ol” as a direct child of a container resource 
-					 * 
-					 */
-					testcase TC_CSE_DMR_CRE_011() runs on AeSimu system CseSystem {
-						// Local variables
-						var template RequestPrimitive v_createRequest := m_createContainerBase;
-						var MsgIn v_response;
-						var RequestPrimitive v_request;
-						var integer v_aeIndex := -1;
-						var integer v_containerIndex := -1;
+					// Test control
+			
+					// Test component configuration
+					f_cf01Up();
+			
+					// Test adapter configuration
+			
+					// Preamble
+					v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+					
+					v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
+				
+					// Test Body
+					v_createRequest.primitiveContent.container.resourceName := c_resourceShortNameLatest;
+					
+					v_request := f_getCreateRequestPrimitive(int3, v_createRequest, v_containerIndex);
+				
+					mcaPort.send(f_getMsgOutPrimitive(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 create a contentInstance resource named 'la'");
+							
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Rejected creation of contentInstance named 'la' with wrong ResponseStatusCode");
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Accepted creation of contentInstance named 'la'");
+							
+						}
+						[] tc_ac.timeout {
+							setverdict(fail, __SCOPE__ & ": No answer while creating resource type 4");
+						}
+					}	
+							
+					f_checkAeSimuStatus();
+					
+					//Check to see if the resource is NOT present
+					if(f_isResourceNotPresent(v_containerIndex, f_getResourceName(v_request.primitiveContent))){
+					  setverdict(pass, __SCOPE__ & ":INFO: Resource not created");
+					} else {
+					  setverdict(fail, __SCOPE__ & ":ERROR: Resource created");
+					}
+							
+					// Postamble
+					f_cse_postamble_deleteResources();
+					
+					// Tear down
+					f_cf01Down();
+				    				
+				}//end f_CSE_DMR_CRE_010
 						
-						// Test control
-				
-						// Test component configuration
-						f_cf01Up();
+				/**
+				 * @desc Check that the IUT rejects the CREATE Request of a container resource named “ol” as a direct child of a container resource 
+				 * 
+				 */
+				testcase TC_CSE_DMR_CRE_011() runs on Tester system CseSystem {
 				
-						// Test adapter configuration
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
+								
+					v_ae1.start(f_CSE_DMR_CRE_011());
+					  	  	
+					v_ae1.done;
+					  	  		
+				}
 				
-						// Preamble
-						v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
-						
-						v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
+				function f_CSE_DMR_CRE_011() runs on AeSimu system CseSystem {
+					// Local variables
+					var template RequestPrimitive v_createRequest := m_createContainerBase;
+					var MsgIn v_response;
+					var RequestPrimitive v_request;
+					var integer v_aeIndex := -1;
+					var integer v_containerIndex := -1;
 					
-						// Test Body
-						v_createRequest.primitiveContent.container.resourceName := c_resourceShortNameOldest;
-						
-						v_request := f_getCreateRequestPrimitive(int3, v_createRequest, v_containerIndex);
+					// Test control
+			
+					// Test component configuration
+					f_cf01Up();
+			
+					// Test adapter configuration
+			
+					// Preamble
+					v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
 					
-						mcaPort.send(f_getMsgOutPrimitive(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 create a contentInstance resource named 'ol'");
-								
-							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
-								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Rejected creation of contentInstance named 'ol' with wrong ResponseStatusCode");
-							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
-								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Accepted creation of contentInstance named 'ol'");
-								
-							}
-							[] tc_ac.timeout {
-								setverdict(fail, __SCOPE__ & ": No answer while creating resource type 4");
-							}
-						}	
-								
-						f_checkAeSimuStatus();
-    					
-						//Check to see if the resource is NOT present
-						if(f_isResourceNotPresent(v_containerIndex, f_getResourceName(v_request.primitiveContent))){
-						  setverdict(pass, __SCOPE__ & ":INFO: Resource not created");
-						} else {
-						  setverdict(fail, __SCOPE__ & ":ERROR: Resource created");
+					v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
+				
+					// Test Body
+					v_createRequest.primitiveContent.container.resourceName := c_resourceShortNameOldest;
+					
+					v_request := f_getCreateRequestPrimitive(int3, v_createRequest, v_containerIndex);
+				
+					mcaPort.send(f_getMsgOutPrimitive(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 create a contentInstance resource named 'ol'");
+							
 						}
-								
-						// Postamble
-						f_cse_postamble_deleteResources();
-						
-						// Tear down
-						f_cf01Down();
-					    				
-					}//end TC_CSE_DMR_CRE_011
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Rejected creation of contentInstance named 'ol' with wrong ResponseStatusCode");
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Accepted creation of contentInstance named 'ol'");
+							
+						}
+						[] tc_ac.timeout {
+							setverdict(fail, __SCOPE__ & ": No answer while creating resource type 4");
+						}
+					}	
+							
+					f_checkAeSimuStatus();
+					
+					//Check to see if the resource is NOT present
+					if(f_isResourceNotPresent(v_containerIndex, f_getResourceName(v_request.primitiveContent))){
+					  setverdict(pass, __SCOPE__ & ":INFO: Resource not created");
+					} else {
+					  setverdict(fail, __SCOPE__ & ":ERROR: Resource created");
+					}
+							
+					// Postamble
+					f_cse_postamble_deleteResources();
+					
+					// Tear down
+					f_cf01Down();
+				    				
+				}//end f_CSE_DMR_CRE_011
 						
-				}// end group g_CSE_DMR_CRE_011
-
 				group g_CSE_DMR_CRE_012 {
 					
 					/**
@@ -4541,68 +4611,76 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 				}// end group g_CSE_DMR_CRE_012	
 
-				group g_CSE_DMR_CRE_013{
-					
-					/**
-					 * @desc Check that the IUT rejects the CREATE Request of a contentInstance resource with error “NOT_ACCEPTABLE” when contentSize exceeds maxByteSize
-					 * 
-					 */
-					testcase TC_CSE_DMR_CRE_013() runs on AeSimu system CseSystem {
-						// Local variables
-						var template RequestPrimitive v_createRequest := m_createContainerBase;
-						var MsgIn v_response;
-						var RequestPrimitive v_request;
-						var integer v_aeIndex := -1;
-						var integer v_containerIndex := -1;
-						const integer c_maxByteSize := 1;				   
-						// Test control
+				/**
+				 * @desc Check that the IUT rejects the CREATE Request of a contentInstance resource with error “NOT_ACCEPTABLE” when contentSize exceeds maxByteSize
+				 * 
+				 */
+				testcase TC_CSE_DMR_CRE_013() runs on Tester system CseSystem {
+			
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
+							
+					v_ae1.start(f_CSE_DMR_CRE_013());
+				  	  	
+					v_ae1.done;
+				  	  		
+				}
+				
+				function f_CSE_DMR_CRE_013() runs on AeSimu system CseSystem {
+					// Local variables
+					var template RequestPrimitive v_createRequest := m_createContainerBase;
+					var MsgIn v_response;
+					var RequestPrimitive v_request;
+					var integer v_aeIndex := -1;
+					var integer v_containerIndex := -1;
+					const integer c_maxByteSize := 1;				   
+					// Test control
 
-						// Test component configuration
-						f_cf01Up();
+					// Test component configuration
+					f_cf01Up();
 
-						// Test adapter configuration
+					// Test adapter configuration
 
-						// Preamble
-						v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
-		
-						v_createRequest.primitiveContent.container.maxByteSize := c_maxByteSize;
-								
-						v_containerIndex := f_cse_createResource(int3, v_createRequest, v_aeIndex);
-	
-						// Test Body
-						v_request := f_getCreateRequestPrimitive(int4, m_createContentInstanceBase, v_containerIndex);
+					// Preamble
+					v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
 	
-						mcaPort.send(f_getMsgOutPrimitive(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 contentInstance exceding maximum byte size");
-							}
-							[] tc_ac.timeout {
-								setverdict(fail, __SCOPE__ & ": No answer while creating resource type 4");
-							}
-						}	
-				
-						// Postamble
-						f_cse_postamble_deleteResources();
+					v_createRequest.primitiveContent.container.maxByteSize := c_maxByteSize;
+							
+					v_containerIndex := f_cse_createResource(int3, v_createRequest, v_aeIndex);
+
+					// Test Body
+					v_request := f_getCreateRequestPrimitive(int4, m_createContentInstanceBase, v_containerIndex);
+
+					mcaPort.send(f_getMsgOutPrimitive(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");
+						}
 		
-						// Tear down
-						f_cf01Down();
-	    				
-					}//end TC_CSE_DMR_CRE_013
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Accepted creation of contentInstance exceding maximum byte size");
+						}
+						[] tc_ac.timeout {
+							setverdict(fail, __SCOPE__ & ": No answer while creating resource type 4");
+						}
+					}	
+			
+					// Postamble
+					f_cse_postamble_deleteResources();
+	
+					// Tear down
+					f_cf01Down();
+    				
+				}//end f_CSE_DMR_CRE_013
 		
-				}// end group g_CSE_DMR_CRE_013	
-				
 				group g_CSE_DMR_CRE_014 {
 				
 					/**
@@ -4762,145 +4840,161 @@ module OneM2M_Testcases_CSE_Release_1 {
 				
 				} // end g_CSE_DMR_RET_003
 
-				group g_CSE_DMR_RET_010{
-
-					/**
-					 * @desc Check that the IUT accepts the RETRIEVE Request of the oldest contentInstance target to a <container> resource
-					 * 
-					 */
-					testcase TC_CSE_DMR_RET_010() runs on AeSimu system CseSystem {
-						// Local variables
-						var integer v_aeIndex := -1;
-						var integer v_containerIndex := -1;
-						var integer v_contentInstanceIndex1 := -1; 
-						var integer v_contentInstanceIndex2 := -1;
-						var template PrimitiveContent v_contentResponse;                        
-						    										   
-						// Test control
-    				
-						// Test component configuration
-						f_cf01Up();
-    				
-						// Test adapter configuration
-    				
-						// Preamble
-						v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
-						
-						v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex); 	
-						
-						v_contentInstanceIndex1 := f_cse_createResource(int4, m_createContentInstance_noResourceName, v_containerIndex);
-						
-						v_contentInstanceIndex2 := f_cse_createResource(int4, m_createContentInstance_noResourceName, v_containerIndex);  
-						
-						v_contentResponse.contentInstance := mw_contentContentInstanceBase;
-						v_contentResponse.contentInstance.resourceName := vc_resourcesList[v_contentInstanceIndex1].resource.contentInstance.resourceName;
-    									
-						// Test Body
-						mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameOldest, f_getOriginator(v_containerIndex)))));
-
-						tc_ac.start;
-						alt {
-							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, v_contentResponse))) {
-								tc_ac.stop;
-								setverdict(pass, __SCOPE__ & ": resourceName attribute of <oldest> resource retrieved successfully");
-							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(v_contentResponse))){
-								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Wrong response status code");
-							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)){
-								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute of <oldest> resource value not expected");
-							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)){
-								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Error while retrieving <oldest> resource");
-							}
-							[] tc_ac.timeout {
-								setverdict(fail, __SCOPE__ & ": No answer while retrieving <oldest> resource");
-							}
-						}	
-    								
-						// Postamble
-						f_cse_postamble_deleteResources();
-						
-						// Tear down
-						f_cf01Down();
-
-					}//end TC_CSE_DMR_RET_010
+				/**
+				 * @desc Check that the IUT accepts the RETRIEVE Request of the oldest contentInstance target to a <container> resource
+				 * 
+				 */
+				testcase TC_CSE_DMR_RET_010() runs on Tester system CseSystem {
+			
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
+							
+					v_ae1.start(f_CSE_DMR_RET_010());
+				  	  	
+					v_ae1.done;
+				  	  		
+				}
+				
+				function f_CSE_DMR_RET_010() runs on AeSimu system CseSystem {
+					// Local variables
+					var integer v_aeIndex := -1;
+					var integer v_containerIndex := -1;
+					var integer v_contentInstanceIndex1 := -1; 
+					var integer v_contentInstanceIndex2 := -1;
+					var template PrimitiveContent v_contentResponse;                        
+					    										   
+					// Test control
+				
+					// Test component configuration
+					f_cf01Up();
+				
+					// Test adapter configuration
+				
+					// Preamble
+					v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+					
+					v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex); 	
+					
+					v_contentInstanceIndex1 := f_cse_createResource(int4, m_createContentInstance_noResourceName, v_containerIndex);
+					
+					v_contentInstanceIndex2 := f_cse_createResource(int4, m_createContentInstance_noResourceName, v_containerIndex);  
+					
+					v_contentResponse.contentInstance := mw_contentContentInstanceBase;
+					v_contentResponse.contentInstance.resourceName := vc_resourcesList[v_contentInstanceIndex1].resource.contentInstance.resourceName;
+									
+					// Test Body
+					mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameOldest, f_getOriginator(v_containerIndex)))));
 
-				} // end group g_CSE_DMR_RET_010
+					tc_ac.start;
+					alt {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, v_contentResponse))) {
+							tc_ac.stop;
+							setverdict(pass, __SCOPE__ & ": resourceName attribute of <oldest> resource retrieved successfully");
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(v_contentResponse))){
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Wrong response status code");
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)){
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Error, resourceName attribute of <oldest> resource value not expected");
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)){
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Error while retrieving <oldest> resource");
+						}
+						[] tc_ac.timeout {
+							setverdict(fail, __SCOPE__ & ": No answer while retrieving <oldest> resource");
+						}
+					}	
 								
-				group g_CSE_DMR_RET_012{
+					// Postamble
+					f_cse_postamble_deleteResources();
+					
+					// Tear down
+					f_cf01Down();
 
-					/**
-					 * @desc Check that the IUT accepts the RETRIEVE Request of the latest contentInstance target to a <container> resource7
-					 * 
-					 */
-					testcase TC_CSE_DMR_RET_012() runs on AeSimu system CseSystem {
-						// Local variables
-						var integer v_aeIndex := -1;
-						var integer v_containerIndex := -1;
-						var integer v_contentInstanceIndex1 := -1; 
-						var integer v_contentInstanceIndex2 := -1;
-						var template PrimitiveContent v_contentResponse;                        
-						// Test control
-    				
-						// Test component configuration
-						f_cf01Up();
-    				
-						// Test adapter configuration
-    				
-						// Preamble
-						v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
-						
-						v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex); 	
-						
-						v_contentInstanceIndex1 := f_cse_createResource(int4, m_createContentInstance_noResourceName, v_containerIndex);
-						
-						f_sleep(1.0);
-						
-						v_contentInstanceIndex2 := f_cse_createResource(int4, m_createContentInstance_noResourceName, v_containerIndex);  
-						
-						v_contentResponse.contentInstance := mw_contentContentInstanceBase;
-						v_contentResponse.contentInstance.resourceName := vc_resourcesList[v_contentInstanceIndex2].resource.contentInstance.resourceName;
-						 
-    					
-						// Test Body
-						mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameLatest, f_getOriginator(v_containerIndex)))));
+				}//end f_CSE_DMR_RET_010
 
-						tc_ac.start;
-						alt {
-							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, v_contentResponse))){
-								tc_ac.stop;
-								setverdict(pass, __SCOPE__ & ": resourceName attribute of <latest> resource retrieved successfully");
-							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(v_contentResponse))){
-								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Wrong response status code");
-							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)){
-								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Error, retrieved contentInstance with incorrect attributes");
-							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)){
-								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Error while retrieving <latest> resource");
-							}
-							[] tc_ac.timeout {
-								setverdict(fail, __SCOPE__ & ": No answer while retrieving <latest> resource");
-							}
-						}	
-    								
-						// Postamble
-						f_cse_postamble_deleteResources();
-						
-						// Tear down
-						f_cf01Down();
+				/**
+				 * @desc Check that the IUT accepts the RETRIEVE Request of the latest contentInstance target to a <container> resource7
+				 * 
+				 */
+				testcase TC_CSE_DMR_RET_012() runs on Tester system CseSystem {
+			
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
+							
+					v_ae1.start(f_CSE_DMR_RET_012());
+				  	  	
+					v_ae1.done;
+				  	  		
+				}
+
+				function f_CSE_DMR_RET_012() runs on AeSimu system CseSystem {
+					// Local variables
+					var integer v_aeIndex := -1;
+					var integer v_containerIndex := -1;
+					var integer v_contentInstanceIndex1 := -1; 
+					var integer v_contentInstanceIndex2 := -1;
+					var template PrimitiveContent v_contentResponse;                        
+					// Test control
+				
+					// Test component configuration
+					f_cf01Up();
+				
+					// Test adapter configuration
+				
+					// Preamble
+					v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+					
+					v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex); 	
+					
+					v_contentInstanceIndex1 := f_cse_createResource(int4, m_createContentInstance_noResourceName, v_containerIndex);
+					
+					f_sleep(1.0);
+					
+					v_contentInstanceIndex2 := f_cse_createResource(int4, m_createContentInstance_noResourceName, v_containerIndex);  
+					
+					v_contentResponse.contentInstance := mw_contentContentInstanceBase;
+					v_contentResponse.contentInstance.resourceName := vc_resourcesList[v_contentInstanceIndex2].resource.contentInstance.resourceName;
+					 
+					
+					// Test Body
+					mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameLatest, f_getOriginator(v_containerIndex)))));
 
-					}//end TC_CSE_DMR_RET_012
+					tc_ac.start;
+					alt {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, v_contentResponse))){
+							tc_ac.stop;
+							setverdict(pass, __SCOPE__ & ": resourceName attribute of <latest> resource retrieved successfully");
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(v_contentResponse))){
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Wrong response status code");
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)){
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Error, retrieved contentInstance with incorrect attributes");
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)){
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Error while retrieving <latest> resource");
+						}
+						[] tc_ac.timeout {
+							setverdict(fail, __SCOPE__ & ": No answer while retrieving <latest> resource");
+						}
+					}	
+								
+					// Postamble
+					f_cse_postamble_deleteResources();
+					
+					// Tear down
+					f_cf01Down();
 
-				} // end group g_CSE_DMR_RET_012
+				}//end f_CSE_DMR_RET_012
 
 				group g_CSE_DMR_RET_013 {
 					
@@ -6328,343 +6422,372 @@ module OneM2M_Testcases_CSE_Release_1 {
 	
 						v_updateRequest.primitiveContent.group_update_invalid.expirationCounter := v_expirationCounter;
 	
-						v_ae1.start(f_CSE_DMR_UPD_009(int9, v_createRequest, v_updateRequest));//Group
-						v_ae1.done;
-					}
-
-					testcase TC_CSE_DMR_UPD_009_ACP_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_createAcpBase;
-						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_updateRequest.primitiveContent := {aCP_update_invalid := m_contentUpdateAcp_invalid};
-	
-						v_updateRequest.primitiveContent.aCP_update_invalid.expirationCounter := v_expirationCounter;
-			
-						v_ae1.start(f_CSE_DMR_UPD_009(int1, v_createRequest, v_updateRequest));//AccessControlPolicy
-						v_ae1.done;
-					}
-
-					testcase TC_CSE_DMR_UPD_009_SUB_MNI() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var XSD.NonNegativeInteger v_maxNrOfInstances := 5;
-						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
-						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
-						v_ae1.done;
-						v_updateRequest.primitiveContent := {subscription_update_invalid := m_contentUpdateSubscription_invalid};
-	
-						v_updateRequest.primitiveContent.subscription_update_invalid.maxNrOfInstances := v_maxNrOfInstances;
-			
-						v_ae1.start(f_CSE_DMR_UPD_009(int23, v_createRequest, v_updateRequest));//Subscription
-						v_ae1.done;
-					}
-	
-				} // end g_CSE_DMR_UPD_009	
-				
-				group g_CSE_DMR_UPD_010{
-
-					/**
-					 * @desc Check that the stateTag attribute of a container resource is increased when an update operation has been performed on its child resource
-					 * 
-					 */
-					testcase TC_CSE_DMR_UPD_010() runs on AeSimu system CseSystem {
-						var MsgIn v_response;
-						var integer v_aeIndex := -1;
-						var integer v_containerIndex := -1;
-						var RequestPrimitive v_updateRequest := valueof(m_updateContainerBase);
-						var Labels v_labels_1:= {"VALUE_1"};
-						v_updateRequest.primitiveContent.container.labels := v_labels_1;
-				   
-						// Test control
-
-						// Test component configuration
-						f_cf01Up();
-
-						// Test adapter configuration
-
-						// Preamble
-						v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
-		
-						v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex); 
-		
-						// Test Body
-						if(ispresent(vc_resourcesList[v_containerIndex].resource.container.stateTag)) { 
-		
-							f_cse_updateResource(int3, v_containerIndex, v_updateRequest);
-
-							mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_containerIndex), f_getOriginator(v_containerIndex)))));
-
-							tc_ac.start;
-							alt {
-								[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
-									tc_ac.stop;
-									if(v_response.primitive.responsePrimitive.primitiveContent.container.stateTag == 1) { //(Create and Delete)
-										setverdict(pass, __SCOPE__ & ": The stateTag attribute is incremented");	
-									}
-									else{
-										setverdict(fail, __SCOPE__ & ": Error the stateTag attribute is not incremented");
-									}
-								}
-								[] 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");
-								}
-							}	
-				
-						}//end if
-						else{
-							setverdict(fail, __SCOPE__ & ": Error the stateTag attribute is empty");
-						}
-		
-						// Postamble
-						f_cse_postamble_deleteResources();
-
-						// Tear down
-						f_cf01Down();
-			
-					}//end TC_CSE_DMR_UPD_010
-					
-				} // end group g_CSE_DMR_UPD_010
-				
-				group g_CSE_DMR_UPD_011{
-
-					/**
-					 * @desc Check that the IUT rejects the UPDATE Request of an existing contentInstance resource with error “OPERATION_NOT_ALLOWED”
-					 * 
-					 */
-					testcase TC_CSE_DMR_UPD_011() runs on AeSimu system CseSystem {
-						// Local variables
-						var MsgIn v_response;
-						var RequestPrimitive v_request;
-						var integer v_aeIndex := -1;
-						var integer v_containerIndex := -1;
-						var integer v_contentInstanceIndex := -1; 
-						var template RequestPrimitive v_updateRequest := m_updateContentInstanceBase;
-						var Labels v_labels:= {"LABEL"};
-						var PrimitiveContent v_primitiveContentRetrieveResource;
-						
-						v_updateRequest.primitiveContent.contentInstance.labels := v_labels;
-								   
-						// Test control
-            
-						// Test component configuration
-						f_cf01Up();
-            
-						// Test adapter configuration
-            
-						// Preamble
-						v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
-						
-						v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex); 
-						
-						v_contentInstanceIndex := f_cse_createResource(int4, m_createContentInstanceBase, v_containerIndex); 
-						
-						//Test Body
-						v_request := f_getUpdateRequestPrimitive(int4, v_contentInstanceIndex, v_updateRequest);
-	
-						mcaPort.send(f_getMsgOutPrimitive(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 a contentInstance 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 contentInstance");
-						   }
-						   [] tc_ac.timeout {
-							   setverdict(fail, __SCOPE__ & ": No answer while updating contentInstance");
-						   }
-						}	
-				
-						v_primitiveContentRetrieveResource:=f_cse_retrieveResource(v_contentInstanceIndex);
-						if(getverdict == pass){ 
-							//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")
-							  }
-						   }
-						}
-				
-						// Postamble
-						f_cse_postamble_deleteResources();
-	
-						// Tear down
-						f_cf01Down();
+						v_ae1.start(f_CSE_DMR_UPD_009(int9, v_createRequest, v_updateRequest));//Group
+						v_ae1.done;
+					}
 
-					}//end TC_CSE_DMR_UPD_011
+					testcase TC_CSE_DMR_UPD_009_ACP_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_createAcpBase;
+						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_updateRequest.primitiveContent := {aCP_update_invalid := m_contentUpdateAcp_invalid};
 	
-				} // end group g_CSE_DMR_UPD_011
-				
-				group g_CSE_DMR_UPD_012{
+						v_updateRequest.primitiveContent.aCP_update_invalid.expirationCounter := v_expirationCounter;
+			
+						v_ae1.start(f_CSE_DMR_UPD_009(int1, v_createRequest, v_updateRequest));//AccessControlPolicy
+						v_ae1.done;
+					}
 
-					/**
-					 * @desc Check that the IUT rejects the UPDATE Request of a latest resource as a direct child of a <container> resource with error “OPERATION_NOT_ALLOWED”
-					 * 
-					 */
-					testcase TC_CSE_DMR_UPD_012() runs on AeSimu system CseSystem {
+					testcase TC_CSE_DMR_UPD_009_SUB_MNI() runs on Tester system CseSystem {
 						// Local variables
-						var MsgIn v_response;
-						var RequestPrimitive v_request;
-						var integer v_aeIndex := -1;
-						var integer v_containerIndex := -1;
-						var integer v_contentInstanceIndex := -1; 
-						var template RequestPrimitive v_updateRequest := m_updateContentInstanceBase;
-						var Labels v_labels := {"LABEL"};					  	
-						var PrimitiveContent v_primitiveContentRetrieveResource;					  	
-		
-						v_updateRequest.primitiveContent.contentInstance.labels := v_labels;
-				   
-						// Test control
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+						var XSD.NonNegativeInteger v_maxNrOfInstances := 5;
+						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
+						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
+						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						v_ae1.done;
+						v_updateRequest.primitiveContent := {subscription_update_invalid := m_contentUpdateSubscription_invalid};
+	
+						v_updateRequest.primitiveContent.subscription_update_invalid.maxNrOfInstances := v_maxNrOfInstances;
+			
+						v_ae1.start(f_CSE_DMR_UPD_009(int23, v_createRequest, v_updateRequest));//Subscription
+						v_ae1.done;
+					}
+	
+				} // end g_CSE_DMR_UPD_009	
+				
+				/**
+				 * @desc Check that the stateTag attribute of a container resource is increased when an update operation has been performed on its child resource
+				 * 
+				 */
+				testcase TC_CSE_DMR_UPD_010() runs on Tester system CseSystem {
+			
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
+							
+					v_ae1.start(f_CSE_DMR_UPD_010());
+				  	  	
+					v_ae1.done;
+				  	  		
+				}
+				function f_CSE_DMR_UPD_010() runs on AeSimu system CseSystem {
+					var MsgIn v_response;
+					var integer v_aeIndex := -1;
+					var integer v_containerIndex := -1;
+					var RequestPrimitive v_updateRequest := valueof(m_updateContainerBase);
+					var Labels v_labels_1:= {"VALUE_1"};
+					v_updateRequest.primitiveContent.container.labels := v_labels_1;
+			   
+					// Test control
 
-						// Test component configuration
-						f_cf01Up();
+					// Test component configuration
+					f_cf01Up();
 
-						// Test adapter configuration
+					// Test adapter configuration
 
-						// Preamble
-						v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
-		
-						v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex); 
-		
-						v_contentInstanceIndex := f_cse_createResource(int4, m_createContentInstanceBase, v_containerIndex); 
-		
-						//Test Body
-						v_request := f_getUpdateRequestPrimitive(int4, v_containerIndex, v_updateRequest);
-					  	
-						v_request.to_ := v_request.to_ & "/" & c_resourceShortNameLatest;		//<latest>
+					// Preamble
+					v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+	
+					v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex); 
+	
+					// Test Body
+					if(ispresent(vc_resourcesList[v_containerIndex].resource.container.stateTag)) { 
+	
+						v_updateRequest := f_getUpdateRequestPrimitive(int3, v_containerIndex, v_updateRequest);
+						f_cse_updateResource(int3, v_containerIndex, v_updateRequest);
+
+						mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_containerIndex), f_getOriginator(v_containerIndex)))));
 
-						mcaPort.send(f_getMsgOutPrimitive(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 a latest resource with error OPERATION_NOT_ALLOWED");
-							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Wrong response status code");
+								if(v_response.primitive.responsePrimitive.primitiveContent.container.stateTag == 1) { //(Create and Delete)
+									setverdict(pass, __SCOPE__ & ": The stateTag attribute is incremented");	
+								}
+								else{
+									setverdict(fail, __SCOPE__ & ": Error the stateTag attribute is not incremented");
+								}
 							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Accepted update of a latest resource");
+								setverdict(fail, __SCOPE__ & ": Error while retrieving resource attributes");
 							}
 							[] tc_ac.timeout {
-								setverdict(fail, __SCOPE__ & ": No answer while updating a latest resource");
+								setverdict(fail, __SCOPE__ & ": No answer while retrieving resource attributes");
 							}
 						}	
+			
+					}//end if
+					else{
+						setverdict(fail, __SCOPE__ & ": Error the stateTag attribute is empty");
+					}
+	
+					// Postamble
+					f_cse_postamble_deleteResources();
 
-						v_primitiveContentRetrieveResource:=f_cse_retrieveResource(v_contentInstanceIndex);
-						if(getverdict == pass){ 
-							//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")
-							  }
-						   }
-						}	
+					// Tear down
+					f_cf01Down();
+		
+				}//end f_CSE_DMR_UPD_010
+					
+				/**
+				 * @desc Check that the IUT rejects the UPDATE Request of an existing contentInstance resource with error “OPERATION_NOT_ALLOWED”
+				 * 
+				 */
+				testcase TC_CSE_DMR_UPD_011() runs on Tester system CseSystem {
+			
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
+							
+					v_ae1.start(f_CSE_DMR_UPD_011());
+				  	  	
+					v_ae1.done;
+				  	  		
+				}
+				function f_CSE_DMR_UPD_011() runs on AeSimu system CseSystem {
+					// Local variables
+					var MsgIn v_response;
+					var RequestPrimitive v_request;
+					var integer v_aeIndex := -1;
+					var integer v_containerIndex := -1;
+					var integer v_contentInstanceIndex := -1; 
+					var template RequestPrimitive v_updateRequest := m_updateContentInstanceBase;
+					var Labels v_labels:= {"LABEL"};
+					var PrimitiveContent v_primitiveContentRetrieveResource;
+					
+					v_updateRequest.primitiveContent.contentInstance.labels := v_labels;
+							   
+					// Test control
+        
+					// Test component configuration
+					f_cf01Up();
+        
+					// Test adapter configuration
+        
+					// Preamble
+					v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+					
+					v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex); 
+					
+					v_contentInstanceIndex := f_cse_createResource(int4, m_createContentInstanceBase, v_containerIndex); 
+					
+					//Test Body
+					v_request := f_getUpdateRequestPrimitive(int4, v_contentInstanceIndex, v_updateRequest);
 
-						// Postamble
-						f_cse_postamble_deleteResources();
+					mcaPort.send(f_getMsgOutPrimitive(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 a contentInstance 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 contentInstance");
+					   }
+					   [] tc_ac.timeout {
+						   setverdict(fail, __SCOPE__ & ": No answer while updating contentInstance");
+					   }
+					}	
+			
+					v_primitiveContentRetrieveResource:=f_cse_retrieveResource(v_contentInstanceIndex);
+					if(getverdict == pass){ 
+						//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")
+						  }
+					   }
+					}
+			
+					// Postamble
+					f_cse_postamble_deleteResources();
 
-						// Tear down
-						f_cf01Down();
+					// Tear down
+					f_cf01Down();
 
-					}//end TC_CSE_DMR_UPD_012
+				}//end f_CSE_DMR_UPD_011
+				
+				/**
+				 * @desc Check that the IUT rejects the UPDATE Request of a latest resource as a direct child of a <container> resource with error “OPERATION_NOT_ALLOWED”
+				 * 
+				 */
+				testcase TC_CSE_DMR_UPD_012() runs on Tester system CseSystem {
+			
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
+							
+					v_ae1.start(f_CSE_DMR_UPD_012());
+				  	  	
+					v_ae1.done;
+				  	  		
+				}
+				function f_CSE_DMR_UPD_012() runs on AeSimu system CseSystem {
+					// Local variables
+					var MsgIn v_response;
+					var RequestPrimitive v_request;
+					var integer v_aeIndex := -1;
+					var integer v_containerIndex := -1;
+					var integer v_contentInstanceIndex := -1; 
+					var template RequestPrimitive v_updateRequest := m_updateContentInstanceBase;
+					var Labels v_labels := {"LABEL"};					  	
+					var PrimitiveContent v_primitiveContentRetrieveResource;					  	
+	
+					v_updateRequest.primitiveContent.contentInstance.labels := v_labels;
+			   
+					// Test control
 
-				} // end group g_CSE_DMR_UPD_012
-			  	
-				group g_CSE_DMR_UPD_013{
+					// Test component configuration
+					f_cf01Up();
 
-					/**
-					 * @desc Check that the IUT rejects the UPDATE Request of an oldest resource as a direct child of a <container> resource with error “OPERATION_NOT_ALLOWED”
-					 * 
-					 */
-					testcase TC_CSE_DMR_UPD_013() runs on AeSimu system CseSystem {
-						// Local variables
-						var MsgIn v_response;
-						var RequestPrimitive v_request;
-						var integer v_aeIndex := -1;
-						var integer v_containerIndex := -1;
-						var integer v_contentInstanceIndex := -1; 
-						var template RequestPrimitive v_updateRequest := m_updateContentInstanceBase;
-						var Labels v_labels:= {"LABEL"};
-						var PrimitiveContent v_primitiveContentRetrieveResource;
+					// Test adapter configuration
+
+					// Preamble
+					v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+	
+					v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex); 
+	
+					v_contentInstanceIndex := f_cse_createResource(int4, m_createContentInstanceBase, v_containerIndex); 
+	
+					//Test Body
+					v_request := f_getUpdateRequestPrimitive(int4, v_containerIndex, v_updateRequest);
+				  	
+					v_request.to_ := v_request.to_ & "/" & c_resourceShortNameLatest;		//<latest>
+
+					mcaPort.send(f_getMsgOutPrimitive(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 a latest resource 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 a latest resource");
+						}
+						[] tc_ac.timeout {
+							setverdict(fail, __SCOPE__ & ": No answer while updating a latest resource");
+						}
+					}	
+
+					v_primitiveContentRetrieveResource:=f_cse_retrieveResource(v_contentInstanceIndex);
+					if(getverdict == pass){ 
+						//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")
+						  }
+					   }
+					}	
+
+					// Postamble
+					f_cse_postamble_deleteResources();
+
+					// Tear down
+					f_cf01Down();
+
+				}//end f_CSE_DMR_UPD_012
+			  	
+				/**
+				 * @desc Check that the IUT rejects the UPDATE Request of an oldest resource as a direct child of a <container> resource with error “OPERATION_NOT_ALLOWED”
+				 * 
+				 */
+				testcase TC_CSE_DMR_UPD_013() runs on Tester system CseSystem {
+			
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
+							
+					v_ae1.start(f_CSE_DMR_UPD_013());
+				  	  	
+					v_ae1.done;
+				  	  		
+				}
+				function f_CSE_DMR_UPD_013() runs on AeSimu system CseSystem {
+					// Local variables
+					var MsgIn v_response;
+					var RequestPrimitive v_request;
+					var integer v_aeIndex := -1;
+					var integer v_containerIndex := -1;
+					var integer v_contentInstanceIndex := -1; 
+					var template RequestPrimitive v_updateRequest := m_updateContentInstanceBase;
+					var Labels v_labels:= {"LABEL"};
+					var PrimitiveContent v_primitiveContentRetrieveResource;
 
-						v_updateRequest.primitiveContent.contentInstance.labels := v_labels;
+					v_updateRequest.primitiveContent.contentInstance.labels := v_labels;
    
 						// Test control
 
-						// Test component configuration
-						f_cf01Up();
+					// Test component configuration
+					f_cf01Up();
 
-						// Test adapter configuration
+					// Test adapter configuration
 
-						// Preamble
-						v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+					// Preamble
+					v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
 
-						v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex); 
+					v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex); 
 
-						v_contentInstanceIndex := f_cse_createResource(int4, m_createContentInstanceBase, v_containerIndex); 
+					v_contentInstanceIndex := f_cse_createResource(int4, m_createContentInstanceBase, v_containerIndex); 
 
-						//Test Body
-						v_request := f_getUpdateRequestPrimitive(int4, v_containerIndex, v_updateRequest);
-					  	
-						v_request.to_ := v_request.to_ & "/" & c_resourceShortNameOldest;		//<oldest>
+					//Test Body
+					v_request := f_getUpdateRequestPrimitive(int4, v_containerIndex, v_updateRequest);
+				  	
+					v_request.to_ := v_request.to_ & "/" & c_resourceShortNameOldest;		//<oldest>
 
-						mcaPort.send(f_getMsgOutPrimitive(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 an oldest resource 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 an oldest resource");
-							}
-							[] tc_ac.timeout {
-								setverdict(fail, __SCOPE__ & ": No answer while updating an oldest resource");
-							}
-						}	
+					mcaPort.send(f_getMsgOutPrimitive(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 an oldest resource 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 an oldest resource");
+						}
+						[] tc_ac.timeout {
+							setverdict(fail, __SCOPE__ & ": No answer while updating an oldest resource");
+						}
+					}	
 
-						v_primitiveContentRetrieveResource:=f_cse_retrieveResource(v_contentInstanceIndex);
-						if(getverdict == pass){ 
-							//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")
-							  }
-						   }
-						}	
-						// Postamble
-						f_cse_postamble_deleteResources();
+					v_primitiveContentRetrieveResource:=f_cse_retrieveResource(v_contentInstanceIndex);
+					if(getverdict == pass){ 
+						//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")
+						  }
+					   }
+					}	
+					// Postamble
+					f_cse_postamble_deleteResources();
 
-						// Tear down
-						f_cf01Down();
+					// Tear down
+					f_cf01Down();
 
-					}//end TC_CSE_DMR_UPD_013
+				}//end f_CSE_DMR_UPD_013
 
-				} // end group g_CSE_DMR_UPD_013
-			  	
 				group g_CSE_DMR_UPD_014 {
 					
 					testcase TC_CSE_DMR_UPD_014_ACP_LBL() runs on Tester system CseSystem {
@@ -6944,7 +7067,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						   if(ispresent(v_responsePrimitive.primitiveContent)) {
 							   if(ischosen(v_responsePrimitive.primitiveContent.remoteCSE)) {
 								   if(v_responsePrimitive.primitiveContent.remoteCSE.labels != v_labels){
-									   setverdict(fail, __SCOPE__, ": Error: Labels attribute not updated correctly")
+									   setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
 								   }
 							   }
 						   }
@@ -6979,7 +7102,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						  if(ispresent(v_responsePrimitive.primitiveContent)) {
 							  if(ischosen(v_responsePrimitive.primitiveContent.remoteCSE)) {
 								  if(v_responsePrimitive.primitiveContent.remoteCSE.pointOfAccess != v_poaList){
-									  setverdict(fail, __SCOPE__, ": Error: Point of access attribute not updated correctly")
+									  setverdict(fail, __SCOPE__ & ": Error: Point of access attribute not updated correctly")
 								  }
 							  }
 						  }
@@ -7014,7 +7137,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						 if(ispresent(v_responsePrimitive.primitiveContent)) {
 							 if(ischosen(v_responsePrimitive.primitiveContent.remoteCSE)) {
 								 if(v_responsePrimitive.primitiveContent.remoteCSE.nodeLink != v_nodeLink){
-									 setverdict(fail, __SCOPE__, ": Error: Node link attribute not updated correctly")
+									 setverdict(fail, __SCOPE__ & ": Error: Node link attribute not updated correctly")
 								 }
 							 }
 						 }
@@ -7049,7 +7172,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.aE)) {
 									 if(v_responsePrimitive.primitiveContent.aE.labels != v_labels){
-										 setverdict(fail, __SCOPE__, ": Error: Labels attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -7083,8 +7206,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 							 //Check attribute 1
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.aE)) {
-									 if(v_responsePrimitive.primitiveContent.aE.accessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.node.accessControlPolicyIDs)){
-										 setverdict(fail, __SCOPE__, ": Error: Access control policy IDs attribute not updated correctly")
+									 if(v_responsePrimitive.primitiveContent.aE.accessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.aE.accessControlPolicyIDs)){
+										 setverdict(fail, __SCOPE__ & ": Error: Access control policy IDs attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -7092,7 +7215,7 @@ module OneM2M_Testcases_CSE_Release_1 {
  
 							 //Check that the resource has been udpated correctly
 							  if(ischosen(v_primitiveContentRetrieveResource.aE)) {
-							   if(v_primitiveContentRetrieveResource.aE.accessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.node.accessControlPolicyIDs)){
+							   if(v_primitiveContentRetrieveResource.aE.accessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.aE.accessControlPolicyIDs)){
 								setverdict(fail, __SCOPE__ & ": Error: Access control policy IDs attribute not updated correctly")
 							  }
 							}
@@ -7118,7 +7241,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.aE)) {
 									 if(v_responsePrimitive.primitiveContent.aE.appName != v_appName){
-										 setverdict(fail, __SCOPE__, ": Error: AppName attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: AppName attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -7152,7 +7275,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.aE)) {
 									 if(v_responsePrimitive.primitiveContent.aE.pointOfAccess != v_poaList){
-										 setverdict(fail, __SCOPE__, ": Error: Point of Access attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Point of Access attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -7187,7 +7310,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.container)) {
 									 if(v_responsePrimitive.primitiveContent.container.labels != v_labels){
-										 setverdict(fail, __SCOPE__, ": Error: Labels attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -7221,8 +7344,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 							 //Check attribute 1
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.container)) {
-									 if(v_responsePrimitive.primitiveContent.container.accessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.node.accessControlPolicyIDs)){
-										 setverdict(fail, __SCOPE__, ": Error: Access Control Policy IDs attribute not updated correctly")
+									 if(v_responsePrimitive.primitiveContent.container.accessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.container.accessControlPolicyIDs)){
+										 setverdict(fail, __SCOPE__ & ": Error: Access Control Policy IDs attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -7230,7 +7353,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 	 
 							  //Check that the resource has been udpated correctly
 							  if(ischosen(v_primitiveContentRetrieveResource.container)) {
-							   if(v_primitiveContentRetrieveResource.container.accessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.node.accessControlPolicyIDs)){
+							   if(v_primitiveContentRetrieveResource.container.accessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.container.accessControlPolicyIDs)){
 								setverdict(fail, __SCOPE__ & ": Error: Access Control Policy IDs attribute not updated correctly")
 							  }
 							}
@@ -7257,7 +7380,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.container)) {
 									 if(v_responsePrimitive.primitiveContent.container.maxNrOfInstances != v_maxNrOfInstances){
-										 setverdict(fail, __SCOPE__, ": Error: Maximum number of instances attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Maximum number of instances attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -7292,7 +7415,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.container)) {
 									 if(v_responsePrimitive.primitiveContent.container.maxByteSize != v_maxByteSize){
-										 setverdict(fail, __SCOPE__, ": Error: Maximum Byte size attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Maximum Byte size attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -7327,7 +7450,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.container)) {
 									 if(v_responsePrimitive.primitiveContent.container.maxInstanceAge != v_maxInstanceAge){
-										 setverdict(fail, __SCOPE__, ": Error: Maximum Instance age attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Maximum Instance age attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -7362,7 +7485,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.accessControlPolicy)) {
 									 if(v_responsePrimitive.primitiveContent.accessControlPolicy.labels != v_labels){
-										 setverdict(fail, __SCOPE__, ": Error: Labels attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -7396,8 +7519,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 							  //Check attribute 1
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
-									 if(v_responsePrimitive.primitiveContent.subscription.accessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.node.accessControlPolicyIDs)){
-										 setverdict(fail, __SCOPE__, ": Error: Access Control Policy IDs attribute not updated correctly")
+									 if(v_responsePrimitive.primitiveContent.subscription.accessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.subscription.accessControlPolicyIDs)){
+										 setverdict(fail, __SCOPE__ & ": Error: Access Control Policy IDs attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -7405,7 +7528,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 	 
 							  //Check that the resource has been udpated correctly
 							  if(ischosen(v_primitiveContentRetrieveResource.subscription)) {
-							   if(v_primitiveContentRetrieveResource.subscription.accessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.node.accessControlPolicyIDs)){
+							   if(v_primitiveContentRetrieveResource.subscription.accessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.subscription.accessControlPolicyIDs)){
 								setverdict(fail, __SCOPE__ & ": Error: Access Control Policy IDs attribute not updated correctly")
 							  }
 							}
@@ -7431,7 +7554,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
 									 if(v_responsePrimitive.primitiveContent.subscription.labels != v_labels){
-										 setverdict(fail, __SCOPE__, ": Error: Labels attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -7465,7 +7588,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
 									 if(v_responsePrimitive.primitiveContent.group_.labels != v_labels){
-										 setverdict(fail, __SCOPE__, ": Error: Labels attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -7499,8 +7622,8 @@ module OneM2M_Testcases_CSE_Release_1 {
 							 //Check attribute 1
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
-									 if(v_responsePrimitive.primitiveContent.group_.accessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.node.accessControlPolicyIDs)){
-										 setverdict(fail, __SCOPE__, ": Error: Access Control Policy IDs attribute not updated correctly")
+									 if(v_responsePrimitive.primitiveContent.group_.accessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.group_.accessControlPolicyIDs)){
+										 setverdict(fail, __SCOPE__ & ": Error: Access Control Policy IDs attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -7508,7 +7631,7 @@ module OneM2M_Testcases_CSE_Release_1 {
  
 							//Check that the resource has been udpated correctly
 							  if(ischosen(v_primitiveContentRetrieveResource.group_)) {
-							   if(v_primitiveContentRetrieveResource.group_.accessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.node.accessControlPolicyIDs)){
+							   if(v_primitiveContentRetrieveResource.group_.accessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.group_.accessControlPolicyIDs)){
 								setverdict(fail, __SCOPE__ & ": Error: Access Control Policy IDs attribute not updated correctly")
 							  }
 							}
@@ -7534,7 +7657,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
 									 if(v_responsePrimitive.primitiveContent.group_.membersAccessControlPolicyIDs != v_membersAccessControlPolicyIDs){
-										 setverdict(fail, __SCOPE__, ": Error: Members Access Control Policy IDs attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Members Access Control Policy IDs attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -7568,7 +7691,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
 									 if(v_responsePrimitive.primitiveContent.group_.groupName != v_groupName){
-										 setverdict(fail, __SCOPE__, ": Error: Group name attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Group name attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -7610,7 +7733,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.remoteCSE)) {
 									if(v_responsePrimitive.primitiveContent.remoteCSE.expirationTime != v_expirationTime){
-										setverdict(fail, __SCOPE__, ": Error: Expiration time attribute not updated correctly")
+										setverdict(fail, __SCOPE__ & ": Error: Expiration time attribute not updated correctly")
 									}
 								}
 							}
@@ -7643,7 +7766,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.remoteCSE)) {
 									if(v_responsePrimitive.primitiveContent.remoteCSE.requestReachability != v_requestReachability){
-										setverdict(fail, __SCOPE__, ": Error: Request Reachability attribute not updated correctly")
+										setverdict(fail, __SCOPE__ & ": Error: Request Reachability attribute not updated correctly")
 									}
 								}
 							}
@@ -7678,7 +7801,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.aE)) {
 									if(v_responsePrimitive.primitiveContent.aE.expirationTime != v_expirationTime){
-										setverdict(fail, __SCOPE__, ": Error: Expiration time attribute not updated correctly")
+										setverdict(fail, __SCOPE__ & ": Error: Expiration time attribute not updated correctly")
 									}
 								}
 							}
@@ -7713,7 +7836,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.aE)) {
 									if(v_responsePrimitive.primitiveContent.aE.requestReachability != v_requestReachability){
-										setverdict(fail, __SCOPE__, ": Error: Request Reachability attribute not updated correctly")
+										setverdict(fail, __SCOPE__ & ": Error: Request Reachability attribute not updated correctly")
 									}
 								}
 							}
@@ -7748,7 +7871,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.container)) {
 									if(v_responsePrimitive.primitiveContent.container.expirationTime != v_expirationTime){
-										setverdict(fail, __SCOPE__, ": Error: Expiration time attribute not updated correctly")
+										setverdict(fail, __SCOPE__ & ": Error: Expiration time attribute not updated correctly")
 									}
 								}
 							}
@@ -7783,7 +7906,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.accessControlPolicy)) {
 									if(v_responsePrimitive.primitiveContent.accessControlPolicy.expirationTime != v_expirationTime){
-										setverdict(fail, __SCOPE__, ": Error: Expiration time attribute not updated correctly")
+										setverdict(fail, __SCOPE__ & ": Error: Expiration time attribute not updated correctly")
 									}
 								}
 							}
@@ -7817,7 +7940,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.accessControlPolicy)) {
 									if(v_responsePrimitive.primitiveContent.accessControlPolicy.privileges != v_privileges_1){
-										setverdict(fail, __SCOPE__, ": Error: Privileges attribute not updated correctly")
+										setverdict(fail, __SCOPE__ & ": Error: Privileges attribute not updated correctly")
 									}
 								}
 							}
@@ -7851,7 +7974,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.accessControlPolicy)) {
 									if(v_responsePrimitive.primitiveContent.accessControlPolicy.selfPrivileges != v_privileges_1){
-										setverdict(fail, __SCOPE__, ": Error: Self Privileges attribute not updated correctly")
+										setverdict(fail, __SCOPE__ & ": Error: Self Privileges attribute not updated correctly")
 									}
 								}
 							}
@@ -7886,7 +8009,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
 									if(v_responsePrimitive.primitiveContent.subscription.expirationTime != v_expirationTime){
-										setverdict(fail, __SCOPE__, ": Error: Expiration time attribute not updated correctly")
+										setverdict(fail, __SCOPE__ & ": Error: Expiration time attribute not updated correctly")
 									}
 								}
 							}
@@ -7922,7 +8045,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
 									if(v_responsePrimitive.primitiveContent.subscription.notificationURI != v_notificationURI){
-										setverdict(fail, __SCOPE__, ": Error: Notification URI attribute not updated correctly")
+										setverdict(fail, __SCOPE__ & ": Error: Notification URI attribute not updated correctly")
 									}
 								}
 							}
@@ -7957,7 +8080,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
 									if(v_responsePrimitive.primitiveContent.subscription.notificationContentType != v_notificationContentType){
-										setverdict(fail, __SCOPE__, ": Error: Notification Content Type attribute not updated correctly")
+										setverdict(fail, __SCOPE__ & ": Error: Notification Content Type attribute not updated correctly")
 									}
 								}
 							}
@@ -7992,7 +8115,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
 									if(v_responsePrimitive.primitiveContent.group_.expirationTime != v_expirationTime){
-										setverdict(fail, __SCOPE__, ": Error: Expiration Time attribute not updated correctly")
+										setverdict(fail, __SCOPE__ & ": Error: Expiration Time attribute not updated correctly")
 									}
 								}
 							}
@@ -8027,7 +8150,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
 									if(v_responsePrimitive.primitiveContent.group_.maxNrOfMembers != v_maxNrOfMembers){
-										setverdict(fail, __SCOPE__, ": Error: Maximum Number of Members attribute not updated correctly")
+										setverdict(fail, __SCOPE__ & ": Error: Maximum Number of Members attribute not updated correctly")
 									}
 								}
 							}
@@ -8062,7 +8185,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
 									if(v_responsePrimitive.primitiveContent.group_.memberIDs != v_memberIDs){
-										setverdict(fail, __SCOPE__, ": Error: Member IDs attribute not updated correctly")
+										setverdict(fail, __SCOPE__ & ": Error: Member IDs attribute not updated correctly")
 									}
 								}
 							}
@@ -8188,264 +8311,27 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_ae1.done;
                 
 						v_ae1.start(f_CSE_DMR_DEL_002(int23, m_createSubscriptionBase));//Subscription
-						v_ae1.done;
-					};
-                
-                
-				};//end of group g_CSE_DMR_DEL_002
-
-				group g_CSE_DMR_DEL_005{
-
-					/**
-					 * @desc Check that the stateTag attribute of a container resource is increased when a child resource is deleted
-					 * 
-					 */
-					testcase TC_CSE_DMR_DEL_005() runs on AeSimu system CseSystem {
-						// 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; 
-						const ResourceType c_containerResourceType := int3;          			
-                
-						// Test control
-            
-						// Test component configuration
-						f_cf01Up();
-            
-						// Test adapter configuration
-            
-						// Preamble
-						v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
-						
-						v_resourceIndex := f_cse_createResource(c_containerResourceType, m_createContainerBase, v_aeIndex); 
-            			
-						if(ispresent(vc_resourcesList[v_resourceIndex].resource.container.stateTag)) {
-            				
-							v_childResourceIndex := f_cse_createResource(c_containerResourceType, m_createContainerBase, v_resourceIndex); 
-            				
-							// Test Body
-							mcaPort.send(f_getMsgOutPrimitive(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(c_containerResourceType)) & " delete 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(c_containerResourceType)));
-								}
-								[] tc_ac.timeout {
-									setverdict(fail, __SCOPE__ & ": No answer while deleting resource type " & int2str(enum2int(c_containerResourceType)));
-								}
-							}
-            	
-            	
-            	
-							mcaPort.send(f_getMsgOutPrimitive(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;
-									if(v_response.primitive.responsePrimitive.primitiveContent.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");
-									}
-								}
-								[] 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");
-								}
-							}	
-            					
-						}//end if
-						else{
-							setverdict(fail, __SCOPE__ & ": Error the stateTag attribute is empty");
-						}
-            			
-						// Postamble
-						f_cse_postamble_deleteResources();
-            
-						// Tear down
-						f_cf01Down();
-            				
-					}//end f_CSE_DMR_DEL_005
-				} // end 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 container when a latest contentInstance resource is deleted successfully
-					 * 
-					 */
-					testcase TC_CSE_DMR_DEL_006() runs on AeSimu system CseSystem {
-						// Local variables
-						var integer v_aeIndex := -1;
-						var integer v_containerIndex := -1;
-						var integer v_contentInstanceIndex := -1; 
-						var PrimitiveContent v_attributesContainer, v_attributesContainer_afterDeletion;
-								   
-						// Test control
-            
-						// Test component configuration
-						f_cf01Up();
-            
-						// Test adapter configuration
-            
-						// Preamble
-						v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
-						
-						v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex); 
-						
-						v_contentInstanceIndex := f_cse_createResource(int4, m_createContentInstanceBase, v_containerIndex); 
-						
-						v_attributesContainer := f_cse_retrieveResource(v_containerIndex);
-            			
-						if(not(ispresent(v_attributesContainer.container.currentNrOfInstances))) {
-							setverdict(fail, __SCOPE__ & ": Error the currentNrOfInstances attribute is empty");
-							f_checkAeSimuStatus();
-						}
-							
-						// Test Body
-						f_cse_deleteResource(v_contentInstanceIndex);
-					
-						v_attributesContainer_afterDeletion := f_cse_retrieveResource(v_containerIndex);
-						
-						if(not(ispresent(v_attributesContainer.container.currentNrOfInstances))) {
-							setverdict(fail, __SCOPE__ & ": Error the currentNrOfInstances attribute is empty");
-							f_checkAeSimuStatus();
-						}
-						
-						if((v_attributesContainer.container.currentNrOfInstances > v_attributesContainer_afterDeletion.container.currentNrOfInstances) and
-							(v_attributesContainer.container.currentByteSize > v_attributesContainer_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");
-						}
-							
-						// Postamble
-						f_cse_postamble_deleteResources();
-            
-						// Tear down
-						f_cf01Down();
-            				
-					}//end f_CSE_DMR_DEL_006
-				} // end group g_CSE_DMR_DEL_006
-				
-				group g_CSE_DMR_DEL_007{
-
-					/**
-					 * @desc Check that the IUT accepts the DELETE Request of the latest contentInstance resource target to a container resource
-					 * 
-					 */
-					testcase TC_CSE_DMR_DEL_007() runs on AeSimu system CseSystem {
-						// Local variables
-						var MsgIn v_response;
-						var RequestPrimitive v_request;
-						var integer v_aeIndex := -1;
-						var integer v_containerIndex := -1;
-						var integer v_contentInstanceIndex_1 := -1;
-						var integer v_contentInstanceIndex_2 := -1; 
-						const ResourceType c_containerResourceType := int3;
-								   
-						// Test control
-            
-						// Test component configuration
-						f_cf01Up();
-            
-						// Test adapter configuration
-            
-						// Preamble
-						v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
-						
-						v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex); 
-						
-						v_contentInstanceIndex_1 := f_cse_createResource(int4, m_createContentInstance_noResourceName, v_containerIndex); 
-						
-						f_sleep(1.0);
-						
-						v_contentInstanceIndex_2 := f_cse_createResource(int4, m_createContentInstance_noResourceName, v_containerIndex);
-							
-						// Test Body
-						v_request := valueof(m_delete(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameLatest, f_getOriginator(v_containerIndex)));
-						            	
-						mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
-						tc_ac.start;
-						alt {
-							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) -> value v_response {
-								tc_ac.stop;
-								setverdict(pass, __SCOPE__ & ": Resource type " & int2str(enum2int(c_containerResourceType)) & " deleted successfuly");
-							}
-							[] 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(c_containerResourceType)));
-							}
-							[] tc_ac.timeout {
-								setverdict(fail, __SCOPE__ & ": No answer while deleting resource type " & int2str(enum2int(c_containerResourceType)));
-							}
-						}
-						
-						f_checkAeSimuStatus();
-			       		            	
-						mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve((f_getResourceAddress(v_contentInstanceIndex_2)), f_getOriginator(v_contentInstanceIndex_2)))));
-					            
-						tc_ac.start;
-						alt {
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
-								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Resource type" & int2str(enum2int(c_containerResourceType)) & " has already been deleted");	
-							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
-								tc_ac.stop;
-								setverdict(pass, __SCOPE__ & ": Error while retrieving resource attributes as" & int2str(enum2int(c_containerResourceType)) & " has been deleted");
-							}
-							[] tc_ac.timeout {
-								setverdict(fail, __SCOPE__ & ": No answer while retrieving resource attributes");
-							}
-						}
-					    
-						// Postamble
-						f_cse_postamble_deleteResources();
-            
-						// Tear down
-						f_cf01Down();
-            				
-					}//end f_CSE_DMR_DEL_007
-				} // end group g_CSE_DMR_DEL_007
-				
-				group g_CSE_DMR_DEL_009{
+						v_ae1.done;
+					};
+                
+                
+				};//end of group g_CSE_DMR_DEL_002
+
+				group g_CSE_DMR_DEL_005{
 
 					/**
-					 * @desc Check that the IUT accepts the DELETE Request of the oldest contentInstance resource target to a container resource
+					 * @desc Check that the stateTag attribute of a container resource is increased when a child resource is deleted
 					 * 
 					 */
-					testcase TC_CSE_DMR_DEL_009() runs on AeSimu system CseSystem {
+					testcase TC_CSE_DMR_DEL_005() runs on AeSimu system CseSystem {
 						// Local variables
 						var MsgIn v_response;
 						var RequestPrimitive v_request;
 						var integer v_aeIndex := -1;
-						var integer v_containerIndex := -1;
-						var integer v_contentInstanceIndex_1 := -1;
-						var integer v_contentInstanceIndex_2 := -1; 
-						const ResourceType c_containerResourceType := int3;
-								   
+						var integer v_resourceIndex := -1;
+						var integer v_childResourceIndex := -1; 
+						const ResourceType c_containerResourceType := int3;          			
+                
 						// Test control
             
 						// Test component configuration
@@ -8456,23 +8342,20 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Preamble
 						v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
 						
-						v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex); 
-						
-						v_contentInstanceIndex_1 := f_cse_createResource(int4, m_createContentInstance_noResourceName, v_containerIndex); 
-						
-						f_sleep(1.0);
-												
-						v_contentInstanceIndex_2 := f_cse_createResource(int4, m_createContentInstance_noResourceName, v_containerIndex);
-							
-						// Test Body
-						v_request := valueof(m_delete(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameOldest, f_getOriginator(v_containerIndex)));
-						            	
-						mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
-						tc_ac.start;
-						alt {
+						v_resourceIndex := f_cse_createResource(c_containerResourceType, m_createContainerBase, v_aeIndex); 
+            			
+						if(ispresent(vc_resourcesList[v_resourceIndex].resource.container.stateTag)) {
+            				
+							v_childResourceIndex := f_cse_createResource(c_containerResourceType, m_createContainerBase, v_resourceIndex); 
+            				
+							// Test Body
+							mcaPort.send(f_getMsgOutPrimitive(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(c_containerResourceType)) & " deleted successfuly");
+									setverdict(pass, __SCOPE__ & ": Resource type " & int2str(enum2int(c_containerResourceType)) & " delete successfully");
 								}
 								[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 									tc_ac.stop;
@@ -8485,35 +8368,302 @@ module OneM2M_Testcases_CSE_Release_1 {
 								[] tc_ac.timeout {
 									setverdict(fail, __SCOPE__ & ": No answer while deleting resource type " & int2str(enum2int(c_containerResourceType)));
 								}
-						   }
-						   
-						f_checkAeSimuStatus();
-						   
-						mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve((f_getResourceAddress(v_contentInstanceIndex_1)), f_getOriginator(v_contentInstanceIndex_1)))));
-					            
-						tc_ac.start;
-						alt {
+							}
+            	
+            	
+            	
+							mcaPort.send(f_getMsgOutPrimitive(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;
-								   setverdict(fail, __SCOPE__ & ": Resource type" & int2str(enum2int(c_containerResourceType)) & " has already been deleted");	
+									tc_ac.stop;
+									if(v_response.primitive.responsePrimitive.primitiveContent.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");
+									}
 								}
 								[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
-								   tc_ac.stop;
-								   setverdict(pass, __SCOPE__ & ": Error while retrieving resource attributes as " & int2str(enum2int(c_containerResourceType)) & " has been deleted");
+									tc_ac.stop;
+									setverdict(fail, __SCOPE__ & ": Error while retrieving resource attributes");
 								}
 								[] tc_ac.timeout {
-								   setverdict(fail, __SCOPE__ & ": No answer while retrieving resource attributes");
+									setverdict(fail, __SCOPE__ & ": No answer while retrieving resource attributes");
 								}
-							}
-							
+							}	
+            					
+						}//end if
+						else{
+							setverdict(fail, __SCOPE__ & ": Error the stateTag attribute is empty");
+						}
+            			
 						// Postamble
 						f_cse_postamble_deleteResources();
             
 						// Tear down
 						f_cf01Down();
             				
-					}//end f_CSE_DMR_DEL_009
-				} // end group g_CSE_DMR_DEL_009
+					}//end f_CSE_DMR_DEL_005
+				} // end group g_CSE_DMR_DEL_005
+                
+				/**
+				 * @desc Check that the IUT decreases the field value of attribute currentNrOfInstances and currentByteSize of parent container when a latest contentInstance resource is deleted successfully
+				 * 
+				 */
+				testcase TC_CSE_DMR_DEL_006() runs on Tester system CseSystem {
+			
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
+							
+					v_ae1.start(f_CSE_DMR_DEL_006());
+				  	  	
+					v_ae1.done;
+				  	  		
+				}
+				
+				function f_CSE_DMR_DEL_006() runs on AeSimu system CseSystem {
+					// Local variables
+					var integer v_aeIndex := -1;
+					var integer v_containerIndex := -1;
+					var integer v_contentInstanceIndex := -1; 
+					var PrimitiveContent v_attributesContainer, v_attributesContainer_afterDeletion;
+							   
+					// Test control
+        
+					// Test component configuration
+					f_cf01Up();
+        
+					// Test adapter configuration
+        
+					// Preamble
+					v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+					
+					v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex); 
+					
+					v_contentInstanceIndex := f_cse_createResource(int4, m_createContentInstanceBase, v_containerIndex); 
+					
+					v_attributesContainer := f_cse_retrieveResource(v_containerIndex);
+        			
+					if(not(ispresent(v_attributesContainer.container.currentNrOfInstances))) {
+						setverdict(fail, __SCOPE__ & ": Error the currentNrOfInstances attribute is empty");
+						f_checkAeSimuStatus();
+					}
+						
+					// Test Body
+					f_cse_deleteResource(v_contentInstanceIndex);
+				
+					v_attributesContainer_afterDeletion := f_cse_retrieveResource(v_containerIndex);
+					
+					if(not(ispresent(v_attributesContainer.container.currentNrOfInstances))) {
+						setverdict(fail, __SCOPE__ & ": Error the currentNrOfInstances attribute is empty");
+						f_checkAeSimuStatus();
+					}
+					
+					if((v_attributesContainer.container.currentNrOfInstances > v_attributesContainer_afterDeletion.container.currentNrOfInstances) and
+						(v_attributesContainer.container.currentByteSize > v_attributesContainer_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");
+					}
+						
+					// Postamble
+					f_cse_postamble_deleteResources();
+        
+					// Tear down
+					f_cf01Down();
+        				
+				}//end f_CSE_DMR_DEL_006
+
+				/**
+				 * @desc Check that the IUT accepts the DELETE Request of the latest contentInstance resource target to a container resource
+				 * 
+				 */
+				testcase TC_CSE_DMR_DEL_007() runs on Tester system CseSystem {
+			
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
+							
+					v_ae1.start(f_CSE_DMR_DEL_007());
+				  	  	
+					v_ae1.done;
+				  	  		
+				}
+				
+				function f_CSE_DMR_DEL_007() runs on AeSimu system CseSystem {
+					// Local variables
+					var MsgIn v_response;
+					var RequestPrimitive v_request;
+					var integer v_aeIndex := -1;
+					var integer v_containerIndex := -1;
+					var integer v_contentInstanceIndex_1 := -1;
+					var integer v_contentInstanceIndex_2 := -1; 
+					const ResourceType c_containerResourceType := int3;
+							   
+					// Test control
+        
+					// Test component configuration
+					f_cf01Up();
+        
+					// Test adapter configuration
+        
+					// Preamble
+					v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+					
+					v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex); 
+					
+					v_contentInstanceIndex_1 := f_cse_createResource(int4, m_createContentInstance_noResourceName, v_containerIndex); 
+					
+					f_sleep(1.0);
+					
+					v_contentInstanceIndex_2 := f_cse_createResource(int4, m_createContentInstance_noResourceName, v_containerIndex);
+						
+					// Test Body
+					v_request := valueof(m_delete(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameLatest, f_getOriginator(v_containerIndex)));
+					            	
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
+					tc_ac.start;
+					alt {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) -> value v_response {
+							tc_ac.stop;
+							setverdict(pass, __SCOPE__ & ": Resource type " & int2str(enum2int(c_containerResourceType)) & " deleted successfuly");
+						}
+						[] 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(c_containerResourceType)));
+						}
+						[] tc_ac.timeout {
+							setverdict(fail, __SCOPE__ & ": No answer while deleting resource type " & int2str(enum2int(c_containerResourceType)));
+						}
+					}
+					
+					f_checkAeSimuStatus();
+		       		            	
+					mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve((f_getResourceAddress(v_contentInstanceIndex_2)), f_getOriginator(v_contentInstanceIndex_2)))));
+				            
+					tc_ac.start;
+					alt {
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Resource type" & int2str(enum2int(c_containerResourceType)) & " has already been deleted");	
+						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
+							tc_ac.stop;
+							setverdict(pass, __SCOPE__ & ": Error while retrieving resource attributes as" & int2str(enum2int(c_containerResourceType)) & " has been deleted");
+						}
+						[] tc_ac.timeout {
+							setverdict(fail, __SCOPE__ & ": No answer while retrieving resource attributes");
+						}
+					}
+				    
+					// Postamble
+					f_cse_postamble_deleteResources();
+        
+					// Tear down
+					f_cf01Down();
+        				
+				}//end f_CSE_DMR_DEL_007
+
+				/**
+				 * @desc Check that the IUT accepts the DELETE Request of the oldest contentInstance resource target to a container resource
+				 * 
+				 */
+				testcase TC_CSE_DMR_DEL_009() runs on Tester system CseSystem {
+			
+					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+					v_ae1.done;
+							
+					v_ae1.start(f_CSE_DMR_DEL_009());
+				  	  	
+					v_ae1.done;
+				  	  		
+				}
+
+				function f_CSE_DMR_DEL_009() runs on AeSimu system CseSystem {
+					// Local variables
+					var MsgIn v_response;
+					var RequestPrimitive v_request;
+					var integer v_aeIndex := -1;
+					var integer v_containerIndex := -1;
+					var integer v_contentInstanceIndex_1 := -1;
+					var integer v_contentInstanceIndex_2 := -1; 
+					const ResourceType c_containerResourceType := int3;
+							   
+					// Test control
+        
+					// Test component configuration
+					f_cf01Up();
+        
+					// Test adapter configuration
+        
+					// Preamble
+					v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+					
+					v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex); 
+					
+					v_contentInstanceIndex_1 := f_cse_createResource(int4, m_createContentInstance_noResourceName, v_containerIndex); 
+					
+					f_sleep(1.0);
+											
+					v_contentInstanceIndex_2 := f_cse_createResource(int4, m_createContentInstance_noResourceName, v_containerIndex);
+						
+					// Test Body
+					v_request := valueof(m_delete(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameOldest, f_getOriginator(v_containerIndex)));
+					            	
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
+					tc_ac.start;
+					alt {
+							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) -> value v_response {
+								tc_ac.stop;
+								setverdict(pass, __SCOPE__ & ": Resource type " & int2str(enum2int(c_containerResourceType)) & " deleted successfuly");
+							}
+							[] 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(c_containerResourceType)));
+							}
+							[] tc_ac.timeout {
+								setverdict(fail, __SCOPE__ & ": No answer while deleting resource type " & int2str(enum2int(c_containerResourceType)));
+							}
+					   }
+					   
+					f_checkAeSimuStatus();
+					   
+					mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve((f_getResourceAddress(v_contentInstanceIndex_1)), f_getOriginator(v_contentInstanceIndex_1)))));
+				            
+					tc_ac.start;
+					alt {
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+							   tc_ac.stop;
+							   setverdict(fail, __SCOPE__ & ": Resource type" & int2str(enum2int(c_containerResourceType)) & " has already been deleted");	
+							}
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
+							   tc_ac.stop;
+							   setverdict(pass, __SCOPE__ & ": Error while retrieving resource attributes as " & int2str(enum2int(c_containerResourceType)) & " has been deleted");
+							}
+							[] tc_ac.timeout {
+							   setverdict(fail, __SCOPE__ & ": No answer while retrieving resource attributes");
+							}
+						}
+						
+					// Postamble
+					f_cse_postamble_deleteResources();
+        
+					// Tear down
+					f_cf01Down();
+        				
+				}//end f_CSE_DMR_DEL_009
 				
 			}//end group Delete
 			
@@ -11146,7 +11296,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							setverdict(pass, __SCOPE__ & ": Resource created successfully");
 						
 							if(not match({v_memberID}, v_response.primitive.responsePrimitive.primitiveContent.group_.memberIDs)){
-								setverdict(fail, __SCOPE__, ": Error, presence of duplicate member IDs ");
+								setverdict(fail, __SCOPE__ & ": Error, presence of duplicate member IDs ");
 							}
 							if(lengthof(v_response.primitive.responsePrimitive.primitiveContent.group_.memberIDs) != 1) {
 							   setverdict(fail, __SCOPE__ & ": Error, wrong number of memberIDs attribute");      
@@ -11212,11 +11362,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__ & ": Resource created successfully");
 							if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.group_.memberTypeValidated)){
-								setverdict(fail, __SCOPE__, ": Error, memberTypeValidated attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, memberTypeValidated attribute not provided");
 							}
 							else {
 								if(v_response.primitive.responsePrimitive.primitiveContent.group_.memberTypeValidated == false){
-									setverdict(fail, __SCOPE__, ": Error, memberTypeValidated attribute not correct");
+									setverdict(fail, __SCOPE__ & ": Error, memberTypeValidated attribute not correct");
 								}
 							}     
 						}
@@ -11283,20 +11433,20 @@ module OneM2M_Testcases_CSE_Release_1 {
 							
 							// check for memberTypeValidated
 							if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.group_.memberTypeValidated)){
-								setverdict(fail, __SCOPE__, ": Error, memberTypeValidated attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, memberTypeValidated attribute not provided");
 							}
 							else {
 								if(v_response.primitive.responsePrimitive.primitiveContent.group_.memberTypeValidated == false){
-									setverdict(fail, __SCOPE__, ": Error, memberTypeValidated attribute not correct");
+									setverdict(fail, __SCOPE__ & ": Error, memberTypeValidated attribute not correct");
 								}
 							}
 							// check for memberType (MIXED)
 							if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.group_.memberType)){
-								setverdict(fail, __SCOPE__, ": Error, memberType attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, memberType attribute not provided");
 							} 
 							else {
 								if(v_response.primitive.responsePrimitive.primitiveContent.group_.memberType != int0){ 
-									setverdict(fail, __SCOPE__, ": Error, memberType attribute not correct");
+									setverdict(fail, __SCOPE__ & ": Error, memberType attribute not correct");
 								}
 							}
 						}
@@ -11367,19 +11517,19 @@ module OneM2M_Testcases_CSE_Release_1 {
 							
 							// check for memberTypeValidated
 							if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.group_.memberTypeValidated)){
-								setverdict(fail, __SCOPE__, ": Error, memberTypeValidated attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, memberTypeValidated attribute not provided");
 							} else {
 								if(v_response.primitive.responsePrimitive.primitiveContent.group_.memberTypeValidated == false){
-									setverdict(fail, __SCOPE__, ": Error, memberTypeValidated attribute not correct");
+									setverdict(fail, __SCOPE__ & ": Error, memberTypeValidated attribute not correct");
 								}
 							}
 							// check for membersId
 							if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.group_.memberIDs)){
-								setverdict(fail, __SCOPE__, ": Error, memberIDs attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, memberIDs attribute not provided");
 							} 
 							else {
 								if(not match({f_getResourceId(vc_resourcesList[v_containerIndex].resource)}, v_response.primitive.responsePrimitive.primitiveContent.group_.memberIDs)){
-									setverdict(fail, __SCOPE__, ": Error, memberIDs attribute not correct");
+									setverdict(fail, __SCOPE__ & ": Error, memberIDs attribute not correct");
 								}
 							}
 						}
@@ -11541,16 +11691,16 @@ module OneM2M_Testcases_CSE_Release_1 {
 							setverdict(pass, __SCOPE__ & ": creation successfull by using fanOutPoint in group resource");
     
 							if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list)){
-								setverdict(fail, __SCOPE__, ": Error, aggregatedResponse attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, aggregatedResponse attribute not provided");
 							}
 							else{
 								if(lengthof(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list) != c_numberOfResponsePrimitive){
-									setverdict(fail, __SCOPE__, ": Error, length of aggregatedResponse is not valid");
+									setverdict(fail, __SCOPE__ & ": Error, length of aggregatedResponse is not valid");
 								}
 								else{
 									for(i:=0; i<c_numberOfResponsePrimitive; i:=i+1){
 										if(not match(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list[i].primitiveContent, v_contentResponse)){
-											setverdict(fail, __SCOPE__, ": Error, aggregatedResponse doesn't match with template expected");
+											setverdict(fail, __SCOPE__ & ": Error, aggregatedResponse doesn't match with template expected");
 										}
 									}
 								}
@@ -11719,14 +11869,14 @@ module OneM2M_Testcases_CSE_Release_1 {
      
 							// check for membersId
 							if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.group_.memberIDs)){
-								setverdict(fail, __SCOPE__, ": Error, memberIDs attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, memberIDs attribute not provided");
 							} 
 							else {
 								if(lengthof(v_response.primitive.responsePrimitive.primitiveContent.group_.memberIDs) != 1) {
 								   setverdict(fail, __SCOPE__ & ": Error, wrong number of memberIDs attribute");      
 								}                               
 								if(v_response.primitive.responsePrimitive.primitiveContent.group_.memberIDs[0] != v_memberId_2){
-									setverdict(fail, __SCOPE__, ": Error, memberIDs attribute not correct");
+									setverdict(fail, __SCOPE__ & ": Error, memberIDs attribute not correct");
 								}
 							}
 						 }
@@ -11747,7 +11897,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					 if(getverdict == pass){ 
 						 if(ischosen(v_primitiveContentRetrievedResource.group_)){
 							if(v_primitiveContentRetrievedResource.group_.memberIDs[0] != v_memberId_2){
-								setverdict(fail, __SCOPE__, ": Error, memberIDs attribute not updated");
+								setverdict(fail, __SCOPE__ & ": Error, memberIDs attribute not updated");
 							}
 						  }
 					 }
@@ -11810,11 +11960,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 							setverdict(pass, __SCOPE__ & ": update successful"); 
                              
 							 if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.group_.memberTypeValidated)) {
-								setverdict(fail, __SCOPE__, ": Error, memberTypeValidated attribute not provided");    
+								setverdict(fail, __SCOPE__ & ": Error, memberTypeValidated attribute not provided");    
 							 } 
 							 else {
 								if(v_response.primitive.responsePrimitive.primitiveContent.group_.memberTypeValidated == false) {
-									setverdict(fail, __SCOPE__, ": Error, memberTypeValidated wrong value");  
+									setverdict(fail, __SCOPE__ & ": Error, memberTypeValidated wrong value");  
 								}
 							 }
 						}
@@ -11835,7 +11985,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					if(getverdict == pass){ 
 						 if(ischosen(v_primitiveContentRetrievedResource.group_)){
 							if(v_primitiveContentRetrievedResource.group_.memberTypeValidated == false){
-								setverdict(fail, __SCOPE__, ": Error,  memberTypeValidated attribute not updated");
+								setverdict(fail, __SCOPE__ & ": Error,  memberTypeValidated attribute not updated");
 							}
 						  }
 					 } 
@@ -11903,21 +12053,21 @@ module OneM2M_Testcases_CSE_Release_1 {
                              
 							//memberTypeValidated attribute set to FALSE
 							if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.group_.memberTypeValidated)) {
-								setverdict(fail, __SCOPE__, ": Error, memberTypeValidated attribute not provided");    
+								setverdict(fail, __SCOPE__ & ": Error, memberTypeValidated attribute not provided");    
 							}
 							else {
 								if(v_response.primitive.responsePrimitive.primitiveContent.group_.memberTypeValidated != true) {
-									setverdict(fail, __SCOPE__, ": Error, memberTypeValidated must be TRUE");
+									setverdict(fail, __SCOPE__ & ": Error, memberTypeValidated must be TRUE");
 								}
 							}
                                 
 							//memberType attribute set to MIXED
 							if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.group_.memberType)) {
-								setverdict(fail, __SCOPE__, ": Error, memberType attribute not provided");    
+								setverdict(fail, __SCOPE__ & ": Error, memberType attribute not provided");    
 							}
 							else {
 								if(v_response.primitive.responsePrimitive.primitiveContent.group_.memberType != int0) { //Mixed is int0 in release 2 and int24 in release 1
-									setverdict(fail, __SCOPE__, ": Error, memberType was not set to MIXED");
+									setverdict(fail, __SCOPE__ & ": Error, memberType was not set to MIXED");
 								}
 							}
                                 
@@ -11939,11 +12089,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 					if(getverdict == pass){ 
 						 if(ischosen(v_primitiveContentRetrievedResource.group_)){
 							if(v_primitiveContentRetrievedResource.group_.memberTypeValidated == false){
-								setverdict(fail, __SCOPE__, ": Error,  memberTypeValidated attribute not updated");
+								setverdict(fail, __SCOPE__ & ": Error,  memberTypeValidated attribute not updated");
 							}
 							
 							if(v_primitiveContentRetrievedResource.group_.memberType != int0){
-								setverdict(fail, __SCOPE__, ": Error,  memberType attribute not set to MIXED");
+								setverdict(fail, __SCOPE__ & ": Error,  memberType attribute not set to MIXED");
 							}
 						  }
 					 }
@@ -12012,24 +12162,24 @@ module OneM2M_Testcases_CSE_Release_1 {
                                                           
 							//memberTypeValidated attribute set to TRUE
 							if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.group_.memberTypeValidated)) {
-								setverdict(fail, __SCOPE__, ": Error, memberTypeValidated attribute not provided");    
+								setverdict(fail, __SCOPE__ & ": Error, memberTypeValidated attribute not provided");    
 							} 
 							else {
 								if(v_response.primitive.responsePrimitive.primitiveContent.group_.memberTypeValidated != true) {
-									setverdict(fail, __SCOPE__, ": Error, memberTypeValidated must be TRUE");
+									setverdict(fail, __SCOPE__ & ": Error, memberTypeValidated must be TRUE");
 								}
 							}
 
 							//memberIDs attribute set to v_memberID1
 							if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.group_.memberIDs)){
-								setverdict(fail, __SCOPE__, ": Error, memberIDs attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, memberIDs attribute not provided");
 							}
 							else {                               
 								if(lengthof(v_response.primitive.responsePrimitive.primitiveContent.group_.memberIDs) != 1) {
 								   setverdict(fail, __SCOPE__ & ": Error, wrong number of memberIDs attribute");      
 								}                               
 								if(v_response.primitive.responsePrimitive.primitiveContent.group_.memberIDs[0] != v_memberId_1){
-									setverdict(fail, __SCOPE__, ": Error, memberIDs attribute not correct");
+									setverdict(fail, __SCOPE__ & ": Error, memberIDs attribute not correct");
 								}
 							}                                   
 						}
@@ -12050,11 +12200,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 					if(getverdict == pass){ 
 						 if(ischosen(v_primitiveContentRetrievedResource.group_)){
 							if(v_primitiveContentRetrievedResource.group_.memberTypeValidated == false){
-								setverdict(fail, __SCOPE__, ": Error,  memberTypeValidated attribute not updated");
+								setverdict(fail, __SCOPE__ & ": Error,  memberTypeValidated attribute not updated");
 							}
 		
 							if(v_primitiveContentRetrievedResource.group_.memberIDs[0] != v_memberId_1){
-								setverdict(fail, __SCOPE__, ": Error,  memberIDs attribute not correct");
+								setverdict(fail, __SCOPE__ & ": Error,  memberIDs attribute not correct");
 							}
 						  }
 					 }
@@ -12385,7 +12535,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							tc_ac.stop;
                             
 							if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.group_.memberTypeValidated)) {
-								setverdict(fail, __SCOPE__, ": Error, memberTypeValidated attribute not provided");    
+								setverdict(fail, __SCOPE__ & ": Error, memberTypeValidated attribute not provided");    
 							 } else {
 								if(v_response.primitive.responsePrimitive.primitiveContent.group_.memberTypeValidated == false) {
 									if(lengthof(v_response.primitive.responsePrimitive.primitiveContent.group_.memberIDs) != 2) {
@@ -12394,11 +12544,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 										if(v_response.primitive.responsePrimitive.primitiveContent.group_.memberIDs[0] == v_memberId_1 and v_response.primitive.responsePrimitive.primitiveContent.group_.memberIDs[1] == v_memberId_2) {
 											setverdict(pass, __SCOPE__ & ": update successful");       
 										} else {
-											setverdict(fail, __SCOPE__, ": Error, wrong memberIDs");   
+											setverdict(fail, __SCOPE__ & ": Error, wrong memberIDs");   
 										}
 									}
 								} else {
-									setverdict(fail, __SCOPE__, ": Error, memberTypeValidated must be set to FALSE");  
+									setverdict(fail, __SCOPE__ & ": Error, memberTypeValidated must be set to FALSE");  
 								}   
 							}                            
 						}
@@ -12415,11 +12565,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 					if(getverdict == pass){ 
 						 if(ischosen(v_primitiveContentRetrievedResource.group_)){
 							if(v_primitiveContentRetrievedResource.group_.memberTypeValidated != false){
-								setverdict(fail, __SCOPE__, ": Error,  memberTypeValidated attribute not updated");
+								setverdict(fail, __SCOPE__ & ": Error,  memberTypeValidated attribute not updated");
 							}
 
 							if((v_primitiveContentRetrievedResource.group_.memberIDs[0] != v_memberId_1) and (v_primitiveContentRetrievedResource.group_.memberIDs[1] != v_memberId_2)){
-								setverdict(fail, __SCOPE__, ": Error,  memberIDs attribute not correct");
+								setverdict(fail, __SCOPE__ & ": Error,  memberIDs attribute not correct");
 							}
 						  }
 					 }
diff --git a/OneM2M_Testcases_CSE_Release_2.ttcn b/OneM2M_Testcases_CSE_Release_2.ttcn
index 822112e038a2ce54cad359b6facac9bd152cd46a..6c2b4c7b7ade6af30b20c394e9692591884d3263 100644
--- a/OneM2M_Testcases_CSE_Release_2.ttcn
+++ b/OneM2M_Testcases_CSE_Release_2.ttcn
@@ -235,7 +235,6 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var RequestPrimitive v_request;
 						 var template PrimitiveContent v_contentResponse;
 						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
 						v_cse1.done;
 						 v_request := valueof(m_createRemoteCSEBase);
 						 v_request.primitiveContent.remoteCSE.cseType := int2;	//MN_CSE
@@ -291,7 +290,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						
 						 var template RequestPrimitive v_createRequest := m_createAe(PX_APP_ID);
 						 var template PrimitiveContent v_contentResponse;
-						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+						 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
 						 v_createRequest.primitiveContent.aE.nodeLink := "http://127.0.0.1/";
 
@@ -520,7 +519,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 																	
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.schedule.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
 						}
 						
@@ -542,7 +541,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 											
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.schedule.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
 						}
 						
@@ -564,7 +563,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 																		
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.schedule.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
 						}
 					
@@ -588,7 +587,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.pollingChannel.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
 						}
 						
@@ -610,7 +609,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.subscription.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
 						}		
 					}
@@ -631,7 +630,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.subscription.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
 						}		
 					}
@@ -732,7 +731,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.node.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
 						}
 						
@@ -752,7 +751,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.mgmtCmd.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
 						}
 						
@@ -772,7 +771,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.locationPolicy.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
 						}
 						
@@ -792,7 +791,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.statsConfig.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
 						}
 					}
@@ -812,7 +811,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.statsCollect.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
 						}
 						
@@ -832,7 +831,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.m2mServiceSubscriptionProfile.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
 						}
 						
@@ -852,7 +851,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.serviceSubscribedAppRule.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							}
 						}
 						
@@ -980,10 +979,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 																		
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.schedule.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							} else {
 								if(v_responsePrimitive.primitiveContent.schedule.resourceName != c_defaultScheduleResourceName){
-									setverdict(fail, __SCOPE__, ": Error, resourceName attribute not correct");
+									setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not correct");
 								}
 							}
 						}
@@ -1003,10 +1002,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 												
 						if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
 							if(not ispresent(v_responsePrimitive.primitiveContent.pollingChannel.resourceName)){
-								setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+								setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
 							} else {
 								if(v_responsePrimitive.primitiveContent.pollingChannel.resourceName != c_defaultPollingChannelResourceName){
-									setverdict(fail, __SCOPE__, ": Error, resourceName attribute not correct");
+									setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not correct");
 								}
 							}
 						}
@@ -3985,7 +3984,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_ae1.done;
 					}
 										
-					testcase TC_CSE_DMR_RET_018_SUB_LBL() runs on AeSimu system CseSystem {
+					testcase TC_CSE_DMR_RET_018_SUB_LBL() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
@@ -6371,7 +6370,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							 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")
+										 setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -6409,7 +6408,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							 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")
+										 setverdict(fail, __SCOPE__ & ": Error: Access Control Policy attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -6448,7 +6447,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							 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")
+										 setverdict(fail, __SCOPE__ & ": Error: Ontology Ref attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -6484,7 +6483,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.container)) {
 									 if(v_responsePrimitive.primitiveContent.container.ontologyRef != v_ontoLogyRef){
-										 setverdict(fail, __SCOPE__, ": Error: Ontology Ref attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Ontology Ref attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -6520,7 +6519,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.container)) {
 									 if(v_responsePrimitive.primitiveContent.container.locationID != v_locationID){
-										 setverdict(fail, __SCOPE__, ": Error: Location ID attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Location ID attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -6555,7 +6554,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
 									 if(v_responsePrimitive.primitiveContent.subscription.eventNotificationCriteria != v_eventNotificationCriteria){
-										 setverdict(fail, __SCOPE__, ": Error: Event Notification Criteria attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Event Notification Criteria attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -6590,7 +6589,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
 									 if(v_responsePrimitive.primitiveContent.subscription.expirationCounter != v_expirationCounter){
-										 setverdict(fail, __SCOPE__, ": Error: Expiration Counter attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Expiration Counter attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -6625,7 +6624,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
 									 if(v_responsePrimitive.primitiveContent.subscription.groupID != v_groupID){
-										 setverdict(fail, __SCOPE__, ": Error: Group ID attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Group ID attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -6660,7 +6659,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
 									 if(v_responsePrimitive.primitiveContent.subscription.notificationForwardingURI != v_notificationForwardingURI){
-										 setverdict(fail, __SCOPE__, ": Error: Notification Forwarding URI attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Notification Forwarding URI attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -6695,7 +6694,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
 									 if(v_responsePrimitive.primitiveContent.subscription.batchNotify != v_batchNotify){
-										 setverdict(fail, __SCOPE__, ": Error: Batch Notify attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Batch Notify attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -6730,7 +6729,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
 									 if(v_responsePrimitive.primitiveContent.subscription.rateLimit != v_rateLimit){
-										 setverdict(fail, __SCOPE__, ": Error: Rate Limit attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Rate Limit attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -6765,7 +6764,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
 									 if(v_responsePrimitive.primitiveContent.subscription.pendingNotification != v_pendingNotification){
-										 setverdict(fail, __SCOPE__, ": Error: Pending Notification attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Pending Notification attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -6800,7 +6799,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
 									 if(v_responsePrimitive.primitiveContent.subscription.notificationStoragePriority != v_notificationStoragePriority){
-										 setverdict(fail, __SCOPE__, ": Error: Notification Storage priority attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Notification Storage priority attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -6835,7 +6834,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
 									 if(v_responsePrimitive.primitiveContent.subscription.latestNotify != v_latestNotify){
-										 setverdict(fail, __SCOPE__, ": Error: Latest Notify priority attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Latest Notify priority attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -6868,7 +6867,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
 								 if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
 									 if(v_responsePrimitive.primitiveContent.subscription.notificationEventCat != v_eventCat){
-										 setverdict(fail, __SCOPE__, ": Error: Notification Event Cat attribute not updated correctly")
+										 setverdict(fail, __SCOPE__ & ": Error: Notification Event Cat attribute not updated correctly")
 									 }
 								 }
 							 }
@@ -7251,7 +7250,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
 								if(ischosen(v_responsePrimitive.primitiveContent.node)) {
 									if(v_responsePrimitive.primitiveContent.node.expirationTime != v_expirationTime){
-										setverdict(fail, __SCOPE__, ": Error: Expiration time attribute not updated correctly")
+										setverdict(fail, __SCOPE__ & ": Error: Expiration time attribute not updated correctly")
 									}
 								}
 							}
@@ -7287,7 +7286,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							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")
+										setverdict(fail, __SCOPE__ & ": Error: NodeID attribute not updated correctly")
 									}
 								}
 							}