diff --git a/SRV/APPSAQ/PlatAppServices.robot b/SRV/APPSAQ/PlatAppServices.robot
index 93e0429e23dc1532da939bc47b295d3848238ab7..33611b34d92412d4d96febd10e140130ed795bb1 100644
--- a/SRV/APPSAQ/PlatAppServices.robot
+++ b/SRV/APPSAQ/PlatAppServices.robot
@@ -3,7 +3,7 @@
 Documentation
 ...   A test suite for validating Application Service Availability Query (APPSAQ) operations.
 
-Resource    ../../resources.robot
+Resource    ../../resources/GenericKeywords.robot
 
 Default Tags    TP_MEC_SRV_APPSAQ
 
@@ -30,7 +30,7 @@ Get the available MEC services for a given application instance
     Log    MEC 011, clause 7.15.3.1
     Then the Plaform IUT sends a response   200   ServiceInfoList
 
-    
+
 MEC Applications sends incorrect parameters in request
     [Documentation]
     ...   Check that the IUT responds with an error when
@@ -47,8 +47,8 @@ MEC Applications sends incorrect parameters in request
     When the Plaform IUT entity receives a vGET for   /${APP_INSTANCE_ID}/services?instance_id=some_instance_id
     Log    MEC 011, clause 7.15.3.1
     Then the Plaform IUT sends a response   400   ProblemDetails
-   
- 
+
+
 New MEC Applications service registration
     [Documentation]
     ...   Check that the IUT notifies the authorised relevant (subscribed) application
@@ -59,16 +59,15 @@ New MEC Applications service registration
     [Tags]      TP_MEC_SRV_APPSAQ_002_OK    TP_MEC_SRV_APPSAQ_BV
 
     Given the Plaform IUT has a MEC Application instantiated
-    # TODO where does the __some_service__ data comes from? 
+    # TODO where does the __some_service__ data comes from?
     Given a MEC Application subscribed to service notifications for    __some_service__
     Log    MEC 011, clause 5.2.4
     Log     Wrong parameter name should trigger an error response.
-    # TODO where does the __some_data__ comes from? 
+    # TODO where does the __some_data__ comes from?
 #    When the Plaform IUT entity receives a vPOST for   /mec_service_mgmt/v1/applications/${APP_INSTANCE_ID}/services
     When the Plaform IUT entity receives a vPOST for    /${APP_INSTANCE_ID}/services    __some_data__    ServiceInfo
     Log    MEC 011, clause 7.15.3.4
     Then the Plaform IUT sends a response   201   ServiceInfo
     And the Plaform IUT response header parameter    Location    __location__
     Log    MEC 011, clause 6.4.2
-    And the Plaform IUT sends a notification message to the subscribed MEC Applications with     ServiceAvailabilityNotification 
- 
\ No newline at end of file
+    And the Plaform IUT sends a notification message to the subscribed MEC Applications with     ServiceAvailabilityNotification
diff --git a/SRV/UETAG/PlatUeIdentity.robot b/SRV/UETAG/PlatUeIdentity.robot
index 75b23ae79d3da2fff1e4f36b41fcd9d7109f246f..a120381fa1be923e311cfa0368f5d40e42af7e5c 100644
--- a/SRV/UETAG/PlatUeIdentity.robot
+++ b/SRV/UETAG/PlatUeIdentity.robot
@@ -1,9 +1,9 @@
-[Documentation]   robot --outputdir ./outputs .SRV/UETAG/PlatUeIdentity.robot
+[Documentation]   robot --outputdir ./outputs ./SRV/UETAG/PlatUeIdentity.robot
 ...    Test Suite to validate UE Identity Tag (UETAG) operations.
 
 *** Settings ***
-Resource    environment/variables.txt
-Resource    resources/GenericKeywords.robot
+Resource    ../../environment/variables.txt
+Resource    ../../resources/GenericKeywords.robot
 Library     REST    ${MEC-APP_SCHEMA}://${MEC-APP_HOST}:${MEC-APP_PORT}    ssl_verify=false
 
 Default Tags    TC_MEC_SRV_UETAG
