diff --git a/csit/tests/cps-data/cps-data.robot b/csit/tests/cps-data/cps-data.robot
index ce2033c..0e3dfab 100644
--- a/csit/tests/cps-data/cps-data.robot
+++ b/csit/tests/cps-data/cps-data.robot
@@ -38,7 +38,7 @@
 Create Data Node
     ${uri}=             Set Variable        ${basePath}/v1/dataspaces/${dataspaceName}/anchors/${anchorName}/nodes
     ${headers}          Create Dictionary   Content-Type=application/json   Authorization=${auth}
-    ${jsonData}=        Get Binary File     ${DATADIR}${/}test-tree.json
+    ${jsonData}=        Get Binary File     ${DATADIR_CPS_CORE}${/}test-tree.json
     ${response}=        POST On Session     CPS_URL   ${uri}   headers=${headers}   data=${jsonData}
     Should Be Equal As Strings              ${response.status_code}   201
 
@@ -46,7 +46,7 @@
     ${uri}=             Set Variable        ${basePath}/v1/dataspaces/${dataspaceName}/anchors/${anchorName}/nodes
     ${params}=          Create Dictionary   xpath=/test-tree/branch[@name='Right']
     ${headers}          Create Dictionary   Content-Type=application/json   Authorization=${auth}
-    ${jsonData}=        Get Binary File     ${DATADIR}${/}testTreePatchExample.json
+    ${jsonData}=        Get Binary File     ${DATADIR_CPS_CORE}${/}testTreePatchExample.json
     ${response}=        PATCH On Session    CPS_URL   ${uri}  params=${params}   headers=${headers}   data=${jsonData}
     Should Be Equal As Strings              ${response.status_code}   200
 
@@ -64,7 +64,6 @@
     ${params}=          Create Dictionary   xpath=/test-tree/branch[@name='LEFT/left']/nest
     ${headers}=         Create Dictionary   Authorization=${auth}
     ${response}=        Get On Session      CPS_URL   ${uri}   params=${params}   headers=${headers}   expected_status=200
-    ${responseJson}=    Set Variable        ${response.json()['tree:nest']}
-    Should Be Equal As Strings              ${responseJson['name']}   SMALL/small
+    Should Be Equal As Strings              ${response.json()['tree:nest']['name']}   SMALL/small