diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index 631f4fa485e48d282bf9aad07d8ab298f3c1ddd9..1faf1bcf18f7eda71ad2994f51def3b1c29a9826 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
  *
  */
@@ -3143,10 +3143,10 @@ module OneM2M_Templates {
 			primitiveContent := p_content			
 		}
 		
-		template ResponsePrimitive mw_responsePrimitive(ResponseStatusCode p_statusCode) := {
+		template ResponsePrimitive mw_responsePrimitive(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 807147851d042d735db732ac5177f7144f150f92..7db538f1f4cd2f2acd9c88be3518a6d1e378a335 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 331 2017-07-27 15:41:51Z reinaortega $
  *  @desc       Module containing test cases for oneM2M
  *
  */
@@ -1269,7 +1269,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;
@@ -1292,10 +1292,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");
@@ -1311,13 +1315,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;
@@ -1359,59 +1363,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;
@@ -1433,11 +1437,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);
 							}
@@ -1491,10 +1499,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");
@@ -1549,7 +1561,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){
@@ -1562,6 +1574,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");
@@ -1612,7 +1628,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) {
@@ -1628,6 +1644,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");
@@ -2203,11 +2223,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)));
@@ -2369,10 +2393,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(int2001))) -> value v_response {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__ & ": Resource type " & int2str(enum2int(p_resourceType)) & " 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 " & int2str(enum2int(p_resourceType)));
@@ -2663,17 +2691,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)));  
@@ -2762,10 +2790,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(int2001))) -> value v_response {
 									tc_ac.stop;
 									setverdict(pass, __SCOPE__ & ": Accepted creation rejected for resource type " & int2str(enum2int(p_resourceType)));
 								}
+								[] 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)));
@@ -2947,7 +2979,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) {
@@ -2956,7 +2988,11 @@ module OneM2M_Testcases {
 									setverdict(fail, __SCOPE__ & ": stateTag attribute not incremented correctly after creation of contentInstance resource");
                         		}
                         	}
-                        	[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+							[] 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");
                         	}
@@ -3167,10 +3203,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");
@@ -3278,10 +3318,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");
@@ -3389,10 +3433,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");
@@ -3805,11 +3853,15 @@ 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);
 								}
-								[] 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);
 								}
@@ -3949,15 +4001,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");
@@ -4179,15 +4227,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");
-							}
-							[] mccPort.receive(mw_response(mw_responsePrimitiveKO)) {
+								setverdict(pass, __SCOPE__ & ": Correct CREATE request for the resource announced variant");
+								}
+							[] 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");
@@ -4311,10 +4355,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");
@@ -4386,7 +4434,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;
@@ -4614,10 +4662,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");
@@ -4737,10 +4789,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");
@@ -4867,10 +4923,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");
@@ -4972,7 +5032,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;
@@ -5071,7 +5131,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;
@@ -5128,7 +5188,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;
@@ -5188,10 +5248,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");
@@ -5251,7 +5315,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;
@@ -5312,10 +5376,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");
@@ -5452,10 +5520,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");
@@ -5702,10 +5774,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");
@@ -5840,10 +5916,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");
@@ -5986,10 +6066,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");
@@ -6103,7 +6187,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;
@@ -6214,7 +6298,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;
@@ -6288,7 +6372,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;
@@ -6410,10 +6494,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)));
@@ -6539,10 +6627,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)));
@@ -6668,10 +6760,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)));
@@ -6796,10 +6892,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)));
@@ -6924,10 +7024,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)));
@@ -7145,10 +7249,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)));
@@ -7338,10 +7446,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)));
@@ -7571,10 +7683,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)));
@@ -7871,10 +7987,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)));
@@ -8005,7 +8125,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;
@@ -8138,7 +8258,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;
@@ -8268,7 +8388,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;
@@ -8409,7 +8529,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;
@@ -8543,7 +8663,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;
@@ -8610,7 +8730,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;
@@ -8677,7 +8797,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;
@@ -8779,10 +8899,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)));
@@ -8924,14 +9048,14 @@ 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)));
                 			}