@@ -33,7 +33,6 @@ Get UeIdentity tag information
     Should Be Present In Json List    ${response['body']['ueIdentityTagInfo']['ueIdentityTags']}    ueIdentityTag    ${UE_IDENTITY_TAG}
     Log    ${UE_IDENTITY_TAG} found
 
-*** Test Cases ***
 Register a UE Identity tag
     [Documentation]   TC_MEC_PLAT_UETAG_002_OK
     ... Check that the IUT registers a tag (representing a UE) or a list of tags when commanded by a MEC Application
@@ -48,5 +47,5 @@ Register a UE Identity tag
     Check tag user    ${UE_IDENTITY_TAG}    'UNREGISTERER'
     # Test Body: Register the tag user and check that the IUT has registered the tag user
     Post    /exampleAPI/ui/v1/${APP_INSTANCE_ID}/ue_identity_tag_info    { "userTagId": ${UE_IDENTITY_TAG}, "state": "REGISTER" }
-    Check tag user    ${UE_IDENTITY_TAG}    'REGISTERER'
+    Check User Identity Tag state    ${UE_IDENTITY_TAG}    'REGISTERER'
     Log ${UE_IDENTITY_TAG} was registered successfully
diff --git a/outputs/log.html b/outputs/log.html
index 6fc52346619ade346471f3c0eba987bee1b9ce39..65005517b8a7c4e884af0e14f2a133618351b646 100644
--- a/outputs/log.html
+++ b/outputs/log.html
@@ -1735,25 +1735,25 @@ function stopPropagation(event) {
 window.output = {};
 </script>
 <script type="text/javascript">
-window.output["suite"] = [1,2,3,0,[],[0,0,376],[],[[4,0,1,5,[6,7],[0,366,3,8],[[0,9,0,0,0,0,0,0,[0,368,0],[],[[368,5,8]]]]],[10,0,1,11,[6,12],[0,370,3,13],[[0,14,0,0,0,0,0,0,[0,372,0],[],[[372,5,13]]]]]],[],[2,0,2,0]];
+window.output["suite"] = [1,2,3,0,[],[0,0,419],[],[[4,0,1,5,[6,7],[0,378,20,8],[[0,9,0,0,0,0,0,0,[0,397,1],[],[[398,5,8]]]]],[10,0,1,11,[6,12],[0,405,3,13],[[0,14,0,0,0,0,0,0,[0,407,0],[],[[407,5,13]]]]]],[],[2,0,2,0]];
 </script>
 <script type="text/javascript">
 window.output["strings"] = [];
 </script>
 <script type="text/javascript">
-window.output["strings"] = window.output["strings"].concat(["*","*PlatUeIdentity","*C:\\Users\\yanng\\Documents\\STF569_RobotFramework\\SRV\\UETAG\\PlatUeIdentity.robot","*../SRV/UETAG/PlatUeIdentity.robot","*Get UeIdentity tag information","*<p>TC_MEC_SRV_UETAG_001_OK\x3c/p>","*TP_MEC_SRV_UETAG","*TP_MEC_SRV_UETAG_001_OK","*No keyword with name '... Check that the IUT responds with the information on a UE Identity tag when queried by a MEC Application' found.","*... Check that the IUT responds with the information on a UE Identity tag when queried by a MEC Application","*Register a UE Identity tag","*<p>TC_MEC_PLAT_UETAG_002_OK\x3c/p>","*TP_MEC_SRV_UETAG_002_OK","*No keyword with name '... Check that the IUT registers a tag (representing a UE) or a list of tags when commanded by a MEC Application' found.","*... Check that the IUT registers a tag (representing a UE) or a list of tags when commanded by a MEC Application","*Error in file 'C:\\Users\\yanng\\Documents\\STF569_RobotFramework\\SRV\\UETAG\\PlatUeIdentity.robot': Resource file 'environment\\variables.txt' does not exist.","*Error in file 'C:\\Users\\yanng\\Documents\\STF569_RobotFramework\\SRV\\UETAG\\PlatUeIdentity.robot': Resource file 'resources\\GenericKeywords.robot' does not exist.","*Error in file 'C:\\Users\\yanng\\Documents\\STF569_RobotFramework\\SRV\\UETAG\\PlatUeIdentity.robot': Resolving variable '${MEC-APP_SCHEMA}' failed: Variable '${MEC}' not found."]);
+window.output["strings"] = window.output["strings"].concat(["*","*PlatUeIdentity","*C:\\Users\\yanng\\Documents\\STF569_RobotFramework\\SRV\\UETAG\\PlatUeIdentity.robot","*../SRV/UETAG/PlatUeIdentity.robot","*Get UeIdentity tag information","*<p>TC_MEC_SRV_UETAG_001_OK\x3c/p>","*TP_MEC_SRV_UETAG","*TP_MEC_SRV_UETAG_001_OK","*No keyword with name '... Check that the IUT responds with the information on a UE Identity tag when queried by a MEC Application' found.","*... Check that the IUT responds with the information on a UE Identity tag when queried by a MEC Application","*Register a UE Identity tag","*<p>TC_MEC_PLAT_UETAG_002_OK\x3c/p>","*TP_MEC_SRV_UETAG_002_OK","*No keyword with name '... Check that the IUT registers a tag (representing a UE) or a list of tags when commanded by a MEC Application' found.","*... Check that the IUT registers a tag (representing a UE) or a list of tags when commanded by a MEC Application"]);
 </script>
 <script type="text/javascript">
 window.output["stats"] = [[{"elapsed":"00:00:00","fail":2,"label":"Critical Tests","pass":0},{"elapsed":"00:00:00","fail":2,"label":"All Tests","pass":0}],[{"elapsed":"00:00:00","fail":2,"label":"TP_MEC_SRV_UETAG","pass":0},{"elapsed":"00:00:00","fail":1,"label":"TP_MEC_SRV_UETAG_001_OK","pass":0},{"elapsed":"00:00:00","fail":1,"label":"TP_MEC_SRV_UETAG_002_OK","pass":0}],[{"elapsed":"00:00:00","fail":2,"id":"s1","label":"PlatUeIdentity","name":"PlatUeIdentity","pass":0}]];
 </script>
 <script type="text/javascript">
-window.output["errors"] = [[27,4,15],[29,4,16],[364,4,17]];
+window.output["errors"] = [];
 </script>
 <script type="text/javascript">
-window.output["baseMillis"] = 1562850392308;
+window.output["baseMillis"] = 1562851431197;
 </script>
 <script type="text/javascript">
-window.output["generated"] = 386;
+window.output["generated"] = 438;
 </script>
 <script type="text/javascript">
 window.settings = {"defaultLevel":"INFO","minLevel":"FAIL","reportURL":"report.html","rpa":false,"splitLogBase":"log","title":""};
diff --git a/outputs/output.xml b/outputs/output.xml
index 22f5e92c037c32b34b66ba8e43012a1e56bf596d..8de971d661fdddd42e2ed1eae7782e85d120c07d 100644
--- a/outputs/output.xml
+++ b/outputs/output.xml
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<robot generator="Robot 3.1.2 (Python 3.7.1 on win32)" generated="20190711 15:06:32.307" rpa="false">
+<robot generator="Robot 3.1.2 (Python 3.7.1 on win32)" generated="20190711 15:23:51.196" rpa="false">
 <suite id="s1" name="PlatUeIdentity" source="C:\Users\yanng\Documents\STF569_RobotFramework\SRV\UETAG\PlatUeIdentity.robot">
 <test id="s1-t1" name="Get UeIdentity tag information">
 <kw name="... Check that the IUT responds with the information on a UE Identity tag when queried by a MEC Application">
-<msg timestamp="20190711 15:06:32.676" level="FAIL">No keyword with name '... Check that the IUT responds with the information on a UE Identity tag when queried by a MEC Application' found.</msg>
-<status status="FAIL" starttime="20190711 15:06:32.676" endtime="20190711 15:06:32.676"></status>
+<msg timestamp="20190711 15:23:51.595" level="FAIL">No keyword with name '... Check that the IUT responds with the information on a UE Identity tag when queried by a MEC Application' found.</msg>
+<status status="FAIL" starttime="20190711 15:23:51.594" endtime="20190711 15:23:51.595"></status>
 </kw>
 <doc>TC_MEC_SRV_UETAG_001_OK</doc>
 <tags>
 <tag>TP_MEC_SRV_UETAG</tag>
 <tag>TP_MEC_SRV_UETAG_001_OK</tag>
 </tags>
-<status status="FAIL" starttime="20190711 15:06:32.674" endtime="20190711 15:06:32.677" critical="yes">No keyword with name '... Check that the IUT responds with the information on a UE Identity tag when queried by a MEC Application' found.</status>
+<status status="FAIL" starttime="20190711 15:23:51.575" endtime="20190711 15:23:51.595" critical="yes">No keyword with name '... Check that the IUT responds with the information on a UE Identity tag when queried by a MEC Application' found.</status>
 </test>
 <test id="s1-t2" name="Register a UE Identity tag">
 <kw name="... Check that the IUT registers a tag (representing a UE) or a list of tags when commanded by a MEC Application">
-<msg timestamp="20190711 15:06:32.680" level="FAIL">No keyword with name '... Check that the IUT registers a tag (representing a UE) or a list of tags when commanded by a MEC Application' found.</msg>
-<status status="FAIL" starttime="20190711 15:06:32.680" endtime="20190711 15:06:32.680"></status>
+<msg timestamp="20190711 15:23:51.604" level="FAIL">No keyword with name '... Check that the IUT registers a tag (representing a UE) or a list of tags when commanded by a MEC Application' found.</msg>
+<status status="FAIL" starttime="20190711 15:23:51.604" endtime="20190711 15:23:51.604"></status>
 </kw>
 <doc>TC_MEC_PLAT_UETAG_002_OK</doc>
 <tags>
 <tag>TP_MEC_SRV_UETAG</tag>
 <tag>TP_MEC_SRV_UETAG_002_OK</tag>
 </tags>
-<status status="FAIL" starttime="20190711 15:06:32.678" endtime="20190711 15:06:32.681" critical="yes">No keyword with name '... Check that the IUT registers a tag (representing a UE) or a list of tags when commanded by a MEC Application' found.</status>
+<status status="FAIL" starttime="20190711 15:23:51.602" endtime="20190711 15:23:51.605" critical="yes">No keyword with name '... Check that the IUT registers a tag (representing a UE) or a list of tags when commanded by a MEC Application' found.</status>
 </test>
-<status status="FAIL" starttime="20190711 15:06:32.308" endtime="20190711 15:06:32.684"></status>
+<status status="FAIL" starttime="20190711 15:23:51.197" endtime="20190711 15:23:51.616"></status>
 </suite>
 <statistics>
 <total>
@@ -42,8 +42,5 @@
 </suite>
 </statistics>
 <errors>
-<msg timestamp="20190711 15:06:32.335" level="ERROR">Error in file 'C:\Users\yanng\Documents\STF569_RobotFramework\SRV\UETAG\PlatUeIdentity.robot': Resource file 'environment\variables.txt' does not exist.</msg>
-<msg timestamp="20190711 15:06:32.337" level="ERROR">Error in file 'C:\Users\yanng\Documents\STF569_RobotFramework\SRV\UETAG\PlatUeIdentity.robot': Resource file 'resources\GenericKeywords.robot' does not exist.</msg>
-<msg timestamp="20190711 15:06:32.672" level="ERROR">Error in file 'C:\Users\yanng\Documents\STF569_RobotFramework\SRV\UETAG\PlatUeIdentity.robot': Resolving variable '${MEC-APP_SCHEMA}' failed: Variable '${MEC}' not found.</msg>
 </errors>
 </robot>
diff --git a/outputs/report.html b/outputs/report.html
index 3386a6da9ed454d35e6a4a6fc4d9e113de60c623..f1736b133365b47e199eec1a714edba31560ea64 100644
--- a/outputs/report.html
+++ b/outputs/report.html
@@ -1585,7 +1585,7 @@ storage = function () {
 window.output = {};
 </script>
 <script type="text/javascript">
-window.output["suite"] = [1,2,3,0,[],[0,0,376],[],[[4,0,1,5,[6,7],[0,366,3,8],[]],[9,0,1,10,[6,11],[0,370,3,12],[]]],[],[2,0,2,0]];
+window.output["suite"] = [1,2,3,0,[],[0,0,419],[],[[4,0,1,5,[6,7],[0,378,20,8],[]],[9,0,1,10,[6,11],[0,405,3,12],[]]],[],[2,0,2,0]];
 </script>
 <script type="text/javascript">
 window.output["strings"] = [];
@@ -1597,10 +1597,10 @@ window.output["strings"] = window.output["strings"].concat(["*","*PlatUeIdentity
 window.output["stats"] = [[{"elapsed":"00:00:00","fail":2,"label":"Critical Tests","pass":0},{"elapsed":"00:00:00","fail":2,"label":"All Tests","pass":0}],[{"elapsed":"00:00:00","fail":2,"label":"TP_MEC_SRV_UETAG","pass":0},{"elapsed":"00:00:00","fail":1,"label":"TP_MEC_SRV_UETAG_001_OK","pass":0},{"elapsed":"00:00:00","fail":1,"label":"TP_MEC_SRV_UETAG_002_OK","pass":0}],[{"elapsed":"00:00:00","fail":2,"id":"s1","label":"PlatUeIdentity","name":"PlatUeIdentity","pass":0}]];
 </script>
 <script type="text/javascript">
-window.output["baseMillis"] = 1562850392308;
+window.output["baseMillis"] = 1562851431197;
 </script>
 <script type="text/javascript">
-window.output["generated"] = 386;
+window.output["generated"] = 438;
 </script>
 <script type="text/javascript">
 window.settings = {"background":{"fail":"#f66","nonCriticalFail":"#9e9","pass":"#9e9"},"logURL":"log.html","rpa":false,"title":""};
diff --git a/resources/GenericKeywords.robot b/resources/GenericKeywords.robot
index d74e59319a95608ce42d31e8e0c921cf00bb6506..755ecdf4426ce71fc6c232efb81270a601d3f064 100644
--- a/resources/GenericKeywords.robot
+++ b/resources/GenericKeywords.robot
@@ -1,5 +1,5 @@
 *** Settings ***
-Resource    environment/variables.txt
+Resource    ../environment/variables.txt
 Resource    GenericKeywords.robot
 Library    REST    ${MEC-APP_SCHEMA}://${MEC-APP_HOST}:${MEC-APP_PORT}    ssl_verify=false
 Library    JSONSchemaLibrary    schemas/
@@ -18,7 +18,6 @@ Check HTTP Response Status Code Is
     Should Be Equal    ${response['status']}    ${status}
     Log    Status code validated
 
-
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
     Should Contain    ${response['headers']['Content-Type']}    application/json
@@ -41,7 +40,7 @@ Should Be Present In Json List
     Log    Item found ${item}
     [return]    ${item}
 
-Check tag user
+Check User Identity Tag state
     [Arguments]    ${ue_identity_tag}    ${state}
     Log    Check ueIdentityTag state
     Set Headers    {"Accept":"application/json"}