diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 62a4012b980b61a623a2fd868dc73895c8e45594..f480e165c2b9cff202b204acca6b1f253b0a7870 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -7,7 +7,7 @@
  *  
  *  @author     ETSI
  *  @version    $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Functions.ttcn $
- *              $Id: OneM2M_Functions.ttcn 127 2016-10-10 08:36:57Z reinaortega $
+ *              $Id: OneM2M_Functions.ttcn 134 2016-10-11 09:33:13Z reinaortega $
  *  @desc       Module containing functions for oneM2M
  *
  */
diff --git a/LibOneM2M/OneM2M_Pixits.ttcn b/LibOneM2M/OneM2M_Pixits.ttcn
index e18ee42e037ac84c4e58b6f10e698658ebf4f09b..db1b55fb85c3312ef839852ff84648e9503f1d30 100644
--- a/LibOneM2M/OneM2M_Pixits.ttcn
+++ b/LibOneM2M/OneM2M_Pixits.ttcn
@@ -7,7 +7,7 @@
  *  
  *  @author     ETSI
  *  @version    $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Pixits.ttcn $
- *              $Id: OneM2M_Pixits.ttcn 127 2016-10-10 08:36:57Z reinaortega $
+ *              $Id: OneM2M_Pixits.ttcn 134 2016-10-11 09:33:13Z reinaortega $
  *  @desc       Module containing Pixits for oneM2M
  *
  */
diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index 1e97ca00c4614a04510b06dc1a787bf821f5ea4a..b9278af7ebbdfc4ee90ee8301cb294f53d4a262e 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -7,7 +7,7 @@
  *  
  *  @author     ETSI
  *  @version    $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Templates.ttcn $
- *              $Id: OneM2M_Templates.ttcn 131 2016-10-10 11:54:46Z reinaortega $
+ *              $Id: OneM2M_Templates.ttcn 134 2016-10-11 09:33:13Z reinaortega $
  *  @desc       Module containing templates for oneM2M
  *
  */
diff --git a/LibOneM2M/OneM2M_Types.ttcn b/LibOneM2M/OneM2M_Types.ttcn
index 26d7c9e4101ef02c72abd41ee5a3813be9bdbcc6..5f5212d685955cdedd4de04b6be1897bcbfc8532 100644
--- a/LibOneM2M/OneM2M_Types.ttcn
+++ b/LibOneM2M/OneM2M_Types.ttcn
@@ -7,7 +7,7 @@
  *  
  *  @author     ETSI
  *  @version    $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Types.ttcn $
- *              $Id: OneM2M_Types.ttcn 131 2016-10-10 11:54:46Z reinaortega $
+ *              $Id: OneM2M_Types.ttcn 134 2016-10-11 09:33:13Z reinaortega $
  *  @desc       Test System module for oneM2M
  *
  */
diff --git a/LibOneM2M/OneM2M_TypesAndValues.ttcn b/LibOneM2M/OneM2M_TypesAndValues.ttcn
index 81502671637561a87dfd2d9e0f556e00feaac973..a2b3713aca438674ad566a1989a998db04a49741 100644
--- a/LibOneM2M/OneM2M_TypesAndValues.ttcn
+++ b/LibOneM2M/OneM2M_TypesAndValues.ttcn
@@ -7,7 +7,7 @@
  *  
  *  @author     ETSI
  *  @version    $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_TypesAndValues.ttcn $
- *              $Id: OneM2M_TypesAndValues.ttcn 131 2016-10-10 11:54:46Z reinaortega $
+ *              $Id: OneM2M_TypesAndValues.ttcn 134 2016-10-11 09:33:13Z reinaortega $
  *  @desc       Module containing types and values for oneM2M
  *
  */
diff --git a/OneM2M_Testcases.ttcn b/OneM2M_Testcases.ttcn
index f8fbea26685ff0a5ae9dd8ac5e1ad9a9e968c2da..fff796dc650c57e63021ac2193960f0d22bab0db 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 132 2016-10-10 12:20:14Z reinaortega $
+ *              $Id: OneM2M_Testcases.ttcn 134 2016-10-11 09:33:13Z reinaortega $
  *  @desc       Module containing test cases for oneM2M
  *
  */
@@ -5864,6 +5864,7 @@ module OneM2M_Testcases {
 					var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 					var RequestPrimitive v_request;
 					
+					v_createRequest.primitiveContent.any_1[0].Subscription_optional.resourceName := omit;
 					// Test control
 
 					// Test component configuration
@@ -5876,7 +5877,7 @@ module OneM2M_Testcases {
 
 					v_containerResourceIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);//Container 				
 
-					v_contentInstanceResourceIndex := f_cse_createResource(int4, m_createContentInstance(f_getResourceAddress(v_aeIndex), "Random Value"), v_aeIndex);//ContentInstance
+					v_contentInstanceResourceIndex := f_cse_createResource(int4, m_createContentInstance(f_getResourceAddress(v_aeIndex), "Random Value"), v_containerResourceIndex);//ContentInstance
 
 					v_request := f_getCreateRequestPrimitive(int23, v_createRequest, v_contentInstanceResourceIndex);