diff --git a/OneM2M_Testcases_CSE_Release_2.ttcn b/OneM2M_Testcases_CSE_Release_2.ttcn
index 43b4f5597e31e87366d191a0e48e90cd26af1e92..41faf2f46966ca98443cce1c60a77016b59809e3 100644
--- a/OneM2M_Testcases_CSE_Release_2.ttcn
+++ b/OneM2M_Testcases_CSE_Release_2.ttcn
@@ -3335,7 +3335,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					// Local variables
 					var integer v_aeIndex := -1;
 					var integer v_resourceIndex := -1;
-					var RequestPrimitive v_req1, v_req2, v_req3;
+					var RequestPrimitive v_req1, v_req3;
+					var template RequestPrimitive v_req2;
 					var MsgIn v_resp1, v_resp3;
 					var ResponsePrimitive v_resp2;
 					
@@ -3359,11 +3360,12 @@ module OneM2M_Testcases_CSE_Release_2 {
 					v_req1 := valueof(m_retrievePollingRequest(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
 					f_send(e_mca_port, m_request(v_req1));
 					
-					v_req2 := valueof(m_notifyNotification(f_getResourceAddress(v_aeIndex), m_contentNotification_subscriptionVerification(PX_TS_CSE1.cseId)));
+					v_req2 := m_notifyNotification(f_getResourceAddress(v_aeIndex), m_contentNotification_subscriptionVerification(PX_TS_CSE1.cseId));
 					
-					vc_cse1.start(f_cse_notifyProcedure_notify(v_req2));
+					vc_cse1.start(f_cse_notifyProcedure_notify(valueof(v_req2)));
 					
 					v_req2.from_ := PX_TS_CSE1.cseId;
+					v_req2.requestIdentifier := pattern "{v_req2.requestIdentifier}*";
 					
 					tc_ac.start;
 					alt {
@@ -3444,7 +3446,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					// Local variables
 					var integer v_aeIndex := -1;
 					var integer v_resourceIndex := -1;
-					var RequestPrimitive v_req1, v_req2, v_req3;
+					var RequestPrimitive v_req1, v_req3;
+					var template RequestPrimitive v_req2;
 					var MsgIn v_resp1, v_resp3;
 					var ResponsePrimitive v_resp2;
 					
@@ -3465,10 +3468,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					v_resourceIndex := f_cse_createResource(int15, m_createPollingChannelBase, v_aeIndex);
 					
-					v_req2 := valueof(m_notifyNotification(f_getResourceAddress(v_aeIndex), m_contentNotification_subscriptionVerification(PX_TS_CSE1.cseId)));
+					v_req2 := m_notifyNotification(f_getResourceAddress(v_aeIndex), m_contentNotification_subscriptionVerification(PX_TS_CSE1.cseId));
 					
-					vc_cse1.start(f_cse_notifyProcedure_notify(v_req2));
+					vc_cse1.start(f_cse_notifyProcedure_notify(valueof(v_req2)));
 					v_req2.from_ := PX_TS_CSE1.cseId;
+					v_req2.requestIdentifier := pattern "{v_req2.requestIdentifier}*";
 					
 					v_req1 := valueof(m_retrievePollingRequest(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
 					f_send(e_mca_port, m_request(v_req1));
@@ -3550,7 +3554,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					var integer v_aeIndex := -1;
 					var integer v_resourceIndex := -1;
 					var RequestPrimitive v_req1;
-					var RequestPrimitive v_req2;
+					var template RequestPrimitive v_req2;
 					var RequestPrimitive v_req3;
 					var MsgIn v_resp1, v_resp3;
 					var ResponsePrimitive v_resp2;//Response to a Notify Request
@@ -3576,10 +3580,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 					v_req1 := valueof(m_retrievePollingRequest(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
 					f_send(e_mca_port, m_request(v_req1));
 					
-					v_req2 := valueof(m_notifyNotification(f_getResourceAddress(v_aeIndex), m_contentNotification_subscriptionVerification(PX_TS_CSE1.cseId)));
+					v_req2 := m_notifyNotification(f_getResourceAddress(v_aeIndex), m_contentNotification_subscriptionVerification(PX_TS_CSE1.cseId));
 					
-					vc_cse1.start(f_cse_notifyProcedure_notify(v_req2));
+					vc_cse1.start(f_cse_notifyProcedure_notify(valueof(v_req2)));
 					v_req2.from_ := PX_TS_CSE1.cseId;
+					v_req2.requestIdentifier := pattern "{v_req2.requestIdentifier}*";
 					
 					tc_ac.start;
 					alt {