diff --git a/MEC016/MEO/UEAPPCTX/SysUeAppsContext.robot b/MEC016/MEO/UEAPPCTX/SysUeAppsContext.robot
index dae88eea41420529de7862e002cae7bcca98b604..5766d4be5e82e8da9b1021b4e5d47ad3964e6989 100644
--- a/MEC016/MEO/UEAPPCTX/SysUeAppsContext.robot
+++ b/MEC016/MEO/UEAPPCTX/SysUeAppsContext.robot
@@ -79,7 +79,7 @@ TC_MEC_MEC016_MEO_UEAPPCTX_002_BR
     [Setup]    Create application context    AppContext.json
     Set Suite Variable    ${contextId_tbu}    ${response['body']['contextId']}
 
-    Update application context    ${context-id}    UpdateAppContext_BR.json
+    Update application context    ${contextId_tbu}    UpdateAppContext_BR.json
     Check HTTP Response Status Code Is    400
 
     [Teardown]    Delete application context    ${contextId_tbu}
@@ -106,7 +106,11 @@ TC_MEC_MEC016_MEO_UEAPPCTX_003_OK
     # Preamble
     Should Be True    ${PIC_MEC_SYSTEM} == 1
     Should Be True    ${PIC_SERVICES} == 1
-    Delete application context    ${context-id}
+    
+    [Setup]    Create application context    AppContext.json
+    Set Suite Variable    ${contextId_tbd}    ${response['body']['contextId']}
+
+    Delete application context    ${contextId_tbd}
     Check HTTP Response Status Code Is    204
 
 
diff --git a/MEC021/SRV/AMS/environment/variables.txt b/MEC021/SRV/AMS/environment/variables.txt
index af30adf4c6d0cb4fb9ade3077238eb63af920563..ce533f359b3b49c6e1b1f7ed0e43b15c32a20c4b 100644
--- a/MEC021/SRV/AMS/environment/variables.txt
+++ b/MEC021/SRV/AMS/environment/variables.txt
@@ -1,8 +1,8 @@
 *** Variables ***
 # Generic variables
 ${AMS_SCHEMA}                   http
-${AMS_HOST}                     10.192.2.172
-${AMS_PORT}                     8081
+${AMS_HOST}                     mockoon
+${AMS_PORT}                     3006
 ${response}                         {}
 ${TOKEN}                            Basic YWxhZGRpbjpvcGVuc2VzYW1l
 ${apiRoot}        
diff --git a/MEC030/SRV/V2X/jsons/V2XDistributionServers_BR.json b/MEC030/SRV/V2X/jsons/V2XDistributionServers_BR.json
index 70139860b6bcfaa3bb8c733a2d29de78de05b425..1362c1b9a11646fffc9cc25b65a45e44ec5476bf 100644
--- a/MEC030/SRV/V2X/jsons/V2XDistributionServers_BR.json
+++ b/MEC030/SRV/V2X/jsons/V2XDistributionServers_BR.json
@@ -40,7 +40,7 @@
                         1,
                         2
                     ],
-                    "protImplementation": "Java"
+                    "protImplementation": "cpp"
                 }
             },
             {
diff --git a/MEC033/MEX/IOTS/IOTDEV/RegisteredDevices.robot b/MEC033/MEX/IOTS/IOTDEV/RegisteredDevices.robot
index 675c44573eb8ce8378c7e337f7a584ce465c7c9c..3c2220824109662d6b2b3eb79e397bde9e810cb3 100644
--- a/MEC033/MEX/IOTS/IOTDEV/RegisteredDevices.robot
+++ b/MEC033/MEX/IOTS/IOTDEV/RegisteredDevices.robot
@@ -1,4 +1,4 @@
-Y''[Documentation]   robot --outputdir ../../../outputs ./RegisteredDevices.robot
+''[Documentation]   robot --outputdir ../../../outputs ./RegisteredDevices.robot
 ...    Test Suite to validate the Registered IOT Device (IOTDEV) operations.
 
 *** Settings ***