diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 9c6657575db72c1894f858316105792968c0ac57..f6c01ab00e09501eb481621d4ab7e69023c47bf7 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -7,7 +7,7 @@
  *  
  *  @author     oneM2M
  *  @version    $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Functions.ttcn $
- *              $Id: OneM2M_Functions.ttcn 330 2017-07-26 10:02:53Z reinaortega $
+ *              $Id: OneM2M_Functions.ttcn 333 2017-07-28 08:17:47Z reinaortega $
  *  @desc       Module containing functions for oneM2M
  *
  */
@@ -620,61 +620,70 @@ module OneM2M_Functions {
 				
 			}// end f_cse_deleteResource
 			
-			function f_isResourceCreated (integer p_resourceIndex) runs on CseTester return boolean {
+			/**
+			 * @desc Check that a resource is present in the IUT (resourceId is known)
+			 * @param p_resourceIndex Resource index 
+			 * @return boolean
+			 */
+			function f_isResourcePresent (integer p_resourceIndex) runs on CseTester return boolean {
 			
-			  var ResponseStatusCode v_responseStatusCode;
+				var ResponseStatusCode v_responseStatusCode;
 			  
-			  //Check to see if the resource has been created or not
-			  mcaPort.send(m_request(m_retrieveResource(f_getResourceAddress(p_resourceIndex), f_getOriginator(p_resourceIndex))));
-			  tc_ac.start;
-			  alt {
+			  	//Check to see if the resource is present or not
+			  	mcaPort.send(m_request(m_retrieveResource(f_getResourceAddress(p_resourceIndex), f_getOriginator(p_resourceIndex))));
+			  	tc_ac.start;
+			  	alt {
 					[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) {
 						tc_ac.stop;
-					  	setverdict(pass, testcasename() & ": Resource created: " & f_getResourceAddress(p_resourceIndex));
+					  	setverdict(pass, testcasename() & ": Resource present: " & f_getResourceAddress(p_resourceIndex));
 					  	return true;
 				  	}
-				  	[] mcaPort.receive(mw_response(mw_responsePrimitive(?))) {
+				  	[] mcaPort.receive(mw_response(mw_responsePrimitive(?, -))) {
 						tc_ac.stop;
-						setverdict(fail, testcasename() & ": Wrong response status code in the response");
+						setverdict(inconc, testcasename() & ": Wrong response status code in the response");
 						return false;
 					}
 					[] tc_ac.timeout {
-						setverdict(fail, testcasename() & ": No answer while creating resource");
+						setverdict(inconc, testcasename() & ": No answer while retrieving resource");
 						return false;
 					}
-			  }	
-			
+			  	}	
 			}
 			
-			function f_isResourceNotCreated (integer p_parentIndex, XSD.String p_resourceName) runs on CseTester return boolean {
+			/**
+			 * @desc Check that a resource is not present in the IUT (resourceId is NOT known)
+			 * @param p_parentIndex Index of the parent resource
+			 * @param p_resourceName Resource name (Hierarchical method is used)
+			 * @return boolean
+			 */
+			function f_isResourceNotPresent (integer p_parentIndex, XSD.String p_resourceName) runs on CseTester return boolean {
 			
-			  var ResponseStatusCode v_responseStatusCode;
+				var ResponseStatusCode v_responseStatusCode;
 			  
-			  log(testcasename() & "Hierarchical method is required to check the non creation of the resource");
-			  vc_addressingMethod := e_hierarchical;
-			  //Check to see if the resource has NOT been created
-			  mcaPort.send(m_request(m_retrieveResource(f_getResourceAddress(p_parentIndex) & "/" & p_resourceName, f_getOriginator(p_parentIndex))));
-			  tc_ac.start;
-			  alt {
+			  	log(testcasename() & "Hierarchical method is required to check the non presence of the resource");
+			  	vc_addressingMethod := e_hierarchical;
+			  	//Check to see if the resource has NOT been created
+			  	mcaPort.send(m_request(m_retrieveResource(f_getResourceAddress(p_parentIndex) & "/" & p_resourceName, f_getOriginator(p_parentIndex))));
+			  	tc_ac.start;
+			  	alt {
 					[] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))) {
 						tc_ac.stop;
-						setverdict(pass, testcasename() & ": Resource not created");
+						setverdict(pass, testcasename() & ": Resource not present");
 						vc_addressingMethod := PX_ADDRESSING_METHOD;
 						return true;
 					}
 					[] mcaPort.receive(mw_response(mw_responsePrimitive(?))) {
 						tc_ac.stop;
-						setverdict(fail, testcasename() & ": Wrong response status code in the response");
+						setverdict(inconc, testcasename() & ": Wrong response status code in the response");
 						vc_addressingMethod := PX_ADDRESSING_METHOD;
 						return false;
 					}
 					[] tc_ac.timeout {
-						setverdict(fail, testcasename() & ": No answer while creating resource");
+						setverdict(inconc, testcasename() & ": No answer while retrieving resource");
 						vc_addressingMethod := PX_ADDRESSING_METHOD;
 						return false;
 					}
-			  }	
-			
+			  	}	
 			}
 			
 			/**
@@ -1031,8 +1040,7 @@ module OneM2M_Functions {
 					unmap(self:mcaPort, system:mcaPort);
 					unmap(self:acPort, system:acPort);  
 
-				} //end f_cse_notifyProcedure_subscriptionDeletion
-    		
+				} //end f_cse_notifyProcedure_subscriptionDeletion    		
     		
     		/**
     		 * @desc It determines whether the addressing method of the given address is non-hierarchical. Not valid for CSE-Base as target
diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index cd2c3bcbcb02d407a8d14adeb86c9612aefe90d8..bab6437e635aca100cf483f42064e8e614b8e9c3 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -7,7 +7,7 @@
  *  
  *  @author     oneM2M
  *  @version    $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Templates.ttcn $
- *              $Id: OneM2M_Templates.ttcn 317 2017-07-12 18:07:15Z reinaortega $
+ *              $Id: OneM2M_Templates.ttcn 331 2017-07-27 15:41:51Z reinaortega $
  *  @desc       Module containing templates for oneM2M
  *
  */
