diff --git a/OneM2M_Testcases.ttcn b/OneM2M_Testcases.ttcn
index d5559640346d767ef5ae2e42539c1d65b175a2f4..460aff896582f3626bf17b77baaca2e44f8d5897 100644
--- a/OneM2M_Testcases.ttcn
+++ b/OneM2M_Testcases.ttcn
@@ -5027,7 +5027,7 @@ module OneM2M_Testcases {
const ResourceType c_ResourceTypeGroup := int9; // "group": TS-0004, Table 6.3.4.2.1-1
const ResourceType c_ResourceType1 := int4; // "contentInstance": TS-0004, Table 6.3.4.2.1-1
const XSD.String c_primitiveContent := "any content instance value"; // embedded value of a contentInstance
- const XSD.AnyURI c_targetResourceAddress := "TARGET_RESOURCE_ADDRESS"; // resource type can be <CSEBase>, <AE>, <remoteCSE>
+// const XSD.AnyURI c_targetResourceAddress := "TARGET_RESOURCE_ADDRESS"; // resource type can be <CSEBase>, <AE>, <remoteCSE>
const XSD.AnyURI c_memberResourceAddress1 := "MEMBER_RESSOURCE_ADDRESS_1"; // any resource type
const XSD.AnyURI c_memberResourceAddress2 := "MEMBER_RESSOURCE_ADDRESS_2"; // any resource type
@@ -5073,7 +5073,7 @@ module OneM2M_Testcases {
//Test Body
v_request := f_getUpdateRequestPrimitive(c_ResourceTypeGroup, v_groupIndex, v_updateRequest);
- v_request.to_ := c_targetResourceAddress;
+// v_request.to_ := c_targetResourceAddress;
v_request.primitiveContent.any_1[0].Group_optional := valueof(m_contentCreateGroup(2, {c_memberResourceAddress2, c_memberResourceAddress2}, omit));
mcaPort.send(m_request(v_request));
@@ -5126,7 +5126,7 @@ module OneM2M_Testcases {
const ResourceType c_ResourceType1 := int4;
const MemberType c_memberType1 := int4; // should be set same type as c_ResourceType1
const XSD.String c_primitiveContent := "any content instance value"; // embedded value of a contentInstance
- const XSD.AnyURI c_targetResourceAddress := "TARGET_RESOURCE_ADDRESS";
+// const XSD.AnyURI c_targetResourceAddress := "TARGET_RESOURCE_ADDRESS";
const XSD.AnyURI c_memberResourceAddress1 := "MEMBER_RESSOURCE_ADDRESS_1";
const XSD.AnyURI c_memberResourceAddress2 := "MEMBER_RESSOURCE_ADDRESS_2";
@@ -5173,7 +5173,7 @@ module OneM2M_Testcases {
//Test Body
v_request := f_getUpdateRequestPrimitive(c_ResourceTypeGroup, v_groupIndex, v_updateRequest);
- v_request.to_ := c_targetResourceAddress;
+// v_request.to_ := c_targetResourceAddress;
v_request.primitiveContent.any_1[0].Group_optional := valueof(m_contentCreateGroup(1, {c_memberResourceAddress2}, omit));
mcaPort.send(m_request(v_request));
@@ -5221,7 +5221,7 @@ module OneM2M_Testcases {
const MemberType c_memberType_MIXED := int0; // "mixed": TS-0004, Table 6.3.4.2.11-1
const XSD.String c_primitiveContent := "any embedded primitive_content";
const ConsistencyStrategy c_consistentcyStrategy := int3; // "SET_MIXED": TS-0004, Table 6.3.4.2.12-1
- const XSD.AnyURI c_targetResourceAddress := "TARGET_RESOURCE_ADDRESS";
+// const XSD.AnyURI c_targetResourceAddress := "TARGET_RESOURCE_ADDRESS";
const XSD.AnyURI c_memberResourceAddress1 := "MEMBER_RESSOURCE_ADDRESS_1";
const XSD.AnyURI c_memberResourceAddress2 := "MEMBER_RESSOURCE_ADDRESS_2";
@@ -5279,7 +5279,7 @@ module OneM2M_Testcases {
// MEMBER_RESOURCE_ADDRESS_1,
// MEMBER_RESOURCE_ADDRESS_2
v_request := f_getUpdateRequestPrimitive(c_ResourceTypeGroup, v_groupIndex, v_updateRequest);
- v_request.to_ := c_targetResourceAddress;
+// v_request.to_ := c_targetResourceAddress;
v_request.primitiveContent.any_1[0].Group_optional := valueof(m_contentCreateGroup(2, {c_memberResourceAddress1, c_memberResourceAddress2}, omit));
mcaPort.send(m_request(v_request));
@@ -5335,7 +5335,7 @@ module OneM2M_Testcases {
const MemberType c_memberType2 := int5; // should be set same type as c_ResourceType2
const XSD.String c_primitiveContent := "primitive_content";
const ConsistencyStrategy c_consistentcyStrategy := int1; // ABANDOND_MEMBER: TS-0004, Table 6.3.4.2.12-1
- const XSD.AnyURI c_targetResourceAddress := "TARGET_RESOURCE_ADDRESS";
+// const XSD.AnyURI c_targetResourceAddress := "TARGET_RESOURCE_ADDRESS";
const XSD.AnyURI c_memberResourceAddress1 := "MEMBER_RESSOURCE_ADDRESS_1";
const XSD.AnyURI c_memberResourceAddress2 := "MEMBER_RESSOURCE_ADDRESS_2";
@@ -5386,7 +5386,7 @@ module OneM2M_Testcases {
//Test Body
v_request := f_getUpdateRequestPrimitive(c_ResourceTypeGroup, v_groupIndex, v_updateRequest);
- v_request.to_ := c_targetResourceAddress;
+// v_request.to_ := c_targetResourceAddress;
v_request.primitiveContent.any_1[0].Group_optional := valueof(m_contentCreateGroup(2, {c_memberResourceAddress1, c_memberResourceAddress2}, omit));
mcaPort.send(m_request(v_request));
@@ -5447,7 +5447,7 @@ module OneM2M_Testcases {
const MemberType c_memberType2 := int5; // should be set same type as c_ResourceType2
const XSD.String c_primitiveContent := "primitive_contet";
const ConsistencyStrategy c_consistentcyStrategy := int2; // ABANDOND_GROUP
- const XSD.AnyURI c_targetResourceAddress := "TARGET_RESOURCE_ADDRESS";
+// const XSD.AnyURI c_targetResourceAddress := "TARGET_RESOURCE_ADDRESS";
const XSD.AnyURI c_memberResourceAddress1 := "MEMBER_RESSOURCE_ADDRESS_1";
const XSD.AnyURI c_memberResourceAddress2 := "MEMBER_RESSOURCE_ADDRESS_2";
@@ -5498,7 +5498,7 @@ module OneM2M_Testcases {
//Test Body
v_request := f_getUpdateRequestPrimitive(c_ResourceTypeGroup, v_groupIndex, v_updateRequest);
- v_request.to_ := c_targetResourceAddress;
+// v_request.to_ := c_targetResourceAddress;
v_request.primitiveContent.any_1[0].Group_optional := valueof(m_contentCreateGroup(2, {c_memberResourceAddress1, c_memberResourceAddress2}, omit));
mcaPort.send(m_request(v_request));
@@ -5534,7 +5534,7 @@ module OneM2M_Testcases {
const ResourceType c_ResourceType1 := int4;
const MemberType c_memberType1 := int4; // should be set same type as c_ResourceType1
const XSD.String c_primitiveContent := "primitive_contet";
- const XSD.AnyURI c_targetResourceAddress := "TARGET_RESOURCE_ADDRESS";
+// const XSD.AnyURI c_targetResourceAddress := "TARGET_RESOURCE_ADDRESS";
const XSD.AnyURI c_memberResourceAddress1 := "MEMBER_RESSOURCE_ADDRESS_1";
const XSD.AnyURI c_memberResourceAddress2 := "MEMBER_RESSOURCE_ADDRESS_2";
const XSD.AnyURI c_memberResourceAddress3 := "MEMBER_RESSOURCE_ADDRESS_3";
@@ -5586,7 +5586,7 @@ module OneM2M_Testcases {
//Test Body
v_request := f_getUpdateRequestPrimitive(c_ResourceTypeGroup, v_groupIndex, v_updateRequest);
- v_request.to_ := c_targetResourceAddress;
+// v_request.to_ := c_targetResourceAddress;
v_request.primitiveContent.any_1[0].Group_optional := valueof(m_contentCreateGroup(3, {c_memberResourceAddress1, c_memberResourceAddress2, c_memberResourceAddress3}, omit));
mcaPort.send(m_request(v_request));
@@ -5622,7 +5622,7 @@ module OneM2M_Testcases {
const ResourceType c_ResourceType1 := int4;
const MemberType c_memberType1 := int4; // should be set same type as c_ResourceType1
const XSD.String c_primitiveContent := "primitive_contet";
- const XSD.AnyURI c_targetResourceAddress := "TARGET_RESOURCE_ADDRESS";
+// const XSD.AnyURI c_targetResourceAddress := "TARGET_RESOURCE_ADDRESS";
const XSD.AnyURI c_memberResourceAddress1 := "MEMBER_RESSOURCE_ADDRESS_1";
const XSD.AnyURI c_memberResourceAddress2 := "MEMBER_RESSOURCE_ADDRESS_2";
const XSD.AnyURI c_memberResourceAddress3 := "MEMBER_RESSOURCE_ADDRESS_3";
@@ -5675,7 +5675,7 @@ module OneM2M_Testcases {
//Test Body
v_request := f_getUpdateRequestPrimitive(c_ResourceTypeGroup, v_groupIndex, v_updateRequest);
- v_request.to_ := c_targetResourceAddress;
+// v_request.to_ := c_targetResourceAddress;
v_request.primitiveContent.any_1[0].Group_optional.maxNrOfMembers := 2;
mcaPort.send(m_request(v_request));
@@ -5712,7 +5712,7 @@ module OneM2M_Testcases {
const MemberType c_memberType1 := int4; // should be set same type as c_ResourceType1
const XSD.String c_primitiveContent := "primitive_contet";
const ConsistencyStrategy c_consistentcyStrategy := int1; // ABANDOND_MEMBER
- const XSD.AnyURI c_targetResourceAddress := "TARGET_RESOURCE_ADDRESS";
+// const XSD.AnyURI c_targetResourceAddress := "TARGET_RESOURCE_ADDRESS";
const XSD.AnyURI c_memberResourceAddress1 := "MEMBER_RESSOURCE_ADDRESS_1";
const XSD.AnyURI c_memberResourceAddress2 := "MEMBER_RESSOURCE_ADDRESS_2";
@@ -5755,7 +5755,7 @@ module OneM2M_Testcases {
//Test Body
v_request := f_getUpdateRequestPrimitive(c_ResourceTypeGroup, v_groupIndex, v_updateRequest);
- v_request.to_ := c_targetResourceAddress;
+// v_request.to_ := c_targetResourceAddress;
v_createRequest.primitiveContent.any_1[0].Group_optional := m_contentCreateGroup(2, {c_memberResourceAddress1, c_memberResourceAddress2}, omit);
mcaPort.send(m_request(v_request));
@@ -5809,7 +5809,7 @@ module OneM2M_Testcases {
const MemberType c_memberType1 := int4; // should be set same type as c_ResourceType1
const XSD.String c_primitiveContent := "primitive_contet";
const ConsistencyStrategy c_consistentcyStrategy := int1; // ABANDOND_MEMBER
- const XSD.AnyURI c_targetResourceAddress := "TARGET_RESOURCE_ADDRESS";
+// const XSD.AnyURI c_targetResourceAddress := "TARGET_RESOURCE_ADDRESS";
const XSD.AnyURI c_memberResourceAddress1 := "MEMBER_RESSOURCE_ADDRESS_1";
const XSD.AnyURI c_memberResourceAddress2 := "MEMBER_RESSOURCE_ADDRESS_2";