diff --git a/OneM2M_Testcases_CSE_Release_1.ttcn b/OneM2M_Testcases_CSE_Release_1.ttcn
index 803130db7d556a7836bae0e5bda7bfd1399e7991..edd5dec498a56e8d27f13d018b7c00a319289aa0 100644
--- a/OneM2M_Testcases_CSE_Release_1.ttcn
+++ b/OneM2M_Testcases_CSE_Release_1.ttcn
@@ -2779,10 +2779,10 @@ module OneM2M_Testcases_CSE_Release_1 {
 							v_localResourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
 							if(v_localResourceIndex == -1)
 							{ 
-								log(__SCOPE__&": ERROR: Retrieve request target not found");
+								setverdict(fail, __SCOPE__ & ": ERROR: Retrieve request target not found");
 								v_response := valueof(m_responsePrimitive(int4004,v_request.primitive.requestPrimitive.requestIdentifier));
-							} else if(v_localResourceIndex != vc_remoteCseIndex) { 
-								log(__SCOPE__&": ERROR: Retrieve request target not expected");
+							} else if(v_localResourceIndex != vc_localRemoteCseIndex) { 
+								setverdict(fail, __SCOPE__ & ": ERROR: Retrieve request target not expected");
 								v_response := valueof(m_responsePrimitive(int4004,v_request.primitive.requestPrimitive.requestIdentifier));
 							} else {
 								setverdict(pass, __SCOPE__ & ": Retrieve Request received successfully");
@@ -2793,9 +2793,9 @@ module OneM2M_Testcases_CSE_Release_1 {
 							v_response.to_ := v_request.primitive.requestPrimitive.from_;
 							mccPortIn.send(f_getMsgOutPrimitive(m_response(v_response)));
 						}
-						[] mccPortIn.receive {
+						[] mccPortIn.receive(mw_request(?)) {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Error Retrieve request was not received");
+							setverdict(fail, __SCOPE__ & ": ERROR: Unexpected request received");
 						}
 						[] tc_ac.timeout {
 							setverdict(fail, __SCOPE__ & ": No answer while waiting to receive Retrieve request");
@@ -3338,10 +3338,10 @@ module OneM2M_Testcases_CSE_Release_1 {
 							v_localResourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
 							if(v_localResourceIndex == -1)
 							{ 
-								log(__SCOPE__&": ERROR: Delete request target not found");
+								setverdict(fail, __SCOPE__&": ERROR: Delete request target not found");
 								v_response := valueof(m_responsePrimitive(int4004,v_request.primitive.requestPrimitive.requestIdentifier));
-							} else if(v_localResourceIndex != vc_remoteCseIndex) { 
-								log(__SCOPE__&": ERROR: Delete request target not expected");
+							} else if(v_localResourceIndex != vc_localRemoteCseIndex) { 
+								setverdict(fail, __SCOPE__&": ERROR: Delete request target not expected");
 								v_response := valueof(m_responsePrimitive(int4004,v_request.primitive.requestPrimitive.requestIdentifier));
 							} else {
 								setverdict(pass, __SCOPE__ & ": <remoteCSE> delete request has been received");
@@ -3351,7 +3351,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							v_response.to_ := v_request.primitive.requestPrimitive.from_;
 							mccPortIn.send(f_getMsgOutPrimitive(m_response(v_response)));
 						}
-						[] mccPortIn.receive {
+						[] mccPortIn.receive(mw_request(?)) {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__ & ": Error while receiving <remoteCSE> delete request");
 						}