@@ -3119,7 +3119,7 @@ module OneM2M_Templates {
 		 * @param p_statusCode	Status code
 		 * @param p_requestId	Request ID of the corresponding request
 		 */
-		template (value) ResponsePrimitive m_responsePrimitive(in ResponseStatusCode p_statusCode, in RequestID p_requestId, in template (omit) PrimitiveContent p_content := omit) := {
+		template (value) ResponsePrimitive m_responsePrimitive(in template ResponseStatusCode p_statusCode, in RequestID p_requestId, in template (omit) PrimitiveContent p_content := omit) := {
 			responseStatusCode := p_statusCode,
 			requestIdentifier := p_requestId,
 			primitiveContent := p_content,
@@ -3139,14 +3139,14 @@ module OneM2M_Templates {
 		 * @param p_statusCode	Status code
 		 * @param p_requestId	Request ID of the corresponding request
 		 */
-		template (value) ResponsePrimitive m_responsePrimitive_content(in ResponseStatusCode p_statusCode, in RequestID p_requestId, in template (value) PrimitiveContent p_content) modifies m_responsePrimitive := {
+		template (value) ResponsePrimitive m_responsePrimitive_content(in template ResponseStatusCode p_statusCode, in RequestID p_requestId, in template (value) PrimitiveContent p_content) modifies m_responsePrimitive := {
 			primitiveContent := p_content			
 		}
 		
-		template ResponsePrimitive mw_responsePrimitive(template ResponseStatusCode p_statusCode) := {
+		template ResponsePrimitive mw_responsePrimitive(in template ResponseStatusCode p_statusCode, in template PrimitiveContent p_content := *) := {
 			responseStatusCode := p_statusCode,
 			requestIdentifier := ?,
-			primitiveContent := *,
+			primitiveContent := p_content,
 			to_ := *,
 			from_ := *,
 			originatingTimestamp := *,
diff --git a/OneM2M_Testcases.ttcn b/OneM2M_Testcases.ttcn
index 8989ce7bd7e1b17a23d4001635f09920d0a574c8..ca16d5a15ec7e19bc1725dfcb9b44ec0d80cd1cc 100644
--- a/OneM2M_Testcases.ttcn
+++ b/OneM2M_Testcases.ttcn
@@ -7,7 +7,7 @@
  *  
  *  @author     oneM2M
  *  @version    $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/OneM2M_Testcases.ttcn $
- *              $Id: OneM2M_Testcases.ttcn 330 2017-07-26 10:02:53Z reinaortega $
+ *              $Id: OneM2M_Testcases.ttcn 333 2017-07-28 08:17:47Z reinaortega $
  *  @desc       Module containing test cases for oneM2M
  *
  */
@@ -1272,7 +1272,7 @@ module OneM2M_Testcases {
 				 * @desc Check that the IUT accepts an create request of <remoteCSE> resource with attributes multiplicity equals to 1. 
 				 *  
 				 */
-				testcase TC_CSE_REG_CRE_021() runs on CseTester system CseSystem {
+				testcase TC_CSE_REG_CRE_022() runs on CseTester system CseSystem {
 				
 					// Local variables
 					var MsgIn v_response;
@@ -1295,10 +1295,14 @@ module OneM2M_Testcases {
 					mccPort.send(m_request(v_request));
 					tc_ac.start;
 					alt {
-						[] mccPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+						[] mccPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__ & ": Resource type remoteCSE created successfully");
 						}
+						[] mccPort.receive(mw_response(mw_responsePrimitiveOK)) {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Wrong response status code in the response");
+						}
 						[] mccPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__ & ": Error while creating resource type remoteCSE");
@@ -1314,13 +1318,13 @@ module OneM2M_Testcases {
 					// Tear down
 					f_cf04Down();
 
-				}//end TC_CSE_REG_CRE_BV_011
+				}//end TC_CSE_REG_CRE_022
 				
 				/**
 				 * @desc Check that the IUT accepts an create request of <remoteCSE> resource with attributes multiplicity equals to 1 without the preconfigured CSE-ID
 				 *
 				 */
-				testcase TC_CSE_REG_CRE_022() runs on CseTester system CseSystem {
+				testcase TC_CSE_REG_CRE_023() runs on CseTester system CseSystem {
 				
 					// Local variables
 					var MsgIn v_response;
@@ -1362,59 +1366,59 @@ module OneM2M_Testcases {
 					// Tear down
 					f_cf04Down();
 
-				}//end TC_CSE_REG_CRE_022
+				}//end TC_CSE_REG_CRE_023
 				
-				group g_CSE_REG_CRE_015{
+				group g_CSE_REG_CRE_016{
 					
 					/**
 					 * @desc Check that the IUT accepts a create request of <remoteCSE> resource with OPTIONAL_ATTRIBUTE. 
 					 * 
 					 */
-					testcase TC_CSE_REG_CRE_015_LBL() runs on CseTester system CseSystem {
+					testcase TC_CSE_REG_CRE_016_LBL() runs on CseTester system CseSystem {
 						// Local variables
 						var template RequestPrimitive v_createRequest := m_createRemoteCSEBase;	
 						const AttributeAux c_optionalAttribute := {"labels", omit};
 						
 						v_createRequest.primitiveContent.remoteCSE.labels := {"MyLabel"};
 						
-						f_CSE_REG_CRE_015(v_createRequest, c_optionalAttribute);
+						f_CSE_REG_CRE_016(v_createRequest, c_optionalAttribute);
 						
 					}
 					
-					testcase TC_CSE_REG_CRE_015_CST() runs on CseTester system CseSystem {
+					testcase TC_CSE_REG_CRE_016_CST() runs on CseTester system CseSystem {
 						// Local variables
 						var template RequestPrimitive v_createRequest := m_createRemoteCSEBase;	
 						const AttributeAux c_optionalAttribute := {"cseType", omit};
 						
 						v_createRequest.primitiveContent.remoteCSE.cseType := int1;
 						
-						f_CSE_REG_CRE_015(v_createRequest, c_optionalAttribute);
+						f_CSE_REG_CRE_016(v_createRequest, c_optionalAttribute);
 	
 					}
 					
-					testcase TC_CSE_REG_CRE_015_POA() runs on CseTester system CseSystem {
+					testcase TC_CSE_REG_CRE_016_POA() runs on CseTester system CseSystem {
 						// Local variables
 						var template RequestPrimitive v_createRequest := m_createRemoteCSEBase;	
 						const AttributeAux c_optionalAttribute := {"pointOfAccess", omit};
 	
 						v_createRequest.primitiveContent.remoteCSE.pointOfAccess := {"http://" & PX_CSE1_ADDRESS & "/"};
 	
-						f_CSE_REG_CRE_015(v_createRequest, c_optionalAttribute);
+						f_CSE_REG_CRE_016(v_createRequest, c_optionalAttribute);
 
 					}
 					
-					testcase TC_CSE_REG_CRE_015_NL() runs on CseTester system CseSystem {
+					testcase TC_CSE_REG_CRE_016_NL() runs on CseTester system CseSystem {
 						// Local variables
 						var template RequestPrimitive v_createRequest := m_createRemoteCSEBase;	
 						const AttributeAux c_optionalAttribute := {"nodeLink", omit};
 
 						v_createRequest.primitiveContent.remoteCSE.nodeLink := c_defaultNodeID;
 
-						f_CSE_REG_CRE_015(v_createRequest, c_optionalAttribute);
+						f_CSE_REG_CRE_016(v_createRequest, c_optionalAttribute);
 
 					}
 					
-					function f_CSE_REG_CRE_015(template RequestPrimitive p_requestPrimitive, in AttributeAux p_optionalAttribute) runs on CseTester {
+					function f_CSE_REG_CRE_016(template RequestPrimitive p_requestPrimitive, in AttributeAux p_optionalAttribute) runs on CseTester {
 					
 						// Local variables
 						var MsgIn v_response;
@@ -1436,11 +1440,15 @@ module OneM2M_Testcases {
 						mccPort.send(m_request(v_request));
 						tc_ac.start;
 						alt {
-							[] mccPort.receive(mw_response(mw_responsePrimitiveOK(f_getTemplateFromPrimitiveContent(v_request.primitiveContent)))) -> value v_response {
+							[] mccPort.receive(mw_response(mw_responsePrimitive(int2001, f_getTemplateFromPrimitiveContent(v_request.primitiveContent)))) -> value v_response {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__ & ": Accepted creation for resource type remoteCSE containing attribute " & p_optionalAttribute.name);
 							}
-							[] mccPort.receive(mw_response(mw_responsePrimitiveOK())) -> value v_response {
+							[] mccPort.receive(mw_response(mw_responsePrimitiveOK(f_getTemplateFromPrimitiveContent(v_request.primitiveContent)))) -> value v_response {
+								tc_ac.stop;
+								setverdict(fail, __SCOPE__ & ": Wrong response status code in the response");
+							}
+							[] mccPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__ & ": Accepted creation for resource type remoteCSE without containing attribute " & p_optionalAttribute.name);
 							}
@@ -1494,10 +1502,14 @@ module OneM2M_Testcases {
 	
 					tc_ac.start;
 					alt {
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(v_contentResponse))) -> value v_response {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, v_contentResponse))) -> value v_response {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__ & ": Response OK for retrieving");
 						}
+						[] 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");
@@ -1552,7 +1564,7 @@ module OneM2M_Testcases {
 
 					tc_ac.start;
 					alt {
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(v_contentResponse))) -> value v_response {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, v_contentResponse))) -> value v_response {
 							tc_ac.stop;
 							if (ispresent(v_response.primitive.responsePrimitive.primitiveContent.cSEBase.cseType)){
 								if (v_response.primitive.responsePrimitive.primitiveContent.cSEBase.cseType==int1){
@@ -1565,6 +1577,10 @@ module OneM2M_Testcases {
 							}
 							
 						}
+						[] 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");
@@ -1615,7 +1631,7 @@ module OneM2M_Testcases {
 
 					tc_ac.start;
 					alt {
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(v_contentResponse))) -> value v_response {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, v_contentResponse))) -> value v_response {
 							tc_ac.stop;
 							
 							if (v_response.primitive.responsePrimitive.primitiveContent.cSEBase.supportedResourceType == PX_SRT) {
@@ -1631,6 +1647,10 @@ module OneM2M_Testcases {
 							}
 			
 						}
+						[] 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");
@@ -2206,11 +2226,15 @@ module OneM2M_Testcases {
     					mcaPort.send(m_request(v_request));
     					tc_ac.start;
     					alt {
-    						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+    						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
     							tc_ac.stop;
     							setverdict(pass, __SCOPE__ & ": Resource type " & int2str(enum2int(p_resourceType)) & " created successfully");
 								v_resourceIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, p_resourceType, v_parentIndex);
 								}
+							[] 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 creating resource type " & int2str(enum2int(p_resourceType)));
@@ -2222,8 +2246,8 @@ module OneM2M_Testcases {
     					
     					f_checkCseTesterStatus();
     					
-						//Check to see if the resource has been created
-						if (f_isResourceCreated(v_resourceIndex)){
+						//Check to see if the resource is present or not
+						if (f_isResourcePresent(v_resourceIndex)){
 							setverdict(pass, __SCOPE__ & ":INFO: Resource created");
 						} else {
 							setverdict(fail, __SCOPE__ & ":ERROR: Resource not created");
@@ -2380,11 +2404,15 @@ module OneM2M_Testcases {
 						mcaPort.send(m_request(v_request));
 						tc_ac.start;
 						alt {
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__ & ": Resource type " & int2str(enum2int(p_resourceType)) & " created successfully");
 								v_resourceIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, p_resourceType, v_aeIndex);
 							}
+							[] 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 creating resource type " & int2str(enum2int(p_resourceType)));
@@ -2396,8 +2424,8 @@ module OneM2M_Testcases {
 						
 						f_checkCseTesterStatus();
 						
-						//Check to see if the resource has been created
-						if(f_isResourceCreated(v_resourceIndex)){
+						//Check to see if the resource is present or not
+						if(f_isResourcePresent(v_resourceIndex)){
 							setverdict(pass, __SCOPE__ & ":INFO: Resource created");	
 						} else {
 							setverdict(fail, __SCOPE__ & ":ERROR: Resource not created");
@@ -2611,8 +2639,8 @@ module OneM2M_Testcases {
 						
 						f_checkCseTesterStatus();
     					
-						//Check to see if the resource has NOT been created
-						if(f_isResourceNotCreated(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
+						//Check to see if the resource is NOT present
+						if(f_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
 						  setverdict(pass, __SCOPE__ & ":INFO: Resource not created");
 						} else {
 						  setverdict(fail, __SCOPE__ & ":ERROR: Resource created");
@@ -2692,17 +2720,17 @@ module OneM2M_Testcases {
     						mcaPort.send(m_request(v_request, {p_invalidAttribute}));
 							tc_ac.start;
 							alt {
-								[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+								[] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) -> value v_response {
 									tc_ac.stop;
 									setverdict(pass, __SCOPE__ & ": Creation rejected for resource type " & int2str(enum2int(p_resourceType)) & " containing an invalid value for attribute " & p_invalidAttribute.name);
 								}								
-								[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+								[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 									tc_ac.stop;
-									setverdict(fail, __SCOPE__ & ": Accepted creation of resource type " & int2str(enum2int(p_resourceType)) & " containing an invalid value for attribute" & p_invalidAttribute.name);
+									setverdict(fail, __SCOPE__ & ": Wrong response status code");
 								}
-								[] mcaPort.receive {
+								[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 									tc_ac.stop;
-									setverdict(fail, __SCOPE__ & ": Incorrect value received");
+									setverdict(fail, __SCOPE__ & ": Accepted creation of resource type " & int2str(enum2int(p_resourceType)) & " containing an invalid value for attribute" & p_invalidAttribute.name);
 								}
 								[] tc_ac.timeout {
 									setverdict(fail, __SCOPE__ & ": No answer while creating resource type " & int2str(enum2int(p_resourceType)));  
@@ -2711,8 +2739,8 @@ module OneM2M_Testcases {
     						
 							f_checkCseTesterStatus();
     					
-							//Check to see if the resource has NOT been created
-							if(f_isResourceNotCreated(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
+							//Check to see if the resource is NOT present
+							if(f_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
 							  setverdict(pass, __SCOPE__ & ":INFO: Resource not created");
 							} else {
 							  setverdict(fail, __SCOPE__ & ":ERROR: Resource created");
@@ -2802,11 +2830,15 @@ module OneM2M_Testcases {
 							mcaPort.send(m_request(v_request));
 							tc_ac.start;
 							alt {
-								[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+								[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
 									tc_ac.stop;
 									setverdict(pass, __SCOPE__ & ": Accepted creation rejected for resource type " & int2str(enum2int(p_resourceType)));
 									v_resourceIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, p_resourceType, v_aeIndex);
 								}
+								[] 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__ & ": Creation rejected of resource type " & int2str(enum2int(p_resourceType)));
@@ -2818,8 +2850,8 @@ module OneM2M_Testcases {
 							
 							f_checkCseTesterStatus();
     						
-						    //Check to see if the resource has been created
-						    if(f_isResourceCreated(v_resourceIndex)){
+						    //Check to see if the resource is present or not
+						    if(f_isResourcePresent(v_resourceIndex)){
 								setverdict(pass, __SCOPE__ & ":INFO: Resource created");
 						    } else {
 								setverdict(fail, __SCOPE__ & ":ERROR: Resource not created");
@@ -2891,8 +2923,8 @@ module OneM2M_Testcases {
 						
 						f_checkCseTesterStatus();
     					
-						//Check to see if the resource has NOT been created
-						if(f_isResourceNotCreated(v_containerIndex, f_getResourceName(v_request.primitiveContent))){
+						//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");
@@ -2963,8 +2995,8 @@ module OneM2M_Testcases {
 						
 						f_checkCseTesterStatus();
 						
-						//Check to see if the resource has been created or not
-						if(f_isResourceNotCreated(v_containerIndex, f_getResourceName(v_request.primitiveContent))){
+						//Check to see if the resource is present or not
+						if(f_isResourceNotPresent(v_containerIndex, f_getResourceName(v_request.primitiveContent))){
 							setverdict(pass, __SCOPE__ & ":INFO: Resource created");
 						} else {
 							setverdict(fail, __SCOPE__ & ":ERROR: Resource not created");
@@ -3017,7 +3049,7 @@ module OneM2M_Testcases {
 						
                         tc_ac.start;
                         alt {
-                        	[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(v_contentResponse))) -> value v_response {
+                        	[] 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) {
@@ -3026,6 +3058,10 @@ module OneM2M_Testcases {
 									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");
@@ -3104,8 +3140,8 @@ module OneM2M_Testcases {
 						
 						f_checkCseTesterStatus();
     					
-						//Check to see if the resource has NOT been created
-						if(f_isResourceNotCreated(v_containerIndex, f_getResourceName(v_request.primitiveContent))){
+						//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");
@@ -3177,8 +3213,8 @@ module OneM2M_Testcases {
 						
 						f_checkCseTesterStatus();
     					
-						//Check to see if the resource has NOT been created
-						if(f_isResourceNotCreated(v_containerIndex, f_getResourceName(v_request.primitiveContent))){
+						//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");
@@ -3260,10 +3296,14 @@ module OneM2M_Testcases {
 						mcaPort.send(m_request(v_request));
 						tc_ac.start;
 						alt {
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(omit))) -> value v_response {
+							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001, omit))) -> value v_response {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__ & ": No content provided with RC set to 0");
 							}
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(omit))) -> 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__ & ": Content provided with RC set to 0");
@@ -3371,10 +3411,14 @@ module OneM2M_Testcases {
 						mcaPort.send(m_request(v_request));
 						tc_ac.start;
 						alt {
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(p_contentResponse))) -> value v_response {
+							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001, p_contentResponse))) -> value v_response {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__ & ": No content provided with RC set to 0");
 							}
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(p_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__ & ": Content provided with RC set to 0");
@@ -3482,10 +3526,14 @@ module OneM2M_Testcases {
 						mcaPort.send(m_request(v_request));
 						tc_ac.start;
 						alt {
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(p_contentResponse))) -> value v_response {
+							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001, p_contentResponse))) -> value v_response {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__ & ": No content provided with RC set to 0");
 							}
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(p_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__ & ": Content provided with RC set to 0");
@@ -3899,12 +3947,16 @@ module OneM2M_Testcases {
 							mcaPort.send(m_request(v_request));
 							tc_ac.start;
 							alt {
-								[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(f_getTemplateFromPrimitiveContent(v_request.primitiveContent)))) -> value v_response {
+								[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001, f_getTemplateFromPrimitiveContent(v_request.primitiveContent)))) -> value v_response {
 									tc_ac.stop;
 									setverdict(pass, __SCOPE__ & ": Accepted creation for resource type " & int2str(enum2int(p_resourceType)) & " containing attribute " & p_optionalAttribute.name);
 									v_resourceIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, p_resourceType, v_parentIndex);
 								}
-								[] mcaPort.receive(mw_response(mw_responsePrimitiveOK())) -> value v_response {
+								[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(f_getTemplateFromPrimitiveContent(v_request.primitiveContent)))) -> 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 creation for resource type " & int2str(enum2int(p_resourceType)) & " without containing attribute " & p_optionalAttribute.name);
 								}
@@ -3919,8 +3971,8 @@ module OneM2M_Testcases {
 							
 							f_checkCseTesterStatus();
     						
-    						//Check to see if the resource has been created or not
-						    if(f_isResourceCreated(v_resourceIndex)) {
+    						//Check to see if the resource is present or not
+						    if(f_isResourcePresent(v_resourceIndex)) {
 						    	setverdict(pass, __SCOPE__ & ":INFO: Resource created");
 						    } else {
 								setverdict(fail, __SCOPE__ & ":ERROR: Resource not created");
@@ -4053,15 +4105,11 @@ module OneM2M_Testcases {
 						alt {
 							[] mccPort.receive(mw_request(p_requestAnnc)) -> value v_response {
 								tc_ac.stop;
-								setverdict(pass, __SCOPE__ & ": No content provided with RC set to 0");
+								setverdict(pass, __SCOPE__ & ": Correct CREATE request for the resource announced variant");
 							}
-							[] mccPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+							[] mccPort.receive(mw_request(?)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Content provided with RC set to 0");
-							}
-							[] mccPort.receive(mw_response(mw_responsePrimitiveKO)) {
-								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Error while creating resource");
+								setverdict(fail, __SCOPE__ & ": Wrong CREATE request received");
 							}
 							[] tc_ac.timeout {
 								setverdict(fail, __SCOPE__ & ": No answer while creating resource");
@@ -4283,15 +4331,11 @@ module OneM2M_Testcases {
 						alt {
 							[] mccPort.receive(mw_request(p_requestAnnc)) -> value v_anncRequest {
 								tc_ac.stop;
-								setverdict(pass, __SCOPE__ & ": No content provided with RC set to 0");
-							}
-							[] mccPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_anncRequest {
-								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Content provided with RC set to 0");
+								setverdict(pass, __SCOPE__ & ": Correct CREATE request for the resource announced variant");
 							}
-							[] mccPort.receive(mw_response(mw_responsePrimitiveKO)) {
+							[] mccPort.receive(mw_request(?)) -> value v_anncRequest {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Error while creating resource");
+								setverdict(fail, __SCOPE__ & ": Wrong CREATE request received");
 							}
 							[] tc_ac.timeout {
 								setverdict(fail, __SCOPE__ & ": No answer while creating resource");
@@ -4415,10 +4459,14 @@ module OneM2M_Testcases {
 
 						tc_ac.start;
 						alt {
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(p_contentResponse))) -> value v_response {
+							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, p_contentResponse))) -> value v_response {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__ & ": Response OK for retrieving");
 							}
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(p_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");
@@ -4490,7 +4538,7 @@ module OneM2M_Testcases {
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
+								setverdict(fail, __SCOPE__ & ": Wrong response status code");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
 								tc_ac.stop;
@@ -4718,10 +4766,14 @@ module OneM2M_Testcases {
 
 						tc_ac.start;
 						alt {
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(p_contentResponse))) -> value v_response {
+							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, p_contentResponse))) -> value v_response {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__ & ": Requested attribute retrieved successfully");
 							}
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(p_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, not only requested attribute retrieved");
@@ -4841,10 +4893,14 @@ module OneM2M_Testcases {
 
 						tc_ac.start;
 						alt {
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(p_contentResponse))) -> value v_response {
+							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, p_contentResponse))) -> value v_response {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__ & ": Requested attribute retrieved successfully");
 							}
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(p_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, not only requested attribute retrieved");
@@ -4971,10 +5027,14 @@ module OneM2M_Testcases {
 
 						tc_ac.start;
 						alt {
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(p_contentResponse))) -> value v_response {
+							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, p_contentResponse))) -> value v_response {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__ & ": Requested attributes retrieved successfully");
 							}
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(p_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, not only requested attributes retrieved");
@@ -5076,7 +5136,7 @@ module OneM2M_Testcases {
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Error while retrieving non existing resource attribute");
+								setverdict(fail, __SCOPE__ & ": Wrong response status code");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
@@ -5175,7 +5235,7 @@ module OneM2M_Testcases {
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Error while retrieving non existing resource attributes");
+								setverdict(fail, __SCOPE__ & ": Wrong response status code");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
@@ -5232,7 +5292,7 @@ module OneM2M_Testcases {
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
+								setverdict(fail, __SCOPE__ & ": Wrong response status code");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
 								tc_ac.stop;
@@ -5292,10 +5352,14 @@ module OneM2M_Testcases {
 
 						tc_ac.start;
 						alt {
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(v_contentResponse))){
+							[] 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");
@@ -5355,7 +5419,7 @@ module OneM2M_Testcases {
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
+								setverdict(fail, __SCOPE__ & ": Wrong response status code");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
 								tc_ac.stop;
@@ -5416,10 +5480,14 @@ module OneM2M_Testcases {
 
 						tc_ac.start;
 						alt {
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(v_contentResponse))){
+							[] 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, resourceName attribute of <latest> resource value not expected");
@@ -5556,10 +5624,14 @@ module OneM2M_Testcases {
 
 						tc_ac.start;
 						alt {
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(p_contentResponse))) -> value v_response {
+							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, p_contentResponse))) -> value v_response {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__ & ": Response OK for retrieving");
 							}
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(p_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");
@@ -5806,10 +5878,14 @@ module OneM2M_Testcases {
 
 						tc_ac.start;
 						alt {
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(p_contentResponse))) -> value v_response {
+							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, p_contentResponse))) -> value v_response {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__ & ": Requested attribute retrieved successfully");
 							}
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(p_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, not only requested attribute retrieved");
@@ -5944,10 +6020,14 @@ module OneM2M_Testcases {
 
 						tc_ac.start;
 						alt {
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(p_contentResponse))) -> value v_response {
+							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, p_contentResponse))) -> value v_response {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__ & ": Requested attribute retrieved successfully");
 							}
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(p_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, not only requested attribute retrieved");
@@ -6090,10 +6170,14 @@ module OneM2M_Testcases {
 
 						tc_ac.start;
 						alt {
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(p_contentResponse))) -> value v_response {
+							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, p_contentResponse))) -> value v_response {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__ & ": Requested attributes retrieved successfully");
 							}
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(p_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, not only requested attributes retrieved");
@@ -6207,7 +6291,7 @@ module OneM2M_Testcases {
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Error while retrieving non existing resource attribute");
+								setverdict(fail, __SCOPE__ & ": Wrong response status code");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
@@ -6318,7 +6402,7 @@ module OneM2M_Testcases {
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Error while retrieving non existing resource attributes");
+								setverdict(fail, __SCOPE__ & ": Wrong response status code");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
@@ -6392,7 +6476,7 @@ module OneM2M_Testcases {
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) { 
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
+								setverdict(fail, __SCOPE__ & ": Wrong response status code");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
@@ -6514,10 +6598,14 @@ module OneM2M_Testcases {
 						mcaPort.send(m_request(v_request));
 						tc_ac.start;
 						alt {
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(p_contentResponse))) -> value v_response {
+							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, p_contentResponse))) -> value v_response {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__ & ": No child resources provided with RC set to " & int2str(enum2int(v_request.resultContent)));
 							}
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(p_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__ & ": Child resources provided with RC set to " & int2str(enum2int(v_request.resultContent)));
@@ -6643,10 +6731,14 @@ module OneM2M_Testcases {
 						mcaPort.send(m_request(v_request));
 						tc_ac.start;
 						alt {
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(p_contentResponse))) -> value v_response {
+							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, p_contentResponse))) -> value v_response {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__ & ": No child resources provided with RC set to " & int2str(enum2int(v_request.resultContent)));
 							}
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(p_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__ & ": Child resources provided with RC set to " & int2str(enum2int(v_request.resultContent)));
@@ -6772,10 +6864,14 @@ module OneM2M_Testcases {
 						mcaPort.send(m_request(v_request));
 						tc_ac.start;
 						alt {
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(p_contentResponse))) -> value v_response {
+							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, p_contentResponse))) -> value v_response {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__ & ": No child resources provided with RC set to " & int2str(enum2int(v_request.resultContent)));
 							}
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(p_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__ & ": Child resources provided with RC set to " & int2str(enum2int(v_request.resultContent)));
@@ -6900,10 +6996,14 @@ module OneM2M_Testcases {
 						mcaPort.send(m_request(v_request));
 						tc_ac.start;
 						alt {
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(p_contentResponse))) -> value v_response {
+							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, p_contentResponse))) -> value v_response {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__ & ": No child resources provided with RC set to " & int2str(enum2int(v_request.resultContent)));
 							}
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(p_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__ & ": Child resources provided with RC set to " & int2str(enum2int(v_request.resultContent)));
@@ -7028,10 +7128,14 @@ module OneM2M_Testcases {
 						mcaPort.send(m_request(v_request));
 						tc_ac.start;
 						alt {
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(p_contentResponse))) -> value v_response {
+							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, p_contentResponse))) -> value v_response {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__ & ": No child resources provided with RC set to " & int2str(enum2int(v_request.resultContent)));
 							}
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(p_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__ & ": Child resources provided with RC set to " & int2str(enum2int(v_request.resultContent)));
@@ -7289,10 +7393,14 @@ module OneM2M_Testcases {
 						mcaPort.send(m_request(v_request));
 						tc_ac.start;
 						alt {
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__ & ": Attribute of resource type " & int2str(enum2int(p_resourceType)) & " updated 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 updating resource type " & int2str(enum2int(p_resourceType)));
@@ -7535,10 +7643,14 @@ module OneM2M_Testcases {
 						mcaPort.send(m_request(v_request));
 						tc_ac.start;
 						alt {
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__ & ": Attribute of resource type " & int2str(enum2int(p_resourceType)) & " updated 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 updating resource type " & int2str(enum2int(p_resourceType)));
@@ -7831,10 +7943,14 @@ module OneM2M_Testcases {
 						mcaPort.send(m_request(v_request, p_nullFields));
 						tc_ac.start;
 						alt {
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__ & ": Attribute of resource type " & int2str(enum2int(p_resourceType)) & " updated 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 updating resource type " & int2str(enum2int(p_resourceType)));
@@ -8226,10 +8342,14 @@ module OneM2M_Testcases {
 						mcaPort.send(m_request(v_request, p_nullFields));
 						tc_ac.start;
 						alt {
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK())) -> value v_response {
+							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__ & ": Attribute of resource type " & int2str(enum2int(p_resourceType)) & " updated 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 updating resource type " & int2str(enum2int(p_resourceType)));
@@ -8362,7 +8482,7 @@ module OneM2M_Testcases {
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Error while updating an unexisting resource type " & int2str(enum2int(p_resourceType)));
+								setverdict(fail, __SCOPE__ & ": Wrong response status code");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
 								tc_ac.stop;
@@ -8549,7 +8669,7 @@ module OneM2M_Testcases {
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Error while updating attributes from resource without having privileges");
+								setverdict(fail, __SCOPE__ & ": Wrong response status code");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
 								tc_ac.stop;
@@ -8735,7 +8855,7 @@ module OneM2M_Testcases {
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Error while updating RO attribute");
+								setverdict(fail, __SCOPE__ & ": Wrong response status code");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
 								tc_ac.stop;
@@ -8932,7 +9052,7 @@ module OneM2M_Testcases {
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Error while deleting mandatory RW attribute");
+								setverdict(fail, __SCOPE__ & ": Wrong response status code");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
 								tc_ac.stop;
@@ -9069,7 +9189,7 @@ module OneM2M_Testcases {
 						   }
 						   [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 							   tc_ac.stop;
-							   setverdict(fail, __SCOPE__ & ": Not allowed to update a contentInstance with a wrong error code");
+							   setverdict(fail, __SCOPE__ & ": Wrong response status code");
 						   }
 						   [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 							   tc_ac.stop;
@@ -9147,7 +9267,7 @@ module OneM2M_Testcases {
 						 	}
 						 	[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 							 	tc_ac.stop;
-							 	setverdict(fail, __SCOPE__ & ": Not allowed to update a latest resource with a wrong error code");
+							 	setverdict(fail, __SCOPE__ & ": Wrong response status code");
 						 	}
 						 	[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 							 	tc_ac.stop;
@@ -9225,7 +9345,7 @@ module OneM2M_Testcases {
 						  	}
 						  	[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 							  	tc_ac.stop;
-							  	setverdict(fail, __SCOPE__ & ": Not allowed to update an oldest resource with a wrong error code");
+							  	setverdict(fail, __SCOPE__ & ": Wrong response status code");
 						  	}
 						  	[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 							  	tc_ac.stop;
@@ -9336,10 +9456,14 @@ module OneM2M_Testcases {
                 		mcaPort.send(m_request(v_request));
                 		tc_ac.start;
                 		alt {
-                			[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+                			[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) -> value v_response {
                 				tc_ac.stop;
                 				setverdict(pass, __SCOPE__ & ": Resource" & int2str(enum2int(p_resourceType)) & " deleted successfully");
                 			}
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+								tc_ac.stop;
+								setverdict(fail, __SCOPE__ & ": Wrong response status code");
+							}
                 			[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
                 				tc_ac.stop;
                 				setverdict(fail, __SCOPE__ & ": Error while deleting resource type " & int2str(enum2int(p_resourceType)));
@@ -9439,23 +9563,8 @@ module OneM2M_Testcases {
             			v_setOfArcs.accessControlRule_list := {v_accessControlRule_1, v_accessControlRule_2};
 						v_updateRequest := valueof(m_updateAcpPrivileges(v_setOfArcs, -));
 						v_updateRequest := f_getUpdateRequestPrimitive(int1, vc_acpAuxIndex, v_updateRequest);
+						f_cse_updateResource(v_updateRequest);
 						
-						mcaPort.send(m_request(v_updateRequest));
-						tc_ac.start;
-						alt {
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
-								tc_ac.stop;
-								setverdict(pass, __SCOPE__ & ": Attribute of resource type int1 (Acp) updated successfully");
-							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
-								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Error while updating resource type int1 (Acp)");
-							}
-							[] tc_ac.timeout {
-								setverdict(fail, __SCOPE__ & ": No answer while updating resource type int1 (Acp)");
-							}
-						}
-                		
                 		//Adjustments for ACP resource type
                 		if(p_resourceType == int1) {
 							p_createRequestPrimitive.primitiveContent.accessControlPolicy.selfPrivileges.accessControlRule_list := {v_accessControlRule_2};//{v_accessControlRule_1,v_accessControlRule_2};
@@ -9481,19 +9590,28 @@ module OneM2M_Testcases {
                 				tc_ac.stop;
                 				setverdict(pass, __SCOPE__ & ": Access denied to delete the resource " & int2str(enum2int(p_resourceType)));
                 			}
+							[] 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__ & ": Error resource deleted without having privileges");
 							}                			
-                			[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
-                				tc_ac.stop;
-                				setverdict(fail, __SCOPE__ & ": Error while deleting a resource ");
-                			}
                 			[] tc_ac.timeout {
                 				setverdict(fail, __SCOPE__ & ": No answer while deleting resource type " & int2str(enum2int(p_resourceType)));
                 			}
                 		}	
                 					
+                		f_checkCseTesterStatus();
+                		
+                		//Check if the resource has been deleted or not
+                		if(f_isResourcePresent(v_resourceIndex)) {
+                			setverdict(pass, __SCOPE__ & ":INFO: Resource not deleted");
+                		} else {
+							setverdict(fail, __SCOPE__ & ":INFO: Resource deleted");
+                		}
+                					
                 		// Postamble
 						// We are forced to delete the Ae because the delete request in the postamble_deleteResources is sent by Ae itself, witch doesn't have privileges
 						f_cse_deleteResource(valueof(m_deleteRequest(f_getResourceAddress(v_aeIndex))));
@@ -9634,25 +9752,9 @@ module OneM2M_Testcases {
                 
                 		v_childResourceIndex := f_cse_createResource(p_childResourceType, p_createRequestPrimitiveChildResource, v_resourceIndex); 
                 												
-                		// Test Body
-                		v_request := valueof(m_deleteRequest(f_getResourceAddress(v_resourceIndex)));
-                		
-                		mcaPort.send(m_request(v_request));
-                		tc_ac.start;
-                		alt {
-                			[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
-                				tc_ac.stop;
-                				setverdict(pass, __SCOPE__ & ":Resource type " & int2str(enum2int(p_resourceType)) & " delete successfully");
-                			}
-                			[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
-                				tc_ac.stop;
-                				setverdict(fail, __SCOPE__ & ": Error while deleting resource type " & int2str(enum2int(p_resourceType)));
-                			}
-                			[] tc_ac.timeout {
-                				setverdict(fail, __SCOPE__ & ": No answer while deleting resource type " & int2str(enum2int(p_resourceType)));
-                			}
-                		}
+                		f_cse_deleteResource(valueof(m_deleteRequest(f_getResourceAddress(v_resourceIndex))));
                 		
+                		// Test Body
                 		mcaPort.send(m_request(m_deleteRequest(f_getResourceAddress(v_childResourceIndex), f_getOriginator(v_childResourceIndex))));
                 
                 		tc_ac.start;
@@ -9663,7 +9765,7 @@ module OneM2M_Testcases {
                 			}
                 			[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
                 				tc_ac.stop;
-                				setverdict(fail, __SCOPE__ & ": Error while deleting non existing resource");
+                				setverdict(fail, __SCOPE__ & ": Wrong response status code");
                 			}
                 			[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
                 				tc_ac.stop;
@@ -9720,10 +9822,14 @@ module OneM2M_Testcases {
             				mcaPort.send(m_request(v_request));
             				tc_ac.start;
             				alt {
-            					[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+            					[] 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)));
@@ -9870,10 +9976,14 @@ module OneM2M_Testcases {
 						mcaPort.send(m_request(v_request));
 						tc_ac.start;
 						alt {
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+							[] 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)));
@@ -9948,6 +10058,10 @@ module OneM2M_Testcases {
 									tc_ac.stop;
 									setverdict(pass, __SCOPE__ & ": Resource type  " & int2str(enum2int(c_containerResourceType)) & " NOT FOUND");
 								}
+								[] 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__ & ": Resource type  " & int2str(enum2int(c_containerResourceType)) & " has not been created");
@@ -10003,10 +10117,14 @@ module OneM2M_Testcases {
 						mcaPort.send(m_request(v_request));
 						tc_ac.start;
 						alt {
-								[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+								[] 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)));
@@ -10081,6 +10199,10 @@ module OneM2M_Testcases {
 									tc_ac.stop;
 									setverdict(pass, __SCOPE__ & ": Resource type" & int2str(enum2int(c_containerResourceType)) & " NOT FOUND");
 								}
+								[] 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__ & ": Resource type" & int2str(enum2int(c_containerResourceType)) & " has not been created");
@@ -10132,7 +10254,7 @@ module OneM2M_Testcases {
      	    	  }
      	    	  [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
      	    	    tc_ac.stop;
-    				setverdict(fail, __SCOPE__ & ": Error while handling an invalid locationPolicy resource create request with response status code:" & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)));     	    	    
+    				setverdict(fail, __SCOPE__ & ": Wrong response status code");     	    	    
      	    	  }
      	    	   [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
      	    	    tc_ac.stop;
@@ -10146,8 +10268,8 @@ module OneM2M_Testcases {
      	    	
 				f_checkCseTesterStatus();
     					
-				//Check to see if the resource has NOT been created
-				if(f_isResourceNotCreated(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
+				//Check to see if the resource is NOT present
+				if(f_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
 				  setverdict(pass, __SCOPE__ & ":INFO: Resource not created");
 				} else {
 				  setverdict(fail, __SCOPE__ & ":ERROR: Resource created");
@@ -10188,11 +10310,15 @@ module OneM2M_Testcases {
     			mcaPort.send(m_request(v_request));
     			tc_ac.start;
     			alt {
-    				[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+    				[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
     					tc_ac.stop;
     					setverdict(pass, __SCOPE__ & ": Resource locationPolicy is created successfully with response status code: " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode))&"!");
 						v_resourceIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int10, v_aeAuxIndex);
     				}
+					[] 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 occurrs with response status code: " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)) & "while handling a valid locationPolicy resource create request!");
@@ -10204,8 +10330,8 @@ module OneM2M_Testcases {
     			
 				f_checkCseTesterStatus();
     						
-				//Check to see if the resource has been created or not
-				if(f_isResourceCreated(v_resourceIndex)) {
+				//Check to see if the resource is present or not
+				if(f_isResourcePresent(v_resourceIndex)) {
 					setverdict(pass, __SCOPE__ & ":INFO: Resource created");
 				} else {
 					setverdict(fail, __SCOPE__ & ":ERROR: Resource not created");
@@ -10260,6 +10386,10 @@ module OneM2M_Testcases {
     					tc_ac.stop;
     					setverdict(pass, __SCOPE__ & ": Access denied to create a resource including locationPolicy!");
     				}
+					[] 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__ & ": Error occurrs with response status code: " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)) & "due to IUT failed to check the access privilege of originator!");
@@ -10271,8 +10401,8 @@ module OneM2M_Testcases {
     			
 				f_checkCseTesterStatus();
     					
-				//Check to see if the resource has NOT been created
-				if(f_isResourceNotCreated(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
+				//Check to see if the resource is NOT present
+				if(f_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
 				  setverdict(pass, __SCOPE__ & ":INFO: Resource not created");
 				} else {
 				  setverdict(fail, __SCOPE__ & ":ERROR: Resource created");
@@ -10317,6 +10447,10 @@ module OneM2M_Testcases {
     					tc_ac.stop;
     					setverdict(pass, __SCOPE__ & ": The targeted resource is not found!!");
     				}
+					[] 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__ & ": Error occurrs with response status code: "& int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)) & "due to IUT created a locationPolicy resource under a non-existed parent resource!");
@@ -10328,8 +10462,8 @@ module OneM2M_Testcases {
     			
 				f_checkCseTesterStatus();
     					
-				//Check to see if the resource has NOT been created
-				if(f_isResourceNotCreated(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
+				//Check to see if the resource is NOT present
+				if(f_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
 				  setverdict(pass, __SCOPE__ & ":INFO: Resource not created");
 				} else {
 				  setverdict(fail, __SCOPE__ & ":ERROR: Resource created");
@@ -10380,6 +10514,10 @@ module OneM2M_Testcases {
     					tc_ac.stop;
     					setverdict(pass, __SCOPE__ & ": Update locationPolicy resource is rejected!!");
     				}
+					[] 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__ & ": Error occurrs with response status code: "& int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)) & "due to IUT failed to handle an invalid locationPolicy update request");
@@ -10495,11 +10633,15 @@ module OneM2M_Testcases {
           			mcaPort.send(m_request(v_request));
           			tc_ac.start;
           			alt {
-          				[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+          				[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
           					tc_ac.stop;
           					setverdict(pass, __SCOPE__ & ": Resource locationPolicy is created successfully with response status code: " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode))&"!");
 							v_resourceIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int10, v_aeAuxIndex);
           				}
+						[] 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 occurrs with response status code: " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)) & "while handling a valid locationPolicy resource create request!");
@@ -10511,8 +10653,8 @@ module OneM2M_Testcases {
           			
 					f_checkCseTesterStatus();
     						
-					//Check to see if the resource has been created or not
-					if(f_isResourceCreated(v_resourceIndex)) {
+					//Check to see if the resource is present or not
+					if(f_isResourcePresent(v_resourceIndex)) {
 						setverdict(pass, __SCOPE__ & ":INFO: Resource created");
 					} else {
 						setverdict(fail, __SCOPE__ & ":ERROR: Resource not created");
@@ -10555,11 +10697,15 @@ module OneM2M_Testcases {
         			mcaPort.send(m_request(v_request));
         			tc_ac.start;
         			alt {
-        				[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+        				[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
         					tc_ac.stop;
         					setverdict(pass, __SCOPE__ & ": Resource locationPolicy is created successfully with response status code: " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode))&"!");
 							v_resourceIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int10, v_aeAuxIndex);
         				}
+						[] 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 occurrs with response status code: " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)) & "while handling a valid locationPolicy resource create request!");
@@ -10571,8 +10717,8 @@ module OneM2M_Testcases {
         			
 					f_checkCseTesterStatus();
     						
-					//Check to see if the resource has been created or not
-					if(f_isResourceCreated(v_resourceIndex)) {
+					//Check to see if the resource is present or not
+					if(f_isResourcePresent(v_resourceIndex)) {
 						setverdict(pass, __SCOPE__ & ":INFO: Resource created");
 					} else {
 						setverdict(fail, __SCOPE__ & ":ERROR: Resource not created");
@@ -10827,11 +10973,15 @@ module OneM2M_Testcases {
     		      mcaPort.send(m_request(valueof(f_getCreateRequestPrimitive(int23, v_subscription_request_preamble, v_locContainerResourceIndex)))); 
     		      tc_ac.start;
     		      alt{
-    		        [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response{
+    		        [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response{
     		          tc_ac.stop;    		         
     		          setverdict(pass, __SCOPE__ & "Subscription resource is successfully!");
     		        }
-    		        [] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))) -> value v_response{
+					[] 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__ & "Requested container resource is not found!");
     		        }    		        
@@ -10965,7 +11115,7 @@ module OneM2M_Testcases {
                         }
                         [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
                             tc_ac.stop;
-                            setverdict(fail, __SCOPE__ & ": Error while creating resource");
+                            setverdict(fail, __SCOPE__ & ": Wrong response status code");
                         }
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
 							tc_ac.stop;
@@ -10978,8 +11128,8 @@ module OneM2M_Testcases {
                     
 					f_checkCseTesterStatus();
     					
-					//Check to see if the resource has NOT been created
-					if(f_isResourceNotCreated(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
+					//Check to see if the resource is NOT present
+					if(f_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
 					  setverdict(pass, __SCOPE__ & ":INFO: Resource not created");
 					} else {
 					  setverdict(fail, __SCOPE__ & ":ERROR: Resource created");
@@ -11045,7 +11195,7 @@ module OneM2M_Testcases {
                 		}
                 		[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
                 			tc_ac.stop;
-                			setverdict(fail, __SCOPE__ & ": Error while creating resource");
+                			setverdict(fail, __SCOPE__ & ": Wrong response status code");
                 		}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
 							tc_ac.stop;
@@ -11058,8 +11208,8 @@ module OneM2M_Testcases {
                 	
 					f_checkCseTesterStatus();
     					
-					//Check to see if the resource has NOT been created
-					if(f_isResourceNotCreated(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
+					//Check to see if the resource is NOT present
+					if(f_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
 					  setverdict(pass, __SCOPE__ & ":INFO: Resource not created");
 					} else {
 					  setverdict(fail, __SCOPE__ & ":ERROR: Resource created");
@@ -11126,7 +11276,7 @@ module OneM2M_Testcases {
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Error while updating resource");
+							setverdict(fail, __SCOPE__ & ": Wrong response status code");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
 							tc_ac.stop;
@@ -11377,13 +11527,13 @@ module OneM2M_Testcases {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__ & ": unsuccessful validation of the resource type during the creation of the group");
 						}
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Error create succesfull while the operation should be aborted");
+							setverdict(fail, __SCOPE__ & ": Wrong response status code");
 						}
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Error while creating resource");
+							setverdict(fail, __SCOPE__ & ": Error create succesfull while the operation should be aborted");
 						}
 						[] tc_ac.timeout {
 							setverdict(fail, __SCOPE__ & ": No answer while creating resource");
@@ -11534,7 +11684,7 @@ module OneM2M_Testcases {
 						 }
 						 [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Error update successful with wrong ResponseStatusCode");
+							setverdict(fail, __SCOPE__ & ": Wrong response status code");
 						 }
 						 [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 							 tc_ac.stop;
@@ -11613,7 +11763,7 @@ module OneM2M_Testcases {
                         }
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
 						   tc_ac.stop;
-						   setverdict(fail, __SCOPE__ & ": Error update successful with wrong ResponseStatusCode");
+						   setverdict(fail, __SCOPE__ & ": Wrong response status code");
 						}
                          [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
                              tc_ac.stop;
@@ -11708,7 +11858,7 @@ module OneM2M_Testcases {
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
 						   tc_ac.stop;
-						   setverdict(fail, __SCOPE__ & ": Error update successful with wrong ResponseStatusCode");
+						   setverdict(fail, __SCOPE__ & ": Wrong response status code");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 							tc_ac.stop;
@@ -11810,7 +11960,7 @@ module OneM2M_Testcases {
                         }
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
 						   tc_ac.stop;
-						   setverdict(fail, __SCOPE__ & ": Error update successful with wrong ResponseStatusCode");
+						   setverdict(fail, __SCOPE__ & ": Wrong response status code");
 						}
                          [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
                              tc_ac.stop;
@@ -11885,13 +12035,13 @@ module OneM2M_Testcases {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__ & ": unsuccessful validation of the resource type during the creation of the group");
 						}
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Error create succesfull while the operation should be aborted");
+							setverdict(fail, __SCOPE__ & ": Wrong response status code");
 						}
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Error while creating resource");
+							setverdict(fail, __SCOPE__ & ": Error create succesfull while the operation should be aborted");
 						}
 						[] tc_ac.timeout {
 							setverdict(fail, __SCOPE__ & ": No answer while creating resource");
@@ -11963,7 +12113,7 @@ module OneM2M_Testcases {
                         }
                          [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
                              tc_ac.stop;
-                            setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
+                            setverdict(fail, __SCOPE__ & ": Wrong response status code");
                          }
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
 							tc_ac.stop;
@@ -12038,7 +12188,7 @@ module OneM2M_Testcases {
                         }
                          [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
                              tc_ac.stop;
-                             setverdict(fail, __SCOPE__ & ": Error while updating resource");
+                             setverdict(fail, __SCOPE__ & ": Wrong response status code");
                          }
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
 							 tc_ac.stop;
@@ -12280,25 +12430,25 @@ module OneM2M_Testcases {
 				 * @verdict 
 				 */
 				testcase TC_CSE_GMG_003_CRE() runs on CseTester system CseSystem { //Create
-					f_CSE_GMG_003(m_createContainerBase);
+					f_CSE_GMG_003(m_createContainerBase, int2001);
 				}//end TC_CSE_GMG_003_CRE
 
 				testcase TC_CSE_GMG_003_UPD() runs on CseTester system CseSystem { //Update
 					var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 					var Labels v_labels_1:= {"VALUE_1"};
 					v_updateRequest.primitiveContent.container.labels := v_labels_1;
-					f_CSE_GMG_003(v_updateRequest);
+					f_CSE_GMG_003(v_updateRequest, int2004);
 				}//end TC_CSE_GMG_003_UPD
 
 				testcase TC_CSE_GMG_003_RET() runs on CseTester system CseSystem { //Retrieve
-					f_CSE_GMG_003(m_retrieveResource("Temporary", "Temporary"));
+					f_CSE_GMG_003(m_retrieveResource("Temporary", "Temporary"), int2000);
 				}//end TC_CSE_GMG_003_RET
 
 				testcase TC_CSE_GMG_003_DEL() runs on CseTester system CseSystem { //Delete
-					f_CSE_GMG_003(m_deleteRequest("Temporary"));	
+					f_CSE_GMG_003(m_deleteRequest("Temporary"), int2002);	
 				}//end TC_CSE_GMG_003_DEL
 
-				function f_CSE_GMG_003(template RequestPrimitive p_requestPrimitive) runs on CseTester {
+				function f_CSE_GMG_003(template RequestPrimitive p_requestPrimitive, in ResponseStatusCode p_responseStatusCode) runs on CseTester {
 					// Local variables
 					var MsgIn v_response;
 					var integer v_aeIndex := -1;
@@ -12339,7 +12489,7 @@ module OneM2M_Testcases {
 					mcaPort.send(m_request(valueof(p_requestPrimitive)));
 					tc_ac.start;
 					alt {
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(p_responseStatusCode))) -> value v_response {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__ & ": creation successfull by using fanOutPoint in group resource");
     
@@ -12354,6 +12504,10 @@ module OneM2M_Testcases {
 								}
 							}                       
 						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Wrong response status code");
+						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__ & ": Error while creating resource");
@@ -12444,16 +12598,12 @@ module OneM2M_Testcases {
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Error while operation");
+							setverdict(fail, __SCOPE__ & ": Wrong response status code");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__ & ": Error operation successful while doesn't have privileges");
 						}
-						[] mcaPort.receive{
-							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Error, unexpected message received");
-						}
 						[] tc_ac.timeout {
 							setverdict(fail, __SCOPE__ & ": No answer while executing operation");
 						}
@@ -12476,25 +12626,25 @@ module OneM2M_Testcases {
 				 * 
 				 */
 				testcase TC_CSE_GMG_001_CRE() runs on CseTester system CseSystem { //Create
-					f_CSE_GMG_001(m_createContainerBase);
+					f_CSE_GMG_001(m_createContainerBase, int2001);
 				}//end TC_CSE_GMG_001_CRE
 
 				testcase TC_CSE_GMG_001_UPD() runs on CseTester system CseSystem { //Update
 					var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 					var Labels v_labels_1:= {"VALUE_1"};
 					v_updateRequest.primitiveContent.container.labels := v_labels_1;
-					f_CSE_GMG_001(v_updateRequest);
+					f_CSE_GMG_001(v_updateRequest, int2004);
 				}//end TC_CSE_GMG_001_UPD
 
 				testcase TC_CSE_GMG_001_RET() runs on CseTester system CseSystem { //Retrieve
-					f_CSE_GMG_001(m_retrieveResource("Temporary", "Temporary"));
+					f_CSE_GMG_001(m_retrieveResource("Temporary", "Temporary"), int2000);
 				}//end TC_CSE_GMG_001_RET
 
 				testcase TC_CSE_GMG_001_DEL() runs on CseTester system CseSystem { //Delete
-					f_CSE_GMG_001(m_deleteRequest("Temporary"));	
+					f_CSE_GMG_001(m_deleteRequest("Temporary"), int2002);	
 				}//end TC_CSE_GMG_001_DEL
 
-				function f_CSE_GMG_001(template RequestPrimitive p_requestPrimitive) runs on CseTester {
+				function f_CSE_GMG_001(template RequestPrimitive p_requestPrimitive, in ResponseStatusCode p_responseStatusCode) runs on CseTester {
 					// Local variables
 					var MsgIn v_response;
 					var integer v_aeIndex := -1;
@@ -12535,7 +12685,7 @@ module OneM2M_Testcases {
 					mcaPort.send(m_request(valueof(p_requestPrimitive)));
 					tc_ac.start;
 					alt {
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(p_responseStatusCode))) -> value v_response {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__ & ": creation successfull by using fanOutPoint in group resource");
                 
@@ -12550,6 +12700,10 @@ module OneM2M_Testcases {
 								}
 							}                       
 						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Wrong response status code");
+						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__ & ": Error while creating resource");
@@ -12640,16 +12794,12 @@ module OneM2M_Testcases {
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Error while operation");
+							setverdict(fail, __SCOPE__ & ": Wrong response status code");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__ & ": Error operation successful while doesn't have privileges");
 						}
-						[] mcaPort.receive{
-							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Error, unexpected message received");
-						}
 						[] tc_ac.timeout {
 							setverdict(fail, __SCOPE__ & ": No answer while executing operation");
 						}
@@ -12675,7 +12825,7 @@ module OneM2M_Testcases {
 					var template PrimitiveContent v_contentResponse;
 					v_contentResponse.container := mw_contentContainer_rc1;
 					
-					f_CSE_GMG_CRE_008(m_createContainerBase, v_contentResponse);
+					f_CSE_GMG_CRE_008(m_createContainerBase, v_contentResponse, int2001);
 				}//end TC_CSE_GMG_CRE_008_CRE
 
 				testcase TC_CSE_GMG_CRE_008_UPD() runs on CseTester system CseSystem { //Update
@@ -12686,24 +12836,24 @@ module OneM2M_Testcases {
 					v_contentResponse.aE.labels := ?;
 					v_updateRequest.primitiveContent.aE.labels := v_labels_1;
 					
-					f_CSE_GMG_CRE_008(v_updateRequest, v_contentResponse);
+					f_CSE_GMG_CRE_008(v_updateRequest, v_contentResponse, int2004);
 				}//end TC_CSE_GMG_CRE_008_UPD
 
 				testcase TC_CSE_GMG_CRE_008_RET() runs on CseTester system CseSystem { //Retrieve
 					var template PrimitiveContent v_contentResponse;
 					v_contentResponse.aE := mw_contentAeBase;
 					
-					f_CSE_GMG_CRE_008(m_retrieveResource("Temporary", "Temporary"), v_contentResponse);
+					f_CSE_GMG_CRE_008(m_retrieveResource("Temporary", "Temporary"), v_contentResponse, int2000);
 				}//end TC_CSE_GMG_CRE_008_RET
 
 				testcase TC_CSE_GMG_CRE_008_DEL() runs on CseTester system CseSystem { //Delete
 					var template PrimitiveContent v_contentResponse;
 					v_contentResponse.aE := mw_contentAeBase;// TODO see with wath should it be matched
 					
-					f_CSE_GMG_CRE_008(m_deleteRequest("Temporary"), v_contentResponse);	
+					f_CSE_GMG_CRE_008(m_deleteRequest("Temporary"), v_contentResponse, int2002);	
 				}//end TC_CSE_GMG_CRE_008_DEL
 
-				function f_CSE_GMG_CRE_008(template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on CseTester {
+				function f_CSE_GMG_CRE_008(template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse, in ResponseStatusCode p_responseStatusCode) runs on CseTester {
 					//Local constants
 					const integer c_numberOfResponsePrimitive := 2;
 					
@@ -12739,7 +12889,7 @@ module OneM2M_Testcases {
 					mcaPort.send(m_request(valueof(p_requestPrimitive)));
 					tc_ac.start;
 				  	alt {
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(p_responseStatusCode))) -> value v_response {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__ & ": creation successfull by using fanOutPoint in group resource");
                             
@@ -12759,30 +12909,9 @@ module OneM2M_Testcases {
 								}
 							}                            
 						}
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
-							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Error while creating resource");
-						}
-						[] tc_ac.timeout {
-							setverdict(fail, __SCOPE__ & ": No answer while creating resource");
-						}
-					}
-					
-					//Connerie
-					
-					
-					v_createRequest.to_ := f_getResourceAddress(v_groupIndex) & "/" & c_resourceShortNameFanOutPoint & "/" & c_defaultContainerResourceName;
-					v_createRequest.from_ := f_getOriginator(v_groupIndex); //TODO see if it is correct or if we have to use PX_SUPER_ADMIN
-
-					// Test Body
-
-					mcaPort.send(m_request(v_createRequest));
-					tc_ac.start;
-					alt {
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__ & ": creation successfull by using fanOutPoint in group resource");
-              
+							setverdict(fail, __SCOPE__ & ": Wrong response status code");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 							tc_ac.stop;
@@ -12854,7 +12983,7 @@ module OneM2M_Testcases {
 					mcaPort.send(m_request(v_createRequest));
 					tc_ac.start;
 					alt {
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__ & ": creation successfull by using fanOutPoint in group resource");
                 
@@ -12874,6 +13003,10 @@ module OneM2M_Testcases {
 								}
 							}                            
 						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Wrong response status code");
+						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__ & ": Error while creating resource");
@@ -12944,7 +13077,7 @@ module OneM2M_Testcases {
 					mcaPort.send(m_request(m_retrieveResource(v_fanoutPointAddress, f_getOriginator(v_aeIndex_1)))); //TODO see if it is correct or if we have to use PX_SUPER_ADMIN
 					tc_ac.start;
 					alt {
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) -> value v_response {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__ & ": creation successfull by using fanOutPoint in group resource");
     
@@ -12964,6 +13097,10 @@ module OneM2M_Testcases {
 								}
 							}                            
 						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Wrong response status code");
+						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__ & ": Error while creating resource");
@@ -13023,7 +13160,7 @@ module OneM2M_Testcases {
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) { 
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Wrong responseStatusCode while retrieving resource");
+							setverdict(fail, __SCOPE__ & ": Wrong response status code");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) { 
 							tc_ac.stop;
@@ -13087,7 +13224,7 @@ module OneM2M_Testcases {
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) { 
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Wrong responseStatusCode while retrieving resource");
+							setverdict(fail, __SCOPE__ & ": Wrong response status code");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) { 
 							tc_ac.stop;
@@ -13147,7 +13284,7 @@ module OneM2M_Testcases {
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) { 
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Wrong responseStatusCode while retrieving resource");
+							setverdict(fail, __SCOPE__ & ": Wrong response status code");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) { 
 							tc_ac.stop;
@@ -13210,7 +13347,7 @@ module OneM2M_Testcases {
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Wrong response status code while discovering " & f_getResourceAddress(v_resourceIndex) & " without having privileges");
+							setverdict(fail, __SCOPE__ & ": Wrong response status code");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
 							tc_ac.stop;
@@ -13272,7 +13409,7 @@ module OneM2M_Testcases {
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) { 
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Wrong response status code while retrieving resource");
+								setverdict(fail, __SCOPE__ & ": Wrong response status code");
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) { 
 								tc_ac.stop;
@@ -13397,7 +13534,7 @@ module OneM2M_Testcases {
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Error while subscribing a ressource");
+							setverdict(fail, __SCOPE__ & ": Wrong response status code");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 							tc_ac.stop;
@@ -13410,8 +13547,8 @@ module OneM2M_Testcases {
 					
 					f_checkCseTesterStatus();
     					
-					//Check to see if the resource has NOT been created
-					if(f_isResourceNotCreated(v_resourceIndex, f_getResourceName(v_request.primitiveContent))){
+					//Check to see if the resource is NOT present
+					if(f_isResourceNotPresent(v_resourceIndex, f_getResourceName(v_request.primitiveContent))){
 					  setverdict(pass, __SCOPE__ & ":INFO: Resource not created");
 					} else {
 					  setverdict(fail, __SCOPE__ & ":ERROR: Resource created");
@@ -13461,7 +13598,7 @@ module OneM2M_Testcases {
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Error while subscribing a ressource");
+							setverdict(fail, __SCOPE__ & ": Wrong response status code");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 							tc_ac.stop;
@@ -13474,8 +13611,8 @@ module OneM2M_Testcases {
 					
 					f_checkCseTesterStatus();
     					
-					//Check to see if the resource has NOT been created
-					if(f_isResourceNotCreated(v_contentInstanceResourceIndex, f_getResourceName(v_request.primitiveContent))){
+					//Check to see if the resource is NOT present
+					if(f_isResourceNotPresent(v_contentInstanceResourceIndex, f_getResourceName(v_request.primitiveContent))){
 					  setverdict(pass, __SCOPE__ & ":INFO: Resource not created");
 					} else {
 					  setverdict(fail, __SCOPE__ & ":ERROR: Resource created");
@@ -13533,7 +13670,7 @@ module OneM2M_Testcases {
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Error while subscribing a ressource");
+							setverdict(fail, __SCOPE__ & ": Wrong response status code");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 							tc_ac.stop;
@@ -13546,8 +13683,8 @@ module OneM2M_Testcases {
 					
 					f_checkCseTesterStatus();
     					
-					//Check to see if the resource has NOT been created
-					if(f_isResourceNotCreated(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
+					//Check to see if the resource is NOT present
+					if(f_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
 					  setverdict(pass, __SCOPE__ & ":INFO: Resource not created");
 					} else {
 					  setverdict(fail, __SCOPE__ & ":ERROR: Resource created");
@@ -13599,7 +13736,7 @@ module OneM2M_Testcases {
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Error while subscribing a ressource");
+							setverdict(fail, __SCOPE__ & ": Wrong response status code");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 							tc_ac.stop;
@@ -13612,8 +13749,8 @@ module OneM2M_Testcases {
 					
 					f_checkCseTesterStatus();
     					
-					//Check to see if the resource has NOT been created
-					if(f_isResourceNotCreated(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
+					//Check to see if the resource is NOT present
+					if(f_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
 					  setverdict(pass, __SCOPE__ & ":INFO: Resource not created");
 					} else {
 					  setverdict(fail, __SCOPE__ & ":ERROR: Resource created");
@@ -13669,7 +13806,7 @@ module OneM2M_Testcases {
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Error while subscribing a ressource");
+							setverdict(fail, __SCOPE__ & ": Wrong response status code");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 							tc_ac.stop;
@@ -13682,8 +13819,8 @@ module OneM2M_Testcases {
 					
 					f_checkCseTesterStatus();
     					
-					//Check to see if the resource has NOT been created
-					if(f_isResourceNotCreated(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
+					//Check to see if the resource is NOT present
+					if(f_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
 					  setverdict(pass, __SCOPE__ & ":INFO: Resource not created");
 					} else {
 					  setverdict(fail, __SCOPE__ & ":ERROR: Resource created");
@@ -13739,7 +13876,7 @@ module OneM2M_Testcases {
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Error while subscribing a ressource");
+							setverdict(fail, __SCOPE__ & ": Wrong response status code");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 							tc_ac.stop;
@@ -13752,8 +13889,8 @@ module OneM2M_Testcases {
 					
 					f_checkCseTesterStatus();
     					
-					//Check to see if the resource has NOT been created
-					if(f_isResourceNotCreated(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
+					//Check to see if the resource is NOT present
+					if(f_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
 					  setverdict(pass, __SCOPE__ & ":INFO: Resource not created");
 					} else {
 					  setverdict(fail, __SCOPE__ & ":ERROR: Resource created");
@@ -13817,17 +13954,17 @@ module OneM2M_Testcases {
 					mcaPort.send(m_request(v_request));
 					tc_ac.start;
 					alt {
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__ & ": Attribute of resource type int2 (Ae) updated successfully");
 						}
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Error while updating resource type int2 (Ae)");
+							setverdict(fail, __SCOPE__ & ": Wrong response status code");
 						}
-						[] mcaPort.receive{
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Error, unexpected message received");
+							setverdict(fail, __SCOPE__ & ": Error while updating resource type int2 (Ae)");
 						}
 						[] tc_ac.timeout {
 							setverdict(fail, __SCOPE__ & ": No answer while updating resource type int2 (Ae)");
@@ -13846,13 +13983,13 @@ module OneM2M_Testcases {
 
 			}//end group g_CSE_SUB_UPD_001
 
-			group g_CSE_SUB_CRE_007{
+			group g_CSE_SUB_CRE_005{
 				
 				/**
 				 * @desc Check that the IUT sends a Notify request to the subscriber resource when eventType attribute is set to "Create_of_Direct_Child_Resource"  and an create operation has been performed on the subscribed-to resource
 				 * 
 				 */
-				testcase TC_CSE_SUB_CRE_007() runs on CseTester system CseSystem {
+				testcase TC_CSE_SUB_CRE_005() runs on CseTester system CseSystem {
 					
 					// Local variables
 					var MsgIn v_response;
@@ -13892,18 +14029,18 @@ module OneM2M_Testcases {
 					mcaPort.send(m_request(v_request));
     				tc_ac.start;
     				alt {
-    					[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+    					[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
     						tc_ac.stop;
     						setverdict(pass, __SCOPE__ & ": Resource type int3 (Container) created 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 creating resource type int3 (Container)");
     					}
-    					[] mcaPort.receive{
-    						tc_ac.stop;
-    						setverdict(fail, __SCOPE__ & ": Error, unexpected message received");
-    					}
     					[] tc_ac.timeout {
     						setverdict(fail, __SCOPE__ & ": No answer while creating resource type int3 (Container)");
     					}
@@ -13916,17 +14053,17 @@ module OneM2M_Testcases {
 
 					//Tear down
 					f_cf01Down();
-				} // end TC_CSE_SUB_CRE_007
+				} // end TC_CSE_SUB_CRE_005
 				
-			}//end group g_CSE_SUB_CRE_007
+			}//end group g_CSE_SUB_CRE_005
 			
-			group g_CSE_SUB_DEL_008 {
+			group g_CSE_SUB_DEL_002 {
 				
 				/**
 				 * @desc Check that the IUT sends a Notify request to the subscriber resource when eventType attribute is set to "Delete_of_Resource"  and an delete operation has been performed the subscribed-to resource
 				 * 
 				 */
-				testcase TC_CSE_SUB_DEL_008() runs on CseTester system CseSystem {
+				testcase TC_CSE_SUB_DEL_002() runs on CseTester system CseSystem {
 					// Local variables
 					var MsgIn v_response;
 					var integer v_aeIndex := -1;
@@ -13965,19 +14102,19 @@ module OneM2M_Testcases {
 					mcaPort.send(m_request(v_deleteRequest));
 					tc_ac.start;
 					alt {
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) -> value v_response {
 							tc_ac.stop;
 							//Update vc_resourcesIndexToBeDeleted 
 							f_removeElementFromList (vc_resourcesIndexToBeDeleted, v_aeIndex);
 							setverdict(pass, __SCOPE__ & ": resource type int2 (AE) deleted successfully");
 						}
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Error while deleting resource type int2 (AE)");
+							setverdict(fail, __SCOPE__ & ": Wrong response status code");
 						}
-						[] mcaPort.receive{
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Error, unexpected message received");
+							setverdict(fail, __SCOPE__ & ": Error while deleting resource type int2 (AE)");
 						}
 						[] tc_ac.timeout {
 							setverdict(fail, __SCOPE__ & ": No answer while deleting resource type int2 (AE)");
@@ -13992,17 +14129,17 @@ module OneM2M_Testcases {
 					//Tear down
 					f_cf01Down();
 
-				} // end TC_CSE_SUB_DEL_008
+				} // end TC_CSE_SUB_DEL_002
 					
-			}//end group g_CSE_SUB_DEL_008
+			}//end group g_CSE_SUB_DEL_002
 	
-			group g_CSE_SUB_DEL_009 {
+			group g_CSE_SUB_DEL_003 {
 				
 				/**
 				 * @desc Check that the IUT sends a Notify request to the subscriber resource when eventType attribute is set to "Delete_of_Direct_Child_Resource"  and an delete operation has been performed on a child resource of the subscribed-to resource
 				 *  
 				 */
-				testcase TC_CSE_SUB_DEL_009() runs on CseTester system CseSystem {
+				testcase TC_CSE_SUB_DEL_003() runs on CseTester system CseSystem {
 					// Local variables
 					var MsgIn v_response;
 					var integer v_aeIndex := -1;
@@ -14042,17 +14179,17 @@ module OneM2M_Testcases {
 					mcaPort.send(m_request(v_deleteRequest));
 					tc_ac.start;
 					alt {
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) -> value v_response {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__ & ": Container resource deleted successfully");
 						}
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Error while deleting resource type int3 (Container)");
+							setverdict(fail, __SCOPE__ & ": Wrong response status code");
 						}
-						[] mcaPort.receive{
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Error, unexpected message received");
+							setverdict(fail, __SCOPE__ & ": Error while deleting resource type int3 (Container)");
 						}
 						[] tc_ac.timeout {
 							setverdict(fail, __SCOPE__ & ": No answer while deleting resource type int3 (Container)");
@@ -14067,17 +14204,17 @@ module OneM2M_Testcases {
 					//Tear down
 					f_cf01Down();
 
-				} // end TC_CSE_SUB_DEL_009
+				} // end TC_CSE_SUB_DEL_003
 				
-			}//end group g_CSE_SUB_DEL_009
+			}//end group g_CSE_SUB_DEL_003
 	
-			group g_CSE_SUB_CRE_010 {
+			group g_CSE_SUB_CRE_004 {
 				
 				/**
 				 * @desc Check that the IUT stores Originator ID in the notification creator attribute when a <SUBSCRIPTION> creation request which needs verification is received and the notificationURI is not the Originator.
 				 * 
 				 */
-				testcase TC_CSE_SUB_CRE_010() runs on CseTester system CseSystem {
+				testcase TC_CSE_SUB_CRE_004() runs on CseTester system CseSystem {
 					//Local variables
 					 var MsgIn v_response;
 					 var template RequestPrimitive v_request := m_createSubscriptionBase;
@@ -14110,17 +14247,17 @@ module OneM2M_Testcases {
 					 // Tear down
 					 f_cf01Down();					
 				
-				} // end TC_CSE_SUB_CRE_010
+				} // end TC_CSE_SUB_CRE_004
 
-			}//end group g_CSE_SUB_CRE_010
+			}//end group g_CSE_SUB_CRE_004
 			
-			group g_CSE_SUB_UPD_011 {
+			group g_CSE_SUB_UPD_002 {
 				
 				/**
 				 * @desc Check that the IUT sends a Notify request to the subscriber resource when the notificationContentType attribute is set to “modified attributes” and an update operation has been performed on the subscribed-to resource
 				 * 
 				 */
-				testcase TC_CSE_SUB_UPD_011() runs on CseTester system CseSystem {
+				testcase TC_CSE_SUB_UPD_002() runs on CseTester system CseSystem {
 					// Local variables
 					var MsgIn v_response;
 					var integer v_aeIndex := -1;
@@ -14166,19 +14303,18 @@ module OneM2M_Testcases {
 					mcaPort.send(m_request(v_request));
 					tc_ac.start;
 					alt {
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__ & ": Attribute of resource type int2 (Ae) updated 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 updating resource type int2 (Ae)");
 						}
-						[] mcaPort.receive{
-							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Error, unexpected message received");
-						}
 						[] tc_ac.timeout {
 							setverdict(fail, __SCOPE__ & ": No answer while updating resource type int2 (Ae)");
 						}
@@ -14192,16 +14328,16 @@ module OneM2M_Testcases {
 					//Tear down
 					f_cf01Down();
 
-				} // end TC_CSE_SUB_UPD_011
-			}//end group g_CSE_SUB_UPD_011
+				} // end TC_CSE_SUB_UPD_002
+			}//end group g_CSE_SUB_UPD_002
 	
-			group g_CSE_SUB_UPD_012 {
+			group g_CSE_SUB_UPD_003 {
 				
 				/**
 				 * @desc Check that the IUT sends a Notify request to the subscriber resource when the notificationContentType attribute is set to “ResourceID” and an update operation has been performed on the subscribed-to resource
 				 *  
 				 */
-				testcase TC_CSE_SUB_UPD_012() runs on CseTester system CseSystem {
+				testcase TC_CSE_SUB_UPD_003() runs on CseTester system CseSystem {
 					// Local variables
 					var MsgIn v_response;
 					var integer v_aeIndex := -1;
@@ -14244,17 +14380,17 @@ module OneM2M_Testcases {
 					mcaPort.send(m_request(v_request));
 					tc_ac.start;
 					alt {
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__ & ": Attribute of resource type int2 (Ae) updated successfully");
 						}
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Error while updating resource type int2 (Ae)");
+							setverdict(fail, __SCOPE__ & ": Wrong response status code");
 						}
-						[] mcaPort.receive{
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Error, unexpected message received");
+							setverdict(fail, __SCOPE__ & ": Error while updating resource type int2 (Ae)");
 						}
 						[] tc_ac.timeout {
 							setverdict(fail, __SCOPE__ & ": No answer while updating resource type int2 (Ae) or None notification received");
@@ -14267,16 +14403,16 @@ module OneM2M_Testcases {
 					//Tear down
 					f_cf01Down();
 
-				} // end TC_CSE_SUB_UPD_012
-			}//end group g_CSE_SUB_UPD_012
+				} // end TC_CSE_SUB_UPD_003
+			}//end group g_CSE_SUB_UPD_003
 	
-			group g_CSE_SUB_UPD_013 {
+			group g_CSE_SUB_UPD_004 {
 				
 				/**
 				 * @desc Check that the IUT decreases the expirationCounter attribute of a subscription resource when the Hosting CSE of the subscribed-to resource successfully sends the notification request to subscriber resource(s)
 				 *  
 				 */
-				testcase TC_CSE_SUB_UPD_013() runs on CseTester system CseSystem {
+				testcase TC_CSE_SUB_UPD_004() runs on CseTester system CseSystem {
 					// Local variables
 					var MsgIn v_response;
 					var integer v_aeIndex := -1;
@@ -14357,17 +14493,17 @@ module OneM2M_Testcases {
 					//Tear down
 					f_cf01Down();
 
-				} // end TC_CSE_SUB_UPD_013
+				} // end TC_CSE_SUB_UPD_004
 				
-			}//end group g_CSE_SUB_UPD_013
+			}//end group g_CSE_SUB_UPD_004
 				
-			group g_CSE_SUB_UPD_014 {
+			group g_CSE_SUB_UPD_005 {
 		
 				/**
 				 * @desc Check that the IUT deletes the subscription resource when the the expirationCounter meets zero
 				 * 
 				 */
-				testcase TC_CSE_SUB_UPD_014() runs on CseTester system CseSystem {
+				testcase TC_CSE_SUB_UPD_005() runs on CseTester system CseSystem {
 					// Local variables
 					var MsgIn v_response;
 					var integer v_aeIndex := -1;
@@ -14421,7 +14557,7 @@ module OneM2M_Testcases {
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Error while retrieving Subscription Resource");
+							setverdict(fail, __SCOPE__ & ": Wrong response status code");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
 							tc_ac.stop;
@@ -14440,17 +14576,17 @@ module OneM2M_Testcases {
 					//Tear down
 					f_cf01Down();
 
-				} // end TC_CSE_SUB_UPD_014
+				} // end TC_CSE_SUB_UPD_005
 				
-			}//end of group g_CSE_SUB_UPD_014
+			}//end of group g_CSE_SUB_UPD_005
 	
-			group g_CSE_SUB_UPD_015 {
+			group g_CSE_SUB_UPD_009 {
 				
 				/**
 				 * @desc Check that the IUT sends a Notify request to the subscriber resource when the “attribute” condition tag of eventNotificationCriteria attribute is set to ATTRIBUTE_NAME and an update operation has been performed on the subscribed-to resource
 				 * 
 				 */
-				testcase TC_CSE_SUB_UPD_015() runs on CseTester system CseSystem {
+				testcase TC_CSE_SUB_UPD_009() runs on CseTester system CseSystem {
 					// Local variables
 					var MsgIn v_response;
 					var Labels v_labels_1:= {"VALUE_1"};
@@ -14495,17 +14631,17 @@ module OneM2M_Testcases {
 					mcaPort.send(m_request(v_request));
 					tc_ac.start;
 					alt {
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__ & ": Attribute of resource type int2 (Ae) updated successfully");
 						}
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Error while updating resource type int2 (Ae)");
+							setverdict(fail, __SCOPE__ & ": Wrong response status code");
 						}
-						[] mcaPort.receive{
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Error, unexpected message received");
+							setverdict(fail, __SCOPE__ & ": Error while updating resource type int2 (Ae)");
 						}
 						[] tc_ac.timeout {
 							setverdict(fail, __SCOPE__ & ": No answer while updating resource type int2 (Ae) or None notification received");
@@ -14520,17 +14656,17 @@ module OneM2M_Testcases {
 					//Tear down
 					f_cf01Down();
 
-				} // end TC_CSE_SUB_UPD_015
+				} // end TC_CSE_SUB_UPD_009
 	
-			}//end group g_CSE_SUB_UPD_015
+			}//end group g_CSE_SUB_UPD_009
 	
-			group g_CSE_SUB_UPD_016 {
+			group g_CSE_SUB_UPD_006 {
 				
 				/**
 				 * @desc Check that the IUT doesn’t send a Notify request to the subscriber resource when the “attribute” condition tag of eventNotificationCriteria attribute is set to LIST_OF_ATTRIBUTE and doesn’t contain the ATTRIBUTE_NAME attribute updated.
 				 * 
 				 */
-				testcase TC_CSE_SUB_UPD_016() runs on CseTester system CseSystem {
+				testcase TC_CSE_SUB_UPD_006() runs on CseTester system CseSystem {
 					// Local variables
 					var MsgIn v_response;
 					var Labels v_labels_1:= {"VALUE_1"};
@@ -14568,15 +14704,19 @@ module OneM2M_Testcases {
 					};
 
 					// Test Body
-					v_notifyHandler.start(f_CSE_SUB_UPD_016()); // check that no notification is received
+					v_notifyHandler.start(f_CSE_SUB_UPD_006()); // check that no notification is received
 		
 					mcaPort.send(m_request(v_request));
 					tc_ac.start;
 					alt {
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__ & ": Attribute of resource type int2 (Ae) updated 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 updating resource type int2 (Ae)");
@@ -14594,9 +14734,9 @@ module OneM2M_Testcases {
 					//Tear down
 					f_cf01Down();
 
-				} // end TC_CSE_SUB_UPD_016
+				} // end TC_CSE_SUB_UPD_006
 				
-				function f_CSE_SUB_UPD_016() runs on CseTester {
+				function f_CSE_SUB_UPD_006() runs on CseTester {
 					// Local variables
 					var MsgIn v_response;
 
@@ -14617,9 +14757,9 @@ module OneM2M_Testcases {
 					unmap(self:mcaPort, system:mcaPort);
 					unmap(self:acPort, system:acPort); 
 
-				} //end f_CSE_SUB_UPD_016
+				} //end f_CSE_SUB_UPD_006
 
-			}//end group g_CSE_SUB_UPD_016
+			}//end group g_CSE_SUB_UPD_006
 	
 			group g_CSE_SUB_DEL_001{
 				
@@ -14664,17 +14804,17 @@ module OneM2M_Testcases {
 					
 					mcaPort.send(m_request(v_request));
 					alt {
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) -> value v_response {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__ & ": Subscription resource deleted successfully");
 						}
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Error while deleting resource type int23 (Subscription)");
+							setverdict(fail, __SCOPE__ & ": Wrong response status code");
 						}
-						[] mcaPort.receive{
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Error, unexpected message received");
+							setverdict(fail, __SCOPE__ & ": Error while deleting resource type int23 (Subscription)");
 						}
 						[] tc_ac.timeout {
 							setverdict(fail, __SCOPE__ & ": No answer while deleting resource type int23 (Subscription)");
@@ -14726,13 +14866,13 @@ module OneM2M_Testcases {
 				
 			}//end group g_CSE_SUB_DEL_001
 			
-			group g_CSE_SUB_UPD_018 {
+			group g_CSE_SUB_UPD_007 {
 				
 				/**
 				 * @desc Check that the IUT sends aggregated notification to the subscriber resource when the number value of the batchNotify attribute is set to GROUP_LIMIT and when this number have been reached
 				 * 
 				 */
-				testcase TC_CSE_SUB_UPD_018() runs on CseTester system CseSystem {
+				testcase TC_CSE_SUB_UPD_007() runs on CseTester system CseSystem {
 					// Local variables
 					const integer numberOfAggregatedNotification := 3;
 					var MsgIn v_response;
@@ -14771,7 +14911,7 @@ module OneM2M_Testcases {
 					};
 
 					// Test Body
-					v_notifyHandler.start(f_CSE_SUB_UPD_018(v_contentResponse, numberOfAggregatedNotification)); // check that no notification is received
+					v_notifyHandler.start(f_CSE_SUB_UPD_007(v_contentResponse, numberOfAggregatedNotification)); // check that no notification is received
 					
 					v_updateRequest.primitiveContent.aE.labels := v_labels_1;
 					v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest); // Update request 1
@@ -14793,9 +14933,9 @@ module OneM2M_Testcases {
 					//Tear down
 					f_cf01Down();
 
-				} // end TC_CSE_SUB_UPD_018
+				} // end TC_CSE_SUB_UPD_007
 				
-				function f_CSE_SUB_UPD_018(template PrimitiveContent p_primitiveContent,in integer p_numberOfAggregatedNotification) runs on CseTester {
+				function f_CSE_SUB_UPD_007(template PrimitiveContent p_primitiveContent,in integer p_numberOfAggregatedNotification) runs on CseTester {
     				// Local variables
     				var MsgIn v_response;
     
@@ -14830,9 +14970,9 @@ module OneM2M_Testcases {
     				unmap(self:mcaPort, system:mcaPort);
     				unmap(self:acPort, system:acPort); 
     
-    			} //end f_CSE_SUB_UPD_018
+    			} //end f_CSE_SUB_UPD_007
 	
-			}//end group g_CSE_SUB_UPD_018
+			}//end group g_CSE_SUB_UPD_007
 			
 			group g_CSE_SUB_NTF_003 {
 				
@@ -14878,7 +15018,7 @@ module OneM2M_Testcases {
 					};
 
 					// Test Body
-					v_notifyHandler.start(f_CSE_SUB_UPD_018(v_contentResponse, 2)); // check that no notification is received
+					v_notifyHandler.start(f_CSE_SUB_UPD_007(v_contentResponse, 2)); // check that no notification is received
 
 					v_updateRequest.primitiveContent.aE.labels := v_labels_1;
 					v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest); // Update request 1
@@ -14900,13 +15040,13 @@ module OneM2M_Testcases {
     
     		}//end group g_CSE_SUB_NTF_003
     		
-			group g_CSE_SUB_UPD_020 {
+			group g_CSE_SUB_UPD_008 {
 				
             	/**
             	 * @desc Check that the IUT sends the latest notification to the subscriber resource when latestNotify is set to TRUE, the number value of the batchNotify attribute is set to GROUP_LIMIT and when this number have been reached
             	 * 
             	 */
-            	testcase TC_CSE_SUB_UPD_020() runs on CseTester system CseSystem {
+            	testcase TC_CSE_SUB_UPD_008() runs on CseTester system CseSystem {
             		// Local variables
             		const integer numberOfAggregatedNotification := 3;
             		var MsgIn v_response;
@@ -14971,9 +15111,9 @@ module OneM2M_Testcases {
             		//Tear down
             		f_cf01Down();
             
-            	} // end TC_CSE_SUB_UPD_020
+            	} // end TC_CSE_SUB_UPD_008
             	
-            }//end group g_CSE_SUB_UPD_020
+            }//end group g_CSE_SUB_UPD_008
 	
 		}//end group Subscription_And_Notification
 		
@@ -15037,8 +15177,8 @@ module OneM2M_Testcases {
 												
 						f_checkCseTesterStatus();
     						
-						//Check to see if the resource has been created or not
-						if(f_isResourceCreated(v_acpIndex)) {
+						//Check to see if the resource is present or not
+						if(f_isResourcePresent(v_acpIndex)) {
 							setverdict(pass, __SCOPE__ & ":INFO: Resource created");
 						} else {
 							setverdict(fail, __SCOPE__ & ":ERROR: Resource not created");
@@ -15109,8 +15249,8 @@ module OneM2M_Testcases {
 												
 						f_checkCseTesterStatus();
     						
-						//Check to see if the resource has been created or not
-						if(f_isResourceCreated(v_acpIndex)) {
+						//Check to see if the resource is present or not
+						if(f_isResourcePresent(v_acpIndex)) {
 							setverdict(pass, __SCOPE__ & ":INFO: Resource created");
 						} else {
 							setverdict(fail, __SCOPE__ & ":ERROR: Resource not created");
@@ -15133,25 +15273,25 @@ module OneM2M_Testcases {
 					 * 
 					 */
 					testcase TC_CSE_SEC_ACP_003_CRE() runs on CseTester system CseSystem { //Create
-						f_CSE_SEC_ACP_003(m_createContainerBase);	
+						f_CSE_SEC_ACP_003(m_createContainerBase, int2001);	
 					}//end TC_CSE_SEC_ACP_003_CRE
 					
 					testcase TC_CSE_SEC_ACP_003_UPD() runs on CseTester system CseSystem { //Update
 						var template RequestPrimitive v_updateRequest := m_updateAeBase;
 						var Labels v_labels_1:= {"VALUE_1"};
 						v_updateRequest.primitiveContent.aE.labels := v_labels_1;
-						f_CSE_SEC_ACP_003(v_updateRequest);	
+						f_CSE_SEC_ACP_003(v_updateRequest, int2004);	
 					}//end TC_CSE_SEC_ACP_003_02
 					
 					testcase TC_CSE_SEC_ACP_003_RET() runs on CseTester system CseSystem { //Retrieve
-						f_CSE_SEC_ACP_003(m_retrieveResource("Temporary", "Temporary"));	
+						f_CSE_SEC_ACP_003(m_retrieveResource("Temporary", "Temporary"), int2000);	
 					}//end TC_CSE_SEC_ACP_003_03
 					
 					testcase TC_CSE_SEC_ACP_003_DEL() runs on CseTester system CseSystem { //Delete
-						f_CSE_SEC_ACP_003(m_deleteRequest("Temporary"));	
+						f_CSE_SEC_ACP_003(m_deleteRequest("Temporary"), int2002);	
 					}//end TC_CSE_SEC_ACP_003_04
 	
-					function f_CSE_SEC_ACP_003(template RequestPrimitive p_requestPrimitive) runs on CseTester{
+					function f_CSE_SEC_ACP_003(template RequestPrimitive p_requestPrimitive, in ResponseStatusCode p_responseStatusCode) runs on CseTester{
 						// Local variables
 						var MsgIn v_response;
 						var integer v_aeIndex := -1;
@@ -15181,18 +15321,18 @@ module OneM2M_Testcases {
 						mcaPort.send(m_request(valueof(p_requestPrimitive)));
 						tc_ac.start;
 						alt {
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+							[] mcaPort.receive(mw_response(mw_responsePrimitive(p_responseStatusCode))) -> value v_response {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__ & ": Successful operation on resource type int2 (Ae)");
 							}
+							[] 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 operation on resource type int2 (Ae)");
 							}
-							[] mcaPort.receive{
-								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Error, unexpected message received");
-							}
 							[] tc_ac.timeout {
 								setverdict(fail, __SCOPE__ & ": No answer while executing operation on resource type int2 (Ae)");
 							}
@@ -15236,25 +15376,25 @@ module OneM2M_Testcases {
 					 * 
 					 */
 					testcase TC_CSE_SEC_ACP_004_CRE() runs on CseTester system CseSystem { //Create
-						f_CSE_SEC_ACP_004(m_createContainerBase);	
+						f_CSE_SEC_ACP_004(m_createContainerBase, int2001);	
 					}//end TC_CSE_SEC_ACP_004_CRE
 	
 					testcase TC_CSE_SEC_ACP_004_UPD() runs on CseTester system CseSystem { //Update
 						var template RequestPrimitive v_updateRequest := m_updateAeBase;
 						var Labels v_labels_1:= {"VALUE_1"};
 						v_updateRequest.primitiveContent.aE.labels := v_labels_1;
-						f_CSE_SEC_ACP_004(v_updateRequest);	
+						f_CSE_SEC_ACP_004(v_updateRequest, int2004);	
 					}//end TC_CSE_SEC_ACP_004_UPD
 	
 					testcase TC_CSE_SEC_ACP_004_RET() runs on CseTester system CseSystem { //Retrieve
-						f_CSE_SEC_ACP_004(m_retrieveResource("Temporary", "Temporary"));	
+						f_CSE_SEC_ACP_004(m_retrieveResource("Temporary", "Temporary"), int2000);	
 					}//end TC_CSE_SEC_ACP_004_RET
 	
 					testcase TC_CSE_SEC_ACP_004_DEL() runs on CseTester system CseSystem { //Delete
-						f_CSE_SEC_ACP_004(m_deleteRequest("Temporary"));	
+						f_CSE_SEC_ACP_004(m_deleteRequest("Temporary"), int2002);	
 					}//end TC_CSE_SEC_ACP_004_DEL
 
-					function f_CSE_SEC_ACP_004(template RequestPrimitive p_requestPrimitive) runs on CseTester{
+					function f_CSE_SEC_ACP_004(template RequestPrimitive p_requestPrimitive, in ResponseStatusCode p_responseStatusCode) runs on CseTester{
 						// Local variables
 						var MsgIn v_response;
 						var integer v_aeIndex := -1;
@@ -15281,17 +15421,17 @@ module OneM2M_Testcases {
 						mcaPort.send(m_request(valueof(p_requestPrimitive)));
 						tc_ac.start;
 						alt {
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+							[] mcaPort.receive(mw_response(mw_responsePrimitive(p_responseStatusCode))) -> value v_response {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__ & ": Successful operation on resource type int2 (Ae)");
 							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Error while operation on resource type int2 (Ae)");
+								setverdict(fail, __SCOPE__ & ": Wrong response status code");
 							}
-							[] mcaPort.receive{
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Error, unexpected message received");
+								setverdict(fail, __SCOPE__ & ": Error while operation on resource type int2 (Ae)");
 							}
 							[] tc_ac.timeout {
 								setverdict(fail, __SCOPE__ & ": No answer while executing operation on resource type int2 (Ae)");
@@ -15316,25 +15456,25 @@ module OneM2M_Testcases {
 					 * 
 					 */
 					testcase TC_CSE_SEC_ACP_011_CRE() runs on CseTester system CseSystem { //Create
-						f_CSE_SEC_ACP_011(m_createContainerBase);	
+						f_CSE_SEC_ACP_011(m_createContainerBase, int2001);	
 					}//end TC_CSE_SEC_ACP_011_CRE
 
 					testcase TC_CSE_SEC_ACP_011_UPD() runs on CseTester system CseSystem { //Update
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var Labels v_labels_1:= {"VALUE_1"};
 						v_updateRequest.primitiveContent.container.labels := v_labels_1;
-						f_CSE_SEC_ACP_011(v_updateRequest);	
+						f_CSE_SEC_ACP_011(v_updateRequest, int2004);	
 					}//end TC_CSE_SEC_ACP_011_UPD
 
 					testcase TC_CSE_SEC_ACP_011_RET() runs on CseTester system CseSystem { //Retrieve
-						f_CSE_SEC_ACP_011(m_retrieveResource("Temporary", "Temporary"));	
+						f_CSE_SEC_ACP_011(m_retrieveResource("Temporary", "Temporary"), int2000);	
 					}//end TC_CSE_SEC_ACP_011_RET
 
 					testcase TC_CSE_SEC_ACP_011_DEL() runs on CseTester system CseSystem { //Delete
-						f_CSE_SEC_ACP_011(m_deleteRequest("Temporary"));	
+						f_CSE_SEC_ACP_011(m_deleteRequest("Temporary"), int2002);	
 					}//end TC_CSE_SEC_ACP_011_DEL
 
-					function f_CSE_SEC_ACP_011(template RequestPrimitive p_requestPrimitive) runs on CseTester {
+					function f_CSE_SEC_ACP_011(template RequestPrimitive p_requestPrimitive, in ResponseStatusCode p_responseStatusCode) runs on CseTester {
 						// Local variables
 						var MsgIn v_response;
 						var integer v_aeIndex := -1;
@@ -15358,17 +15498,17 @@ module OneM2M_Testcases {
 						mcaPort.send(m_request(valueof(p_requestPrimitive)));
 						tc_ac.start;
 						alt {
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+							[] mcaPort.receive(mw_response(mw_responsePrimitive(p_responseStatusCode))) -> value v_response {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__ & ": Successful operation on resource type int3 (Container)");
 							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Error while operation on resource type int3 (Container)");
+								setverdict(fail, __SCOPE__ & ": Wrong response status code");
 							}
-							[] mcaPort.receive{
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Error, unexpected message received");
+								setverdict(fail, __SCOPE__ & ": Error while operation on resource type int3 (Container)");
 							}
 							[] tc_ac.timeout {
 								setverdict(fail, __SCOPE__ & ": No answer while executing operation on resource type int3 (Container)");
@@ -15452,17 +15592,13 @@ module OneM2M_Testcases {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__ & ": Operation denied because of lack of right on Container");
 							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
-								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Error operation have been accpeted without having privileges");
-							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Error while operation on resource type int3 (Container)");
+								setverdict(fail, __SCOPE__ & ": Wrong response status code");
 							}
-							[] mcaPort.receive{
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Error, unexpected message received");
+								setverdict(fail, __SCOPE__ & ": Error operation have been accpeted without having privileges");
 							}
 							[] tc_ac.timeout {
 								setverdict(fail, __SCOPE__ & ": No answer while executing operation on resource type int3 (Container)");
@@ -15542,17 +15678,13 @@ module OneM2M_Testcases {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__ & ": Operation denied because of lack of right on Container");
 							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
-								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Error operation have been accpeted without having privileges");
-							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Error while operation on resource type int3 (Container)");
+								setverdict(fail, __SCOPE__ & ": Wrong response status code");
 							}
-							[] mcaPort.receive{
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Error, unexpected message received");
+								setverdict(fail, __SCOPE__ & ": Error operation have been accpeted without having privileges");
 							}
 							[] tc_ac.timeout {
 								setverdict(fail, __SCOPE__ & ": No answer while executing operation on resource type int3 (Container)");
@@ -15576,25 +15708,25 @@ module OneM2M_Testcases {
 					 * 
 					 */
 					testcase TC_CSE_SEC_ACP_002_CRE() runs on CseTester system CseSystem { //Create
-						f_CSE_SEC_ACP_002(m_createContainerBase);	
+						f_CSE_SEC_ACP_002(m_createContainerBase, int2001);	
 					}//end TC_CSE_SEC_ACP_002_CRE
 
 					testcase TC_CSE_SEC_ACP_002_UPD() runs on CseTester system CseSystem { //Update
 						var template RequestPrimitive v_updateRequest := m_updateAeBase;
 						var Labels v_labels_1:= {"VALUE_1"};
 						v_updateRequest.primitiveContent.aE.labels := v_labels_1;
-						f_CSE_SEC_ACP_002(v_updateRequest);	
+						f_CSE_SEC_ACP_002(v_updateRequest, int2004);	
 					}//end TC_CSE_SEC_ACP_002_UPD
 
 					testcase TC_CSE_SEC_ACP_002_RET() runs on CseTester system CseSystem { //Retrieve
-						f_CSE_SEC_ACP_002(m_retrieveResource("Temporary", "Temporary"));	
+						f_CSE_SEC_ACP_002(m_retrieveResource("Temporary", "Temporary"), int2000);	
 					}//end TC_CSE_SEC_ACP_002_RET
 
 					testcase TC_CSE_SEC_ACP_002_DEL() runs on CseTester system CseSystem { //Delete
-						f_CSE_SEC_ACP_002(m_deleteRequest("Temporary"));	
+						f_CSE_SEC_ACP_002(m_deleteRequest("Temporary"), int2002);	
 					}//end TC_CSE_SEC_ACP_002_DEL
 
-					function f_CSE_SEC_ACP_002(template RequestPrimitive p_requestPrimitive) runs on CseTester {
+					function f_CSE_SEC_ACP_002(template RequestPrimitive p_requestPrimitive, in ResponseStatusCode p_responseStatusCode) runs on CseTester {
 						// Local variables
 						var MsgIn v_response;
 						var integer v_aeIndex := -1;
@@ -15637,17 +15769,17 @@ module OneM2M_Testcases {
 						mcaPort.send(m_request(valueof(p_requestPrimitive)));
 						tc_ac.start;
 						alt {
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+							[] mcaPort.receive(mw_response(mw_responsePrimitive(p_responseStatusCode))) -> value v_response {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__ & ": Successful operation on resource type int2 (Ae)");
 							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Error while operation on resource type int2 (Ae)");
+								setverdict(fail, __SCOPE__ & ": Wrong response status code");
 							}
-							[] mcaPort.receive{
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Error, unexpected message received");
+								setverdict(fail, __SCOPE__ & ": Error while operation on resource type int2 (Ae)");
 							}
 							[] tc_ac.timeout {
 								setverdict(fail, __SCOPE__ & ": No answer while executing operation on resource type int2 (Ae)");
@@ -15713,17 +15845,17 @@ module OneM2M_Testcases {
 						mcaPort.send(m_request(v_updateRequest));
 						tc_ac.start;
 						alt {
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__ & ": Successful Update operation on resource type int2 (Ae)");
 							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Error while Update operation on resource type int2 (Ae)");
+								setverdict(fail, __SCOPE__ & ": Wrong response status code");
 							}
-							[] mcaPort.receive{
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Error, unexpected message received");
+								setverdict(fail, __SCOPE__ & ": Error while Update operation on resource type int2 (Ae)");
 							}
 							[] tc_ac.timeout {
 								setverdict(fail, __SCOPE__ & ": No answer while executing update operation on resource type int2 (Ae)");
@@ -15802,17 +15934,13 @@ module OneM2M_Testcases {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__ & ": Operation denied because of lack of right on Container");
 							}
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
-								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Error operation have been accpeted without having privileges");
-							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Error while operation on resource type int3 (Container)");
+								setverdict(fail, __SCOPE__ & ": Wrong response status code");
 							}
-							[] mcaPort.receive{
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & ": Error, unexpected message received");
+								setverdict(fail, __SCOPE__ & ": Error operation have been accpeted without having privileges");
 							}
 							[] tc_ac.timeout {
 								setverdict(fail, __SCOPE__ & ": No answer while executing operation on resource type int3 (Container)");