diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index 410e9e606c060ebb0ee1784a73244809d7abea87..67918490725c2ddff1400dcafca18518160bc024 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -7,7 +7,7 @@
  *  
  *  @author     oneM2M
  *  @version    $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Templates.ttcn $
- *              $Id: OneM2M_Templates.ttcn 264 2017-05-17 01:25:42Z berge $
+ *              $Id: OneM2M_Templates.ttcn 269 2017-05-17 03:36:25Z reinaortega $
  *  @desc       Module containing templates for oneM2M
  *
  */
@@ -1508,7 +1508,7 @@ module OneM2M_Templates {
     	 * @desc Base primitiveContent for CREATE operation for ContentInstance resource
     	 * @param p_primitiveContent Content for the ContentInstance
     	 */
-    	template (value) ContentInstance_optional m_contentCreateContentInstance(XSD.String p_primitiveContent := "NotInitializedValue") := {
+    	template (value) ContentInstance_optional m_contentCreateContentInstance(XSD.String p_primitiveContent := "AnyValue") := {
 			resourceName := c_defaultContentInstanceResourceName,//O
 			resourceType := omit,//NP
 			resourceID := omit,//NP
diff --git a/OneM2M_Testcases.ttcn b/OneM2M_Testcases.ttcn
index 808cbae85bd6fb00a0258b388a3df416a98008ae..ee729794a5e59bbc4529136e695e7f35edcd0f85 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 267 2017-05-17 02:24:38Z reinaortega $
+ *              $Id: OneM2M_Testcases.ttcn 269 2017-05-17 03:36:25Z reinaortega $
  *  @desc       Module containing test cases for oneM2M
  *
  */
@@ -2078,7 +2078,7 @@ module OneM2M_Testcases {
 						v_containerIndex := f_cse_createResource(int3, v_createRequest, v_aeIndex);
 					
 						// Test Body
-						v_request := f_getCreateRequestPrimitive(int4, m_createContentInstance(f_getResourceAddress(v_containerIndex), "MyValue"), v_aeIndex);
+						v_request := f_getCreateRequestPrimitive(int4, m_createContentInstanceBase, v_containerIndex);
 					
 						mcaPort.send(m_request(v_request));
 						tc_ac.start;
@@ -2135,7 +2135,7 @@ module OneM2M_Testcases {
 						
 						v_containerIndex := f_cse_createResource(int3, v_createRequest, v_aeIndex);
 						
-						v_contentInstanceIndex := f_cse_createResource(int4, m_createContentInstance(f_getResourceAddress(v_containerIndex), "MyValue"), v_containerIndex);
+						v_contentInstanceIndex := f_cse_createResource(int4, m_createContentInstanceBase, v_containerIndex);
 					
 						// Test Body
 						mcaPort.send(m_request(m_retrieveResource(f_getResourceAddress(v_containerIndex), f_getOriginator(v_containerIndex))));