diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index c8f81f25f57de13f5136613557f3e0d6eff02775..2ada7772ba9678ee3a5a896a9a5699cbdb85cf11 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -8720,6 +8720,18 @@ module OneM2M_Templates {
 				responseBody    := { problemDetails := p_problemDetails }
 			} // End of template mw_t8_response_ko
 			
+			template (omit) T8Response m_t8_response_400_bad_request(
+																																in template (present) ResponseHeaders p_responseHeaders
+																																) modifies m_t8_response_200_ok := {
+				responseCode    := 400
+			} // End of template m_t8_response_400_bad_request
+			
+			template (omit) T8Response m_t8_response_404_not_found(
+																																in template (present) ResponseHeaders p_responseHeaders
+																																) modifies m_t8_response_200_ok := {
+				responseCode    := 404
+			} // End of template m_t8_response_404_not_found
+			
 			template T8Response mw_t8_response_404_not_found(
 																												template (present) ResponseHeaders p_responseHeaders := ?,
 																												template ProblemDetails p_problemDetails := ?
diff --git a/OneM2M_Testcases_CSE_Release_3.ttcn b/OneM2M_Testcases_CSE_Release_3.ttcn
index 3713110c2502e128ac3003d40b83ebd033906948..a41de0f7793ff16687dbb22b8b238da16ff2b6e9 100644
--- a/OneM2M_Testcases_CSE_Release_3.ttcn
+++ b/OneM2M_Testcases_CSE_Release_3.ttcn
@@ -17241,7 +17241,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 						
 						tc_ac.start;
 						alt {
-							[] mcnPortIn.receive(mw_t8Request(mw_t8_request_post(-, -, mw_request_body_deviceTriggeringDeliveryReportNotification(mw_deviceTriggeringDeliveryReportNotification)))) {
+							[] mcnPortIn.receive(mw_t8Request(mw_t8_request_post(mw_uri_3gpp_device_triggering(-, "scs_as_id_05/transactions/cf_001", omit), -, mw_request_body_deviceTriggeringDeliveryReportNotification(mw_deviceTriggeringDeliveryReportNotification)))) {
 								tc_ac.stop;
 								// Send the response 200 OK
 								mcnPortIn.send(m_t8Response(m_t8_response_200_ok({ 
@@ -17253,8 +17253,28 @@ module OneM2M_Testcases_CSE_Release_3 {
 																																	})));
 								setverdict(pass);
 							}
+							[] mcnPortIn.receive(mw_t8Request(mw_t8_request_post(mw_uri_3gpp_device_triggering))) {
+								tc_ac.stop;
+								// Send the response 404 Not Found
+								mcnPortIn.send(m_t8Response(m_t8_response_404_not_found({ 
+																																						{ "Host", vc_scefSimuDesc.mcnPortIn.t8PortDesc.binding.httpBindingDesc.bindingDesc.sutAddress & ":" & int2str(vc_scefSimuDesc.mcnPortIn.t8PortDesc.binding.httpBindingDesc.bindingDesc.localPort) }, 
+																																						{ "User-Agent", "oneM2M Test Adapter - TTF001" },
+																																						{ "Accept", "*/*" },
+																																						{ "Content-Type", "application/json" },
+																																						{ "Connection", "keep-alive" } 
+																																					})));
+								setverdict(fail);
+							}
 							[] mcnPortIn.receive(mw_t8Request) {
 								tc_ac.stop;
+								// Send the response 400 Bad Request
+								mcnPortIn.send(m_t8Response(m_t8_response_400_bad_request({ 
+																																						{ "Host", vc_scefSimuDesc.mcnPortIn.t8PortDesc.binding.httpBindingDesc.bindingDesc.sutAddress & ":" & int2str(vc_scefSimuDesc.mcnPortIn.t8PortDesc.binding.httpBindingDesc.bindingDesc.localPort) }, 
+																																						{ "User-Agent", "oneM2M Test Adapter - TTF001" },
+																																						{ "Accept", "*/*" },
+																																						{ "Content-Type", "application/json" },
+																																						{ "Connection", "keep-alive" } 
+																																					})));
 								setverdict(fail);
 							}
 							[] tc_ac.timeout {