@@ -9106,7 +9230,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;
@@ -9163,10 +9287,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)));
@@ -9313,10 +9441,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)));
@@ -9391,6 +9523,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");
@@ -9446,10 +9582,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)));
@@ -9524,6 +9664,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");
@@ -9575,7 +9719,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;
@@ -9620,10 +9764,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(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))&"!");
     				}
+					[] 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!");
@@ -9682,6 +9830,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!");
@@ -9730,6 +9882,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!");
@@ -9785,6 +9941,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");
@@ -9892,10 +10052,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(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))&"!");
           				}
+						[] 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!");
@@ -9941,10 +10105,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(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))&"!");
         				}
+						[] 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!");
@@ -10203,11 +10371,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!");
     		        }    		        
@@ -10340,7 +10512,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;
@@ -10410,7 +10582,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;
@@ -10482,7 +10654,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;
@@ -10733,13 +10905,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");
@@ -10889,7 +11061,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;
@@ -10958,7 +11130,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;
@@ -11043,7 +11215,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;
@@ -11131,7 +11303,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;
@@ -11193,13 +11365,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");
@@ -11270,7 +11442,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;
@@ -11334,7 +11506,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;
@@ -11552,25 +11724,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;
@@ -11611,7 +11783,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");
     
@@ -11626,6 +11798,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");
@@ -11716,16 +11892,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");
 						}
@@ -11748,25 +11920,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;
@@ -11807,7 +11979,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");
                 
@@ -11822,6 +11994,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");
@@ -11912,16 +12088,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");
 						}
@@ -11947,7 +12119,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
@@ -11958,24 +12130,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;
 					
@@ -12011,7 +12183,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");
                             
@@ -12031,30 +12203,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;
@@ -12126,7 +12277,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");
                 
@@ -12146,6 +12297,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");
@@ -12216,7 +12371,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");
     
@@ -12236,6 +12391,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");
@@ -12295,7 +12454,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;
@@ -12359,7 +12518,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;
@@ -12419,7 +12578,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;
@@ -12482,7 +12641,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;
@@ -12544,7 +12703,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;
@@ -12669,7 +12828,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;
@@ -12724,7 +12883,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;
@@ -12787,7 +12946,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;
@@ -12844,7 +13003,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;
@@ -12905,7 +13064,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;
@@ -12966,7 +13125,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;
@@ -13035,17 +13194,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)");
@@ -13064,13 +13223,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;
@@ -13110,18 +13269,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)");
     					}
@@ -13134,9 +13293,9 @@ 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 {
 				
@@ -13183,19 +13342,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)");
@@ -13260,17 +13419,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)");
@@ -13384,19 +13543,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)");
 						}
@@ -13462,17 +13620,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");
@@ -13488,13 +13646,13 @@ module OneM2M_Testcases {
 				} // end TC_CSE_SUB_UPD_012
 			}//end group g_CSE_SUB_UPD_012
 	
-			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;
@@ -13575,17 +13733,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;
@@ -13639,7 +13797,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;
@@ -13658,17 +13816,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"};
@@ -13713,17 +13871,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");
@@ -13738,9 +13896,9 @@ 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 {
 				
@@ -13791,10 +13949,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 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)");
@@ -13882,17 +14044,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)");
@@ -14337,25 +14499,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;
@@ -14385,18 +14547,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)");
 							}
@@ -14440,25 +14602,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;
@@ -14485,17 +14647,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)");
@@ -14519,25 +14681,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;
@@ -14561,17 +14723,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)");
@@ -14655,17 +14817,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)");
@@ -14745,17 +14903,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)");
@@ -14779,25 +14933,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;
@@ -14840,17 +14994,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)");
@@ -14915,17 +15069,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)");
@@ -14994,17 +15148,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)");