diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index 407a564748690905dd15b5d2248032e0fba72a47..a7af3e81ce2a27274dfd900fe2309a65aefc25c2 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -7508,9 +7508,9 @@ module OneM2M_PermutationFunctions {
 				tc_ac.start;
 				alt {
 	
-					[] mcaPort.receive(mw_response(mw_responsePrimitive(int4102))) -> value v_response {
+					[] mcaPort.receive(mw_response(mw_responseDiscovery({}))) -> value v_response {
 						tc_ac.stop;
-						setverdict(pass, __SCOPE__ & ": Contents Unacceptable");
+						setverdict(pass, __SCOPE__ & ": Expected no match due to conflicting filter criteria ");
 					}
 					[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) { 
 						tc_ac.stop;
diff --git a/OneM2M_Testcases_CSE_Release_1.ttcn b/OneM2M_Testcases_CSE_Release_1.ttcn
index 0f8f93223f905e50672bf36561aa43c586307da2..f4f36307faa8bd705ad707dd3407d0b187f32a76 100644
--- a/OneM2M_Testcases_CSE_Release_1.ttcn
+++ b/OneM2M_Testcases_CSE_Release_1.ttcn
@@ -10152,9 +10152,9 @@ module OneM2M_Testcases_CSE_Release_1 {
 				tc_ac.start;
 				alt {
 				
-					[] mcaPort.receive(mw_response(mw_responsePrimitive(int4102))) -> value v_response {
+					[] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) -> value v_response {
 						tc_ac.stop;
-						setverdict(pass, __SCOPE__ & ": Contents Unacceptable");
+						setverdict(pass, __SCOPE__ & ": Discovery properly rejected due to invalid filter criteria format");
 					}
 					[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) { 
 						tc_ac.stop;
@@ -10179,7 +10179,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 			group g_CSE_DIS_008{
 			
 				/**
-				 * @desc Check that the IUT responds the originator with an error when the originator sends a request to discover the resource TARGET_RESOURCE_ADDRESS including two conflicted filter criteria of different type FILTER_CRITERIA_CONDITION_1 and FILTER_CRITERIA_CONDITION_2 (E.G. createBefore < createdAfter)
+				 * @desc Check that the IUT responds the originator with a success response when the originator sends a request to discover the resource TARGET_RESOURCE_ADDRESS including two conflicted filter criteria of different type FILTER_CRITERIA_CONDITION_1 and FILTER_CRITERIA_CONDITION_2 (E.G. createBefore < createdAfter)
 				 * 
 				 */
 				testcase TC_CSE_DIS_008_CRB_CRA() runs on Tester system CseSystem {