diff --git a/OneM2M_TestControl.ttcn b/OneM2M_TestControl.ttcn
index 17e216a2c149483760b05b8f13fd5f32fd17128d..fed8281fd454d8f6094dea0d89dc661d75d7c9bd 100644
--- a/OneM2M_TestControl.ttcn
+++ b/OneM2M_TestControl.ttcn
@@ -7,7 +7,7 @@
  *  
  *  @author     ETSI
  *  @version    $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/OneM2M_TestControl.ttcn $
- *              $Id: OneM2M_TestControl.ttcn 184 2016-11-25 15:07:23Z berge $
+ *              $Id: OneM2M_TestControl.ttcn 213 2017-01-19 10:03:51Z reinaortega $
  *  @desc       Test control module for oneM2M
  *
  */
@@ -27,9 +27,6 @@ module OneM2M_TestControl {
 		execute(TC_CSE_DMR_BV_001_01());
 		execute(TC_CSE_DMR_BV_001_02());
 		execute(TC_CSE_DMR_BV_001_03());
-		execute(TC_CSE_DMR_BV_001_04());
-		execute(TC_CSE_DMR_BV_001_05());
-		execute(TC_CSE_DMR_BV_001_06());
 		execute(TC_CSE_DMR_BV_002_01());
 		execute(TC_CSE_DMR_BV_002_02());
 		execute(TC_CSE_DMR_BV_002_03());
@@ -54,18 +51,6 @@ module OneM2M_TestControl {
 		execute(TC_CSE_DMR_BV_005_04());
 		execute(TC_CSE_DMR_BV_005_05());
 		execute(TC_CSE_DMR_BV_005_06());
-		execute(TC_CSE_DMR_BV_006_01());
-		execute(TC_CSE_DMR_BV_006_02());
-		execute(TC_CSE_DMR_BV_006_03());
-		execute(TC_CSE_DMR_BV_006_04());
-		execute(TC_CSE_DMR_BV_006_05());
-		execute(TC_CSE_DMR_BV_006_06());
-		execute(TC_CSE_DMR_BV_007_01());
-		execute(TC_CSE_DMR_BV_007_02());
-		execute(TC_CSE_DMR_BV_007_03());
-		execute(TC_CSE_DMR_BV_007_04());
-		execute(TC_CSE_DMR_BV_007_05());
-		execute(TC_CSE_DMR_BV_007_06());
 		execute(TC_CSE_DMR_CRE_BV_001_01());
 		execute(TC_CSE_DMR_CRE_BV_001_02());
 		execute(TC_CSE_DMR_CRE_BV_001_03());
@@ -234,11 +219,26 @@ module OneM2M_TestControl {
 		execute(TC_CSE_GMG_BV_015());
 		execute(TC_CSE_GMG_BV_016());
 		execute(TC_CSE_GMG_BV_017());
-		execute(TC_CSE_GMG_BV_018());
-		execute(TC_CSE_GMG_BV_019());
-		execute(TC_CSE_GMG_BV_020());
-		execute(TC_CSE_GMG_BV_021());
-		execute(TC_CSE_GMG_BV_022());
+		execute(TC_CSE_GMG_BV_018_01());
+		execute(TC_CSE_GMG_BV_018_02());
+		execute(TC_CSE_GMG_BV_018_03());
+		execute(TC_CSE_GMG_BV_018_04());
+		execute(TC_CSE_GMG_BV_019_01());
+		execute(TC_CSE_GMG_BV_019_02());
+		execute(TC_CSE_GMG_BV_019_03());
+		execute(TC_CSE_GMG_BV_019_04());
+		execute(TC_CSE_GMG_BV_020_01());
+		execute(TC_CSE_GMG_BV_020_02());
+		execute(TC_CSE_GMG_BV_020_03());
+		execute(TC_CSE_GMG_BV_020_04());
+		execute(TC_CSE_GMG_BV_021_01());
+		execute(TC_CSE_GMG_BV_021_02());
+		execute(TC_CSE_GMG_BV_021_03());
+		execute(TC_CSE_GMG_BV_021_04());
+		execute(TC_CSE_GMG_BV_022_01());
+		execute(TC_CSE_GMG_BV_022_02());
+		execute(TC_CSE_GMG_BV_022_03());
+		execute(TC_CSE_GMG_BV_022_04());
 		execute(TC_CSE_SUB_BV_001_01());
 		execute(TC_CSE_SUB_BV_001_02());
 		execute(TC_CSE_SUB_BV_002());
diff --git a/OneM2M_Testcases.ttcn b/OneM2M_Testcases.ttcn
index 21bf447ee99f73e02fc30edd6fa0528daaa4aabe..a786468fb56ff7ef6c6301030c5939879077e0e4 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 208 2017-01-17 09:17:22Z reinaortega $
+ *              $Id: OneM2M_Testcases.ttcn 210 2017-01-17 16:08:54Z carres $
  *  @desc       Module containing test cases for oneM2M
  *
  */
@@ -426,41 +426,20 @@ module OneM2M_Testcases {
 					
 				testcase TC_CSE_DMR_BV_001_01() runs on CseTester system CseSystem {
 					// Local variables
-                        
-					f_CSE_DMR_BV_001(int3, m_createContainerBase);//Container
+					f_CSE_DMR_BV_001(int3, m_createContainerBase, int0);//ResultContent = 0 (nothing)
 				}
-
+				
 				testcase TC_CSE_DMR_BV_001_02() runs on CseTester system CseSystem {
 					// Local variables
-						
-					f_CSE_DMR_BV_001(int9, m_createGroupBase);//Group
-				}
-					
-				testcase TC_CSE_DMR_BV_001_03() runs on CseTester system CseSystem {
-					// Local variables
-	
-					f_CSE_DMR_BV_001(int1, m_createAcpBase);//AccessControlPolicy
+					f_CSE_DMR_BV_001(int3, m_createContainerBase, int2);//ResultContent = 2 (hierarchical address)
 				}
 				
-				testcase TC_CSE_DMR_BV_001_04() runs on CseTester system CseSystem {
-					// Local variables
-	
-					f_CSE_DMR_BV_001(int18, m_createScheduleBase);//Schedule
-				}
-					
-				testcase TC_CSE_DMR_BV_001_05() runs on CseTester system CseSystem {
+				testcase TC_CSE_DMR_BV_001_03() runs on CseTester system CseSystem {
 					// Local variables
-	
-					f_CSE_DMR_BV_001(int15, m_createPollingChannelBase);//PollingChannel
+					f_CSE_DMR_BV_001(int3, m_createContainerBase, int3);//ResultContent = 3 (attributes and hierarchichal address)
 				}
-					
-				testcase TC_CSE_DMR_BV_001_06() runs on CseTester system CseSystem {
-						// Local variables
-	
-					f_CSE_DMR_BV_001(int23, m_createSubscriptionBase);//Subscription
-					}
 				
-				function f_CSE_DMR_BV_001(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on CseTester {
+				function f_CSE_DMR_BV_001(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, ResultContent p_resultContent) runs on CseTester {
     				
 					// Local variables
 					var MsgIn v_response;
@@ -482,22 +461,22 @@ module OneM2M_Testcases {
     									
 					// Test Body
 					v_request := valueof(m_retrieveResource(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
-					v_request.resultContent := int0;//Nothing
+					v_request.resultContent := p_resultContent;
 					mcaPort.send(m_request(v_request));
 					tc_ac.start;
 					alt {
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) { //BAD REQUEST
 							tc_ac.stop;
-							if(ispresent(v_response.primitive.responsePrimitive.primitiveContent)){
-								setverdict(fail, testcasename() & ": Providing content when RC set to 0");
-							} else {
-								setverdict(pass, testcasename() & ": No content provided with RC set to 0");
-							}
+							setverdict(pass, testcasename() & ": Request successfully rejected");
 						}
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) { 
 							tc_ac.stop;
 							setverdict(fail, testcasename() & ": Error while retrieving resource");
 						}
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+							tc_ac.stop;
+							setverdict(fail, testcasename() & ": Error, Result content set to 0 is impossible for a retrieve request ");
+						}
 						[] tc_ac.timeout {
 							setverdict(inconc, testcasename() & ": No answer while retrieving resource");
 						}
@@ -623,13 +602,14 @@ module OneM2M_Testcases {
     				
 			} // end g_CSE_DMR_BV_002
 			
+			
 			group g_CSE_DMR_BV_003 {
 					
 				testcase TC_CSE_DMR_BV_003_01() runs on CseTester system CseSystem {
 					// Local variables
 					var template PrimitiveContent v_contentResponse;
 					
-					v_contentResponse.any_1[0].AnyURI := mw_contentContainer_rc2;
+					v_contentResponse.any_1[0].Container_optional := mw_contentContainer_rc4;
 					                        
 					f_CSE_DMR_BV_003(int3, m_createContainerBase, v_contentResponse);//Container
 				}
@@ -638,7 +618,7 @@ module OneM2M_Testcases {
 					// Local variables
 					var template PrimitiveContent v_contentResponse;
 					
-					v_contentResponse.any_1[0].AnyURI := mw_contentGroup_rc2;
+					v_contentResponse.any_1[0].Group_optional := mw_contentGroup_rc4;
 					
 					f_CSE_DMR_BV_003(int9, m_createGroupBase, v_contentResponse);//Group
 				}
@@ -647,7 +627,7 @@ module OneM2M_Testcases {
 					// Local variables
 					var template PrimitiveContent v_contentResponse;
 					
-					v_contentResponse.any_1[0].AnyURI := mw_contentAcp_rc2;
+					v_contentResponse.any_1[0].AccessControlPolicy_optional := mw_contentAcp_rc4;
 						
 					f_CSE_DMR_BV_003(int1, m_createAcpBase,v_contentResponse);//AccessControlPolicy
 				}
@@ -656,7 +636,7 @@ module OneM2M_Testcases {
 					// Local variables
 					var template PrimitiveContent v_contentResponse;
 					
-					v_contentResponse.any_1[0].AnyURI := mw_contentSchedule_rc2;
+					v_contentResponse.any_1[0].Schedule_optional := mw_contentSchedule_rc4;
 						
 					f_CSE_DMR_BV_003(int18, m_createScheduleBase, v_contentResponse);//Schedule
 				}
@@ -674,7 +654,7 @@ module OneM2M_Testcases {
 					// Local variables
 					var template PrimitiveContent v_contentResponse;
 					
-					v_contentResponse.any_1[0].AnyURI := mw_contentSubscription_rc2;
+					v_contentResponse.any_1[0].Subscription_optional := mw_contentSubscription_rc4;
 
 					f_CSE_DMR_BV_003(int23, m_createSubscriptionBase, v_contentResponse);//Subscription
 				}
@@ -687,7 +667,7 @@ module OneM2M_Testcases {
 					
 					var integer v_aeIndex := -1;
 					var integer v_resourceIndex := -1;
- 						   
+    										   
 					// Test control
     				
 					// Test component configuration
@@ -702,17 +682,17 @@ module OneM2M_Testcases {
     									
 					// Test Body
 					v_request := valueof(m_retrieveResource(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
-					v_request.resultContent := int2;//Attributes
+					v_request.resultContent := int1;//Attributes
 					mcaPort.send(m_request(v_request));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(p_contentResponse))) -> value v_response {
 							tc_ac.stop;
-							setverdict(pass, testcasename() & ": Only hierarchical address provided with RC set to 2");
+							setverdict(pass, testcasename() & ": No child resources provided with RC set to 1");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Not only hierarchical address provided with RC set to 2");
+							setverdict(fail, testcasename() & ": Child resources provided with RC set to 1");
 						}
 						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 							tc_ac.stop;
@@ -739,7 +719,7 @@ module OneM2M_Testcases {
 					// Local variables
 					var template PrimitiveContent v_contentResponse;
 					
-					v_contentResponse.any_1[0].Container_optional := mw_contentContainer_rc3;
+					v_contentResponse.any_1[0].Container_optional := mw_contentContainer_rc5;
 					                        
 					f_CSE_DMR_BV_004(int3, m_createContainerBase, v_contentResponse);//Container
 				}
@@ -748,7 +728,7 @@ module OneM2M_Testcases {
 					// Local variables
 					var template PrimitiveContent v_contentResponse;
 					
-					v_contentResponse.any_1[0].Group_optional := mw_contentGroup_rc3;
+					v_contentResponse.any_1[0].Group_optional := mw_contentGroup_rc5;
 					
 					f_CSE_DMR_BV_004(int9, m_createGroupBase, v_contentResponse);//Group
 				}
@@ -757,7 +737,7 @@ module OneM2M_Testcases {
 					// Local variables
 					var template PrimitiveContent v_contentResponse;
 					
-					v_contentResponse.any_1[0].AccessControlPolicy_optional := mw_contentAcp_rc3;
+					v_contentResponse.any_1[0].AccessControlPolicy_optional := mw_contentAcp_rc5;
 						
 					f_CSE_DMR_BV_004(int1, m_createAcpBase,v_contentResponse);//AccessControlPolicy
 				}
@@ -766,7 +746,7 @@ module OneM2M_Testcases {
 					// Local variables
 					var template PrimitiveContent v_contentResponse;
 					
-					v_contentResponse.any_1[0].Schedule_optional := mw_contentSchedule_rc3;
+					v_contentResponse.any_1[0].Schedule_optional := mw_contentSchedule_rc5;
 						
 					f_CSE_DMR_BV_004(int18, m_createScheduleBase, v_contentResponse);//Schedule
 				}
@@ -784,7 +764,7 @@ module OneM2M_Testcases {
 					// Local variables
 					var template PrimitiveContent v_contentResponse;
 					
-					v_contentResponse.any_1[0].Subscription_optional := mw_contentSubscription_rc3;
+					v_contentResponse.any_1[0].Subscription_optional := mw_contentSubscription_rc5;
 
 					f_CSE_DMR_BV_004(int23, m_createSubscriptionBase, v_contentResponse);//Subscription
 				}
@@ -797,7 +777,7 @@ module OneM2M_Testcases {
 					
 					var integer v_aeIndex := -1;
 					var integer v_resourceIndex := -1;
-											   
+     										   
 					// Test control
     				
 					// Test component configuration
@@ -812,7 +792,7 @@ module OneM2M_Testcases {
     									
 					// Test Body
 					v_request := valueof(m_retrieveResource(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
-					v_request.resultContent := int3;//Hierarchical address and attributes
+					v_request.resultContent := int1;//Attributes
 					mcaPort.send(m_request(v_request));
 					tc_ac.start;
 					alt {
@@ -849,7 +829,7 @@ module OneM2M_Testcases {
 					// Local variables
 					var template PrimitiveContent v_contentResponse;
 					
-					v_contentResponse.any_1[0].Container_optional := mw_contentContainer_rc4;
+					v_contentResponse.any_1[0].Container_optional := mw_contentContainer_rc6;
 					                        
 					f_CSE_DMR_BV_005(int3, m_createContainerBase, v_contentResponse);//Container
 				}
@@ -858,7 +838,7 @@ module OneM2M_Testcases {
 					// Local variables
 					var template PrimitiveContent v_contentResponse;
 					
-					v_contentResponse.any_1[0].Group_optional := mw_contentGroup_rc4;
+					v_contentResponse.any_1[0].Group_optional := mw_contentGroup_rc6;
 					
 					f_CSE_DMR_BV_005(int9, m_createGroupBase, v_contentResponse);//Group
 				}
@@ -867,7 +847,7 @@ module OneM2M_Testcases {
 					// Local variables
 					var template PrimitiveContent v_contentResponse;
 					
-					v_contentResponse.any_1[0].AccessControlPolicy_optional := mw_contentAcp_rc4;
+					v_contentResponse.any_1[0].AccessControlPolicy_optional := mw_contentAcp_rc6;
 						
 					f_CSE_DMR_BV_005(int1, m_createAcpBase,v_contentResponse);//AccessControlPolicy
 				}
@@ -876,7 +856,7 @@ module OneM2M_Testcases {
 					// Local variables
 					var template PrimitiveContent v_contentResponse;
 					
-					v_contentResponse.any_1[0].Schedule_optional := mw_contentSchedule_rc4;
+					v_contentResponse.any_1[0].Schedule_optional := mw_contentSchedule_rc6;
 						
 					f_CSE_DMR_BV_005(int18, m_createScheduleBase, v_contentResponse);//Schedule
 				}
@@ -894,7 +874,7 @@ module OneM2M_Testcases {
 					// Local variables
 					var template PrimitiveContent v_contentResponse;
 					
-					v_contentResponse.any_1[0].Subscription_optional := mw_contentSubscription_rc4;
+					v_contentResponse.any_1[0].Subscription_optional := mw_contentSubscription_rc6;
 
 					f_CSE_DMR_BV_005(int23, m_createSubscriptionBase, v_contentResponse);//Subscription
 				}
@@ -952,226 +932,6 @@ module OneM2M_Testcases {
 				}//end f_CSE_DMR_BV_005
     				
 			} // end g_CSE_DMR_BV_005
-			
-			group g_CSE_DMR_BV_006 {
-					
-				testcase TC_CSE_DMR_BV_006_01() runs on CseTester system CseSystem {
-					// Local variables
-					var template PrimitiveContent v_contentResponse;
-					
-					v_contentResponse.any_1[0].Container_optional := mw_contentContainer_rc5;
-					                        
-					f_CSE_DMR_BV_006(int3, m_createContainerBase, v_contentResponse);//Container
-				}
-
-				testcase TC_CSE_DMR_BV_006_02() runs on CseTester system CseSystem {
-					// Local variables
-					var template PrimitiveContent v_contentResponse;
-					
-					v_contentResponse.any_1[0].Group_optional := mw_contentGroup_rc5;
-					
-					f_CSE_DMR_BV_006(int9, m_createGroupBase, v_contentResponse);//Group
-				}
-					
-				testcase TC_CSE_DMR_BV_006_03() runs on CseTester system CseSystem {
-					// Local variables
-					var template PrimitiveContent v_contentResponse;
-					
-					v_contentResponse.any_1[0].AccessControlPolicy_optional := mw_contentAcp_rc5;
-						
-					f_CSE_DMR_BV_006(int1, m_createAcpBase,v_contentResponse);//AccessControlPolicy
-				}
-				
-				testcase TC_CSE_DMR_BV_006_04() runs on CseTester system CseSystem {
-					// Local variables
-					var template PrimitiveContent v_contentResponse;
-					
-					v_contentResponse.any_1[0].Schedule_optional := mw_contentSchedule_rc5;
-						
-					f_CSE_DMR_BV_006(int18, m_createScheduleBase, v_contentResponse);//Schedule
-				}
-					
-				testcase TC_CSE_DMR_BV_006_05() runs on CseTester system CseSystem {
-					// Local variables
-					var template PrimitiveContent v_contentResponse;
-					
-					v_contentResponse.any_1[0].PollingChannel_optional := mw_contentPollingChannelBase;//FIXME
-						
-					f_CSE_DMR_BV_006(int15, m_createPollingChannelBase, v_contentResponse);//PollingChannel
-				}
-					
-				testcase TC_CSE_DMR_BV_006_06() runs on CseTester system CseSystem {
-					// Local variables
-					var template PrimitiveContent v_contentResponse;
-					
-					v_contentResponse.any_1[0].Subscription_optional := mw_contentSubscription_rc5;
-
-					f_CSE_DMR_BV_006(int23, m_createSubscriptionBase, v_contentResponse);//Subscription
-				}
-				
-				function f_CSE_DMR_BV_006(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on CseTester {
-    				
-					// Local variables
-					var MsgIn v_response;
-					var RequestPrimitive v_request;
-					
-					var integer v_aeIndex := -1;
-					var integer v_resourceIndex := -1;
-     										   
-					// Test control
-    				
-					// Test component configuration
-					f_cf01Up();
-    				
-					// Test adapter configuration
-    				
-					// Preamble
-					v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
-					
-					v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex); 				
-    									
-					// Test Body
-					v_request := valueof(m_retrieveResource(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
-					v_request.resultContent := int1;//Attributes
-					mcaPort.send(m_request(v_request));
-					tc_ac.start;
-					alt {
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(p_contentResponse))) -> value v_response {
-							tc_ac.stop;
-							setverdict(pass, testcasename() & ": No child resources provided with RC set to 1");
-						}
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
-							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Child resources provided with RC set to 1");
-						}
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
-							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error while retrieving resource");
-						}
-						[] tc_ac.timeout {
-							setverdict(inconc, testcasename() & ": No answer while retrieving resource");
-						}
-					}	
-    								
-					// Postamble
-					f_cse_postamble_deleteResources();
-					
-					// Tear down
-					f_cf01Down();
-    				
-				}//end f_CSE_DMR_BV_006
-    				
-			} // end g_CSE_DMR_BV_006
-			
-			group g_CSE_DMR_BV_007 {
-					
-				testcase TC_CSE_DMR_BV_007_01() runs on CseTester system CseSystem {
-					// Local variables
-					var template PrimitiveContent v_contentResponse;
-					
-					v_contentResponse.any_1[0].Container_optional := mw_contentContainer_rc6;
-					                        
-					f_CSE_DMR_BV_007(int3, m_createContainerBase, v_contentResponse);//Container
-				}
-
-				testcase TC_CSE_DMR_BV_007_02() runs on CseTester system CseSystem {
-					// Local variables
-					var template PrimitiveContent v_contentResponse;
-					
-					v_contentResponse.any_1[0].Group_optional := mw_contentGroup_rc6;
-					
-					f_CSE_DMR_BV_007(int9, m_createGroupBase, v_contentResponse);//Group
-				}
-					
-				testcase TC_CSE_DMR_BV_007_03() runs on CseTester system CseSystem {
-					// Local variables
-					var template PrimitiveContent v_contentResponse;
-					
-					v_contentResponse.any_1[0].AccessControlPolicy_optional := mw_contentAcp_rc6;
-						
-					f_CSE_DMR_BV_007(int1, m_createAcpBase,v_contentResponse);//AccessControlPolicy
-				}
-				
-				testcase TC_CSE_DMR_BV_007_04() runs on CseTester system CseSystem {
-					// Local variables
-					var template PrimitiveContent v_contentResponse;
-					
-					v_contentResponse.any_1[0].Schedule_optional := mw_contentSchedule_rc6;
-						
-					f_CSE_DMR_BV_007(int18, m_createScheduleBase, v_contentResponse);//Schedule
-				}
-					
-				testcase TC_CSE_DMR_BV_007_05() runs on CseTester system CseSystem {
-					// Local variables
-					var template PrimitiveContent v_contentResponse;
-					
-					v_contentResponse.any_1[0].PollingChannel_optional := mw_contentPollingChannelBase;//FIXME
-						
-					f_CSE_DMR_BV_007(int15, m_createPollingChannelBase, v_contentResponse);//PollingChannel
-				}
-					
-				testcase TC_CSE_DMR_BV_007_06() runs on CseTester system CseSystem {
-					// Local variables
-					var template PrimitiveContent v_contentResponse;
-					
-					v_contentResponse.any_1[0].Subscription_optional := mw_contentSubscription_rc6;
-
-					f_CSE_DMR_BV_007(int23, m_createSubscriptionBase, v_contentResponse);//Subscription
-				}
-				
-				function f_CSE_DMR_BV_007(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on CseTester {
-    				
-					// Local variables
-					var MsgIn v_response;
-					var RequestPrimitive v_request;
-					
-					var integer v_aeIndex := -1;
-					var integer v_resourceIndex := -1;
-    										   
-					// Test control
-    				
-					// Test component configuration
-					f_cf01Up();
-    				
-					// Test adapter configuration
-    				
-					// Preamble
-					v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
-					
-					v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex); 				
-    									
-					// Test Body
-					v_request := valueof(m_retrieveResource(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
-					v_request.resultContent := int1;//Attributes
-					mcaPort.send(m_request(v_request));
-					tc_ac.start;
-					alt {
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(p_contentResponse))) -> value v_response {
-							tc_ac.stop;
-							setverdict(pass, testcasename() & ": No child resources provided with RC set to 1");
-						}
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
-							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Child resources provided with RC set to 1");
-						}
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
-							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error while retrieving resource");
-						}
-						[] tc_ac.timeout {
-							setverdict(inconc, testcasename() & ": No answer while retrieving resource");
-						}
-					}	
-    								
-					// Postamble
-					f_cse_postamble_deleteResources();
-					
-					// Tear down
-					f_cf01Down();
-    				
-				}//end f_CSE_DMR_BV_007
-    				
-			} // end g_CSE_DMR_BV_007
 						
 			group Create {
 				
@@ -5611,367 +5371,14 @@ module OneM2M_Testcases {
             
             } // end group g_CSE_GMG_BV_003
             
+            
             // Test objective:
-            // Check that the IUT rejects the update of the group
-            // resource when member ID exceed max number of members.
+            // Check that the IUT detects the presence of duplicate member IDs during the creation of the
+            // group resource and removes the duplicate member IDs prior to creation of the group resource.
             group g_CSE_GMG_BV_004 {
                 
-                testcase TC_CSE_GMG_BV_004() 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";
-					
-					// Local variables
-                    var MsgIn v_response;
-                    var integer v_aeIndex := -1;
-                    var integer v_resourceIndex := -1;
-					var RequestPrimitive v_request;
-                    var template RequestPrimitive v_createRequest := m_createGroup(5, -, omit);
-                    var template RequestPrimitive v_updateRequest := m_updateGroupBase;
-                            
-					v_updateRequest.primitiveContent.any_1[0].Group_optional.memberIDs := {c_memberResourceAddress1, c_memberResourceAddress2, c_memberResourceAddress3, c_memberResourceAddress4, c_memberResourceAddress5, c_memberResourceAddress6};
-                    
-                    // Test control
-                    
-                    // Test component configuration
-                    f_cf01Up();
-                    
-                    // Test adapter configuration
-                                        
-                    // Preamble
-                    v_aeIndex := f_cse_preamble_registerAe(); //c_CRUDNDi
-                    v_resourceIndex := f_cse_createResource(int9, v_createRequest, v_aeIndex);
-                    
-                    // Test Body
-                    v_request := f_getUpdateRequestPrimitive(int9, v_resourceIndex, v_updateRequest);
-                                     
-                                     
-                    mcaPort.send(m_request(v_request));
-                    tc_ac.start;
-                    alt {
-                        [] mcaPort.receive(mw_response(mw_responsePrimitive(int6010))) -> value v_response {
-                            tc_ac.stop;
-                            setverdict(pass, testcasename() & ": Update failed because member ID exceed max number of member");
-                        }
-                        [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
-                            tc_ac.stop;
-                            setverdict(fail, testcasename() & ": Error while retrieving resource");
-                        }
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
-							tc_ac.stop;
-							setverdict(fail, testcasename() & ": Error resource updated while member ID exceed max number of member");
-						}
-                        [] tc_ac.timeout {
-                            setverdict(inconc, testcasename() & ": No answer while retrieving resource");
-                        }
-                    }
-                                    
-                    // Postamble
-                    f_cse_postamble_deleteResources();
-                    
-					// Tear down
-					f_cf01Down();
-                                    
-                }
-                
-            } // end group g_CSE_GMG_BV_004
-            
-            // Test objective:
-            // Check that the IUT accepts the creation of the  RESOURCE_TYPE resource by using
-            // fanOutPoint in group resource.
-            group g_CSE_GMG_BV_005 {
-            
-                testcase TC_CSE_GMG_BV_005() runs on CseTester system CseSystem {
-                    // Local variables
-                    var MsgIn v_response;
-					var RequestPrimitive v_createRequest := valueof(m_createContainerBase);
-                    var integer v_aeIndex := -1;
-					var integer v_containerIndex1 := -1;
-					var integer v_containerIndex2 := -1;
-                    var integer v_groupIndex := -1;
-					var ListOfURIs v_memberIDs;
-					var integer i;
-					
-                    // Test control
-                    
-                    // Test component configuration
-                    f_cf01Up();
-                    
-                    // Test adapter configuration
-                                        
-                    // 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_groupIndex := f_cse_createResource(int9, m_createGroup(2, v_memberIDs, omit, int3), v_aeIndex); // AE child resource
-       
-					v_createRequest.to_ := f_getResourceAddress(v_groupIndex) & "/fopt"; // short name of fanOutPoint
-					v_createRequest.from_ := f_getOriginator(v_groupIndex);
-					
-                    // Test Body
-
-                    mcaPort.send(m_request(v_createRequest));
-                    tc_ac.start;
-                    alt {
-                        [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
-                            tc_ac.stop;
-                            setverdict(pass, testcasename() & ": creation successfull by using fanOutPoint in group resource");
-                            
-							if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].AggregatedResponse.responsePrimitive_list)){
-								setverdict(fail, testcasename(), ": Error, aggregatedResponse attribute not provided");
-							}
-							else {
-								for(i:=0; i<lengthof(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].AggregatedResponse.responsePrimitive_list); i := i+1){
-									if(not match(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].AggregatedResponse.responsePrimitive_list[i], mw_responsePrimitiveOK)){
-										setverdict(fail, testcasename(), ": Error, one responsePrimitve of aggregatedResponse_list is not successful");
-									}
-								}
-							}                             
-                        }
-                        [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
-                            tc_ac.stop;
-                            setverdict(fail, testcasename() & ": Error while creating resource");
-                        }
-                        [] tc_ac.timeout {
-                            setverdict(inconc, testcasename() & ": No answer while creating resource");
-                        }
-                    }
-                                    
-                    // Postamble
-                    f_cse_postamble_deleteResources();
-                    
-					// Tear down
-					f_cf01Down();                    
-                
-                }
-                
-            } // end group g_CSE_GMG_BV_005
-            
-            // Test objective:
-            // Check that the IUT returns successfully the resource of the group members by using
-            // fanOutPoint in group resource.
-            group g_CSE_GMG_BV_006 {
-            
-                testcase TC_CSE_GMG_BV_006() runs on CseTester system CseSystem {
-					var MsgIn v_response;
-					var integer v_aeIndex := -1;
-					var integer v_containerIndex1 := -1;
-					var integer v_containerIndex2 := -1;
-					var integer v_groupIndex := -1;
-					var XSD.AnyURI v_fanoutPointAddress;
-					var ListOfURIs v_memberIDs;
-					var integer i;
-					
-                    // Test control
-                    
-                    // Test component configuration
-                    f_cf01Up();
-                    
-                    // Test adapter configuration
-                                        
-                    // 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_groupIndex := f_cse_createResource(int9, m_createGroup(2, v_memberIDs, omit, int3), v_aeIndex); // AE child resource
-       
-					v_fanoutPointAddress := f_getResourceAddress(v_groupIndex) & "/fopt"; // short name of fanOutPoint
-       
-                    // Test Body
-                    mcaPort.send(m_request(m_retrieveResource(v_fanoutPointAddress, f_getOriginator(v_groupIndex))));
-                    tc_ac.start;
-                    alt {
-                        [] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) -> value v_response {
-                            tc_ac.stop;
-                            setverdict(pass, testcasename() & ": retrieve attributes successfull by using fanOutPoint in group resource");
-                        
-							if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].AggregatedResponse.responsePrimitive_list)){
-								setverdict(fail, testcasename(), ": Error, aggregatedResponse attribute not provided");
-							}
-							else {
-								for(i:=0; i<lengthof(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].AggregatedResponse.responsePrimitive_list); i := i+1){
-									if(not match(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].AggregatedResponse.responsePrimitive_list[i], mw_responsePrimitiveOK)){
-										setverdict(fail, testcasename(), ": Error, one responsePrimitve of aggregatedResponse_list is not successful");
-									}
-								}
-							} 
-						}
-                        [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
-                            tc_ac.stop;
-                            setverdict(fail, testcasename() & ": Error while retrieving resource");
-                        }
-                        [] tc_ac.timeout {
-                            setverdict(inconc, testcasename() & ": No answer while retrieving resource");
-                        }
-                    }
-                                    
-                    // Postamble
-                    f_cse_postamble_deleteResources();
-                    
-					// Tear down
-					f_cf01Down();
-                                    
-                }
-            
-            } // end group g_CSE_GMG_BV_006
-            
-            // Test objective:
-            // Check that the IUT accepts the update of the  RESOURCE_TYPE resource by using
-            // fanOutPoint in group resource.
-            group g_CSE_GMG_BV_007 {
-            
-                testcase TC_CSE_GMG_BV_007() runs on CseTester system CseSystem {
-                    // Local variables
-					var MsgIn v_response;
-					var RequestPrimitive v_updateRequest := valueof(m_updateContainerBase);
-					var integer v_aeIndex := -1;
-					var integer v_containerIndex1 := -1;
-					var integer v_containerIndex2 := -1;
-					var integer v_groupIndex := -1;
-					var ListOfURIs v_memberIDs;
-					var Labels v_labels_1:= {"VALUE_1"};
-					var integer i;
-					
-					v_updateRequest.primitiveContent.any_1[0].Container_optional.labels := v_labels_1;
-					
-                    // Test control
-                    
-                    // Test component configuration
-                    f_cf01Up();
-                    
-                    // Test adapter configuration
-                                        
-                    // 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_groupIndex := f_cse_createResource(int9, m_createGroup(2, v_memberIDs, omit, int3), v_aeIndex); // AE child resource
-       
-					v_updateRequest.to_ := f_getResourceAddress(v_groupIndex) & "/fopt"; // short name of fanOutPoint
-					v_updateRequest.from_ :=  f_getOriginator(v_groupIndex);
-                    
-                    // Test Body           
-                    mcaPort.send(m_request(v_updateRequest));
-                    tc_ac.start;
-                    alt {
-                        [] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
-                            tc_ac.stop;
-                            setverdict(pass, testcasename() & ": update successful by using fanOutPoint in group resource");
-                            
-							if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].AggregatedResponse.responsePrimitive_list)){
-								setverdict(fail, testcasename(), ": Error, aggregatedResponse attribute not provided");
-							}
-							else {
-								for(i:=0; i<lengthof(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].AggregatedResponse.responsePrimitive_list); i := i+1){
-									if(not match(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].AggregatedResponse.responsePrimitive_list[i], mw_responsePrimitiveOK)){
-										setverdict(fail, testcasename(), ": Error, one responsePrimitve of aggregatedResponse_list is not successful");
-									}
-								}
-							}                  
-                        }
-                        [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
-                            tc_ac.stop;
-                            setverdict(fail, testcasename() & ": Error while retrieving resource");
-                        }
-                        [] tc_ac.timeout {
-                            setverdict(inconc, testcasename() & ": No answer while retrieving resource");
-                        }
-                    }
-                                    
-                    // Postamble
-                    f_cse_postamble_deleteResources();
-                    
-					// Tear down
-					f_cf01Down();
-                                    
-                }
-            
-            } // end group g_CSE_GMG_BV_007
-            
-            // Test objective:
-            // Check that the IUT could delete the  RESOURCE_TYPE resource by using
-            // fanOutPoint in group resource.
-            group g_CSE_GMG_BV_008 {
-                
-                testcase TC_CSE_GMG_BV_008() 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_groupIndex := -1;
-					var XSD.AnyURI v_fanoutPointAddress;
-					var ListOfURIs v_memberIDs;
-					var integer i;                         
-
-                    // Test control
-                    
-                    // Test component configuration
-                    f_cf01Up();
-                    
-                    // Test adapter configuration
-                                        
-                    // 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_groupIndex := f_cse_createResource(int9, m_createGroup(2, v_memberIDs, omit, int3), v_aeIndex); // AE child resource
-       
-					v_fanoutPointAddress := f_getResourceAddress(v_groupIndex) & "/fopt"; // short name of fanOutPoint
-       
-                    // Test Body                                     
-                    mcaPort.send(m_request(m_deleteRequest(v_fanoutPointAddress))); //TODO  see if we set AE_ID or PX_SUPER_USER to from_ attribute
-                    tc_ac.start;
-                    alt {
-                        [] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) -> value v_response {
-                            tc_ac.stop;
-                            setverdict(pass, testcasename() & ": delete successful by using fanOutPoint in group resource");
-
-							if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].AggregatedResponse.responsePrimitive_list)){
-								setverdict(fail, testcasename(), ": Error, aggregatedResponse attribute not provided");
-							}
-							else {
-								for(i:=0; i<lengthof(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].AggregatedResponse.responsePrimitive_list); i := i+1){
-									if(not match(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].AggregatedResponse.responsePrimitive_list[i], mw_responsePrimitiveOK)){
-										setverdict(fail, testcasename(), ": Error, one responsePrimitve of aggregatedResponse_list is not successful");
-									}
-								}
-							} 
-                        }
-                        [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
-                            tc_ac.stop;
-                            setverdict(fail, testcasename() & ": Error while deleting resource");
-                        }
-                        [] tc_ac.timeout {
-                            setverdict(inconc, testcasename() & ": No answer while deleting resource");
-                        }
-                    }
-                                    
-                    // Postamble
-                    f_cse_postamble_deleteResources();
-                    
-					// Tear down
-					f_cf01Down();                    
-                                    
-                }
-            
-            } // 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
-            // group resource and removes the duplicate member IDs prior to creation of the group resource.
-            group g_CSE_GMG_BV_009 {
-                
-                testcase TC_CSE_GMG_BV_009() runs on CseTester system CseSystem {                    
-                    // Local variables
+                testcase TC_CSE_GMG_BV_004() runs on CseTester system CseSystem {                    
+                    // Local variables
                     var MsgIn v_response;
                     var integer v_aeIndex := -1;
 					var integer v_containerIndex := -1;
@@ -6024,14 +5431,14 @@ module OneM2M_Testcases {
                     
                 }
             
-            } // end group g_CSE_GMG_BV_009
+            } // end group g_CSE_GMG_BV_004
             
             // Test objective:
             // Check that the IUT validates the resource type during the creation of the
             // group resource when memberType attribute is not ‘mixed’.
-            group g_CSE_GMG_BV_010 {
+            group g_CSE_GMG_BV_005 {
             
-                testcase TC_CSE_GMG_BV_010() runs on CseTester system CseSystem {
+                testcase TC_CSE_GMG_BV_005() runs on CseTester system CseSystem {
 					// Local variables
                     var MsgIn v_response;
 					var RequestPrimitive v_createRequest;
@@ -6083,15 +5490,15 @@ module OneM2M_Testcases {
 					f_cf01Down();
                                         
                 }
-            } // end group g_CSE_GMG_BV_010
+            } // end group g_CSE_GMG_BV_005
             
             
             // Test objective:
             // Check that the IUT handles unsuccessful validation of the resource type during the creation of the
             // group resource when memberType attribute is not ‘mixed’ and the consistencyStrategy attribute is SET_MIXED.
-            group g_CSE_GMG_BV_011 {
+            group g_CSE_GMG_BV_006 {
             
-                testcase TC_CSE_GMG_BV_011() runs on CseTester system CseSystem {
+                testcase TC_CSE_GMG_BV_006() runs on CseTester system CseSystem {
 					//Local variables
 					var MsgIn v_response;
 					var RequestPrimitive v_createRequest;
@@ -6154,15 +5561,15 @@ module OneM2M_Testcases {
 					f_cf01Down();                   
                     
                 }
-            } // end group g_CSE_GMG_BV_011
+            } // end group g_CSE_GMG_BV_006
             
             // Test objective:
             // Check that the IUT handles unsuccessful validation of the resource type during the creation of the
             // group resource when memberType attribute is not ‘mixed’ and the consistencyStrategy attribute is
             // ABANDON_MEMBER,.
-            group g_CSE_GMG_BV_012 {
+            group g_CSE_GMG_BV_007 {
             
-                testcase TC_CSE_GMG_BV_012() runs on CseTester system CseSystem {
+                testcase TC_CSE_GMG_BV_007() runs on CseTester system CseSystem {
 					//Local variables
 					var MsgIn v_response;
 					var RequestPrimitive v_createRequest;
@@ -6229,15 +5636,15 @@ module OneM2M_Testcases {
                     
                 }
             
-            } // end group g_CSE_GMG_BV_012
+            } // end group g_CSE_GMG_BV_007
             
             // Test objective:
             // Check that the IUT handles unsuccessful validation of the resource type during the creation of the
             // group resource when memberType attribute is not ‘mixed’ and the consistencyStrategy attribute is
             // ABANDON_GROUP.
-            group g_CSE_GMG_BV_013 {
+            group g_CSE_GMG_BV_008 {
                 
-                testcase TC_CSE_GMG_BV_013() runs on CseTester system CseSystem {
+                testcase TC_CSE_GMG_BV_008() runs on CseTester system CseSystem {
 					//Local variables
 					var MsgIn v_response;
 					var RequestPrimitive v_createRequest;
@@ -6290,13 +5697,13 @@ module OneM2M_Testcases {
 					
                 }
             
-            } // end group g_CSE_GMG_BV_013
+            } // 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
             // group resource and removes the duplicate member IDs prior to updating of the group resource.
-            group g_CSE_GMG_BV_014 {
-				testcase TC_CSE_GMG_BV_014() runs on CseTester system CseSystem {
+            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;
@@ -6361,12 +5768,12 @@ module OneM2M_Testcases {
 					// Tear down
 					f_cf01Down();
 				}
-            } // end group g_CSE_GMG_BV_014
+            } // end group g_CSE_GMG_BV_009
 
 			//Test objective:
             //Check that the IUT validates the resource type during an UPDATE of the  <group> resource when memberType attribute is not ‘mixed’.
-            group g_CSE_GMG_BV_015 {
-                testcase TC_CSE_GMG_BV_015() runs on CseTester system CseSystem {
+            group g_CSE_GMG_BV_010 {
+                testcase TC_CSE_GMG_BV_010() runs on CseTester system CseSystem {
                     // Local variables
 					var MsgIn v_response;
 					var integer v_aeIndex := -1;
@@ -6423,13 +5830,13 @@ module OneM2M_Testcases {
                     // Tear down
                     f_cf01Down();
                 }
-            } // end group g_CSE_GMG_BV_015 
+            } // end group g_CSE_GMG_BV_010 
             
 			//Test objective:
 			//Check that the IUT handles unsuccessful validation of the resource type during an UPDATE of the <group> resource when memberType attribute is not ‘mixed’ and the consistencyStrategy attribute is SET_MIXED.
-            group g_CSE_GMG_BV_016 {
+            group g_CSE_GMG_BV_011 {
               
-                testcase TC_CSE_GMG_BV_016() runs on CseTester system CseSystem {
+                testcase TC_CSE_GMG_BV_011() runs on CseTester system CseSystem {
                     // Local variables
                     var MsgIn v_response;
 					var RequestPrimitive v_updateRequest := valueof(m_updateGroupBase);
@@ -6502,12 +5909,12 @@ module OneM2M_Testcases {
                     // Tear down
                     f_cf01Down();
                 }
-            } // end group g_CSE_GMG_BV_016 
+            } // end group g_CSE_GMG_BV_011 
             
 			//Test objective: Check that the IUT handles unsuccessful validation of the resource type during an UPDATE of the <group> resource when memberType attribute is not ‘mixed’ and the consistencyStrategy attribute is ABANDON_MEMBER.
-            group g_CSE_GMG_BV_017 {
+            group g_CSE_GMG_BV_012 {
       
-                testcase TC_CSE_GMG_BV_017() runs on CseTester system CseSystem {
+                testcase TC_CSE_GMG_BV_012() runs on CseTester system CseSystem {
 					// Local variables
 					var MsgIn v_response;
 					var RequestPrimitive v_updateRequest := valueof(m_updateGroupBase);
@@ -6583,12 +5990,12 @@ module OneM2M_Testcases {
                     // Tear down
                     f_cf01Down();
                 }
-            } // end group g_CSE_GMG_BV_017
+            } // end group g_CSE_GMG_BV_012
         
 			//Test objective: Check that the IUT handles unsuccessful validation of the resource type during an update of the <group> resource when memberType attribute is not ‘mixed’ and the consistencyStrategy attribute is ABANDON_GROUP.
-            group g_CSE_GMG_BV_018 {
+            group g_CSE_GMG_BV_013 {
                 
-                testcase TC_CSE_GMG_BV_018() runs on CseTester system CseSystem {
+                testcase TC_CSE_GMG_BV_013() runs on CseTester system CseSystem {
 					// Local variables
                 	var MsgIn v_response;
                 	var RequestPrimitive v_updateRequest := valueof(m_updateGroupBase);
@@ -6644,11 +6051,11 @@ module OneM2M_Testcases {
                     // Tear down
                     f_cf01Down();
                 }
-            } // end group g_CSE_GMG_BV_018
+            } // end group g_CSE_GMG_BV_013
        
-            group g_CSE_GMG_BV_019 {
+            group g_CSE_GMG_BV_014 {
                 // Test objective: Check that the IUT detects when the number of memberIDs exceeds the limitation of maxNrOfMembers.
-                testcase TC_CSE_GMG_BV_019() runs on CseTester system CseSystem
+                testcase TC_CSE_GMG_BV_014() runs on CseTester system CseSystem
                 {
                     //Local constants
                     const ResourceType c_ResourceTypeGroup := int9;  
@@ -6732,12 +6139,12 @@ module OneM2M_Testcases {
                     // Tear down
                     f_cf01Down();
                 }
-            } // end group g_CSE_GMG_BV_019
+            } // end group g_CSE_GMG_BV_014
 
 			// Test objective: Check that the IUT detects when the value provided for maxNrOfMembers attribute is less than the value of the currentNrOfMembers attribute.
-            group g_CSE_GMG_BV_020 {
+            group g_CSE_GMG_BV_015 {
                
-                testcase TC_CSE_GMG_BV_020() runs on CseTester system CseSystem {
+                testcase TC_CSE_GMG_BV_015() runs on CseTester system CseSystem {
                     // Local variables
 					var MsgIn v_response;
 					var RequestPrimitive v_updateRequest := valueof(m_updateGroupBase);
@@ -6793,11 +6200,11 @@ module OneM2M_Testcases {
                     // Tear down
                     f_cf01Down();
                 }
-            } // end group g_CSE_GMG_BV_020
+            } // end group g_CSE_GMG_BV_015
 
-            group g_CSE_GMG_BV_021 {
+            group g_CSE_GMG_BV_016 {
                 // Test objective: Check that the IUT handles validation of the resource type during an UPDATE of the <group> resource when memberIDs contains a sub-group on a temporarily unreachable Hosting CSE.
-                testcase TC_CSE_GMG_BV_021() runs on CseTester system CseSystem
+                testcase TC_CSE_GMG_BV_016() runs on CseTester system CseSystem
                 {
                     //Local constants
                     const ResourceType c_ResourceTypeGroup := int9;  
@@ -6890,11 +6297,11 @@ module OneM2M_Testcases {
                     // Tear down
                     f_cf01Down();
                 }
-            } // end group g_CSE_GMG_BV_021
+            } // end group g_CSE_GMG_BV_016
 
-            group g_CSE_GMG_BV_022 {
+            group g_CSE_GMG_BV_017 {
                 // Test objective: Check that the IUT handles validation of the resource type during an UPDATE of the <group> resource when memberIDs contains a sub-group on a  a previously unreachable Hosting CSE that has become reachable
-                testcase TC_CSE_GMG_BV_022() runs on CseTester system CseSystem
+                testcase TC_CSE_GMG_BV_017() runs on CseTester system CseSystem
                 {
                     //Local constants
                     const ResourceType c_ResourceTypeGroup := int9;  
@@ -6976,31 +6383,31 @@ module OneM2M_Testcases {
                     // Tear down
                     f_cf01Down();
                 }
-            } // end group g_CSE_GMG_BV_022
+            } // end group g_CSE_GMG_BV_017
             
             
-			group g_CSE_GMG_BV_023 {
+			group g_CSE_GMG_BV_018 {
             	
-				testcase TC_CSE_GMG_BV_023_01() runs on CseTester system CseSystem { //Create
-					f_CSE_GMG_BV_023(m_createContainerBase);
-				}//end TC_CSE_GMG_BV_023_01
+				testcase TC_CSE_GMG_BV_018_01() runs on CseTester system CseSystem { //Create
+					f_CSE_GMG_BV_018(m_createContainerBase);
+				}//end TC_CSE_GMG_BV_018_01
 
-				testcase TC_CSE_GMG_BV_023_02() runs on CseTester system CseSystem { //Update
+				testcase TC_CSE_GMG_BV_018_02() runs on CseTester system CseSystem { //Update
 					var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 					var Labels v_labels_1:= {"VALUE_1"};
 					v_updateRequest.primitiveContent.any_1[0].Container_optional.labels := v_labels_1;
-					f_CSE_GMG_BV_023(v_updateRequest);
-				}//end TC_CSE_GMG_BV_023_02
+					f_CSE_GMG_BV_018(v_updateRequest);
+				}//end TC_CSE_GMG_BV_018_02
 
-				testcase TC_CSE_GMG_BV_023_03() runs on CseTester system CseSystem { //Retrieve
-					f_CSE_GMG_BV_023(m_retrieveResource("Temporary", "Temporary"));
-				}//end TC_CSE_GMG_BV_023_03
+				testcase TC_CSE_GMG_BV_018_03() runs on CseTester system CseSystem { //Retrieve
+					f_CSE_GMG_BV_018(m_retrieveResource("Temporary", "Temporary"));
+				}//end TC_CSE_GMG_BV_018_03
 
-				testcase TC_CSE_GMG_BV_023_04() runs on CseTester system CseSystem { //Delete
-					f_CSE_GMG_BV_023(m_deleteRequest("Temporary"));	
-				}//end TC_CSE_GMG_BV_023_04
+				testcase TC_CSE_GMG_BV_018_04() runs on CseTester system CseSystem { //Delete
+					f_CSE_GMG_BV_018(m_deleteRequest("Temporary"));	
+				}//end TC_CSE_GMG_BV_018_04
 
-				function f_CSE_GMG_BV_023(template RequestPrimitive p_requestPrimitive) runs on CseTester {
+				function f_CSE_GMG_BV_018(template RequestPrimitive p_requestPrimitive) runs on CseTester {
 					// Local variables
 					var MsgIn v_response;
 					var integer v_aeIndex := -1;
@@ -7071,32 +6478,32 @@ module OneM2M_Testcases {
 					// Tear down
 					f_cf01Down();                    
 
-				} // end f_CSE_GMG_BV_023
+				} // end f_CSE_GMG_BV_018
 
-			} // end group g_CSE_GMG_BV_023
+			} // end group g_CSE_GMG_BV_018
             
-			group g_CSE_GMG_BO_024 {
+			group g_CSE_GMG_BO_019 {
             	
-				testcase TC_CSE_GMG_BO_024_01() runs on CseTester system CseSystem { //Create
-					f_CSE_GMG_BO_024(m_createContainerBase, int62);	//c_RUDNDi
-				}//end TC_CSE_GMG_BO_024_01
+				testcase TC_CSE_GMG_BO_019_01() runs on CseTester system CseSystem { //Create
+					f_CSE_GMG_BO_019(m_createContainerBase, int62);	//c_RUDNDi
+				}//end TC_CSE_GMG_BO_019_01
 
-				testcase TC_CSE_GMG_BO_024_02() runs on CseTester system CseSystem { //Update
+				testcase TC_CSE_GMG_BO_019_02() runs on CseTester system CseSystem { //Update
 					var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 					var Labels v_labels_1:= {"VALUE_1"};
 					v_updateRequest.primitiveContent.any_1[0].Container_optional.labels := v_labels_1;
-					f_CSE_GMG_BO_024(v_updateRequest, int59);//c_CRDNDi
-				}//end TC_CSE_GMG_BO_024_02
+					f_CSE_GMG_BO_019(v_updateRequest, int59);//c_CRDNDi
+				}//end TC_CSE_GMG_BO_019_02
 
-				testcase TC_CSE_GMG_BO_024_03() runs on CseTester system CseSystem { //Retrieve
-					f_CSE_GMG_BO_024(m_retrieveResource("Temporary", "Temporary"), int61);//c_CUDNDi
-				}//end TC_CSE_GMG_BO_024_03
+				testcase TC_CSE_GMG_BO_019_03() runs on CseTester system CseSystem { //Retrieve
+					f_CSE_GMG_BO_019(m_retrieveResource("Temporary", "Temporary"), int61);//c_CUDNDi
+				}//end TC_CSE_GMG_BO_019_03
 
-				testcase TC_CSE_GMG_BO_024_04() runs on CseTester system CseSystem { //Delete
-					f_CSE_GMG_BO_024(m_deleteRequest("Temporary"), int55); //c_CRUNDi	
-				}//end TC_CSE_GMG_BO_024_04
+				testcase TC_CSE_GMG_BO_019_04() runs on CseTester system CseSystem { //Delete
+					f_CSE_GMG_BO_019(m_deleteRequest("Temporary"), int55); //c_CRUNDi	
+				}//end TC_CSE_GMG_BO_019_04
 	
-				function f_CSE_GMG_BO_024(template RequestPrimitive p_requestPrimitive, in AccessControlOperations p_accessControlOperations) runs on CseTester {
+				function f_CSE_GMG_BO_019(template RequestPrimitive p_requestPrimitive, in AccessControlOperations p_accessControlOperations) runs on CseTester {
 				   // Local variables
 					var MsgIn v_response;
 					var integer v_aeIndex := -1;
@@ -7163,32 +6570,32 @@ module OneM2M_Testcases {
 					// Tear down
 					f_cf01Down();                    
 
-				} // end f_CSE_GMG_BO_024
+				} // end f_CSE_GMG_BO_019
 
-			} // end group g_CSE_GMG_BO_024
+			} // end group g_CSE_GMG_BO_019
 			
-			group g_CSE_GMG_BV_025 {
+			group g_CSE_GMG_BV_020 {
             	
-				testcase TC_CSE_GMG_BV_025_01() runs on CseTester system CseSystem { //Create
-					f_CSE_GMG_BV_025(m_createContainerBase);
-				}//end TC_CSE_GMG_BV_025_01
+				testcase TC_CSE_GMG_BV_020_01() runs on CseTester system CseSystem { //Create
+					f_CSE_GMG_BV_020(m_createContainerBase);
+				}//end TC_CSE_GMG_BV_020_01
 
-				testcase TC_CSE_GMG_BV_025_02() runs on CseTester system CseSystem { //Update
+				testcase TC_CSE_GMG_BV_020_02() runs on CseTester system CseSystem { //Update
 					var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 					var Labels v_labels_1:= {"VALUE_1"};
 					v_updateRequest.primitiveContent.any_1[0].Container_optional.labels := v_labels_1;
-					f_CSE_GMG_BV_025(v_updateRequest);
-				}//end TC_CSE_GMG_BV_025_02
+					f_CSE_GMG_BV_020(v_updateRequest);
+				}//end TC_CSE_GMG_BV_020_02
 
-				testcase TC_CSE_GMG_BV_025_03() runs on CseTester system CseSystem { //Retrieve
-					f_CSE_GMG_BV_025(m_retrieveResource("Temporary", "Temporary"));
-				}//end TC_CSE_GMG_BV_025_03
+				testcase TC_CSE_GMG_BV_020_03() runs on CseTester system CseSystem { //Retrieve
+					f_CSE_GMG_BV_020(m_retrieveResource("Temporary", "Temporary"));
+				}//end TC_CSE_GMG_BV_020_03
 
-				testcase TC_CSE_GMG_BV_025_04() runs on CseTester system CseSystem { //Delete
-					f_CSE_GMG_BV_025(m_deleteRequest("Temporary"));	
-				}//end TC_CSE_GMG_BV_025_04
+				testcase TC_CSE_GMG_BV_020_04() runs on CseTester system CseSystem { //Delete
+					f_CSE_GMG_BV_020(m_deleteRequest("Temporary"));	
+				}//end TC_CSE_GMG_BV_020_04
 
-				function f_CSE_GMG_BV_025(template RequestPrimitive p_requestPrimitive) runs on CseTester {
+				function f_CSE_GMG_BV_020(template RequestPrimitive p_requestPrimitive) runs on CseTester {
 					// Local variables
 					var MsgIn v_response;
 					var integer v_aeIndex := -1;
@@ -7259,32 +6666,32 @@ module OneM2M_Testcases {
 					// Tear down
 					f_cf01Down();                    
 
-				} // end f_CSE_GMG_BV_025
+				} // end f_CSE_GMG_BV_020
 
-			} // end group g_CSE_GMG_BV_025
+			} // end group g_CSE_GMG_BV_020
 			
-			group g_CSE_GMG_BO_026 {
+			group g_CSE_GMG_BO_021 {
             	
-				testcase TC_CSE_GMG_BO_026_01() runs on CseTester system CseSystem { //Create
-					f_CSE_GMG_BO_026(m_createContainerBase, int62);	//c_RUDNDi
-				}//end TC_CSE_GMG_BO_026_01
+				testcase TC_CSE_GMG_BO_021_01() runs on CseTester system CseSystem { //Create
+					f_CSE_GMG_BO_021(m_createContainerBase, int62);	//c_RUDNDi
+				}//end TC_CSE_GMG_BO_021_01
 
-				testcase TC_CSE_GMG_BO_026_02() runs on CseTester system CseSystem { //Update
+				testcase TC_CSE_GMG_BO_021_02() runs on CseTester system CseSystem { //Update
 					var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 					var Labels v_labels_1:= {"VALUE_1"};
 					v_updateRequest.primitiveContent.any_1[0].Container_optional.labels := v_labels_1;
-					f_CSE_GMG_BO_026(v_updateRequest, int59);//c_CRDNDi
-				}//end TC_CSE_GMG_BO_026_02
+					f_CSE_GMG_BO_021(v_updateRequest, int59);//c_CRDNDi
+				}//end TC_CSE_GMG_BO_021_02
 
-				testcase TC_CSE_GMG_BO_026_03() runs on CseTester system CseSystem { //Retrieve
-					f_CSE_GMG_BO_026(m_retrieveResource("Temporary", "Temporary"), int61);//c_CUDNDi
-				}//end TC_CSE_GMG_BO_026_03
+				testcase TC_CSE_GMG_BO_021_03() runs on CseTester system CseSystem { //Retrieve
+					f_CSE_GMG_BO_021(m_retrieveResource("Temporary", "Temporary"), int61);//c_CUDNDi
+				}//end TC_CSE_GMG_BO_021_03
 
-				testcase TC_CSE_GMG_BO_026_04() runs on CseTester system CseSystem { //Delete
-					f_CSE_GMG_BO_026(m_deleteRequest("Temporary"), int55); //c_CRUNDi	
-				}//end TC_CSE_GMG_BO_026_04
+				testcase TC_CSE_GMG_BO_021_04() runs on CseTester system CseSystem { //Delete
+					f_CSE_GMG_BO_021(m_deleteRequest("Temporary"), int55); //c_CRUNDi	
+				}//end TC_CSE_GMG_BO_021_04
 
-				function f_CSE_GMG_BO_026(template RequestPrimitive p_requestPrimitive, in AccessControlOperations p_accessControlOperations) runs on CseTester {
+				function f_CSE_GMG_BO_021(template RequestPrimitive p_requestPrimitive, in AccessControlOperations p_accessControlOperations) runs on CseTester {
 				   // Local variables
 					var MsgIn v_response;
 					var integer v_aeIndex := -1;
@@ -7351,20 +6758,20 @@ module OneM2M_Testcases {
 					// Tear down
 					f_cf01Down();                    
 
-				} // end f_CSE_GMG_BO_026
+				} // end f_CSE_GMG_BO_021
 
-			} // end group g_CSE_GMG_BO_026
+			} // end group g_CSE_GMG_BO_021
 			
-			group g_CSE_GMG_BV_027 {
+			group g_CSE_GMG_BV_022 {
             	
-				testcase TC_CSE_GMG_BV_027_01() runs on CseTester system CseSystem { //Create
+				testcase TC_CSE_GMG_BV_022_01() runs on CseTester system CseSystem { //Create
 					var template PrimitiveContent v_contentResponse;
 					v_contentResponse.any_1[0].Container_optional := mw_contentContainer_rc1;
 					
-					f_CSE_GMG_BV_027(m_createContainerBase, v_contentResponse);
-				}//end TC_CSE_GMG_BV_027_01
+					f_CSE_GMG_BV_022(m_createContainerBase, v_contentResponse);
+				}//end TC_CSE_GMG_BV_022_01
 
-				testcase TC_CSE_GMG_BV_027_02() runs on CseTester system CseSystem { //Update
+				testcase TC_CSE_GMG_BV_022_02() runs on CseTester system CseSystem { //Update
 					var template RequestPrimitive v_updateRequest := m_updateAeBase;
 					var template PrimitiveContent v_contentResponse;
 					var Labels v_labels_1:= {"VALUE_1"};
@@ -7372,24 +6779,24 @@ module OneM2M_Testcases {
 					v_contentResponse.any_1[0].AE_optional.labels := ?;
 					v_updateRequest.primitiveContent.any_1[0].AE_optional.labels := v_labels_1;
 					
-					f_CSE_GMG_BV_027(v_updateRequest, v_contentResponse);
-				}//end TC_CSE_GMG_BV_027_02
+					f_CSE_GMG_BV_022(v_updateRequest, v_contentResponse);
+				}//end TC_CSE_GMG_BV_022_02
 
-				testcase TC_CSE_GMG_BV_027_03() runs on CseTester system CseSystem { //Retrieve
+				testcase TC_CSE_GMG_BV_022_03() runs on CseTester system CseSystem { //Retrieve
 					var template PrimitiveContent v_contentResponse;
 					v_contentResponse.any_1[0].AE_optional := mw_contentAeBase;
 					
-					f_CSE_GMG_BV_027(m_retrieveResource("Temporary", "Temporary"), v_contentResponse);
-				}//end TC_CSE_GMG_BV_027_03
+					f_CSE_GMG_BV_022(m_retrieveResource("Temporary", "Temporary"), v_contentResponse);
+				}//end TC_CSE_GMG_BV_022_03
 
-				testcase TC_CSE_GMG_BV_027_04() runs on CseTester system CseSystem { //Delete
+				testcase TC_CSE_GMG_BV_022_04() runs on CseTester system CseSystem { //Delete
 					var template PrimitiveContent v_contentResponse;
 					v_contentResponse.any_1[0].AE_optional := mw_contentAeBase;// TODO see with wath should it be matched
 					
-					f_CSE_GMG_BV_027(m_deleteRequest("Temporary"), v_contentResponse);	
-				}//end TC_CSE_GMG_BV_027_04
+					f_CSE_GMG_BV_022(m_deleteRequest("Temporary"), v_contentResponse);	
+				}//end TC_CSE_GMG_BV_022_04
 
-				function f_CSE_GMG_BV_027(template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on CseTester {
+				function f_CSE_GMG_BV_022(template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on CseTester {
 					//Local constants
 					const integer c_numberOfResponsePrimitive := 2;
 					
@@ -7457,13 +6864,13 @@ module OneM2M_Testcases {
 					// Tear down
 					f_cf01Down();                    
 
-				} // end f_CSE_GMG_BV_027
+				} // end f_CSE_GMG_BV_022
 
-			} // end group g_CSE_GMG_BV_027
+			} // end group g_CSE_GMG_BV_022
 			
-			group g_CSE_GMG_BV_028 {
+			group g_CSE_GMG_BV_023 {
             	
-				testcase TC_CSE_GMG_BV_028() runs on CseTester system CseSystem {
+				testcase TC_CSE_GMG_BV_023() runs on CseTester system CseSystem {
 					//Local constants
 					const integer c_numberOfResponsePrimitive := 2;
 		
@@ -7548,13 +6955,13 @@ module OneM2M_Testcases {
 					// Tear down
 					f_cf01Down();                    
 
-				} // end f_CSE_GMG_BV_028
+				} // end f_CSE_GMG_BV_023
 
-			} // end group g_CSE_GMG_BV_028
+			} // end group g_CSE_GMG_BV_023
 			
-			group g_CSE_GMG_BV_029 {
+			group g_CSE_GMG_BV_024 {
             	
-				testcase TC_CSE_GMG_BV_029() runs on CseTester system CseSystem {
+				testcase TC_CSE_GMG_BV_024() runs on CseTester system CseSystem {
 					//Local constants
 					const integer c_numberOfResponsePrimitive := 2;
 
@@ -7637,9 +7044,9 @@ module OneM2M_Testcases {
 					// Tear down
 					f_cf01Down();                    
 
-				} // end f_CSE_GMG_BV_029
+				} // end f_CSE_GMG_BV_024
 
-			} // end group g_CSE_GMG_BV_029
+			} // end group g_CSE_GMG_BV_024
             
         } // end group Group_Managment