diff --git a/OneM2M_Testcases.ttcn b/OneM2M_Testcases.ttcn
index ad05bcdb648745587a03f7113ea41615785d5fb3..fa8e90aeb506403f0e8b703de57c47b1e58724f4 100644
--- a/OneM2M_Testcases.ttcn
+++ b/OneM2M_Testcases.ttcn
@@ -7,7 +7,7 @@
  *  
  *  @author     oneM2M
  *  @version    $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/OneM2M_Testcases.ttcn $
- *              $Id: OneM2M_Testcases.ttcn 234 2017-03-20 16:37:29Z reinaortega $
+ *              $Id: OneM2M_Testcases.ttcn 239 2017-03-23 17:40:22Z reinaortega $
  *  @desc       Module containing test cases for oneM2M
  *
  */
@@ -308,7 +308,7 @@ module OneM2M_Testcases {
 				tc_ac.start;
 
 				alt {
-					[] mccPort.receive(mw_request(mw_createAEAnnc(-, -, -, "APP_ID", -))) {
+					[] mccPort.receive(mw_request(mw_createAEAnnc(-, -, -))) {
 						tc_ac.stop;
 						setverdict(pass, testcasename() & ": AE creation redirected.");
 					}
@@ -397,7 +397,7 @@ module OneM2M_Testcases {
 				tc_ac.start;
 
 				alt {
-					[] mccPort.receive(mw_request(mw_createAEAnnc(omit, "CSE_ID", "/S", "APP_ID", "S-AE-ID-STEM"))) {
+					[] mccPort.receive(mw_request(mw_createAEAnnc("/S", "CSE_ID", -))) {
 						tc_ac.stop;
 						setverdict(pass, testcasename() & ": AE creation redirected.");
 					}
@@ -2301,7 +2301,7 @@ module OneM2M_Testcases {
 					
 						v_contentResponse.any_1[0].Resource := mw_contentContainer_rc3;
 					                        
-						f_CSE_DMR_CRE_BV_013(int3, m_createContainerBase, v_contentResponse);//Container
+						f_CSE_DMR_CRE_BV_014(int3, m_createContainerBase, v_contentResponse);//Container
 					}
 
 					testcase TC_CSE_DMR_CRE_BV_014_02() runs on CseTester system CseSystem {
@@ -2473,7 +2473,7 @@ module OneM2M_Testcases {
 						
 					}
 					
-					testcase TC_CSE_DMR_CRE_BV_015_07() runs on CseTester system CseSystem {
+					testcase TC_CSE_DMR_CRE_BV_015_07() runs on CseTester system CseSystem { 
 						// Local variables
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
@@ -2484,13 +2484,301 @@ module OneM2M_Testcases {
 						v_responsePrimitive := f_CSE_DMR_CRE_BV_015(int3, v_createRequest, c_optionalAttribute);
 						
 					}					
+					
+					testcase TC_CSE_DMR_CRE_BV_015_08() runs on CseTester system CseSystem {//TODO
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
+						var ResponsePrimitive v_responsePrimitive;
+						const AttributeAux c_optionalAttribute := {"expirationTime", omit};
+						
+						v_createRequest.primitiveContent.any_1[0].ContentInstance_optional.expirationTime := "20301231T012345";
+						
+						v_responsePrimitive := f_CSE_DMR_CRE_BV_015(int4, v_createRequest, c_optionalAttribute);			
+					}
+					
+					testcase TC_CSE_DMR_CRE_BV_015_09() runs on CseTester system CseSystem {//TODO
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
+						var ResponsePrimitive v_responsePrimitive;
+						const AttributeAux c_optionalAttribute := {"labels", omit};
+						
+						v_createRequest.primitiveContent.any_1[0].ContentInstance_optional.labels := {"MyLabel"};
+						
+						v_responsePrimitive := f_CSE_DMR_CRE_BV_015(int4, v_createRequest, c_optionalAttribute);
+						  
+					}
+					
+					testcase TC_CSE_DMR_CRE_BV_015_10() runs on CseTester system CseSystem {//TODO
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
+						var ResponsePrimitive v_responsePrimitive;
+						const AttributeAux c_optionalAttribute := {"creator", omit};
+						
+						v_createRequest.primitiveContent.any_1[0].ContentInstance_optional.creator := "MyCreator";
+						
+						v_responsePrimitive := f_CSE_DMR_CRE_BV_015(int4, v_createRequest, c_optionalAttribute);
+						
+					}
+					
+					testcase TC_CSE_DMR_CRE_BV_015_11() runs on CseTester system CseSystem {//TODO
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
+						var ResponsePrimitive v_responsePrimitive;
+						const AttributeAux c_optionalAttribute := {"contentInfo", omit};
+						
+						v_createRequest.primitiveContent.any_1[0].ContentInstance_optional.contentInfo := "MyContentInfo";
+						
+						v_responsePrimitive := f_CSE_DMR_CRE_BV_015(int4, v_createRequest, c_optionalAttribute);
+						
+					}
+					
+					testcase TC_CSE_DMR_CRE_BV_015_12() runs on CseTester system CseSystem {//TODO
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
+						var ResponsePrimitive v_responsePrimitive;
+						const AttributeAux c_optionalAttribute := {"ontologyRef", omit};
+						
+						v_createRequest.primitiveContent.any_1[0].ContentInstance_optional.ontologyRef := "MyOntologyRef";
+						
+						v_responsePrimitive := f_CSE_DMR_CRE_BV_015(int4, v_createRequest, c_optionalAttribute);
+						
+					}
+					
+					testcase TC_CSE_DMR_CRE_BV_015_13() runs on CseTester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createAcpBase;
+						var ResponsePrimitive v_responsePrimitive;
+						const AttributeAux c_optionalAttribute := {"expirationTime", omit};
+						
+						v_createRequest.primitiveContent.any_1[0].AccessControlPolicy_optional.expirationTime := "20301231T012345";
+						
+						v_responsePrimitive := f_CSE_DMR_CRE_BV_015(int1, v_createRequest, c_optionalAttribute);
+						
+					}
+					
+					testcase TC_CSE_DMR_CRE_BV_015_14() runs on CseTester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createAcpBase;
+						var ResponsePrimitive v_responsePrimitive;
+						const AttributeAux c_optionalAttribute := {"labels", omit};
+						
+						v_createRequest.primitiveContent.any_1[0].AccessControlPolicy_optional.labels := {"MyLabel"};
+						
+						v_responsePrimitive := f_CSE_DMR_CRE_BV_015(int1, v_createRequest, c_optionalAttribute);
+						
+					}
+					
+					testcase TC_CSE_DMR_CRE_BV_015_15() runs on CseTester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
+						var ResponsePrimitive v_responsePrimitive;
+						const AttributeAux c_optionalAttribute := {"accessControlPolicyIDs", omit};
+						
+						v_createRequest.primitiveContent.any_1[0].Subscription_optional.accessControlPolicyIDs := {"NotInitialized"};
+						
+						v_responsePrimitive := f_CSE_DMR_CRE_BV_015(int3, v_createRequest, c_optionalAttribute);			
+					}
+					
+					testcase TC_CSE_DMR_CRE_BV_015_16() runs on CseTester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
+						var ResponsePrimitive v_responsePrimitive;
+						const AttributeAux c_optionalAttribute := {"expirationTime", omit};
+						
+						v_createRequest.primitiveContent.any_1[0].Subscription_optional.expirationTime := "20301231T012345";
+						
+						v_responsePrimitive := f_CSE_DMR_CRE_BV_015(int3, v_createRequest, c_optionalAttribute);
+						  
+					}
+					
+					testcase TC_CSE_DMR_CRE_BV_015_17() runs on CseTester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
+						var ResponsePrimitive v_responsePrimitive;
+						const AttributeAux c_optionalAttribute := {"labels", omit};
+						
+						v_createRequest.primitiveContent.any_1[0].Subscription_optional.labels := {"MyLabel"};
+						
+						v_responsePrimitive := f_CSE_DMR_CRE_BV_015(int3, v_createRequest, c_optionalAttribute);
+						
+					}
+					
+					testcase TC_CSE_DMR_CRE_BV_015_18() runs on CseTester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
+						var ResponsePrimitive v_responsePrimitive;
+						const AttributeAux c_optionalAttribute := {"eventNotificationCriteria", omit};
+						
+						v_createRequest.primitiveContent.any_1[0].Subscription_optional.eventNotificationCriteria := valueof(m_eventNotificationCriteria({int1}, -));
+						
+						v_responsePrimitive := f_CSE_DMR_CRE_BV_015(int3, v_createRequest, c_optionalAttribute);
+						
+					}
+					
+					testcase TC_CSE_DMR_CRE_BV_015_19() runs on CseTester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
+						var ResponsePrimitive v_responsePrimitive;
+						const AttributeAux c_optionalAttribute := {"expirationCounter", omit};
+						
+						v_createRequest.primitiveContent.any_1[0].Subscription_optional.expirationCounter := 1;
+						
+						v_responsePrimitive := f_CSE_DMR_CRE_BV_015(int3, v_createRequest, c_optionalAttribute);
+						
+					}
+					
+					testcase TC_CSE_DMR_CRE_BV_015_20() runs on CseTester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
+						var ResponsePrimitive v_responsePrimitive;
+						const AttributeAux c_optionalAttribute := {"groupID", omit};
+						
+						v_createRequest.primitiveContent.any_1[0].Subscription_optional.groupID := "MyGroupID";
+						
+						v_responsePrimitive := f_CSE_DMR_CRE_BV_015(int3, v_createRequest, c_optionalAttribute);
+						
+					}
+					
+					testcase TC_CSE_DMR_CRE_BV_015_21() runs on CseTester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
+						var ResponsePrimitive v_responsePrimitive;
+						const AttributeAux c_optionalAttribute := {"notificationForwardingURI", omit};
+						
+						v_createRequest.primitiveContent.any_1[0].Subscription_optional.notificationForwardingURI := "MyForwardingURI";
+						
+						v_responsePrimitive := f_CSE_DMR_CRE_BV_015(int3, v_createRequest, c_optionalAttribute);
+						
+					}
+					
+					testcase TC_CSE_DMR_CRE_BV_015_22() runs on CseTester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
+						var ResponsePrimitive v_responsePrimitive;
+						const AttributeAux c_optionalAttribute := {"batchNotify", omit};
+						
+						v_createRequest.primitiveContent.any_1[0].Subscription_optional.batchNotify := {0, "PT1S"};
+						
+						v_responsePrimitive := f_CSE_DMR_CRE_BV_015(int3, v_createRequest, c_optionalAttribute);
+						
+					}
+					
+					testcase TC_CSE_DMR_CRE_BV_015_23() runs on CseTester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
+						var ResponsePrimitive v_responsePrimitive;
+						const AttributeAux c_optionalAttribute := {"rateLimit", omit};
+						
+						v_createRequest.primitiveContent.any_1[0].Subscription_optional.rateLimit := {0, omit};
+						
+						v_responsePrimitive := f_CSE_DMR_CRE_BV_015(int3, v_createRequest, c_optionalAttribute);
+						
+					}
+					
+					testcase TC_CSE_DMR_CRE_BV_015_24() runs on CseTester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
+						var ResponsePrimitive v_responsePrimitive;
+						const AttributeAux c_optionalAttribute := {"preSubscriptionNotify", omit};
+						
+						v_createRequest.primitiveContent.any_1[0].Subscription_optional.preSubscriptionNotify := 1;
+						
+						v_responsePrimitive := f_CSE_DMR_CRE_BV_015(int3, v_createRequest, c_optionalAttribute);
+						
+					}
+					
+					testcase TC_CSE_DMR_CRE_BV_015_25() runs on CseTester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
+						var ResponsePrimitive v_responsePrimitive;
+						const AttributeAux c_optionalAttribute := {"pendingNotification", omit};
+						
+						v_createRequest.primitiveContent.any_1[0].Subscription_optional.pendingNotification := int1;
+						
+						v_responsePrimitive := f_CSE_DMR_CRE_BV_015(int3, v_createRequest, c_optionalAttribute);			
+					}
+					
+					testcase TC_CSE_DMR_CRE_BV_015_26() runs on CseTester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
+						var ResponsePrimitive v_responsePrimitive;
+						const AttributeAux c_optionalAttribute := {"notificationStoragePriority", omit};
+						
+						v_createRequest.primitiveContent.any_1[0].Subscription_optional.notificationStoragePriority := 1;
+						
+						v_responsePrimitive := f_CSE_DMR_CRE_BV_015(int3, v_createRequest, c_optionalAttribute);
+						  
+					}
+					
+					testcase TC_CSE_DMR_CRE_BV_015_27() runs on CseTester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
+						var ResponsePrimitive v_responsePrimitive;
+						const AttributeAux c_optionalAttribute := {"latestNotify", omit};
+						
+						v_createRequest.primitiveContent.any_1[0].Subscription_optional.latestNotify := true;
+						
+						v_responsePrimitive := f_CSE_DMR_CRE_BV_015(int3, v_createRequest, c_optionalAttribute);
+						
+					}
+					
+					testcase TC_CSE_DMR_CRE_BV_015_28() runs on CseTester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
+						var ResponsePrimitive v_responsePrimitive;
+						const AttributeAux c_optionalAttribute := {"notificationContentType", omit};
+						
+						v_createRequest.primitiveContent.any_1[0].Subscription_optional.notificationContentType := int1;
+						
+						v_responsePrimitive := f_CSE_DMR_CRE_BV_015(int3, v_createRequest, c_optionalAttribute);
+						
+					}
+					
+					testcase TC_CSE_DMR_CRE_BV_015_29() runs on CseTester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
+						var ResponsePrimitive v_responsePrimitive;
+						const AttributeAux c_optionalAttribute := {"notificationEventCat", omit};
+						
+						v_createRequest.primitiveContent.any_1[0].Subscription_optional.notificationEventCat := {alt_1 := 100};
+						
+						v_responsePrimitive := f_CSE_DMR_CRE_BV_015(int3, v_createRequest, c_optionalAttribute);
+						
+					}
+					
+					testcase TC_CSE_DMR_CRE_BV_015_30() runs on CseTester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
+						var ResponsePrimitive v_responsePrimitive;
+						const AttributeAux c_optionalAttribute := {"creator", omit};
+						
+						v_createRequest.primitiveContent.any_1[0].Subscription_optional.creator := "MyCreator";
+						
+						v_responsePrimitive := f_CSE_DMR_CRE_BV_015(int3, v_createRequest, c_optionalAttribute);
+						
+					}
+					
+					testcase TC_CSE_DMR_CRE_BV_015_31() runs on CseTester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
+						var ResponsePrimitive v_responsePrimitive;
+						const AttributeAux c_optionalAttribute := {"subscriberURI", omit};
+						
+						v_createRequest.primitiveContent.any_1[0].Subscription_optional.subscriberURI := "MySubscriberURI";
+						
+						v_responsePrimitive := f_CSE_DMR_CRE_BV_015(int3, v_createRequest, c_optionalAttribute);
+						
+					}
+					
+
 				
 					function f_CSE_DMR_CRE_BV_015(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, in AttributeAux p_optionalAttribute) runs on CseTester return ResponsePrimitive {
     				
 							// Local variables
 							var MsgIn v_response;
 							var RequestPrimitive v_request;
-							var integer v_aeIndex := -1;
+							var integer v_containerIndex := -1;
+							var integer v_parentIndex := -1;
 							var integer v_acpAuxIndex := -1;
 							const XSD.NCName c_accessControlPolicyIDs := "accessControlPolicyIDs";
 											   
@@ -2512,10 +2800,15 @@ module OneM2M_Testcases {
 								v_acpAuxIndex := f_cse_preamble_createAcpAux();//c_CRUDNDi)
 							}     				
 							
-							v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi); 
+							v_parentIndex := f_cse_preamble_registerAe();//c_CRUDNDi); 
+							
+							if(p_resourceType == int4) {
+								v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_parentIndex);
+								v_parentIndex := v_containerIndex;
+							}
 						
 							// Test Body
-							v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_aeIndex);
+							v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_parentIndex);
     					
 							mcaPort.send(m_request(v_request));
 							tc_ac.start;
@@ -2544,7 +2837,145 @@ module OneM2M_Testcases {
     					    				
 						}//end f_CSE_DMR_CRE_BV_015
 						
-				}// end group g_CSE_DMR_CRE_BV_015					
+				}// end group g_CSE_DMR_CRE_BV_015		
+				
+				group g_CSE_DMR_CRE_BV_016 {
+					
+					testcase TC_CSE_DMR_CRE_BV_016_01() runs on CseTester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createAcpBase;
+						var ResponsePrimitive v_responsePrimitive;
+						
+						v_createRequest.primitiveContent.any_1[0].AccessControlPolicy_optional.announceTo := {PX_TESTER_ADDRESS & "/CseBaseTester"};
+						                    
+						f_CSE_DMR_CRE_BV_016(int1, v_createRequest, mw_createAccessControlPolicyAnnc);//AccessControlPolicy
+					}
+
+					testcase TC_CSE_DMR_CRE_BV_016_02() runs on CseTester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createContainerBase;
+						var ResponsePrimitive v_responsePrimitive;
+						
+						v_createRequest.primitiveContent.any_1[0].Container_optional.announceTo := {PX_TESTER_ADDRESS & "/CseBaseTester"};
+					
+						f_CSE_DMR_CRE_BV_016(int3, v_createRequest, mw_createContainerAnnc);//Container
+					}
+					
+					testcase TC_CSE_DMR_CRE_BV_016_03() runs on CseTester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
+						var ResponsePrimitive v_responsePrimitive;
+						
+						v_createRequest.primitiveContent.any_1[0].ContentInstance_optional.announceTo := {PX_TESTER_ADDRESS & "/CseBaseTester"};
+						
+						f_CSE_DMR_CRE_BV_016(int4, v_createRequest, mw_createContentInstanceAnnc);//ContentInstance
+					}
+				
+					testcase TC_CSE_DMR_CRE_BV_016_04() runs on CseTester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createGroupBase;
+						var ResponsePrimitive v_responsePrimitive;
+						
+						v_createRequest.primitiveContent.any_1[0].Group_optional.announceTo := {PX_TESTER_ADDRESS & "/CseBaseTester"};
+						
+						f_CSE_DMR_CRE_BV_016(int9, v_createRequest, mw_createGroupAnnc);//Group
+					}
+					
+					testcase TC_CSE_DMR_CRE_BV_016_05() runs on CseTester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createLocationPolicy(int1, omit, omit, omit, omit);
+						var ResponsePrimitive v_responsePrimitive;
+						
+						v_createRequest.primitiveContent.any_1[0].LocationPolicy_optional.announceTo := {PX_TESTER_ADDRESS & "/CseBaseTester"};
+						
+						f_CSE_DMR_CRE_BV_016(int10, v_createRequest, mw_createLocationPolicyAnnc);//LocationPolicy
+					}
+					
+					testcase TC_CSE_DMR_CRE_BV_016_06() runs on CseTester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createMgmtObjBase;
+						var ResponsePrimitive v_responsePrimitive;
+						
+						v_createRequest.primitiveContent.any_1[0].MgmtObj_optional.announceTo := {PX_TESTER_ADDRESS & "/CseBaseTester"};
+
+						f_CSE_DMR_CRE_BV_016(int13, v_createRequest, mw_createMgmtObjAnnc);//MgmtObj
+					}
+					
+					testcase TC_CSE_DMR_CRE_BV_016_07() runs on CseTester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createNodeBase;
+						var ResponsePrimitive v_responsePrimitive;
+						
+						v_createRequest.primitiveContent.any_1[0].Node_optional.announceTo := {PX_TESTER_ADDRESS & "/CseBaseTester"};
+						
+						f_CSE_DMR_CRE_BV_016(int14, v_createRequest, mw_createNodeAnnc);//Node
+					}
+					
+					testcase TC_CSE_DMR_CRE_BV_016_08() runs on CseTester system CseSystem {
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createScheduleBase;
+						var ResponsePrimitive v_responsePrimitive;
+						
+						v_createRequest.primitiveContent.any_1[0].Schedule_optional.announceTo := {PX_TESTER_ADDRESS & "/CseBaseTester"};
+
+						f_CSE_DMR_CRE_BV_016(int18, v_createRequest, mw_createScheduleAnnc);//Schedule
+					}
+				
+					function f_CSE_DMR_CRE_BV_016(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template RequestPrimitive p_requestAnnc) runs on CseTester {
+    				
+						// Local variables
+						var MsgIn v_response;
+						var RequestPrimitive v_request;
+						var integer v_parentIndex := -1;
+						var integer v_containerIndex := -1;
+											   
+						// Test control
+    				
+						// Test component configuration
+						f_cf01Up();
+    				
+						// Test adapter configuration
+    				
+						// Preamble
+						v_parentIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+						
+						if(p_resourceType == int4) {
+							v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_parentIndex);
+							v_parentIndex := v_containerIndex;	
+						}
+					
+						// Test Body
+						v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_parentIndex);
+						
+						mcaPort.send(m_request(v_request));
+						tc_ac.start;
+						alt {
+							[] mccPort.receive(mw_request(p_requestAnnc)) -> value v_response {
+								tc_ac.stop;
+								setverdict(pass, testcasename() & ": No content provided with RC set to 0");
+							}
+							[] mccPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+								tc_ac.stop;
+								setverdict(fail, testcasename() & ": Content provided with RC set to 0");
+							}
+							[] mccPort.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 f_CSE_DMR_CRE_BV_016
+    				
+				} // end g_CSE_DMR_CRE_BV_016			
 				
 			}//end group Create
 			
@@ -5093,7 +5524,7 @@ module OneM2M_Testcases {
 						mcaPort.send(m_request(v_request, p_nullFields));
 						tc_ac.start;
 						alt {
-							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK())) -> value v_response {
 								tc_ac.stop;
 								setverdict(pass, testcasename() & ": Attribute of resource type " & int2str(enum2int(p_resourceType)) & " updated successfuly");
 							}