diff --git a/OneM2M_Testcases.ttcn b/OneM2M_Testcases.ttcn
index 1cb788b6505192abc536fba725651c060aa42f25..b36a5734caecc229565b764df7dcb23da02ffc6a 100644
--- a/OneM2M_Testcases.ttcn
+++ b/OneM2M_Testcases.ttcn
@@ -4274,7 +4274,9 @@ module OneM2M_Testcases {
                                         
                     // Preamble
                     v_aeIndex := f_cse_preamble_registerAe(); //c_CRUDNDi
-                    v_resourceIndex := f_cse_createResource(int9, v_createRequest, v_aeIndex);
+                    //v_resourceIndex := f_cse_createResource(int9, v_createRequest, v_aeIndex);	// not used anymore -> Issue #4
+       
+					v_request := f_getCreateRequestPrimitive(int9, v_createRequest, v_aeIndex);
                     
                     // Test Body
 
@@ -4742,7 +4744,7 @@ module OneM2M_Testcases {
                     var integer v_aeIndex := -1;
                     var integer v_resourceIndex := -1;
                     var template RequestPrimitive v_createRequest := m_createGroupBase;
-                    var ResponsePrimitive.primitiveContent v_responsePrimitive;
+                    //var ResponsePrimitive.primitiveContent v_responsePrimitive; // not used anymore -> issue #5
                                     
                     // Test control
                     
@@ -4766,18 +4768,18 @@ module OneM2M_Testcases {
                             setverdict(pass, testcasename() & ": Resource created successfuly");
                         
 //                          check for memberTypeValidated
-                            if(not ispresent(v_responsePrimitive.any_1[0].Group_optional.memberTypeValidated)){
+                            if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].Group_optional.memberTypeValidated)){
                                 setverdict(fail, testcasename(), ": Error, memberTypeValidated attribute not provided");
                             } else {
-                                if(v_responsePrimitive.any_1[0].Group_optional.memberTypeValidated == false){
+                                if(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].Group_optional.memberTypeValidated == false){
                                     setverdict(fail, testcasename(), ": Error, memberTypeValidated attribute not correct");
                                 }
                             }
                             // check for membersId
-                            if(not ispresent(v_responsePrimitive.any_1[0].Group_optional.memberIDs)){
+                            if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].Group_optional.memberIDs)){
                                 setverdict(fail, testcasename(), ": Error, memberIDs attribute not provided");
                             } else {
-                                if(v_responsePrimitive.any_1[0].Group_optional.memberIDs[0] != c_memberRessourceAddress1){
+                                if(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].Group_optional.memberIDs[0] != c_memberRessourceAddress1){
                                     setverdict(fail, testcasename(), ": Error, memberTypeValidated attribute not correct");
                                 }
                             }