diff --git a/ccsrc/Protocols/Json/json_codec.cc b/ccsrc/Protocols/Json/json_codec.cc
index 0793b414983c426a8ece74269aea3b67b7166499..dbb523e3a7b2574c172000999e29c1dd9acd08ea 100644
--- a/ccsrc/Protocols/Json/json_codec.cc
+++ b/ccsrc/Protocols/Json/json_codec.cc
@@ -56,7 +56,8 @@ int json_codec::decode (const OCTETSTRING& p_data, LibItsHttp__JsonMessageBodyTy
       return -1;
     }
   }
-  
+  loggers::get_instance().log("json_codec::decode: decode_str=%s", it->second.c_str());
+
   TTCN_EncDec::set_error_behavior(TTCN_EncDec::ET_ALL, TTCN_EncDec::EB_DEFAULT);
   TTCN_EncDec::clear_error();
   // Remove data structure name...
diff --git a/etc/AtsMec/AtsMec_AdvantEDGE.cfg b/etc/AtsMec/AtsMec_AdvantEDGE.cfg
index 86958ff9590fb146ec08cce59e8af5c4b014866f..3ef1653be2f4a0bef7237a654e76c6fb3befc70e 100644
--- a/etc/AtsMec/AtsMec_AdvantEDGE.cfg
+++ b/etc/AtsMec/AtsMec_AdvantEDGE.cfg
@@ -84,7 +84,7 @@ system.httpPort_notif.params := "HTTP(codecs=json:json_codec)/TCP(debug=1,server
 #AtsMec_UEidentityAPI_TestCases.TC_MEC_SRV_UETAG_002_PF
 
 # ETSI GS MEC 013
-AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UELOCLOOK_001_OK
+#AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UELOCLOOK_001_OK
 #AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UELOCLOOK_001_BR
 #AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UELOCLOOK_001_NF
 
@@ -107,7 +107,8 @@ AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UELOCLOOK_001_OK
 #AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UEINFSUB_002_OK
 #AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UEINFSUB_002_NF
 
-#AtsMec_RadioNodeLocationAPI_TestCases.TP_MEC_SRV_RLOCLOOK_001_OK
+AtsMec_RadioNodeLocationAPI_TestCases.TC_MEC_SRV_RLOCLOOK_001_OK
+AtsMec_RadioNodeLocationAPI_TestCases.TC_MEC_SRV_RLOCLOOK_001_NF
 
 #AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_011_OK
 #AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_012_OK
diff --git a/scripts/mec_generate_makefile.bash b/scripts/mec_generate_makefile.bash
index 2cb9adae5f441e4bc805db5b2b57e490eae1c112..8553a04847d4c8e025f36a3173d76dcf3da1771e 100755
--- a/scripts/mec_generate_makefile.bash
+++ b/scripts/mec_generate_makefile.bash
@@ -52,7 +52,7 @@ find .. -type f -name "*.bak" -exec rm {} \;
 find .. -type f -name "*.log" -exec rm {} \;
 
 # Build JSON files if any and put them in objs directory
-REFERENCES="LibCommon LibHttp LibMec LibMec/LocationAPI LibMec/RnisAPI LibMec/UEidentityAPI LibMec/BwManagementAPI"
+REFERENCES="LibCommon LibHttp LibMec LibMec/Ams LibMec/AppEna LibMec/AppLCM LibMec/BwManagementAPI LibMec/FixedAccessInformationAPI LibMec/Grant LibMec/LocationAPI LibMec/MeoPkgm LibMec/MepmPkgm LibMec/RnisAPI LibMec/UEidentityAPI"
 for i in ${REFERENCES}
 do
     # TTCN code
diff --git a/ttcn/AtsMec/AtsMec_LocationAPI_TestCases.ttcn b/ttcn/AtsMec/AtsMec_LocationAPI_TestCases.ttcn
index 771b77e3d7fe4186a106d8a569eac44d1d4345dc..36db95b730b280b6f6b98399e62b15d97fd23a56 100644
--- a/ttcn/AtsMec/AtsMec_LocationAPI_TestCases.ttcn
+++ b/ttcn/AtsMec/AtsMec_LocationAPI_TestCases.ttcn
@@ -771,7 +771,7 @@ module AtsMec_LocationAPI_TestCases {
       httpPort.send(
                     m_http_request(
                                    m_http_request_get(
-                                                      "/" & PICS_ROOT_API & PX_ME_APP_Q_USERS_LIST_URI & "/invalid/" & oct2char(unichar2oct(PX_USER, "UTF-8")),
+                                                      "/" & PICS_ROOT_API & PX_ME_APP_Q_USERS_LIST_URI/* & "/invalid/"*/ & oct2char(unichar2oct(PX_USER, "UTF-8")),
                                                       v_headers
                                                       )
                                    )
diff --git a/ttcn/AtsMec/AtsMec_RadioNodeLocationAPI_TestCases.ttcn b/ttcn/AtsMec/AtsMec_RadioNodeLocationAPI_TestCases.ttcn
index 82457819664d4ac729357e2cf6b116059dbe076b..4ecc01d8b478853e53fc8664750c8fda322d75ad 100644
--- a/ttcn/AtsMec/AtsMec_RadioNodeLocationAPI_TestCases.ttcn
+++ b/ttcn/AtsMec/AtsMec_RadioNodeLocationAPI_TestCases.ttcn
@@ -67,7 +67,7 @@ module AtsMec_RadioNodeLocationAPI_TestCases {
         httpPort.send(
                       m_http_request(
                                      m_http_request_get(
-                                                        PX_ME_APP_Q_ZONE_ID_URI & "/" & oct2char(unichar2oct(PX_ZONE_ID, "UTF-8")) & "/accessPoints",
+                                                        "/" & PICS_ROOT_API & PX_ME_APP_Q_ZONE_ID_URI & "/" & oct2char(unichar2oct(PX_ZONE_ID, "UTF-8")) & "/accessPoints",
                                                         v_headers
                                                         )
                                      )
@@ -1003,7 +1003,7 @@ module AtsMec_RadioNodeLocationAPI_TestCases {
       httpPort.send(
                     m_http_request(
                                    m_http_request_post(
-                                                       "/" & PICS_ROOT_API & oct2char(unichar2oct(PX_UE_ZONAL_TRAF_SUB_URI, "UTF-8")),
+                                                       "/" & PICS_ROOT_API & PX_UE_ZONAL_TRAF_SUB_URI,
                                                        v_headers,
                                                        m_http_message_body_json(
                                                                                 m_body_json_zonal_traffic_subscription(