diff --git a/LibOneM2M/OneM2M_Types.ttcn b/LibOneM2M/OneM2M_Types.ttcn
index a3f167558e3fab1a510146585f555ad43ce62144..6c34046d3110d43f6f4f05885007995f91791cfa 100644
--- a/LibOneM2M/OneM2M_Types.ttcn
+++ b/LibOneM2M/OneM2M_Types.ttcn
@@ -7,7 +7,7 @@
  *  
  *  @author     ETSI
  *  @version    $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Types.ttcn $
- *              $Id: OneM2M_Types.ttcn 202 2016-12-15 15:08:33Z reinaortega $
+ *              $Id: OneM2M_Types.ttcn 216 2017-01-20 10:14:30Z reinaortega $
  *  @desc       Test System module for oneM2M
  *
  */
@@ -3381,6 +3381,7 @@ type enumerated ResponseStatusCode
 	int6003(6003),
 	int6005(6005),
 	int6010(6010),
+	int6011(6011),//TODO To be deleted - Added to be backward compatible with Rel 1
 	int6020(6020),
 	int6021(6021),
 	int6022(6022),
diff --git a/OneM2M_Testcases.ttcn b/OneM2M_Testcases.ttcn
index d253ad55471bd18d50b88efb3547f6aeaa042407..8f5517c84aebc7abee2675c607927facde47e6cc 100644
--- a/OneM2M_Testcases.ttcn
+++ b/OneM2M_Testcases.ttcn
@@ -7,7 +7,7 @@
  *  
  *  @author     ETSI
  *  @version    $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/OneM2M_Testcases.ttcn $
- *              $Id: OneM2M_Testcases.ttcn 213 2017-01-19 10:03:51Z reinaortega $
+ *              $Id: OneM2M_Testcases.ttcn 216 2017-01-20 10:14:30Z reinaortega $
  *  @desc       Module containing test cases for oneM2M
  *
  */
