diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index a07db23650d2aff66bb729dd6a491595b1a39417..515997f25b235bc40dbb3a96bf0fde8d0a698f6b 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -525,12 +525,11 @@ module OneM2M_PermutationFunctions {
 								mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 							}
 	
-							[] mcaPortIn.receive {
+							[] mcaPortIn.receive(mw_request(mw_create)) {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & " : ContentInstance creation request is rejected due to not including the attribute!");
+								setverdict(fail, __SCOPE__ & " : Unexpected CREATE request ");
 								mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 							}
-	
 							[] tc_ac.timeout{
 								setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 							}
@@ -570,9 +569,9 @@ module OneM2M_PermutationFunctions {
 								//send back responsePrimitive
 								mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 							}
-							[] mcaPortIn.receive {
+							[] mcaPortIn.receive(mw_request(mw_create)) {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & " : Container creation request is rejected due to not including the attribute!");
+								setverdict(fail, __SCOPE__ & " : Unexpected CREATE request ");
 								mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 							}
 							[] tc_ac.timeout{
@@ -618,9 +617,9 @@ module OneM2M_PermutationFunctions {
 							   v_responsePrimitive := valueof(m_responsePrimitive(int2004, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
 							   mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 						   }
-							[] mcaPortIn.receive(mw_request(?)) -> value v_request {
+							[] mcaPortIn.receive(mw_request(mw_update)) -> value v_request {
 							   tc_ac.stop;
-							   setverdict(fail, __SCOPE__ & " : AE update request is rejected due to not including the optional attribute!");
+							   setverdict(fail, __SCOPE__ & " : Unexpected UPDATE request");
 								mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 						   }
 						   [] tc_ac.timeout{
@@ -662,9 +661,9 @@ module OneM2M_PermutationFunctions {
 								mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 							}
 
-							[] mcaPortIn.receive(mw_request(?)) {
+							[] mcaPortIn.receive(mw_request(mw_update)) {
 								tc_ac.stop;
-								setverdict(fail, __SCOPE__ & " : Container update request is rejected due to not including the attribute!");
+								setverdict(fail, __SCOPE__ & " : Unexpected UPDATE request");
 								mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 							}
 
diff --git a/OneM2M_Testcases_AE_Release_1.ttcn b/OneM2M_Testcases_AE_Release_1.ttcn
index 8ec85f895750e29978de4549e96d1892448b5d0e..035de436fd11936bb0bcdd6ea09cd832e206b93a 100644
--- a/OneM2M_Testcases_AE_Release_1.ttcn
+++ b/OneM2M_Testcases_AE_Release_1.ttcn
@@ -840,9 +840,9 @@ module OneM2M_Testcases_AE_Release_1 {
 							//send back responsePrimitive
 							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 						}
-						[] mcaPortIn.receive {
+						[] mcaPortIn.receive(mw_request(mw_create)) {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & " : Container creation request is rejected due to not including mandatory attributes!!");
+							setverdict(fail, __SCOPE__ & " : Unexpected CREATE request ");
 							mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 						}
 						[] tc_ac.timeout{
@@ -907,12 +907,11 @@ module OneM2M_Testcases_AE_Release_1 {
 							//send back responsePrimitive
 							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 						}
-						[] mcaPortIn.receive {
+						[] mcaPortIn.receive(mw_request(mw_create)) {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & " : ContentInstance creation request is rejected due to not including mandatory attributes!!");
+							setverdict(fail, __SCOPE__ & " : Unexpected CREATE request ");
 							mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 						}
-	
 						[] tc_ac.timeout{
 							setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
 						}