diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index ebc1038bd7345eab2d33684d195e3f87e24da235..efab8029477d967362787a8b907811f61d12fbcb 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -3795,7 +3795,7 @@ module OneM2M_Functions {
 		
 		group CseSimuFunctions {
 
-			function f_ae_createPollingChannel(template UtTriggerPrimitive p_utRequest := m_utCreateAe) runs on CseSimu return integer {
+			function f_ae_createPollingChannel(template UtTriggerPrimitive p_utRequest := m_utCreateAe, integer p_parentIndex := vc_cSEBaseIndex) runs on CseSimu return integer {
 				var MsgIn v_request;
 				var PrimitiveContent v_modifiedResource;
 				var integer v_resourceIndex, v_parentIndex;
@@ -3806,6 +3806,8 @@ module OneM2M_Functions {
 					p_utRequest.requestPrimitive.primitiveContent.pollingChannel := m_contentCreatePollingChannel;
 				}
 
+				p_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(p_parentIndex);
+
 				f_ae_sendUtPrimitive(p_utRequest, v_action);
 	
 				tc_ac.start;
diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index 00683ae8dcfb31cccaf5d61104380a240f5dfaed..4ccf7b542eb77247dfe01a37fd55c2df25990ef3 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -7308,7 +7308,7 @@ module OneM2M_PermutationFunctions {
 	
 					} // end f_CSE_GMG_004
 	
-					function f_CSE_GMG_005(template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on AeSimu system CseSystem {
+					function f_CSE_GMG_005(template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse := omit) runs on AeSimu system CseSystem {
 						//Local constants
 						const integer c_numberOfResponsePrimitive := 2;
 						
@@ -7399,7 +7399,7 @@ module OneM2M_PermutationFunctions {
 	
 					} // end f_CSE_GMG_005
 	
-					function f_CSE_GMG_006(template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on AeSimu system CseSystem {
+					function f_CSE_GMG_006(template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse := omit) runs on AeSimu system CseSystem {
 						//Local constants
 						const integer c_numberOfResponsePrimitive := 2;
 			
diff --git a/OneM2M_Testcases_AE_Release_1.ttcn b/OneM2M_Testcases_AE_Release_1.ttcn
index c68acd9bb35795a19cb07963e36bc57ff2119c83..59a815e86bc28b183569b043d37ff5672bbbd201 100644
--- a/OneM2M_Testcases_AE_Release_1.ttcn
+++ b/OneM2M_Testcases_AE_Release_1.ttcn
@@ -2114,7 +2114,7 @@ module OneM2M_Testcases_AE_Release_1 {
    			  f_checkCseSimuStatus();
 			 
 			  //Create a function to receive the Create PollingChannel and to send the response
-			  v_pollingChannelIndex := f_ae_createPollingChannel(v_utRequest2);
+			  v_pollingChannelIndex := f_ae_createPollingChannel(v_utRequest2, v_aeIndex);
 			    				
 			  f_checkCseSimuStatus();
 			  
diff --git a/OneM2M_Testcases_CSE_Release_1.ttcn b/OneM2M_Testcases_CSE_Release_1.ttcn
index 28c9d1c2451e3e2114fda37562e99d6f11773c07..df9614a9535ce39fe1f43eb0c97adae6cfbe86c9 100644
--- a/OneM2M_Testcases_CSE_Release_1.ttcn
+++ b/OneM2M_Testcases_CSE_Release_1.ttcn
@@ -12297,9 +12297,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 	
 					testcase TC_CSE_GMG_005_DEL() runs on Tester system CseSystem { //Delete
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						var template PrimitiveContent v_contentResponse;
-						v_contentResponse.aE := mw_contentAeBase;// TODO see with wath should it be matched
-						v_ae1.start(f_CSE_GMG_005(m_delete("Temporary", "Temporary"), v_contentResponse));	
+						v_ae1.start(f_CSE_GMG_005(m_delete("Temporary", "Temporary")));	
 						v_ae1.done;
 					}//end TC_CSE_GMG_005_DEL
 	
@@ -12347,10 +12345,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					testcase TC_CSE_GMG_006_DEL() runs on Tester system CseSystem { //Delete
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
-						var template PrimitiveContent v_contentResponse;
-						v_contentResponse.container := mw_contentContainerBase;// TODO see with wath should it be matched
-						
-						v_ae1.start(f_CSE_GMG_006(m_delete("Temporary", "Temporary"), v_contentResponse));	
+						v_ae1.start(f_CSE_GMG_006(m_delete("Temporary", "Temporary")));	
 						v_ae1.done;
 					}//end TC_CSE_GMG_006_DEL