diff --git a/OneM2M_Testcases_CSE_Release_2.ttcn b/OneM2M_Testcases_CSE_Release_2.ttcn
index 5fe43975b37f83a59c86476d23e8b2845e542cb9..12dcde4c21840b75df23db3b44e5ece41e5ff413 100644
--- a/OneM2M_Testcases_CSE_Release_2.ttcn
+++ b/OneM2M_Testcases_CSE_Release_2.ttcn
@@ -12533,6 +12533,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 				// Local variables
 				var integer v_aeIndex := -1;
 				var integer v_resourceIndex := -1;
+				var integer v_acpAuxIndex := -1;
 				var RequestPrimitive v_request;
 				var MsgIn v_response;
 				var RequestPrimitive v_requestNotify;
@@ -12546,16 +12547,18 @@ module OneM2M_Testcases_CSE_Release_2 {
 	
 				// Preamble
 				vc_cse1.start(f_cse_registerRemoteCse(m_createRemoteCSEBase));
-				vc_cse1.done;
+				f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
 				
-				v_aeIndex := f_cse_preamble_registerAe();//AE1 is registred;
+				v_acpAuxIndex := f_cse_preamble_createAcpAux();
+				
+				v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);//AE1 is registred;
 				
 				v_resourceIndex := f_cse_createResource(int15, m_createPollingChannelBase, v_aeIndex);
 				
 				v_request := valueof(m_retrievePollingRequest(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
 				mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 				
-				v_requestNotify := valueof(m_notify(f_getResourceAddress(v_aeIndex)));
+				v_requestNotify := valueof(m_notifyNotification(f_getResourceAddress(v_aeIndex), m_contentNotification_subscriptionVerification));
 				
 				vc_cse1.start(f_cse_notifyProcedure_notify(v_requestNotify));
 				
@@ -13806,7 +13809,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__ & ":ERROR: Notification received");
 							//Send response in any case
-							v_responsePrimitive := valueof(m_responseNotification(int2001, omit));
+							v_responsePrimitive := valueof(m_responseNotification(int2000, omit));
 							v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
 							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 						}