@@ -5168,25 +5168,17 @@ module OneM2M_Testcases {
                 
                 testcase TC_CSE_GMG_BV_001() runs on CseTester system CseSystem {
 					// Local constants
-					const XSD.AnyURI c_memberResourceAddress1 := "MEMBER_RESOURCE_ADDRESS_1";
-					const XSD.AnyURI c_memberResourceAddress2 := "MEMBER_RESOURCE_ADDRESS_2";
-					const XSD.AnyURI c_memberResourceAddress3 := "MEMBER_RESOURCE_ADDRESS_3";
-					const XSD.AnyURI c_memberResourceAddress4 := "MEMBER_RESOURCE_ADDRESS_4";
-					const XSD.AnyURI c_memberResourceAddress5 := "MEMBER_RESOURCE_ADDRESS_5";
-					const XSD.AnyURI c_memberResourceAddress6 := "MEMBER_RESOURCE_ADDRESS_6";
-					const XSD.NonNegativeInteger c_maxNrOfMembers := 5;
-					const ListOfURIs c_memberIDs := {c_memberResourceAddress1, c_memberResourceAddress2, c_memberResourceAddress3, c_memberResourceAddress4, c_memberResourceAddress5, c_memberResourceAddress6};
+					const XSD.NonNegativeInteger c_maxNrOfMembers := 1;
 					
                     // Local variables
                     var MsgIn v_response;
                     var integer v_aeIndex := -1;
-                    var integer v_resourceIndex := -1;
-					var RequestPrimitive v_request;                
+                    var integer v_containerIndex_1, v_containerIndex_2 := -1;
+					var RequestPrimitive v_request;
+					var ListOfURIs v_memberIDs;             
                     var template RequestPrimitive v_createRequest;
                     var ResponsePrimitive v_responsePrimitive;
-                    
-					v_createRequest := valueof(m_createGroup(c_maxNrOfMembers, c_memberIDs, omit));
-
+ 
                     //  Test control
                     
                     // Test component configuration
@@ -5196,6 +5188,13 @@ module OneM2M_Testcases {
                                         
                     // Preamble
                     v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+                    
+					v_containerIndex_1 := f_cse_createResource(int3, m_createContainerBase, v_aeIndex); // AE child resource
+					v_containerIndex_2 := f_cse_createResource(int3, m_createContainerBase, v_aeIndex); // AE child resource
+					
+					v_memberIDs := {f_getResourceId(vc_resourcesList[v_containerIndex_1].resource), f_getResourceId(vc_resourcesList[v_containerIndex_2].resource)};
+					
+					v_createRequest := valueof(m_createGroup(c_maxNrOfMembers, v_memberIDs, omit, int3));
                                 
                     // Test Body
 					v_request := f_getCreateRequestPrimitive(int9, v_createRequest, v_aeIndex);
@@ -5266,7 +5265,7 @@ module OneM2M_Testcases {
 					v_containerCreateRequest.primitiveContent.any_1[0].Container_optional.accessControlPolicyIDs := {f_getResourceId(vc_resourcesList[v_acpIndex].resource)};
 					v_containerIndex := f_cse_createResource(int3, v_containerCreateRequest, v_aeIndex); // AE child resource
 					
-					v_createRequest := m_createGroup(1, {f_getResourceAddress(v_containerIndex)}, omit, int3);
+					v_createRequest := m_createGroup(1, {f_getResourceId(vc_resourcesList[v_containerIndex].resource)}, omit, int3);
 					v_request := f_getCreateRequestPrimitive(int9, v_createRequest, v_aeIndex);	// creating group
                 	                		   
                 	// Test Body
@@ -5310,8 +5309,8 @@ module OneM2M_Testcases {
 					// Local variables
 					var MsgIn v_response;
 					var integer v_aeIndex := -1;
-					var integer v_containerIndex1 := -1;
-					var integer v_containerIndex2 := -1;
+					var integer v_containerIndex_1 := -1;
+					var integer v_containerIndex_2 := -1;
 					var integer v_acpIndex := -1;
 					var integer v_groupIndex := -1;
 					var RequestPrimitive v_request;
@@ -5334,11 +5333,11 @@ module OneM2M_Testcases {
 					v_aeIndex := f_cse_preamble_registerAe(-, -); //c_CRUDNDi
 					v_acpIndex := f_cse_createResource(int1, v_createAcp, v_aeIndex); // AE child resource
 					v_containerCreateRequest.primitiveContent.any_1[0].Container_optional.accessControlPolicyIDs := {f_getResourceId(vc_resourcesList[v_acpIndex].resource)};
-					v_containerIndex1 := f_cse_createResource(int3, m_createContainer("NotInitialized", "MyContainer1"), v_aeIndex); // AE child resource
-					v_containerIndex2 := f_cse_createResource(int3, v_containerCreateRequest, v_aeIndex); // AE child resource
-					v_groupIndex := f_cse_createResource(int9, m_createGroup(2, {f_getResourceAddress(v_containerIndex1)}, omit, int3), v_aeIndex);
+					v_containerIndex_1 := f_cse_createResource(int3, m_createContainer("NotInitialized", "MyContainer1"), v_aeIndex); // AE child resource
+					v_containerIndex_2 := f_cse_createResource(int3, v_containerCreateRequest, v_aeIndex); // AE child resource
+					v_groupIndex := f_cse_createResource(int9, m_createGroup(2, {f_getResourceId(vc_resourcesList[v_containerIndex_1].resource)}, omit, int3), v_aeIndex);
 					
-					v_updateRequest.primitiveContent.any_1[0].Group_optional.memberIDs := {f_getResourceAddress(v_containerIndex2)};
+					v_updateRequest.primitiveContent.any_1[0].Group_optional.memberIDs := {f_getResourceId(vc_resourcesList[v_containerIndex_2].resource)};
 					v_request := f_getUpdateRequestPrimitive(int9, v_groupIndex, v_updateRequest);	// creating group
                 	    
 					// Test Body
@@ -5396,7 +5395,7 @@ module OneM2M_Testcases {
                     // Preamble
                     v_aeIndex := f_cse_preamble_registerAe(); //c_CRUDNDi.
 					v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex); // AE child resource
-					v_memberID :=  f_getResourceAddress(v_containerIndex);
+					v_memberID :=  f_getResourceId(vc_resourcesList[v_containerIndex].resource);
 					v_createRequest := valueof(m_createGroup(2, {v_memberID, v_memberID}, omit, int3));
 					v_createRequest := f_getCreateRequestPrimitive(int9, v_createRequest, v_aeIndex);
             		
@@ -5456,7 +5455,7 @@ module OneM2M_Testcases {
                     // Preamble
                     v_aeIndex := f_cse_preamble_registerAe(); //c_CRUDNDi
 					v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex); // AE child resource
-					v_createRequest := valueof(m_createGroup(2, {f_getResourceAddress(v_containerIndex)}, omit, int3)); //Member type is set to Container
+					v_createRequest := valueof(m_createGroup(2, {f_getResourceId(vc_resourcesList[v_containerIndex].resource)}, omit, int3)); //Member type is set to Container
 					v_createRequest := f_getCreateRequestPrimitive(int9, v_createRequest, v_aeIndex);
                 	
                 	// Test Body       
@@ -5516,7 +5515,7 @@ module OneM2M_Testcases {
 					// Preamble
 					v_aeIndex := f_cse_preamble_registerAe(); //c_CRUDNDi
 					v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex); // AE child resource
-					v_createRequest := valueof(m_createGroup(2, {f_getResourceAddress(v_containerIndex)}, omit, int2, int3)); //Member type is set to AE and consistencyStrategy is set to MIXED
+					v_createRequest := valueof(m_createGroup(2, {f_getResourceId(vc_resourcesList[v_containerIndex].resource)}, omit, int2, int3)); //Member type is set to AE and consistencyStrategy is set to MIXED
 					v_createRequest := f_getCreateRequestPrimitive(int9, v_createRequest, v_aeIndex);                                                            
                     
                     // Test Body
@@ -5590,7 +5589,7 @@ module OneM2M_Testcases {
 					v_aeIndex := f_cse_preamble_registerAe(); //c_CRUDNDi
 					v_containerIndex := f_cse_createResource(int3, m_createContainer("NotInitialized", "MyContainer"), v_aeIndex);
 					v_groupIndex :=  f_cse_createResource(int9, m_createGroupBase, v_aeIndex);
-					v_memberIDs := {f_getResourceAddress(v_groupIndex), f_getResourceAddress(v_containerIndex)};
+					v_memberIDs := {f_getResourceId(vc_resourcesList[v_groupIndex].resource), f_getResourceId(vc_resourcesList[v_containerIndex].resource)};
 					v_createRequest := valueof(m_createGroup(2, v_memberIDs, omit, int3, omit)); //Member type is set to container and consistencyStrategy is set to ABANDON MEMBER (default value)
 					v_createRequest := f_getCreateRequestPrimitive(int9, v_createRequest, v_aeIndex);                                                       
                     
@@ -5665,7 +5664,7 @@ module OneM2M_Testcases {
 					v_aeIndex := f_cse_preamble_registerAe(); //c_CRUDNDi
 					v_containerIndex := f_cse_createResource(int3, m_createContainer("NotInitialized", "MyContainer"), v_aeIndex);
 					v_groupIndex :=  f_cse_createResource(int9, m_createGroupBase, v_aeIndex);
-					v_memberIDs := {f_getResourceAddress(v_groupIndex), f_getResourceAddress(v_containerIndex)};
+					v_memberIDs := {f_getResourceId(vc_resourcesList[v_groupIndex].resource), f_getResourceId(vc_resourcesList[v_containerIndex].resource)};
 					v_createRequest := valueof(m_createGroup(2, v_memberIDs, omit, int3, int2)); //Member type is set to container and consistencyStrategy is set to ABANDON GROUP
 					v_createRequest := f_getCreateRequestPrimitive(int9, v_createRequest, v_aeIndex);                                                       
                     
@@ -5673,7 +5672,7 @@ module OneM2M_Testcases {
                     mcaPort.send(m_request(v_createRequest));
                     tc_ac.start;
                     alt {
-                        [] mcaPort.receive(mw_response(mw_responsePrimitive(int4110))) -> value v_response {//TODO Double check ResponseStatusCode
+                        [] mcaPort.receive(mw_response(mw_responsePrimitive(int6011))) -> value v_response {
                             tc_ac.stop;
                             setverdict(pass, testcasename() & ": unsuccessful validation of the resource type during the creation of the group");
                         }
@@ -5701,19 +5700,19 @@ module OneM2M_Testcases {
             } // end group g_CSE_GMG_BV_008
 
             // Test objective:
-            // Check that the IUT detects the presence of duplicate member IDs during the creation of the
+            // Check that the IUT detects the presence of duplicate member IDs during the update of the
             // group resource and removes the duplicate member IDs prior to updating of the group resource.
             group g_CSE_GMG_BV_009 {
 				testcase TC_CSE_GMG_BV_009() runs on CseTester system CseSystem {
 					// Local variables
 					var MsgIn v_response;
 					var integer v_aeIndex := -1;
-					var integer v_containerIndex1 := -1;
-					var integer v_containerIndex2 := -1;
+					var integer v_containerIndex_1 := -1;
+					var integer v_containerIndex_2 := -1;
 					var integer v_groupIndex := -1;
 					var RequestPrimitive v_updateRequest := valueof(m_updateGroupBase);
-					var XSD.AnyURI v_memberID1;
-					var XSD.AnyURI v_memberID2;
+					var XSD.AnyURI v_memberId_1;
+					var XSD.AnyURI v_memberId_2;
 					
 					// Test control
                     
@@ -5724,13 +5723,13 @@ module OneM2M_Testcases {
                     
 					// Preamble
 					v_aeIndex := f_cse_preamble_registerAe(); //c_CRUDNDi
-					v_containerIndex1 := f_cse_createResource(int3, m_createContainer("NotInitialized", "MyContainer1"), v_aeIndex); // AE child resource
-					v_containerIndex2 := f_cse_createResource(int3, m_createContainer("NotInitialized", "MyContainer2"), v_aeIndex); // AE child resource
-					v_memberID1 :=  f_getResourceAddress(v_containerIndex1);
-					v_memberID2 :=  f_getResourceAddress(v_containerIndex2);
-					v_groupIndex := f_cse_createResource(int9, m_createGroup(2, {v_memberID1, v_memberID2}, omit, int3), v_aeIndex); // AE child resource
+					v_containerIndex_1 := f_cse_createResource(int3, m_createContainer("NotInitialized", "MyContainer1"), v_aeIndex); // AE child resource
+					v_containerIndex_2 := f_cse_createResource(int3, m_createContainer("NotInitialized", "MyContainer2"), v_aeIndex); // AE child resource
+					v_memberId_1 :=  f_getResourceId(vc_resourcesList[v_containerIndex_1].resource);
+					v_memberId_2 :=  f_getResourceId(vc_resourcesList[v_containerIndex_2].resource);
+					v_groupIndex := f_cse_createResource(int9, m_createGroup(2, {v_memberId_1, v_memberId_2}, omit, int3), v_aeIndex); // AE child resource
 					
-					v_updateRequest.primitiveContent.any_1[0].Group_optional.memberIDs := {v_memberID2, v_memberID2}; 
+					v_updateRequest.primitiveContent.any_1[0].Group_optional.memberIDs := {v_memberId_2, v_memberId_2}; 
 					v_updateRequest := f_getUpdateRequestPrimitive(int9, v_groupIndex, v_updateRequest);
 					
 					//Test Body
@@ -5749,7 +5748,7 @@ module OneM2M_Testcases {
 								if(lengthof(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].Group_optional.memberIDs) != 1) {
 								   setverdict(fail, testcasename() & ": Error, wrong number of memberIDs attribute");      
 								}                               
-								if(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].Group_optional.memberIDs[0] != v_memberID2){
+								if(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].Group_optional.memberIDs[0] != v_memberId_2){
 									setverdict(fail, testcasename(), ": Error, memberIDs attribute not correct");
 								}
 							}
@@ -5778,8 +5777,8 @@ module OneM2M_Testcases {
                     // Local variables
 					var MsgIn v_response;
 					var integer v_aeIndex := -1;
-					var integer v_containerIndex1 := -1;
-					var integer v_containerIndex2 := -1;
+					var integer v_containerIndex_1 := -1;
+					var integer v_containerIndex_2 := -1;
 					var integer v_groupIndex := -1;
 					var RequestPrimitive v_updateRequest := valueof(m_updateGroupBase);
 					
@@ -5792,11 +5791,11 @@ module OneM2M_Testcases {
                     
 					// Preamble
 					v_aeIndex := f_cse_preamble_registerAe(); //c_CRUDNDi
-					v_containerIndex1 := f_cse_createResource(int3, m_createContainer("NotInitialized", "MyContainer1"), v_aeIndex); // AE child resource
-					v_containerIndex2 := f_cse_createResource(int3, m_createContainer("NotInitialized", "MyContainer2"), v_aeIndex); // AE child resource
-					v_groupIndex := f_cse_createResource(int9, m_createGroup(2, {f_getResourceAddress(v_containerIndex1)}, omit, int3), v_aeIndex);
+					v_containerIndex_1 := f_cse_createResource(int3, m_createContainer("NotInitialized", "MyContainer1"), v_aeIndex); // AE child resource
+					v_containerIndex_2 := f_cse_createResource(int3, m_createContainer("NotInitialized", "MyContainer2"), v_aeIndex); // AE child resource
+					v_groupIndex := f_cse_createResource(int9, m_createGroup(2, {f_getResourceId(vc_resourcesList[v_containerIndex_1].resource)}, omit, int3), v_aeIndex);
 					
-					v_updateRequest.primitiveContent.any_1[0].Group_optional.memberIDs := {f_getResourceAddress(v_containerIndex2)};
+					v_updateRequest.primitiveContent.any_1[0].Group_optional.memberIDs := {f_getResourceId(vc_resourcesList[v_containerIndex_2].resource)};
 					v_updateRequest := f_getUpdateRequestPrimitive(int9, v_groupIndex, v_updateRequest);
 					
                     // Test Body
@@ -5845,8 +5844,8 @@ module OneM2M_Testcases {
 					var integer v_containerIndex := -1;
 					var integer v_groupIndex := -1;
 					var integer v_subGroupIndex := -1;
-					var XSD.AnyURI v_memberID1;
-					var XSD.AnyURI v_memberID2;
+					var XSD.AnyURI v_memberId_1;
+					var XSD.AnyURI v_memberId_2;
                 
                     // Test control
         
@@ -5859,11 +5858,11 @@ module OneM2M_Testcases {
 					v_aeIndex := f_cse_preamble_registerAe(); //c_CRUDNDi
 					v_containerIndex := f_cse_createResource(int3, m_createContainer("NotInitialized", "MyContainer"), v_aeIndex);
 					v_subGroupIndex :=  f_cse_createResource(int9, m_createGroupBase, v_aeIndex);
-					v_memberID1 := f_getResourceAddress(v_containerIndex);
-					v_memberID2 := f_getResourceAddress(v_subGroupIndex);
-					v_groupIndex := f_cse_createResource(int9, m_createGroup(2, {v_memberID1}, omit, int3, int3), v_aeIndex); //Member type is set to Container (int3) and consistencyStrategy is set to MIXED (int3)
+					v_memberId_1 := f_getResourceId(vc_resourcesList[v_containerIndex].resource);
+					v_memberId_2 := f_getResourceId(vc_resourcesList[v_subGroupIndex].resource);
+					v_groupIndex := f_cse_createResource(int9, m_createGroup(2, {v_memberId_1}, omit, int3, int3), v_aeIndex); //Member type is set to Container (int3) and consistencyStrategy is set to MIXED (int3)
                 	
-					v_updateRequest.primitiveContent.any_1[0].Group_optional.memberIDs := {v_memberID1, v_memberID2};
+					v_updateRequest.primitiveContent.any_1[0].Group_optional.memberIDs := {v_memberId_1, v_memberId_2};
 					v_updateRequest := f_getUpdateRequestPrimitive(int9, v_groupIndex, v_updateRequest);
 					
        				// Test Body
@@ -5923,8 +5922,8 @@ module OneM2M_Testcases {
 					var integer v_containerIndex := -1;
 					var integer v_groupIndex := -1;
 					var integer v_subGroupIndex := -1;
-					var XSD.AnyURI v_memberID1;
-					var XSD.AnyURI v_memberID2;
+					var XSD.AnyURI v_memberId_1;
+					var XSD.AnyURI v_memberId_2;
                 
 					// Test control
         
@@ -5937,11 +5936,11 @@ module OneM2M_Testcases {
 					v_aeIndex := f_cse_preamble_registerAe(); //c_CRUDNDi
 					v_containerIndex := f_cse_createResource(int3, m_createContainer("NotInitialized", "MyContainer"), v_aeIndex);
 					v_subGroupIndex :=  f_cse_createResource(int9, m_createGroupBase, v_aeIndex);
-					v_memberID1 := f_getResourceAddress(v_containerIndex);
-					v_memberID2 := f_getResourceAddress(v_subGroupIndex);
-					v_groupIndex := f_cse_createResource(int9, m_createGroup(2, {v_memberID1}, omit, int3, omit), v_aeIndex);  //Member type is set to Container (int3) and consistencyStrategy is set to ABANDON MEMBER (default value)
+					v_memberId_1 := f_getResourceId(vc_resourcesList[v_containerIndex].resource);
+					v_memberId_2 := f_getResourceId(vc_resourcesList[v_subGroupIndex].resource);
+					v_groupIndex := f_cse_createResource(int9, m_createGroup(2, {v_memberId_1}, omit, int3, omit), v_aeIndex);  //Member type is set to Container (int3) and consistencyStrategy is set to ABANDON MEMBER (default value)
                 	
-					v_updateRequest.primitiveContent.any_1[0].Group_optional.memberIDs := {v_memberID2, v_memberID1};
+					v_updateRequest.primitiveContent.any_1[0].Group_optional.memberIDs := {v_memberId_2, v_memberId_1};
 					v_updateRequest := f_getUpdateRequestPrimitive(int9, v_groupIndex, v_updateRequest);
 					
                     //Test Body
@@ -5971,7 +5970,7 @@ module OneM2M_Testcases {
 								if(lengthof(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].Group_optional.memberIDs) != 1) {
 								   setverdict(fail, testcasename() & ": Error, wrong number of memberIDs attribute");      
 								}                               
-								if(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].Group_optional.memberIDs[0] != v_memberID1){
+								if(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].Group_optional.memberIDs[0] != v_memberId_1){
 									setverdict(fail, testcasename(), ": Error, memberIDs attribute not correct");
 								}
 							}                                   
@@ -6004,8 +6003,8 @@ module OneM2M_Testcases {
                 	var integer v_containerIndex := -1;
                 	var integer v_groupIndex := -1;
 					var integer v_subGroupIndex := -1;
-                	var XSD.AnyURI v_memberID1;
-                	var XSD.AnyURI v_memberID2;
+                	var XSD.AnyURI v_memberId_1;
+                	var XSD.AnyURI v_memberId_2;
                                 
                 	// Test control
                         
@@ -6018,18 +6017,18 @@ module OneM2M_Testcases {
 					v_aeIndex := f_cse_preamble_registerAe(); //c_CRUDNDi
 					v_containerIndex := f_cse_createResource(int3, m_createContainer("NotInitialized", "MyContainer"), v_aeIndex);
 					v_subGroupIndex :=  f_cse_createResource(int9, m_createGroupBase, v_aeIndex);
-					v_memberID1 := f_getResourceAddress(v_containerIndex);
-					v_memberID2 := f_getResourceAddress(v_subGroupIndex);
-                	v_groupIndex := f_cse_createResource(int9, m_createGroup(2, {v_memberID1}, omit, int3, int2), v_aeIndex);  //Member type is set to Container(int3) and consistencyStrategy is set to ABANDON GROUP (default value)
+					v_memberId_1 := f_getResourceId(vc_resourcesList[v_containerIndex].resource);
+					v_memberId_2 := f_getResourceId(vc_resourcesList[v_subGroupIndex].resource);
+                	v_groupIndex := f_cse_createResource(int9, m_createGroup(2, {v_memberId_1}, omit, int3, int2), v_aeIndex);  //Member type is set to Container(int3) and consistencyStrategy is set to ABANDON GROUP (default value)
                                 	
-                	v_updateRequest.primitiveContent.any_1[0].Group_optional.memberIDs := {v_memberID2, v_memberID1};
+                	v_updateRequest.primitiveContent.any_1[0].Group_optional.memberIDs := {v_memberId_2, v_memberId_1};
                 	v_updateRequest := f_getUpdateRequestPrimitive(int9, v_groupIndex, v_updateRequest);
                 					
                     //Test Body
 					mcaPort.send(m_request(v_updateRequest));
 					tc_ac.start;
 					alt {
-						[] mcaPort.receive(mw_response(mw_responsePrimitive(int4110))) -> value v_response {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int6011))) -> value v_response {
 							tc_ac.stop;
 							setverdict(pass, testcasename() & ": unsuccessful validation of the resource type during the creation of the group");
 						}
@@ -6059,22 +6058,16 @@ module OneM2M_Testcases {
                 testcase TC_CSE_GMG_BV_014() runs on CseTester system CseSystem
                 {
                     //Local constants
-                    const ResourceType c_ResourceTypeGroup := int9;  
-                    const ResourceType c_ResourceType1 := int4; 
-                    const MemberType   c_memberType1   := int4;     // should be set same type as c_ResourceType1
-                    const XSD.String c_primitiveContent := "primitive_contet";
-//                    const XSD.AnyURI c_targetResourceAddress := "TARGET_RESOURCE_ADDRESS";
-                    const XSD.AnyURI c_memberResourceAddress1 := "MEMBER_RESSOURCE_ADDRESS_1";
-                    const XSD.AnyURI c_memberResourceAddress2 := "MEMBER_RESSOURCE_ADDRESS_2";
-                    const XSD.AnyURI c_memberResourceAddress3 := "MEMBER_RESSOURCE_ADDRESS_3";
-    
+                    const integer c_maxNrOfMembers := 2;
+                    
                     // Local variables
                     var MsgIn v_response;
                     var RequestPrimitive v_request;
                     var integer v_aeIndex := -1;
-                    var integer v_groupIndex := -1;
-            
-                    var template RequestPrimitive v_createRequest := m_createGroupBase;
+                    var integer v_groupIndex, v_containerIndex_1, v_containerIndex_2, v_containerIndex_3 := -1;
+                    var ListOfURIs v_memberIDs;
+                    var template RequestPrimitive v_createRequest;
+                    
                     var template RequestPrimitive v_updateRequest := m_updateGroupBase;
                     var template RequestPrimitive v_createMember;
          
@@ -6086,42 +6079,27 @@ module OneM2M_Testcases {
                     // Test adapter configuration
         
                     // Preamble
-                    v_aeIndex := f_cse_preamble_registerAe(); //c_CRUDNDi
-        
-                    //    and the IUT having a resource at TARGET_RESOURCE_ADDRESS of type <group>
-                    //            containing 
-                    //            memberIDs attribute set to MEMBER_RESOURCE_ADDRESS_1, 
-                    //                                                        MEMBER_RESOURCE_ADDRESS_2
-                    //            maxNrOfMembers attribute set to 2
-                    //    and the AE having privileges to perform UPDATE operation on the TARGET_RESOURCE_ADDRESS
-                    v_createRequest := f_getCreateRequestPrimitive(c_ResourceTypeGroup, v_createRequest, v_aeIndex);
-                    v_createRequest.primitiveContent.any_1[0].Group_optional := m_contentCreateGroup(2, {c_memberResourceAddress1, c_memberResourceAddress2}, omit);
-                    v_createRequest.primitiveContent.any_1[0].Group_optional.maxNrOfMembers := 2;
-                    v_groupIndex := f_cse_createResource(c_ResourceTypeGroup, v_createRequest, v_aeIndex);
-        
-                    //      and the IUT having a resource at MEMBER_RESOURCE_ADDRESS_1
-                    //            having resourceType attribute RESOURCE_TYPE_1
-                    //      and the IUT having a resource at MEMBER_RESOURCE_ADDRESS_2
-                    //            having resourceType attribute RESOURCE_TYPE_1
-                    //      and the IUT having a resource at MEMBER_RESOURCE_ADDRESS_3
-                    //            having resourceType attribute RESOURCE_TYPE_1
-                    v_createMember := m_createContentInstance(f_getResourceAddress(v_aeIndex), c_primitiveContent & "_1");
-                    f_cse_createResource(c_ResourceType1, v_createMember, v_aeIndex);
-                    v_createMember := m_createContentInstance(f_getResourceAddress(v_aeIndex), c_primitiveContent & "_2");
-                    f_cse_createResource(c_ResourceType1, v_createMember, v_aeIndex);
-                    v_createMember := m_createContentInstance(f_getResourceAddress(v_aeIndex), c_primitiveContent & "_3");
-                    f_cse_createResource(c_ResourceType1, v_createMember, v_aeIndex);
-        
+                    v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+                    
+					v_containerIndex_1 := f_cse_createResource(int3, m_createContainerBase, v_aeIndex); // AE child resource
+					v_containerIndex_2 := f_cse_createResource(int3, m_createContainerBase, v_aeIndex); // AE child resource
+					v_containerIndex_3 := f_cse_createResource(int3, m_createContainerBase, v_aeIndex); // AE child resource
+					
+					v_memberIDs := {f_getResourceId(vc_resourcesList[v_containerIndex_1].resource), f_getResourceId(vc_resourcesList[v_containerIndex_2].resource)};
+					
+					v_createRequest := valueof(m_createGroup(c_maxNrOfMembers, v_memberIDs, omit, int3));
+					
+					v_groupIndex :=  f_cse_createResource(int9, v_createRequest, v_aeIndex);
     
                     //Test Body
-                    v_request := f_getUpdateRequestPrimitive(c_ResourceTypeGroup, v_groupIndex, v_updateRequest);
-//                    v_request.to_ := c_targetResourceAddress;
-                    v_request.primitiveContent.any_1[0].Group_optional := valueof(m_contentCreateGroup(3, {c_memberResourceAddress1, c_memberResourceAddress2, c_memberResourceAddress3}, omit));
+                    v_request := f_getUpdateRequestPrimitive(int9, v_groupIndex, v_updateRequest);
+					v_memberIDs := v_memberIDs & {f_getResourceId(vc_resourcesList[v_containerIndex_3].resource)};
+                    v_request.primitiveContent.any_1[0].Group_optional.memberIDs := v_memberIDs;
         
                     mcaPort.send(m_request(v_request));
                     tc_ac.start;
                     alt {
-                        [] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) -> value v_response {
+                        [] mcaPort.receive(mw_response(mw_responsePrimitive(int6010))) -> value v_response {
                             tc_ac.stop;
                             setverdict(pass, testcasename() & ": operation is not allowed");                             
                         }
@@ -6150,8 +6128,8 @@ module OneM2M_Testcases {
 					var MsgIn v_response;
 					var RequestPrimitive v_updateRequest := valueof(m_updateGroupBase);
 					var integer v_aeIndex := -1;
-					var integer v_containerIndex1 := -1;
-					var integer v_containerIndex2 := -1;
+					var integer v_containerIndex_1 := -1;
+					var integer v_containerIndex_2 := -1;
 					var integer v_groupIndex := -1;
 					var ListOfURIs v_memberIDs;
 					var XSD.PositiveInteger v_maxNrOfMembers:= 1;
@@ -6167,9 +6145,9 @@ module OneM2M_Testcases {
                                         
 					// Preamble
 					v_aeIndex := f_cse_preamble_registerAe(-, -); //c_CRUDNDi
-					v_containerIndex1 := f_cse_createResource(int3, m_createContainer("NotInitialized", "MyContainer1"), v_aeIndex); // AE child resource
-					v_containerIndex2 := f_cse_createResource(int3, m_createContainer("NotInitialized", "MyContainer2"), v_aeIndex); // AE child resource
-					v_memberIDs := {f_getResourceAddress(v_containerIndex1), f_getResourceAddress(v_containerIndex2)};
+					v_containerIndex_1 := f_cse_createResource(int3, m_createContainer("NotInitialized", "MyContainer1"), v_aeIndex); // AE child resource
+					v_containerIndex_2 := f_cse_createResource(int3, m_createContainer("NotInitialized", "MyContainer2"), v_aeIndex); // AE child resource
+					v_memberIDs := {f_getResourceId(vc_resourcesList[v_containerIndex_1].resource), f_getResourceId(vc_resourcesList[v_containerIndex_2].resource)};
 					v_groupIndex := f_cse_createResource(int9, m_createGroup(2, v_memberIDs, omit, int3), v_aeIndex);
 					
 					v_updateRequest := f_getUpdateRequestPrimitive(int9, v_groupIndex, v_updateRequest);
@@ -6413,12 +6391,12 @@ module OneM2M_Testcases {
 					var MsgIn v_response;
 					var integer v_aeIndex := -1;
 					var integer v_acpIndex := -1;
-					var integer v_containerIndex1 := -1;
-					var integer v_containerIndex2 := -1;
+					var integer v_containerIndex_1 := -1;
+					var integer v_containerIndex_2 := -1;
 					var integer v_groupIndex := -1;
 					var integer i;
 					var ListOfURIs v_memberIDs;
-					var ListOfURIs v_membersACPIDs;
+					var ListOfURIs v_membersAcpIds;
 					var template RequestPrimitive v_createAcp := m_createAcp("NotInitialized", "MyACP", -, -);
 					
 					// Test control
@@ -6435,11 +6413,11 @@ module OneM2M_Testcases {
 					// Preamble
 					v_aeIndex := f_cse_preamble_registerAe(-, -); //c_CRUDNDi
 					v_acpIndex := f_cse_createResource(int1, v_createAcp, v_aeIndex); // AE child resource
-					v_containerIndex1 := f_cse_createResource(int3, m_createContainer("NotInitialized", "MyContainer1"), v_aeIndex); // AE child resource
-					v_containerIndex2 := f_cse_createResource(int3, m_createContainer("NotInitialized", "MyContainer2"), v_aeIndex); // AE child resource
-					v_memberIDs := {f_getResourceAddress(v_containerIndex1), f_getResourceAddress(v_containerIndex2)};
-					v_membersACPIDs := {f_getResourceId(vc_resourcesList[v_acpIndex].resource)};
-					v_groupIndex := f_cse_createResource(int9, m_createGroup(2, v_memberIDs, omit, int3, -, v_membersACPIDs), v_aeIndex); // AE child resource
+					v_containerIndex_1 := f_cse_createResource(int3, m_createContainer("NotInitialized", "MyContainer1"), v_aeIndex); // AE child resource
+					v_containerIndex_2 := f_cse_createResource(int3, m_createContainer("NotInitialized", "MyContainer2"), v_aeIndex); // AE child resource
+					v_memberIDs := {f_getResourceId(vc_resourcesList[v_containerIndex_1].resource), f_getResourceId(vc_resourcesList[v_containerIndex_2].resource)};
+					v_membersAcpIds := {f_getResourceId(vc_resourcesList[v_acpIndex].resource)};
+					v_groupIndex := f_cse_createResource(int9, m_createGroup(2, v_memberIDs, omit, int3, -, v_membersAcpIds), v_aeIndex); // AE child resource
 					
 					p_requestPrimitive.to_ := f_getResourceAddress(v_groupIndex) & "/fopt";
 					p_requestPrimitive.from_ := f_getOriginator(v_groupIndex);
@@ -6509,11 +6487,11 @@ module OneM2M_Testcases {
 					var MsgIn v_response;
 					var integer v_aeIndex := -1;
 					var integer v_acpIndex := -1;
-					var integer v_containerIndex1 := -1;
-					var integer v_containerIndex2 := -1;
+					var integer v_containerIndex_1 := -1;
+					var integer v_containerIndex_2 := -1;
 					var integer v_groupIndex := -1;
 					var ListOfURIs v_memberIDs;
-					var ListOfURIs v_membersACPIDs;
+					var ListOfURIs v_membersAcpIds;
 					var template RequestPrimitive v_createAcp := m_createAcp("NotInitialized", "MyACP", -, p_accessControlOperations);
 
 					// Test control
@@ -6530,11 +6508,11 @@ module OneM2M_Testcases {
 					// Preamble
 					v_aeIndex := f_cse_preamble_registerAe(-, -); //c_CRUDNDi
 					v_acpIndex := f_cse_createResource(int1, v_createAcp, v_aeIndex); // AE child resource
-					v_containerIndex1 := f_cse_createResource(int3, m_createContainer("NotInitialized", "MyContainer1"), v_aeIndex); // AE child resource
-    				v_containerIndex2 := f_cse_createResource(int3, m_createContainer("NotInitialized", "MyContainer2"), v_aeIndex); // AE child resource
-    				v_memberIDs := {f_getResourceAddress(v_containerIndex1), f_getResourceAddress(v_containerIndex2)};
-					v_membersACPIDs := {f_getResourceId(vc_resourcesList[v_acpIndex].resource)};
-					v_groupIndex := f_cse_createResource(int9, m_createGroup(2, v_memberIDs, omit, int3, -, v_membersACPIDs), v_aeIndex); // AE child resource
+					v_containerIndex_1 := f_cse_createResource(int3, m_createContainer("NotInitialized", "MyContainer1"), v_aeIndex); // AE child resource
+    				v_containerIndex_2 := f_cse_createResource(int3, m_createContainer("NotInitialized", "MyContainer2"), v_aeIndex); // AE child resource
+    				v_memberIDs := {f_getResourceId(vc_resourcesList[v_containerIndex_1].resource), f_getResourceId(vc_resourcesList[v_containerIndex_2].resource)};
+					v_membersAcpIds := {f_getResourceId(vc_resourcesList[v_acpIndex].resource)};
+					v_groupIndex := f_cse_createResource(int9, m_createGroup(2, v_memberIDs, omit, int3, -, v_membersAcpIds), v_aeIndex); // AE child resource
    
 					p_requestPrimitive.to_ := f_getResourceAddress(v_groupIndex) & "/fopt";
 					p_requestPrimitive.from_ := f_getOriginator(v_groupIndex);
@@ -6601,8 +6579,8 @@ module OneM2M_Testcases {
 					var MsgIn v_response;
 					var integer v_aeIndex := -1;
 					var integer v_acpIndex := -1;
-					var integer v_containerIndex1 := -1;
-					var integer v_containerIndex2 := -1;
+					var integer v_containerIndex_1 := -1;
+					var integer v_containerIndex_2 := -1;
 					var integer v_groupIndex := -1;
 					var integer i;
 					var ListOfURIs v_memberIDs;
@@ -6623,9 +6601,9 @@ module OneM2M_Testcases {
 					// Preamble
 					v_aeIndex := f_cse_preamble_registerAe(-, -); //c_CRUDNDi
 					v_acpIndex := f_cse_createResource(int1, v_createAcp, v_aeIndex); // AE child resource
-					v_containerIndex1 := f_cse_createResource(int3, m_createContainer("NotInitialized", "MyContainer1"), v_aeIndex); // AE child resource
-					v_containerIndex2 := f_cse_createResource(int3, m_createContainer("NotInitialized", "MyContainer2"), v_aeIndex); // AE child resource
-					v_memberIDs := {f_getResourceAddress(v_containerIndex1), f_getResourceAddress(v_containerIndex2)};
+					v_containerIndex_1 := f_cse_createResource(int3, m_createContainer("NotInitialized", "MyContainer1"), v_aeIndex); // AE child resource
+					v_containerIndex_2 := f_cse_createResource(int3, m_createContainer("NotInitialized", "MyContainer2"), v_aeIndex); // AE child resource
+					v_memberIDs := {f_getResourceId(vc_resourcesList[v_containerIndex_1].resource), f_getResourceId(vc_resourcesList[v_containerIndex_2].resource)};
 					v_acpIDs := {f_getResourceId(vc_resourcesList[v_acpIndex].resource)};
 					v_groupIndex := f_cse_createResource(int9, m_createGroup(2, v_memberIDs, v_acpIDs, int3), v_aeIndex); // AE child resource
        
@@ -6697,8 +6675,8 @@ module OneM2M_Testcases {
 					var MsgIn v_response;
 					var integer v_aeIndex := -1;
 					var integer v_acpIndex := -1;
-					var integer v_containerIndex1 := -1;
-					var integer v_containerIndex2 := -1;
+					var integer v_containerIndex_1 := -1;
+					var integer v_containerIndex_2 := -1;
 					var integer v_groupIndex := -1;
 					var ListOfURIs v_memberIDs;
 					var AcpType v_acpIDs;
@@ -6718,9 +6696,9 @@ module OneM2M_Testcases {
 					// Preamble
 					v_aeIndex := f_cse_preamble_registerAe(-, -); //c_CRUDNDi
 					v_acpIndex := f_cse_createResource(int1, v_createAcp, v_aeIndex); // AE child resource
-					v_containerIndex1 := f_cse_createResource(int3, m_createContainer("NotInitialized", "MyContainer1"), v_aeIndex); // AE child resource
-					v_containerIndex2 := f_cse_createResource(int3, m_createContainer("NotInitialized", "MyContainer2"), v_aeIndex); // AE child resource
-					v_memberIDs := {f_getResourceAddress(v_containerIndex1), f_getResourceAddress(v_containerIndex2)};
+					v_containerIndex_1 := f_cse_createResource(int3, m_createContainer("NotInitialized", "MyContainer1"), v_aeIndex); // AE child resource
+					v_containerIndex_2 := f_cse_createResource(int3, m_createContainer("NotInitialized", "MyContainer2"), v_aeIndex); // AE child resource
+					v_memberIDs := {f_getResourceId(vc_resourcesList[v_containerIndex_1].resource), f_getResourceId(vc_resourcesList[v_containerIndex_2].resource)};
 					v_acpIDs := {f_getResourceId(vc_resourcesList[v_acpIndex].resource)};
 					v_groupIndex := f_cse_createResource(int9, m_createGroup(2, v_memberIDs, v_acpIDs, int3), v_aeIndex); // AE child resource
    
@@ -6803,8 +6781,8 @@ module OneM2M_Testcases {
 					
 				   // Local variables
 					var MsgIn v_response;
-					var integer v_aeIndex1 := -1;
-					var integer v_aeIndex2 := -1;
+					var integer v_aeIndex_1 := -1;
+					var integer v_aeIndex_2 := -1;
 					var integer v_groupIndex := -1;
 					var ListOfURIs v_memberIDs;
 					var integer i;
@@ -6817,13 +6795,13 @@ module OneM2M_Testcases {
 					// Test adapter configuration
 
 					// Preamble
-					v_aeIndex1 := f_cse_preamble_registerAe(-, -); //c_CRUDNDi
-					v_aeIndex2 := f_cse_createResource(int2, m_createAe(PX_APP_ID, -, PX_AE_ID_STEM, "MyAe2", omit), -1); // AE2 is registred
-					v_memberIDs := {f_getResourceAddress(v_aeIndex1), f_getResourceAddress(v_aeIndex2)};
+					v_aeIndex_1 := f_cse_preamble_registerAe(-, -); //c_CRUDNDi
+					v_aeIndex_2 := f_cse_createResource(int2, m_createAe(PX_APP_ID, -, PX_AE_ID_STEM, "MyAe2", omit), -1); // AE2 is registred
+					v_memberIDs := {f_getResourceId(vc_resourcesList[v_aeIndex_1].resource), f_getResourceId(vc_resourcesList[v_aeIndex_2].resource)};
 					v_groupIndex := f_cse_createResource(int9, m_createGroup(2, v_memberIDs, omit, int2), -1);
    
 					p_requestPrimitive.to_ := f_getResourceAddress(v_groupIndex) & "/fopt";
-					p_requestPrimitive.from_ := f_getOriginator(v_aeIndex1); //TODO see if it is correct or if we have to use PX_SUPER_ADMIN
+					p_requestPrimitive.from_ := f_getOriginator(v_aeIndex_1); //TODO see if it is correct or if we have to use PX_SUPER_ADMIN
 
 					// Test Body
 
@@ -6877,15 +6855,10 @@ module OneM2M_Testcases {
 		
 					// Local variables
 					var MsgIn v_response;
-					var integer v_aeIndex1 := -1;
-					var integer v_aeIndex2 := -1;
-					var integer v_acpIndex := -1;
-					var integer v_containerIndex1 := -1;
-					var integer v_containerIndex2 := -1;
-					var integer v_groupIndex := -1;
+					var integer v_aeIndex_1, v_aeIndex_2, v_acpIndex, v_containerIndex_1, v_containerIndex_2, v_groupIndex := -1;
 					var integer i;
 					var ListOfURIs v_memberIDs;
-					var ListOfURIs v_membersACPIDs;
+					var ListOfURIs v_membersAcpIds;
 					var RequestPrimitive v_createRequest := valueof(m_createContentInstance("NotInitialized", "Value1"));
 					var template RequestPrimitive v_createAcp := m_createAcp("NotInitialized", "MyACP", -, -);
 					var template PrimitiveContent v_contentResponse;
@@ -6904,17 +6877,17 @@ module OneM2M_Testcases {
 					// Test adapter configuration
 
 					// Preamble
-					v_aeIndex1 := f_cse_preamble_registerAe(-, -); //c_CRUDNDi
-					v_aeIndex2 := f_cse_createResource(int2, m_createAe(PX_APP_ID, -, PX_AE_ID_STEM, "MyAe2", omit), -1); // AE2 is registred
+					v_aeIndex_1 := f_cse_preamble_registerAe(-, -); //c_CRUDNDi
+					v_aeIndex_2 := f_cse_createResource(int2, m_createAe(PX_APP_ID, -, PX_AE_ID_STEM, "MyAe2", omit), -1); // AE2 is registred
 					v_acpIndex := f_cse_createResource(int1, v_createAcp, -1); // AE child resource
-					v_containerIndex1 := f_cse_createResource(int3, m_createContainer("NotInitialized", "myCon"), v_aeIndex1); // AE1 child resource
-					v_containerIndex2 := f_cse_createResource(int3, m_createContainer("NotInitialized", "myCon"), v_aeIndex2); // AE2 child resource
-					v_memberIDs := {f_getResourceAddress(v_aeIndex1), f_getResourceAddress(v_aeIndex2)};
-					v_membersACPIDs := {f_getResourceId(vc_resourcesList[v_acpIndex].resource)};
-					v_groupIndex := f_cse_createResource(int9, m_createGroup(2, v_memberIDs, omit, int2, -, v_membersACPIDs), -1);
+					v_containerIndex_1 := f_cse_createResource(int3, m_createContainer("NotInitialized", "myCon"), v_aeIndex_1); // AE1 child resource
+					v_containerIndex_2 := f_cse_createResource(int3, m_createContainer("NotInitialized", "myCon"), v_aeIndex_2); // AE2 child resource
+					v_memberIDs := {f_getResourceId(vc_resourcesList[v_aeIndex_1].resource), f_getResourceId(vc_resourcesList[v_aeIndex_2].resource)};
+					v_membersAcpIds := {f_getResourceId(vc_resourcesList[v_acpIndex].resource)};
+					v_groupIndex := f_cse_createResource(int9, m_createGroup(2, v_memberIDs, omit, int2, -, v_membersAcpIds), -1);
    
 					v_createRequest.to_ := f_getResourceAddress(v_groupIndex) & "/fopt" & "/myCon";
-					v_createRequest.from_ := f_getOriginator(v_aeIndex1); //TODO see if it is correct or if we have to use PX_SUPER_ADMIN
+					v_createRequest.from_ := f_getOriginator(v_aeIndex_1); //TODO see if it is correct or if we have to use PX_SUPER_ADMIN
 
 					// Test Body
 
@@ -6968,15 +6941,10 @@ module OneM2M_Testcases {
 
 					// Local variables
 					var MsgIn v_response;
-					var integer v_aeIndex1 := -1;
-					var integer v_aeIndex2 := -1;
-					var integer v_acpIndex := -1;
-					var integer v_containerIndex1 := -1;
-					var integer v_containerIndex2 := -1;
-					var integer v_groupIndex := -1;
+					var integer v_aeIndex_1, v_aeIndex_2, v_acpIndex, v_containerIndex_1, v_containerIndex_2, v_groupIndex := -1;
 					var integer i;
 					var ListOfURIs v_memberIDs;
-					var ListOfURIs v_membersACPIDs;
+					var ListOfURIs v_membersAcpIds;
 					var template RequestPrimitive v_createAcp := m_createAcp("NotInitialized", "MyACP", -, -);
 					var template PrimitiveContent v_contentResponse;
 					var XSD.AnyURI v_fanoutPointAddress;
@@ -6995,19 +6963,19 @@ module OneM2M_Testcases {
 					// Test adapter configuration
 
 					// Preamble
-					v_aeIndex1 := f_cse_preamble_registerAe(-, -); //c_CRUDNDi
-					v_aeIndex2 := f_cse_createResource(int2, m_createAe(PX_APP_ID, -, PX_AE_ID_STEM, "MyAe2", omit), -1); // AE2 is registred
+					v_aeIndex_1 := f_cse_preamble_registerAe(-, -); //c_CRUDNDi
+					v_aeIndex_2 := f_cse_createResource(int2, m_createAe(PX_APP_ID, -, PX_AE_ID_STEM, "MyAe2", omit), -1); // AE2 is registred
 					v_acpIndex := f_cse_createResource(int1, v_createAcp, -1); // AE child resource
-					v_containerIndex1 := f_cse_createResource(int3, m_createContainer("NotInitialized", "myCon"), v_aeIndex1); // AE1 child resource
-					v_containerIndex2 := f_cse_createResource(int3, m_createContainer("NotInitialized", "myCon"), v_aeIndex2); // AE2 child resource
-					v_memberIDs := {f_getResourceAddress(v_aeIndex1), f_getResourceAddress(v_aeIndex2)};
-					v_membersACPIDs := {f_getResourceId(vc_resourcesList[v_acpIndex].resource)};
-					v_groupIndex := f_cse_createResource(int9, m_createGroup(2, v_memberIDs, omit, int2, -, v_membersACPIDs), -1);
+					v_containerIndex_1 := f_cse_createResource(int3, m_createContainer("NotInitialized", "myCon"), v_aeIndex_1); // AE1 child resource
+					v_containerIndex_2 := f_cse_createResource(int3, m_createContainer("NotInitialized", "myCon"), v_aeIndex_2); // AE2 child resource
+					v_memberIDs := {f_getResourceId(vc_resourcesList[v_aeIndex_1].resource), f_getResourceId(vc_resourcesList[v_aeIndex_2].resource)};
+					v_membersAcpIds := {f_getResourceId(vc_resourcesList[v_acpIndex].resource)};
+					v_groupIndex := f_cse_createResource(int9, m_createGroup(2, v_memberIDs, omit, int2, -, v_membersAcpIds), -1);
    
 					v_fanoutPointAddress := f_getResourceAddress(v_groupIndex) & "/fopt" & "/myCon" & "/la";
 					
 					// Test Body
-					mcaPort.send(m_request(m_retrieveResource(v_fanoutPointAddress, f_getOriginator(v_aeIndex1)))); //TODO see if it is correct or if we have to use PX_SUPER_ADMIN
+					mcaPort.send(m_request(m_retrieveResource(v_fanoutPointAddress, f_getOriginator(v_aeIndex_1)))); //TODO see if it is correct or if we have to use PX_SUPER_ADMIN
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {