diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index cbbe0633b98ce73fef67a6f558fc7cef0b59f259..89e04e72b0f2577d00d0c7079b1e3cfc13803fc8 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -7251,9 +7251,9 @@ module OneM2M_PermutationFunctions {
 					var integer v_parentIndex := -1;
 					var integer v_aeIndex := -1;
 					var integer v_resourceIndex;
-					var integer v_CntAnncResourceIndex;
-					var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
-					v_create.primitiveContent.container.announceTo := {PX_CSE1_ID};
+					var integer v_containerAnncResourceIndex;
+					var template RequestPrimitive v_createContainer := m_createContainerBase;
+					v_createContainer.primitiveContent.container.announceTo := {PX_CSE1_ID};
 					
    
 					// Test control
@@ -7268,15 +7268,16 @@ module OneM2M_PermutationFunctions {
 					vc_cse1.done;
 	
 					//Preamble
+					v_aeIndex := f_cse_preamble_registerAe();
 					vc_cse1.start(f_cse_announcementProcedure_createHandler(mw_createContainerAnncBase(-, -)));
-					v_aeIndex := f_cse_createResource(int2,v_create);
+					v_resourceIndex := f_cse_createResource(int3,v_createContainer, v_aeIndex);
 					vc_cse1.done;
 	
 					// Test Body
-					//Retrieve the parent resource index
-					v_CntAnncResourceIndex := f_getLatestResourceIndex(vc_cse1);
+					//Retrieve the parent resource index where contentInstanceAnnc must be created
+					v_containerAnncResourceIndex := f_getLatestResourceIndex(vc_cse1);
 					v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestCreatePrimitive, v_parentIndex);
-					vc_cse1.start(f_cse_announcementProcedure_createHandler(p_createRequestAnnc,int4000, v_CntAnncResourceIndex));	
+					vc_cse1.start(f_cse_announcementProcedure_createHandler(p_createRequestAnnc,int4000, v_containerAnncResourceIndex));	
 					mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 
 					tc_ac.start;
@@ -7285,7 +7286,9 @@ module OneM2M_PermutationFunctions {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__, ": Resource " & int2str(enum2int(p_resourceType)) & " created successfully");
 							if(ispresent(v_response.primitive.responsePrimitive.primitiveContent.contentInstance.announceTo)) {
-								setverdict(fail, __SCOPE__, ": Resource " & int2str(enum2int(p_resourceType)) & " contains the attribute announceTo");
+								if(v_response.primitive.responsePrimitive.primitiveContent.contentInstance.announceTo != {}) {
+									setverdict(fail, __SCOPE__, ": Resource " & int2str(enum2int(p_resourceType)) & " contains the attribute announceTo");
+								}
 							}
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {