diff --git a/OneM2M_Testcases.ttcn b/OneM2M_Testcases.ttcn
index 97e6214942815d23978c3aedbc47a890debde667..7f4f1c17caf483472d58dc158585196360e6f4a1 100644
--- a/OneM2M_Testcases.ttcn
+++ b/OneM2M_Testcases.ttcn
@@ -2578,6 +2578,121 @@ module OneM2M_Testcases {
 					}//end f_CSE_DMR_RET_BO_008
     				
 				} // end f_CSE_DMR_RET_BO_008
+
+				group g_CSE_DMR_RET_BV_013 {
+					
+					testcase TC_CSE_DMR_RET_BV_013_01() runs on CseTester system CseSystem {
+						// Local variables
+						var ResponsePrimitive v_responsePrimitive;
+						var template PrimitiveContent v_contentResponse;
+					
+						v_contentResponse.any_1[0].AccessControlPolicy_optional := mw_contentAcp_rc1;
+							
+						v_responsePrimitive := f_CSE_DMR_RET_BV_013(int1, m_createAcpBase, v_contentResponse);//AccessControlPolicy
+						
+					}
+										
+					testcase TC_CSE_DMR_RET_BV_013_03() runs on CseTester system CseSystem {
+						// Local variables
+						var ResponsePrimitive v_responsePrimitive;
+						var template PrimitiveContent v_contentResponse;
+					
+						v_contentResponse.any_1[0].Container_optional := mw_contentContainer_rc1;
+						    
+						v_responsePrimitive := f_CSE_DMR_RET_BV_013(int3, m_createContainerBase, v_contentResponse);//Container
+						
+					}
+
+					testcase TC_CSE_DMR_RET_BV_013_05() runs on CseTester system CseSystem {
+						// Local variables
+						var ResponsePrimitive v_responsePrimitive;
+						var template PrimitiveContent v_contentResponse;
+					
+						v_contentResponse.any_1[0].Group_optional := mw_contentGroup_rc1;
+                        
+						v_responsePrimitive := f_CSE_DMR_RET_BV_013(int9, m_createGroupBase, v_contentResponse);//Group
+						
+					}
+				
+					testcase TC_CSE_DMR_RET_BV_013_11() runs on CseTester system CseSystem {
+						// Local variables
+						var ResponsePrimitive v_responsePrimitive;
+						var template PrimitiveContent v_contentResponse;
+					
+						v_contentResponse.any_1[0].Schedule_optional := mw_contentSchedule_rc1;
+						
+						v_responsePrimitive := f_CSE_DMR_RET_BV_013(int18, m_createScheduleBase, v_contentResponse);//Schedule
+						
+					}
+					
+					testcase TC_CSE_DMR_RET_BV_013_14() runs on CseTester system CseSystem {
+						// Local variables
+						var ResponsePrimitive v_responsePrimitive;
+						var template PrimitiveContent v_contentResponse;
+					
+						v_contentResponse.any_1[0].Subscription_optional := mw_contentSubscription_rc1;
+						
+						v_responsePrimitive := f_CSE_DMR_RET_BV_013(int23, m_createSubscriptionBase, v_contentResponse);//Subscription
+					
+					}
+				
+					function f_CSE_DMR_RET_BV_013(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on CseTester return ResponsePrimitive {
+    				
+						// Local variables
+						var MsgIn v_response;
+						var RequestPrimitive v_request;
+						var integer v_aeIndex := -1;
+						var integer v_resourceIndex := -1;
+						var CseTester v_notifyHandler;
+						var integer v_ae2Index := -1;
+						    										   
+						// Test control
+    				
+						// Test component configuration
+						f_cf01Up();
+    				
+						// Test adapter configuration
+    				
+						// Preamble
+						v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+						
+						f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
+						
+						v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive);//under the CSEBase resource
+    									
+						// Test Body
+						mcaPort.send(m_request(m_retrieveResource(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_aeIndex))));//from AE ID
+
+						tc_ac.start;
+						alt {
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(p_contentResponse))) -> value v_response {
+								tc_ac.stop;
+								setverdict(pass, testcasename() & ": Response OK for retrieving");
+							}
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+								tc_ac.stop;
+								setverdict(fail, testcasename() & ": Error, resource elements provided not matching expected resource elements");
+							}
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+								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();
+						
+						return v_response.primitive.responsePrimitive;
+    				
+					}//end f_CSE_DMR_RET_BV_013
+    				
+				} // end g_CSE_DMR_RET_BV_013
 			
 			}//end group Retrieve