diff --git a/OneM2M_Testcases.ttcn b/OneM2M_Testcases.ttcn
index 0c10512f84cc4092453e17a6f3e01cfe689f7982..a30cd742b0e987a64dab2b341c7f63b028a816a1 100644
--- a/OneM2M_Testcases.ttcn
+++ b/OneM2M_Testcases.ttcn
@@ -6749,7 +6749,7 @@ module OneM2M_Testcases {
 						
 						f_checkCseTesterStatus();
 			       		            	
-						mcaPort.send(m_request(m_retrieveResource((f_getResourceAddress(v_containerIndex) & "/la"), f_getOriginator(v_containerIndex))));
+						mcaPort.send(m_request(m_retrieveResource((f_getResourceAddress(v_contentInstanceIndex_2)), f_getOriginator(v_contentInstanceIndex_2))));
 					            
 						tc_ac.start;
 						alt {
@@ -6804,7 +6804,7 @@ module OneM2M_Testcases {
 						mcaPort.send(m_request(v_request));
 					    tc_ac.start;
 						alt {
-						    	[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+						    	[] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))) -> value v_response {
 									tc_ac.stop;
 									setverdict(pass, testcasename() & ": Resource type  " & int2str(enum2int(c_containerResourceType)) & " NOT FOUND");
 								}
@@ -6874,7 +6874,7 @@ module OneM2M_Testcases {
 						   
 						f_checkCseTesterStatus();
 						   
-						mcaPort.send(m_request(m_retrieveResource((f_getResourceAddress(v_containerIndex) & "/ol"), f_getOriginator(v_containerIndex))));
+						mcaPort.send(m_request(m_retrieveResource((f_getResourceAddress(v_contentInstanceIndex_1)), f_getOriginator(v_contentInstanceIndex_1))));
 					            
 						tc_ac.start;
 						alt {
@@ -6929,7 +6929,7 @@ module OneM2M_Testcases {
 						mcaPort.send(m_request(v_request));
 						tc_ac.start;
 						alt {
-								[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+								[] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))) -> value v_response {
 									tc_ac.stop;
 									setverdict(pass, testcasename() & ": Resource type" & int2str(enum2int(c_containerResourceType)) & " NOT FOUND");
 								}