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/AMSService.robot b/MEC021/SRV/AMS/AMSService.robot
index 25ed72c2927516c9b76f9759b989403bf97ebabb..27a88f5d06c805043ac2ad75706550b684f14e51 100644
--- a/MEC021/SRV/AMS/AMSService.robot
+++ b/MEC021/SRV/AMS/AMSService.robot
@@ -9,69 +9,174 @@ Library     REST    ${AMS_SCHEMA}://${AMS_HOST}:${AMS_PORT}    ssl_verify=false
 Library     BuiltIn
 Library     OperatingSystem
 Library     MockServerLibrary
-
-
+Library     Collections
 
 
 *** Test Cases ***
-TC_MEC_MEC021_SRV_AMS_001_OK
+
+# Get    ${apiRoot}/${apiName}/${apiVersion}/app_mobility_services
+TC_MEC_MEC021_SRV_AMS_001_OK_01
     [Documentation]  Request Registered AMS information 
     ...  Check that the AMS service returns information about the registered application mobility services when requested
-    ...  ETSI GS MEC 021 2.0.8, clause 8.3.3.1
+    ...  ETSI GS MEC 021 3.3.1, clause 8.3.3.1
+    ...  Reference https://forge.etsi.org/rep/mec/gs021-amsi-api/-/blob/master/MEC021_AppMobilityService.yaml
     [Tags]    PIC_AMS    INCLUDE_UNDEFINED_SCHEMAS
+
+    [Setup]    Create two new application mobility service      ${APP_MOBILITY_SERVICE_ID}    ${APP_INS_ID}    ${APP_MOBILITY_SERVICE_ID2}    ${APP_INS_ID}
+
     Get Registered AMS information
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is   AppMobilityServiceInfos
 
+    FOR    ${app}    IN    @{response['body']}
+        ${passed_appMobilityServiceId}    Run Keyword And Return Status    Should Be Equal As Strings  ${app['appMobilityServiceId']}    ${APP_MOBILITY_SERVICE_ID} 
+        ${passed_appInstanceId}    Run Keyword And Return Status    Should Be Equal As Strings  ${app['serviceConsumerId']['appInstanceId']}    ${APP_INS_ID}  
+        Exit For Loop If    ${passed_appMobilityServiceId} and ${passed_appInstanceId}
+    END
 
-TC_MEC_MEC021_SRV_AMS_002_OK
-    [Documentation]   Request Registered AMS information using attribute-selector
+    Should be True    ${passed_appMobilityServiceId}
+    Should be True    ${passed_appInstanceId}
+
+    FOR    ${app}    IN    @{response['body']}
+        ${passed_appMobilityServiceId}    Run Keyword And Return Status    Should Be Equal As Strings  ${app['appMobilityServiceId']}    ${APP_MOBILITY_SERVICE_ID2} 
+        ${passed_appInstanceId}    Run Keyword And Return Status    Should Be Equal As Strings  ${app['serviceConsumerId']['appInstanceId']}    ${APP_INS_ID}  
+        Exit For Loop If    ${passed_appMobilityServiceId} and ${passed_appInstanceId}
+    END
+
+    Should be True    ${passed_appMobilityServiceId}
+    Should be True    ${passed_appInstanceId}
+
+    [TearDown]    Delete two specific AMS services    ${APP_MOBILITY_SERVICE_ID}    ${APP_MOBILITY_SERVICE_ID2}
+
+TC_MEC_MEC021_SRV_AMS_001_OK_02
+    [Documentation]  Request Registered AMS information 
     ...  Check that the AMS service returns information about the registered application mobility services when requested
-    ...  ETSI GS MEC 021 2.0.8, clause 8.3.3.1
+    ...  ETSI GS MEC 021 3.3.1, clause 8.3.3.1
+    ...  Reference https://forge.etsi.org/rep/mec/gs021-amsi-api/-/blob/master/MEC021_AppMobilityService.yaml
     [Tags]    PIC_AMS    INCLUDE_UNDEFINED_SCHEMAS
-    Get Registered AMS information using attribute-selector    appMobilityServiceId    ${APP_MOBILITY_SERVICE_ID}
+
+    [Setup]    Create two new application mobility service      ${APP_MOBILITY_SERVICE_ID}    ${APP_INS_ID}    ${APP_MOBILITY_SERVICE_ID2}    ${APP_INS_ID}
+
+    Get Registered AMS information using attribute-selector    filter    ${APP_MOBILITY_SERVICE_FILTER_APP_MOBILITY_SERVICE_ID}
     Check HTTP Response Status Code Is    200
-    Check HTTP Response Body Json Schema Is   AppMobilityServiceInfos
-    Check Result Contains    ${response['body']['AppMobilityServiceInfo']}    appMobilityServiceId    ${APP_MOBILITY_SERVICE_ID}
-    
+    Check HTTP Response Body Json Schema Is    AppMobilityServiceInfos
+
+    FOR    ${app}    IN    @{response['body']}
+        ${passed_appMobilityServiceId}    Run Keyword And Return Status    Should Be Equal As Strings  ${app['appMobilityServiceId']}    ${APP_MOBILITY_SERVICE_ID} 
+        ${passed_appInstanceId}    Run Keyword And Return Status    Should Be Equal As Strings  ${app['serviceConsumerId']['appInstanceId']}    ${APP_INS_ID}  
+        Exit For Loop If    ${passed_appMobilityServiceId} and ${passed_appInstanceId}
+    END
+
+    Should be True    ${passed_appMobilityServiceId}
+    Should be True    ${passed_appInstanceId}
+
+    [TearDown]    Delete two specific AMS services    ${APP_MOBILITY_SERVICE_ID}    ${APP_MOBILITY_SERVICE_ID2}
+
+
+TC_MEC_MEC021_SRV_AMS_001_OK_03
+    [Documentation]  Request Registered AMS information 
+    ...  Check that the AMS service returns information about the a specific registered application mobility service when requested - filter
+    ...  ETSI GS MEC 021 3.3.1, clause 8.3.3.1
+    ...  Reference https://forge.etsi.org/rep/mec/gs021-amsi-api/-/blob/master/MEC021_AppMobilityService.yaml
+    [Tags]    PIC_AMS    INCLUDE_UNDEFINED_SCHEMAS
+
+    [Setup]    Create two new application mobility service      ${APP_MOBILITY_SERVICE_ID}    ${APP_INS_ID}    ${APP_MOBILITY_SERVICE_ID2}    ${APP_INS_ID}
+
+    Get Registered AMS information using attribute-selector    filter    ${APP_MOBILITY_SERVICE_FILTER_SERVICE_CONSUMER_ID}
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is    AppMobilityServiceInfos
+
+    FOR    ${app}    IN    @{response['body']}
+        ${passed_appMobilityServiceId}    Run Keyword And Return Status    Should Be Equal As Strings  ${app['appMobilityServiceId']}    ${APP_MOBILITY_SERVICE_ID} 
+        ${passed_appInstanceId}    Run Keyword And Return Status    Should Be Equal As Strings  ${app['serviceConsumerId']['appInstanceId']}    ${APP_INS_ID}  
+        Exit For Loop If    ${passed_appMobilityServiceId} and ${passed_appInstanceId}
+    END
+
+    [TearDown]    Delete two specific AMS services    ${APP_MOBILITY_SERVICE_ID}    ${APP_MOBILITY_SERVICE_ID2}
+
+
+TC_MEC_MEC021_SRV_AMS_001_OK_04
+    [Documentation]  Request Registered AMS information 
+    ...  Check that the AMS service returns information about the a specific registered application mobility service when requested - filter
+    ...  ETSI GS MEC 021 3.3.1, clause 8.3.3.1
+    ...  Reference https://forge.etsi.org/rep/mec/gs021-amsi-api/-/blob/master/MEC021_AppMobilityService.yaml
+    [Tags]    PIC_AMS    INCLUDE_UNDEFINED_SCHEMAS
+
+    [Setup]    Create two new application mobility service      ${APP_MOBILITY_SERVICE_ID}    ${APP_INS_ID}    ${APP_MOBILITY_SERVICE_ID2}    ${APP_INS_ID}
+
+    Get Registered AMS information using attribute-selector    filter    ${APP_MOBILITY_SERVICE_FILTER_EXCLUDE_FIELDS}
+    Check HTTP Response Status Code Is    200
+    #Check HTTP Response Body Json Schema Is    AppMobilityServiceInfos
+
+    FOR    ${app}    IN    @{response['body']}
+        Should Be Equal As Strings  ${app['appMobilityServiceId']}    ${APP_MOBILITY_SERVICE_ID} 
+        Should Not Contain    ${app}    serviceConsumerId
+    END
+
+    [TearDown]    Delete two specific AMS services    ${APP_MOBILITY_SERVICE_ID}    ${APP_MOBILITY_SERVICE_ID2}
+
+#TC_MEC_MEC021_SRV_AMS_001_OK_05
+#    [Documentation]  Request Registered AMS information 
+#    ...  Check that the AMS service returns information about the registered application mobility services when requested - No registered application mobility service
+#    ...  ETSI GS MEC 021 3.3.1, clause 8.3.3.1
+#    ...  Reference https://forge.etsi.org/rep/mec/gs021-amsi-api/-/blob/master/MEC021_AppMobilityService.yaml
+#    [Tags]    PIC_AMS    INCLUDE_UNDEFINED_SCHEMAS
+
+
 
 TC_MEC_MEC021_SRV_AMS_001_BR
     [Documentation]    Request Registered AMS information using bad parameters
     ...  Check that the AMS service returns an error when receives a query about a registered application mobility service with wrong parameters
-    ...  ETSI GS MEC 021 2.0.8, clause 8.3.3.1
+    ...  ETSI GS MEC 021 3.3.1, clause 8.3.3.1
+    ...  Reference https://forge.etsi.org/rep/mec/gs021-amsi-api/-/blob/master/MEC021_AppMobilityService.yaml
     [Tags]    PIC_AMS    INCLUDE_UNDEFINED_SCHEMAS
     Get Registered AMS information using bad parameters
     Check HTTP Response Status Code Is    400
 
 
-TC_MEC_MEC021_SRV_AMS_003_OK
+# Post    ${apiRoot}/${apiName}/${apiVersion}/app_mobility_services
+TC_MEC_MEC021_SRV_AMS_002_OK
     [Documentation]   Register a new application mobility services
     ...  Check that the AMS service creates a new application mobility services when requested
-    ...  ETSI GS MEC 021 2.0.8, clause 8.3.3.4
+    ...  ETSI GS MEC 021 3.3.1, clause 8.3.3.4
+    ...  Reference https://forge.etsi.org/rep/mec/gs021-amsi-api/-/blob/master/MEC021_AppMobilityService.yaml
     [Tags]    PIC_AMS    INCLUDE_UNDEFINED_SCHEMAS
-    Create a new application mobility service      RegistrationInfo
+    Create a new application mobility service      ${APP_MOBILITY_SERVICE_ID}    ${APP_INS_ID}      
     Check HTTP Response Status Code Is    201
     Check HTTP Response Body Json Schema Is    AppMobilityServiceInfo
-    Log    Checking Postcondition
-    Check Result Contains    ${response['body']['AppMobilityServiceInfo']['registeredAppMobilityService']['serviceConsumerId']['']}    appInstanceId    ${APP_INS_ID}
-    
+    Should Be Equal As Strings  ${response['body']['appMobilityServiceId']}    ${APP_MOBILITY_SERVICE_ID}   
+    Should Be Equal As Strings  ${response['body']['serviceConsumerId']['appInstanceId']}    ${APP_INS_ID}  
+
+
+TC_MEC_MEC021_SRV_AMS_002_BR
+    [Documentation]    Request Registered AMS information using bad parameters
+    ...  Check that the AMS service returns an error when receives a query about a registered application mobility service with wrong parameters
+    ...  ETSI GS MEC 021 3.3.1, clause 8.3.3.4
+    ...  Reference https://forge.etsi.org/rep/mec/gs021-amsi-api/-/blob/master/MEC021_AppMobilityService.yaml
+    [Tags]    PIC_AMS    INCLUDE_UNDEFINED_SCHEMAS
+
+
+ 
 
 TC_MEC_MEC021_SRV_AMS_003_BR
     [Documentation]   Register an UE Identity Tag using invalid parameter
     ...  Check that the AMS service sends an error when it receives a malformed request to create a new application mobility service
-    ...  ETSI GS MEC 021 2.0.8, clause 8.3.3.4
+    ...  ETSI GS MEC 021 3.3.1, clause 8.3.3.4
+    ...  Reference https://forge.etsi.org/rep/mec/gs021-amsi-api/-/blob/master/MEC021_AppMobilityService.yaml
     [Tags]    PIC_AMS    INCLUDE_UNDEFINED_SCHEMAS
-    Create a new application mobility service    RegistrationInfoMalformed
+    Create a new application mobility service    ${MALFORMED_APP_MOBILITY_SERVICE_ID}    
     Check HTTP Response Status Code Is    400
 
 
+# Get    ${apiRoot}/${apiName}/${apiVersion}/subscriptions
 TC_MEC_MEC021_SRV_AMS_004_OK
     [Documentation]   Request Subscriptions List for the registered AMS services
     ...  Check that the AMS service returns information about the available subscriptions when requested.
     ...     Permitted SUBSCRIPTION_TYPE are:
     ...     - MobilityProcedureSubscription
     ...     - AdjacentAppInfoSubscription"
-    ...  ETSI GS MEC 021 2.0.8, clause 8.6.3.1
+    ...  ETSI GS MEC 021 3.3.1, clause 8.6.3.1
+    ...  Reference https://forge.etsi.org/rep/mec/gs021-amsi-api/-/blob/master/MEC021_AppMobilityService.yaml
     [Tags]    PIC_AMS    INCLUDE_UNDEFINED_SCHEMAS
     Get Subscriptions for registered AMS
     Check HTTP Response Status Code Is    200
@@ -82,19 +187,22 @@ TC_MEC_MEC021_SRV_AMS_004_OK
 TC_MEC_MEC021_SRV_AMS_004_BR
     [Documentation]   Request Subscription List for registered AMS Services using wrong attribute parameters
     ...  Check that the AMS service sends an error when it receives a malformed query about the available subscriptions
+    ...  ETSI GS MEC 021 3.3.1, clause 8.6.3.1
+    ...  Reference https://forge.etsi.org/rep/mec/gs021-amsi-api/-/blob/master/MEC021_AppMobilityService.yaml
     [Tags]    PIC_AMS    INCLUDE_UNDEFINED_SCHEMAS
     Get Subscriptions for registered AMS with wrong attbirube parameter
     Check HTTP Response Status Code Is    400
 
 
-
+# Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions
 TC_MEC_MEC021_SRV_AMS_005_OK
     [Documentation]   Create a notification subscription
     ...  Check that the AMS service creates a notification subscriptions when requested.
     ...     Permitted SUBSCRIPTION_TYPE are:
     ...     - MobilityProcedureSubscription
     ...     - AdjacentAppInfoSubscription"
-    ...  ETSI GS MEC 021 2.0.8, clause 8.6.3.4
+    ...  ETSI GS MEC 021 3.3.1, clause 8.6.3.4
+    ...  Reference https://forge.etsi.org/rep/mec/gs021-amsi-api/-/blob/master/MEC021_AppMobilityService.yaml
     [Tags]    PIC_AMS    INCLUDE_UNDEFINED_SCHEMAS
     Post a new notification subscription    NotificationSubscription
     Check HTTP Response Status Code Is    201
@@ -107,20 +215,22 @@ TC_MEC_MEC021_SRV_AMS_005_BR
     ...     Permitted SUBSCRIPTION_TYPE are:
     ...     - MobilityProcedureSubscription
     ...     - AdjacentAppInfoSubscription"
-    ...  ETSI GS MEC 021 2.0.8, clause 8.6.3.4
+    ...  ETSI GS MEC 021 3.3.1, clause 8.6.3.4
+    ...  Reference https://forge.etsi.org/rep/mec/gs021-amsi-api/-/blob/master/MEC021_AppMobilityService.yaml
     [Tags]    PIC_AMS    INCLUDE_UNDEFINED_SCHEMAS
     Post a new notification subscription    NotificationSubscriptionError
     Check HTTP Response Status Code Is    400
 
 
-
+# Get    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${content}
 TC_MEC_MEC021_SRV_AMS_006_OK
     [Documentation]   Request a specific subscription
     ...  Check that the AMS service returns information about a given subscription when requested.
     ...     Permitted SUBSCRIPTION_TYPE are:
     ...     - MobilityProcedureSubscription
     ...     - AdjacentAppInfoSubscription"
-    ...  ETSI GS MEC 021 2.0.8, clause 8.7.3.1
+    ...  ETSI GS MEC 021 3.3.1, clause 8.7.3.1
+    ...  Reference https://forge.etsi.org/rep/mec/gs021-amsi-api/-/blob/master/MEC021_AppMobilityService.yaml
     [Tags]    PIC_AMS    INCLUDE_UNDEFINED_SCHEMAS
     Get individual subscription for AMS services    ${SUBSCRIPTION_ID}
     Check HTTP Response Status Code Is    200
@@ -131,19 +241,22 @@ TC_MEC_MEC021_SRV_AMS_006_OK
 TC_MEC_MEC021_SRV_AMS_006_NF
     [Documentation]   Request a specific subscription using wrong identifier
     ...  Check that the AMS service returns an error when receives a query about a not existing subscription
-    ...     ETSI GS MEC 021 2.0.8, clause 8.7.3.1
+    ...     ETSI GS MEC 021 3.3.1, clause 8.7.3.1
+    ...  Reference https://forge.etsi.org/rep/mec/gs021-amsi-api/-/blob/master/MEC021_AppMobilityService.yaml
     [Tags]    PIC_AMS    INCLUDE_UNDEFINED_SCHEMAS
     Get individual subscription for AMS services    ${NON_EXISTENT_SUBSCRIPTION_ID}
     Check HTTP Response Status Code Is    404
 
 
+# Put    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${identifier}
 TC_MEC_MEC021_SRV_AMS_007_OK
     [Documentation]   Modify a specific subscription
     ...  Check that the AMS service modifies a given subscription when requested.
     ...  Permitted SUBSCRIPTION_TYPE are:
     ...    - MobilityProcedureSubscription
     ...    - AdjacentAppInfoSubscription
-    ...  ETSI GS MEC 021 2.0.8, clause 8.7.3.2
+    ...  ETSI GS MEC 021 3.3.1, clause 8.7.3.2
+    ...  Reference https://forge.etsi.org/rep/mec/gs021-amsi-api/-/blob/master/MEC021_AppMobilityService.yaml
     [Tags]    PIC_AMS    INCLUDE_UNDEFINED_SCHEMAS
     Update individual subscription for AMS services    ${SUBSCRIPTION_ID}    NotificationSubscription
     Check HTTP Response Status Code Is    200
@@ -157,7 +270,8 @@ TC_MEC_MEC021_SRV_AMS_007_BR
     ...  Permitted SUBSCRIPTION_TYPE are:
     ...    - MobilityProcedureSubscription
     ...    - AdjacentAppInfoSubscription
-    ...  ETSI GS MEC 021 2.0.8, clause 8.7.3.2
+    ...  ETSI GS MEC 021 3.3.1, clause 8.7.3.2
+    ...  Reference https://forge.etsi.org/rep/mec/gs021-amsi-api/-/blob/master/MEC021_AppMobilityService.yaml
     [Tags]    PIC_AMS    INCLUDE_UNDEFINED_SCHEMAS
     Update individual subscription for AMS services    ${SUBSCRIPTION_ID}    NotificationSubscriptionError
     Check HTTP Response Status Code Is    400
@@ -166,16 +280,19 @@ TC_MEC_MEC021_SRV_AMS_007_BR
 TP_MEC_MEC021_SRV_AMS_007_NF
     [Documentation]   Modify a specific subscription using wrong identifier
     ...  Check that the AMS service sends an error when it receives a modify request for a not existing subscription.
-    ...  ETSI GS MEC 021 2.0.8, clause 8.7.3.2
+    ...  ETSI GS MEC 021 3.3.1, clause 8.7.3.2
+    ...  Reference https://forge.etsi.org/rep/mec/gs021-amsi-api/-/blob/master/MEC021_AppMobilityService.yaml
     [Tags]    PIC_AMS    INCLUDE_UNDEFINED_SCHEMAS
     Update individual subscription for AMS services    ${NON_EXISTENT_SUBSCRIPTION_ID}    NotificationSubscription
     Check HTTP Response Status Code Is    404
 
 
+# Delete    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${content}
 TC_MEC_MEC021_SRV_AMS_008_OK
     [Documentation]   Remove a specific subscription
     ...  Check that the AMS service deletes a given subscription when requested
-    ...  ETSI GS MEC 021 2.0.8, clause 8.7.3.5
+    ...  ETSI GS MEC 021 3.3.1, clause 8.7.3.5
+    ...  Reference https://forge.etsi.org/rep/mec/gs021-amsi-api/-/blob/master/MEC021_AppMobilityService.yaml
     [Tags]    PIC_AMS    INCLUDE_UNDEFINED_SCHEMAS
     Delete individual subscription for AMS services    ${SUBSCRIPTION_ID}
     Check HTTP Response Status Code Is    204
@@ -184,28 +301,32 @@ TC_MEC_MEC021_SRV_AMS_008_OK
 TC_MEC_MEC021_SRV_AMS_008_NF
     [Documentation]   Remove a specific subscription using wrong identifier
     ...  Check that the AMS service sends an error when it receives a delete request for a not existing subscription
-    ...  ETSI GS MEC 021 2.0.8, clause 8.7.3.5
+    ...  ETSI GS MEC 021 3.3.1, clause 8.7.3.5
+    ...  Reference https://forge.etsi.org/rep/mec/gs021-amsi-api/-/blob/master/MEC021_AppMobilityService.yaml
     [Tags]    PIC_AMS    INCLUDE_UNDEFINED_SCHEMAS
     Delete individual subscription for AMS services    ${NON_EXISTENT_SUBSCRIPTION_ID}
     Check HTTP Response Status Code Is    404
 
 
+
 TC_MEC_MEC021_SRV_AMS_009_OK
     [Documentation]   Post Mobility Procedure Notification
     ...  Check that the AMS service sends an AMS notification  about a mobility procedure 
     ...    if the AMS service has an associated subscription and the event is generated
-    ...  ETSI GS MEC 021 2.0.8, clause 7.4.2
+    ...  ETSI GS MEC 021 3.3.1, clause 7.4.2
+    ...  Reference https://forge.etsi.org/rep/mec/gs021-amsi-api/-/blob/master/MEC021_AppMobilityService.yaml
     [Tags]    PIC_AMS    INCLUDE_UNDEFINED_SCHEMAS
-    ${json}=	Get File	schemas/MobilityProcedureNotification.schema.json
-    Log  Creating mock request and response to handle  Mobility Procedure Notification
-    &{req}=  Create Mock Request Matcher	POST  ${callback_endpoint}  body_type="JSON_SCHEMA"    body=${json}
-    &{rsp}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
-    Create Mock Expectation  ${req}  ${rsp}
-    Wait Until Keyword Succeeds    ${total_polling_time}   ${polling_interval}   Verify Mock Expectation    ${req}
-    Log  Verifying results
-    Verify Mock Expectation  ${req}
-    Log  Cleaning the endpoint
-    Clear Requests  ${callback_endpoint} 
+    Log    TBD
+#    ${json}=	Get File	schemas/MobilityProcedureNotification.schema.json
+#    Log  Creating mock request and response to handle  Mobility Procedure Notification
+#    &{req}=  Create Mock Request Matcher	POST  ${callback_endpoint}  body_type="JSON_SCHEMA"    body=${json}
+#    &{rsp}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
+#    Create Mock Expectation  ${req}  ${rsp}
+#    Wait Until Keyword Succeeds    ${total_polling_time}   ${polling_interval}   Verify Mock Expectation    ${req}
+#    Log  Verifying results
+#    Verify Mock Expectation  ${req}
+#    Log  Cleaning the endpoint
+#    Clear Requests  ${callback_endpoint} 
     
 
 
@@ -213,18 +334,20 @@ TC_MEC_MEC021_SRV_AMS_010_OK
     [Documentation]   Post Adjacent Application Info Notification
     ...  Check that the AMS service sends an AMS notification about adjacent application instances 
     ...    if the AMS service has an associated subscription and the event is generated
-    ...  ETSI GS MEC 021 2.0.8, clause 7.4.3
+    ...  ETSI GS MEC 021 3.3.1, clause 7.4.3
+    ...  Reference https://forge.etsi.org/rep/mec/gs021-amsi-api/-/blob/master/MEC021_AppMobilityService.yaml
     [Tags]    PIC_AMS    INCLUDE_UNDEFINED_SCHEMAS
-    ${json}=	Get File	schemas/AdjacentAppInfoNotification.schema.json
-    Log  Creating mock request and response to handle Adjacent Application Info Notification
-    &{req}=  Create Mock Request Matcher	POST  ${callback_endpoint}  body_type="JSON_SCHEMA"    body=${json}
-    &{rsp}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
-    Create Mock Expectation  ${req}  ${rsp}
-    Wait Until Keyword Succeeds    ${total_polling_time}   ${polling_interval}   Verify Mock Expectation    ${req}
-    Log  Verifying results
-    Verify Mock Expectation  ${req}
-    Log  Cleaning the endpoint
-    Clear Requests  ${callback_endpoint} 
+    Log    TBD
+#    ${json}=	Get File	schemas/AdjacentAppInfoNotification.schema.json
+#    Log  Creating mock request and response to handle Adjacent Application Info Notification
+#    &{req}=  Create Mock Request Matcher	POST  ${callback_endpoint}  body_type="JSON_SCHEMA"    body=${json}
+#    &{rsp}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
+#    Create Mock Expectation  ${req}  ${rsp}
+#    Wait Until Keyword Succeeds    ${total_polling_time}   ${polling_interval}   Verify Mock Expectation    ${req}
+#    Log  Verifying results
+#    Verify Mock Expectation  ${req}
+#    Log  Cleaning the endpoint
+#    Clear Requests  ${callback_endpoint} 
 
 
 
@@ -232,25 +355,28 @@ TC_MEC_MEC021_SRV_AMS_011_OK
     [Documentation]   Post Expire Notification
     ...  Check that the AMS service sends an AMS notification on subscription expiration
     ...    if the AMS service has an associated subscription and the event is generated
-    ...  ETSI GS MEC 021 2.0.8, clause 7.4.4
+    ...  ETSI GS MEC 021 3.3.1, clause 7.4.4
+    ...  Reference https://forge.etsi.org/rep/mec/gs021-amsi-api/-/blob/master/MEC021_AppMobilityService.yaml
     [Tags]    PIC_AMS    INCLUDE_UNDEFINED_SCHEMAS
-    ${json}=	Get File	schemas/ExpiryNotification.schema.json
-    Log  Creating mock request and response to handle Expire Notification
-    &{req}=  Create Mock Request Matcher	POST  ${callback_endpoint}  body_type="JSON_SCHEMA"    body=${json}
-    &{rsp}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
-    Create Mock Expectation  ${req}  ${rsp}
-    Wait Until Keyword Succeeds    ${total_polling_time}   ${polling_interval}   Verify Mock Expectation    ${req}
-    Log  Verifying results
-    Verify Mock Expectation  ${req}
-    Log  Cleaning the endpoint
-    Clear Requests  ${callback_endpoint} 
-
-
-
+    Log    TBD
+#    ${json}=	Get File	schemas/ExpiryNotification.schema.json
+#    Log  Creating mock request and response to handle Expire Notification
+#    &{req}=  Create Mock Request Matcher	POST  ${callback_endpoint}  body_type="JSON_SCHEMA"    body=${json}
+#    &{rsp}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
+#    Create Mock Expectation  ${req}  ${rsp}
+#    Wait Until Keyword Succeeds    ${total_polling_time}   ${polling_interval}   Verify Mock Expectation    ${req}
+#    Log  Verifying results
+#    Verify Mock Expectation  ${req}
+#    Log  Cleaning the endpoint
+#    Clear Requests  ${callback_endpoint} 
+
+
+# Get    ${apiRoot}/${apiName}/${apiVersion}/app_mobility_services/${amsId}
 TC_MEC_MEC021_SRV_AMS_012_OK
     [Documentation]   Request a specific AMS service
     ...  Check that the AMS service returns information about this individual application mobility service
     ...  ETSI GS MEC 021 2.0.10, clause 8.4.3.1
+    ...  Reference https://forge.etsi.org/rep/mec/gs021-amsi-api/-/blob/master/MEC021_AppMobilityService.yaml
     [Tags]    PIC_AMS    INCLUDE_UNDEFINED_SCHEMAS
     Get specific AMS service    ${APP_MOBILITY_SERVICE_ID}
     Check HTTP Response Status Code Is    200
@@ -262,21 +388,47 @@ TC_MEC_MEC021_SRV_AMS_012_NF
     [Documentation]   Request a specific AMS Service using non existent identifier
     ...  Check that the AMS service sends an error when receives a query about a not existing individual application mobility service
     ...  ETSI GS MEC 021 2.0.10, clause 8.4.3.1
+    ...  Reference https://forge.etsi.org/rep/mec/gs021-amsi-api/-/blob/master/MEC021_AppMobilityService.yaml
     [Tags]    PIC_AMS    INCLUDE_UNDEFINED_SCHEMAS
     Get specific AMS service     ${NON_EXISTENT_APP_MOBILITY_SERVICE_ID}
     Check HTTP Response Status Code Is    404
 
 
-
+# Put    ${apiRoot}/${apiName}/${apiVersion}/app_mobility_services/${amsId}
 TC_MEC_MEC021_SRV_AMS_013_OK
     [Documentation]   Modify a specific AMS service
     ...  Check that the AMS service modifies the individual application mobility service when requested
     ...  ETSI GS MEC 021 2.0.10, clause 8.4.3.2
+    ...  Reference https://forge.etsi.org/rep/mec/gs021-amsi-api/-/blob/master/MEC021_AppMobilityService.yaml
     [Tags]    PIC_AMS    INCLUDE_UNDEFINED_SCHEMAS
     Modify a specific AMS service    ${APP_MOBILITY_SERVICE_ID}     RegistrationInfo 
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    AppMobilityServiceInfo
-    Check Result Contains  ${response['registeredAppMobilityService']['serviceConsumerId']}  appInstanceId  ${APP_INS_ID}
+    Should Be Equal As Strings  ${response['body']['appMobilityServiceId']}    ${APP_MOBILITY_SERVICE_ID}
+    Should Be Equal As Strings  ${response['body']['serviceConsumerId']['appInstanceId']}    ${APP_MOBILITY_SERVICE_ID}            # from req
+    #Check Result Contains  ${response['registeredAppMobilityService']['serviceConsumerId']}  appInstanceId  ${APP_INS_ID}
+
+#ensure that {
+#    when {
+#       the IUT entity receives a vPUT containing 
+#            uri indicating value "/amsi/v1/app_mobility_services/{APP_MOBILITY_SERVICE_ID_1}",
+#            body containing
+#                RegistrationInfo containing
+#                    serviceConsumerId containing
+#                        appInstanceId indicating value NEW_APP_INS_ID_NEW_1;;;;
+#        from the AMS_CLIENT entity
+#    }
+#    then {
+#        the IUT entity sends a HTTP_RESPONSE containing
+#            status set to "200 OK",
+#            body containing
+#                RegistrationInfo containing
+#                    appMobilityServiceId indicating value APP_MOBILITY_SERVICE_ID_1,
+#                    serviceConsumerId containing
+#                        appInstanceId indicating value NEW_APP_INS_ID_NEW_1;;;;
+#        to the AMS_CLIENT entity
+#    }
+#}
 
 
 
@@ -284,6 +436,7 @@ TC_MEC_MEC021_SRV_AMS_013_NF
     [Documentation]   Modify a specific AMS Service using non existent identifier
     ...  Check that the AMS service sends an error when receives a request to modify a not existing individual application mobility service
     ...  ETSI GS MEC 021 2.0.10, clause 8.4.3.2
+    ...  Reference https://forge.etsi.org/rep/mec/gs021-amsi-api/-/blob/master/MEC021_AppMobilityService.yaml
     [Tags]    PIC_AMS    INCLUDE_UNDEFINED_SCHEMAS
     Modify a specific AMS service    ${NON_EXISTENT_APP_MOBILITY_SERVICE_ID}    RegistrationInfo 
     Check HTTP Response Status Code Is    404
@@ -293,16 +446,19 @@ TC_MEC_MEC021_SRV_AMS_013_BR
     [Documentation]   Modify a specific AMS Service using bad parameters
     ...  Check that the AMS service sends an error when receives a request to modify a individual application mobility service using bad parameters
     ...  ETSI GS MEC 021 2.0.10, clause 8.4.3.2
+    ...  Reference https://forge.etsi.org/rep/mec/gs021-amsi-api/-/blob/master/MEC021_AppMobilityService.yaml
     [Tags]    PIC_AMS    INCLUDE_UNDEFINED_SCHEMAS
     Modify a specific AMS service    ${APP_MOBILITY_SERVICE_ID}     RegistrationInfoWithError
     Check HTTP Response Status Code Is    400
 
 
+# Delete    ${apiRoot}/${apiName}/${apiVersion}/app_mobility_services/${amsId}
 TC_MEC_MEC021_SRV_AMS_014_OK
     [Documentation]   Remove a specific AMS service
     ...  Check that the AMS service de-register the individual application mobility service and delete the resource
     ...  that represents the individual application mobility service
     ...  ETSI GS MEC 021 2.0.10, clause 8.4.3.5
+    ...  Reference https://forge.etsi.org/rep/mec/gs021-amsi-api/-/blob/master/MEC021_AppMobilityService.yaml
     [Tags]    PIC_AMS    INCLUDE_UNDEFINED_SCHEMAS
     Delete specific AMS service    ${APP_MOBILITY_SERVICE_ID}
     Check HTTP Response Status Code Is    204
@@ -313,16 +469,18 @@ TC_MEC_MEC021_SRV_AMS_014_NF
     ...  Check that the AMS service sends an error when is requested to delete the resource
 	...		that represents the individual application mobility service
     ...  ETSI GS MEC 021 2.0.10, clause 8.4.3.5
+    ...  Reference https://forge.etsi.org/rep/mec/gs021-amsi-api/-/blob/master/MEC021_AppMobilityService.yaml
     [Tags]    PIC_AMS    INCLUDE_UNDEFINED_SCHEMAS
     Delete specific AMS service     ${NON_EXISTENT_APP_MOBILITY_SERVICE_ID}
     Check HTTP Response Status Code Is    404
 
 
-
+# POST    ${apiRoot}/${apiName}/${apiVersion}/appMobilityServices/${amsId}/deregisterTask
 TC_MEC_MEC021_SRV_AMS_015_OK
     [Documentation]   Request to deregister a specific AMS service
     ...  Check that the AMS service deregister an individual application mobility service on expiry of the timer associated with the service
     ...  ETSI GS MEC 021 2.0.10, clause 8.5.3.4
+    ...  Reference https://forge.etsi.org/rep/mec/gs021-amsi-api/-/blob/master/MEC021_AppMobilityService.yaml
     [Tags]    PIC_AMS    INCLUDE_UNDEFINED_SCHEMAS
     Deregister specific AMS service    ${APP_MOBILITY_SERVICE_ID}
     Check HTTP Response Status Code Is    204
@@ -333,6 +491,7 @@ TC_MEC_MEC021_SRV_AMS_015_NF
     [Documentation]   Request to deregister a specific AMS service using non existent identifier
     ...  Check that the AMS service send an error when is requested to deregister a not existent individual application mobility service
     ...  ETSI GS MEC 021 2.0.10, clause 8.5.3.4
+    ...  Reference https://forge.etsi.org/rep/mec/gs021-amsi-api/-/blob/master/MEC021_AppMobilityService.yaml
     [Tags]    PIC_AMS    INCLUDE_UNDEFINED_SCHEMAS
     Deregister specific AMS service     ${NON_EXISTENT_APP_MOBILITY_SERVICE_ID}
     Check HTTP Response Status Code Is    404
@@ -341,7 +500,7 @@ TC_MEC_MEC021_SRV_AMS_015_NF
 Get Registered AMS information
     Set Headers    {"Accept":"application/json"}
     Set Headers    {"Authorization":"${TOKEN}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/appMobilityServices
+    Get    ${apiRoot}/${apiName}/${apiVersion}/app_mobility_services
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -349,7 +508,7 @@ Get Registered AMS information using attribute-selector
     [Arguments]    ${key}    ${value}
     Set Headers    {"Accept":"application/json"}
     Set Headers    {"Authorization":"${TOKEN}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/appMobilityServices?${key}=${value}
+    Get    ${apiRoot}/${apiName}/${apiVersion}/app_mobility_services?${key}=${value}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -357,7 +516,7 @@ Get specific AMS service
     [Arguments]     ${amsId}
     Set Headers    {"Accept":"application/json"}
     Set Headers    {"Authorization":"${TOKEN}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/appMobilityServices/${amsId}
+    Get    ${apiRoot}/${apiName}/${apiVersion}/app_mobility_services/${amsId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}    
 
@@ -365,7 +524,7 @@ Get specific AMS service
 Get Registered AMS information using bad parameters
     Set Headers    {"Accept":"application/json"}
     Set Headers    {"Authorization":"${TOKEN}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/appMobilityServices?appMobilityService=${APP_MOBILITY_SERVICE_ID}     //param should be appMobilityServiceId
+    Get    ${apiRoot}/${apiName}/${apiVersion}/app_mobility_services?appMobilityService=${APP_MOBILITY_SERVICE_ID}     #param should be appMobilityServiceId
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -375,17 +534,29 @@ Modify a specific AMS service
     Set Headers    {"Accept":"application/json"}
     Set Headers    {"Content-Type":"application/json"}
     Set Headers    {"Authorization":"${TOKEN}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/appMobilityServices/${amsId}   ${content}
+    Put    ${apiRoot}/${apiName}/${apiVersion}/app_mobility_services/${amsId}   ${content}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 
-
 Delete specific AMS service
     [Arguments]     ${amsId}
     Set Headers    {"Accept":"application/json"}
     Set Headers    {"Authorization":"${TOKEN}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/appMobilityServices/${amsId}
+    Delete    ${apiRoot}/${apiName}/${apiVersion}/app_mobility_services/${amsId}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+
+Delete two specific AMS services
+    [Arguments]     ${amsId}    ${amsId2}
+    Set Headers    {"Accept":"application/json"}
+    Set Headers    {"Authorization":"${TOKEN}"}
+    Delete    ${apiRoot}/${apiName}/${apiVersion}/app_mobility_services/${amsId}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    Set Headers    {"Accept":"application/json"}
+    Set Headers    {"Authorization":"${TOKEN}"}
+    Delete    ${apiRoot}/${apiName}/${apiVersion}/app_mobility_services/${amsId2}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -395,22 +566,54 @@ Deregister specific AMS service
     Set Headers    {"Accept":"application/json"}
     Set Headers    {"Content-Type":"application/json"}
     Set Headers    {"Authorization":"${TOKEN}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/appMobilityServices/${amsId}/deregisterTask
+    POST    ${apiRoot}/${apiName}/${apiVersion}/app_mobility_services/${amsId}/deregisterTask
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 
 Create a new application mobility service
-    [Arguments]    ${content}
+    [Arguments]    ${appMobilityServiceId}    ${appInstanceId}
     Set Headers    {"Accept":"application/json"}
     Set Headers    {"Content-Type":"application/json"}
     Set Headers    {"Authorization":"${TOKEN}"}
-    ${file}=    Catenate    SEPARATOR=    json/    ${content}    .json
+    ${file}=    Catenate    SEPARATOR=    json/    RegistrationInfo    .json
     ${body}=    Get File    ${file}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/appMobilityServices    ${body}
+    ${json_data}=    Evaluate    json.loads('''${body}''')    json
+    Set To Dictionary    ${json_data}    appMobilityServiceId=${appMobilityServiceId}
+    Set To Dictionary    ${json_data['serviceConsumerId']}    appInstanceId=${appInstanceId}
+    ${modified_json_string}=    Evaluate    json.dumps(${json_data})
+    Post    ${apiRoot}/${apiName}/${apiVersion}/app_mobility_services    ${modified_json_string}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
-    
+
+Create two new application mobility service
+    [Arguments]    ${appMobilityServiceId}    ${appInstanceId}    ${appMobilityServiceId2}    ${appInstanceId2}
+    Set Headers    {"Accept":"application/json"}
+    Set Headers    {"Content-Type":"application/json"}
+    Set Headers    {"Authorization":"${TOKEN}"}
+    ${file}=    Catenate    SEPARATOR=    json/    RegistrationInfo    .json
+    ${body}=    Get File    ${file}
+    ${json_data}=    Evaluate    json.loads('''${body}''')    json
+    Set To Dictionary    ${json_data}    appMobilityServiceId=${appMobilityServiceId}
+    Set To Dictionary    ${json_data['serviceConsumerId']}    appInstanceId=${appInstanceId}
+    ${modified_json_string}=    Evaluate    json.dumps(${json_data})
+    Post    ${apiRoot}/${apiName}/${apiVersion}/app_mobility_services    ${modified_json_string}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    Set Headers    {"Accept":"application/json"}
+    Set Headers    {"Content-Type":"application/json"}
+    Set Headers    {"Authorization":"${TOKEN}"}
+    ${file}=    Catenate    SEPARATOR=    json/    RegistrationInfo    .json
+    ${body}=    Get File    ${file}
+    ${json_data}=    Evaluate    json.loads('''${body}''')    json
+    Set To Dictionary    ${json_data}    appMobilityServiceId=${appMobilityServiceId2}
+    Set To Dictionary    ${json_data['serviceConsumerId']}    appInstanceId=${appInstanceId2}
+    ${modified_json_string}=    Evaluate    json.dumps(${json_data})
+    Post    ${apiRoot}/${apiName}/${apiVersion}/app_mobility_services    ${modified_json_string}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+
+
 
 Get Subscriptions for registered AMS    
     Set Headers    {"Accept":"application/json"}
@@ -456,7 +659,7 @@ Delete individual subscription for AMS services
     [Arguments]    ${content}
     Set Headers    {"Accept":"application/json"}
     Set Headers    {"Authorization":"${TOKEN}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${content}
+    Delete    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${content}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}      
 
diff --git a/MEC021/SRV/AMS/environment/variables.txt b/MEC021/SRV/AMS/environment/variables.txt
index af30adf4c6d0cb4fb9ade3077238eb63af920563..045ce68d5f40191c1ffd65d37b68fa63ee1826fa 100644
--- a/MEC021/SRV/AMS/environment/variables.txt
+++ b/MEC021/SRV/AMS/environment/variables.txt
@@ -1,16 +1,21 @@
 *** 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}        
-${apiName}        
+${apiName}        amsi
 ${apiVersion}     v1
 
 # Specific variables
-${APP_MOBILITY_SERVICE_ID}          KtRGymNQ84dG3mQfRepa
+${APP_MOBILITY_SERVICE_ID}          APP_MOBILITY_SERVICE_ID
+${APP_MOBILITY_SERVICE_ID2}          APP_MOBILITY_SERVICE_ID2
+${MALFORMED_APP_MOBILITY_SERVICE_ID}          MALFORMED_APP_MOBILITY_SERVICE_ID
+${APP_MOBILITY_SERVICE_FILTER_APP_MOBILITY_SERVICE_ID}        (eq,appMobilityServiceId,APP_MOBILITY_SERVICE_ID)
+${APP_MOBILITY_SERVICE_FILTER_SERVICE_CONSUMER_ID}        (eq,serviceConsumerId[appInstanceId],5abe4782-2c70-4e47-9a4e-0ee3a1a0fd1f)
+${APP_MOBILITY_SERVICE_FILTER_EXCLUDE_FIELDS}        (eq,appMobilityServiceId,APP_MOBILITY_SERVICE_ID)&exclude_fields=[serviceConsumerId]
 ${APP_INS_ID}                       5abe4782-2c70-4e47-9a4e-0ee3a1a0fd1f
 ${SUBSCRIPTION_TYPE}                MobilityProcedureSubscription
 ${SUBSCRIPTION_ID}                  e0deee2b-6e50-4f33-ab09-8bf0585025d3
diff --git a/MEC021/SRV/AMS/json/NotificationSubscription.json b/MEC021/SRV/AMS/json/NotificationSubscription.json
new file mode 100644
index 0000000000000000000000000000000000000000..9c2ed02195d97b75b2a0d9e4c75f31912348447c
--- /dev/null
+++ b/MEC021/SRV/AMS/json/NotificationSubscription.json
@@ -0,0 +1,16 @@
+{
+    "callbackReference": "http://example.com/callback",
+    "requestTestNotification": true,
+    "websockNotifConfig": {
+        "websocketUri": "ws://example.com/websocket",
+        "requestWebsocketUri": true
+    },
+    "expiryDeadline": {
+        "seconds": 1644691200,
+        "nanoSeconds": 0
+    },
+    "filterCriteria": {
+        "appInstanceId": "app-123"
+    },
+    "subscriptionType": "AdjacentAppInfoSubscription"
+}
\ No newline at end of file
diff --git a/MEC021/SRV/AMS/json/NotificationSubscriptionError.json b/MEC021/SRV/AMS/json/NotificationSubscriptionError.json
new file mode 100644
index 0000000000000000000000000000000000000000..3c78fc9a3128a77d49041a8601dbd4eaeee8c1ca
--- /dev/null
+++ b/MEC021/SRV/AMS/json/NotificationSubscriptionError.json
@@ -0,0 +1,16 @@
+{
+    "callbackReference": "http://example.com/callback",
+    "requestTestNotification": true,
+    "websockNotifConfig": {
+        "websocketUri": "ws://example.com/websocket",
+        "requestWebsocketUri": true
+    },
+    "expiryDeadline": {
+        "seconds": 1644691200,
+        "nanoSeconds": 0
+    },
+    "filterCriteria": {
+        "appInstanceId": "app-123"
+    },
+    "subscriptionType": "INVALID_SUBSCRIPTION_TYPE"
+}
\ No newline at end of file
diff --git a/MEC021/SRV/AMS/json/RegistrationInfo.json b/MEC021/SRV/AMS/json/RegistrationInfo.json
new file mode 100644
index 0000000000000000000000000000000000000000..ac38cbfb1997b8e5607d4a586a7cf7ce54409525
--- /dev/null
+++ b/MEC021/SRV/AMS/json/RegistrationInfo.json
@@ -0,0 +1,26 @@
+{
+    "serviceConsumerId": {
+        "appInstanceId": "exampleAppInstanceId",
+        "mepId": "exampleMepId"
+    },
+    "appMobilityServiceId": "exampleAppMobilityServiceId",
+    "deviceInformation": [
+        {
+            "associateId": {
+                "type": "UE_IPv4_ADDRESS",
+                "value": "192.168.1.100"
+            },
+            "appMobilityServiceLevel": "APP_MOBILITY_NOT_ALLOWED",
+            "contextTransferState": "NOT_TRANSFERRED"
+        },
+        {
+            "associateId": {
+                "type": "UE_IPV6_ADDRESS",
+                "value": "2001:0db8:85a3:0000:0000:8a2e:0370:7334"
+            },
+            "appMobilityServiceLevel": "APP_MOBILITY_WITH_CONFIRMATION",
+            "contextTransferState": "USER_CONTEXT_TRANSFER_COMPLETED"
+        }
+    ],
+    "expiryTime": 3600
+}
\ No newline at end of file
diff --git a/MEC021/SRV/AMS/schemas/AppMobilityServiceInfo.schema.json b/MEC021/SRV/AMS/schemas/AppMobilityServiceInfo.schema.json
new file mode 100644
index 0000000000000000000000000000000000000000..2af27c6c50b818b6323bd084bac60b150a3f7b01
--- /dev/null
+++ b/MEC021/SRV/AMS/schemas/AppMobilityServiceInfo.schema.json
@@ -0,0 +1,99 @@
+{
+    "title": "RegistrationInfo",
+    "required": [
+      "serviceConsumerId"
+    ],
+    "type": "object",
+    "properties": {
+      "appMobilityServiceId": {
+        "type": "string",
+        "description": "The identifier of registered application mobility service. Shall be absent in POST requests, and present otherwise."
+      },
+      "deviceInformation": {
+        "type": "array",
+        "items": {
+          "title": "RegistrationInfo.deviceInformation",
+          "required": [
+            "associateId"
+          ],
+          "type": "object",
+          "properties": {
+            "associateId": {
+              "title": "AssociateId",
+              "required": [
+                "type",
+                "value"
+              ],
+              "type": "object",
+              "properties": {
+                "type": {
+                  "title": "Type",
+                  "enum": [
+                    "UE_IPv4_ADDRESS",
+                    "UE_IPV6_ADDRESS",
+                    "NATED_IP_ADDRESS",
+                    "GTP_TEID"
+                  ],
+                  "type": "string",
+                  "description": "Numeric value (0-255) corresponding to specified type of identifier",
+                  "examples": [
+                    "UE_IPv4_ADDRESS"
+                  ]
+                },
+                "value": {
+                  "type": "string",
+                  "description": "Value for the identifier."
+                }
+              }
+            },
+            "appMobilityServiceLevel": {
+              "title": "AppMobilityServiceLevel",
+              "enum": [
+                "APP_MOBILITY_NOT_ALLOWED",
+                "APP_MOBILITY_WITH_CONFIRMATION",
+                "APP_MOBILITY_WITHOUT_CONFIRMATION"
+              ],
+              "type": "string",
+              "description": "This attribute provides an option for the application instance (server) to communicate with the application client before relocating this application instance to another MEC host.",
+              "examples": [
+                "APP_MOBILITY_NOT_ALLOWED"
+              ]
+            },
+            "contextTransferState": {
+              "title": "contextTransferState",
+              "enum": [
+                "NOT_TRANSFERRED",
+                "USER_CONTEXT_TRANSFER_COMPLETED"
+              ],
+              "type": "string",
+              "description": "If present, it represents the state of transferring the user context to another application instance.",
+              "examples": [
+                "NOT_TRANSFERRED"
+              ]
+            }
+          }
+        },
+        "description": "If present, it specifies the device served by the application instance which is registering is registering the Application Mobility Service."
+      },
+      "expiryTime": {
+        "type": "integer",
+        "description": "If present, it indicates the time of Application Mobility Service expiration from the time of registration accepted.The value \"0\" means infinite time, i.e. no expiration.The unit of expiry time is one second.",
+        "contentEncoding": "int32"
+      },
+      "serviceConsumerId": {
+        "title": "RegistrationInfo.serviceConsumerId",
+        "type": "object",
+        "properties": {
+          "appInstanceId": {
+            "type": "string",
+            "description": "If present, it represents the identifier of the application instance registering the Application Mobility Service."
+          },
+          "mepId": {
+            "type": "string",
+            "description": "If present, it represents the identifier of the MEC platform registering the Application Mobility Service."
+          }
+        },
+        "description": "The identifier of service consumer requesting the application mobility service, i.e. either the application instance ID or the MEC platform ID."
+      }
+    }
+  }
\ No newline at end of file
diff --git a/MEC021/SRV/AMS/schemas/AppMobilityServiceInfos.schema.json b/MEC021/SRV/AMS/schemas/AppMobilityServiceInfos.schema.json
new file mode 100644
index 0000000000000000000000000000000000000000..5a64a8e0beb03011fdfa76e9a339b0fec6769b64
--- /dev/null
+++ b/MEC021/SRV/AMS/schemas/AppMobilityServiceInfos.schema.json
@@ -0,0 +1,104 @@
+{
+    "type": "array",
+    "items": {
+      "title": "RegistrationInfo",
+      "required": [
+        "serviceConsumerId"
+      ],
+      "type": "object",
+      "properties": {
+        "appMobilityServiceId": {
+          "type": "string",
+          "description": "The identifier of registered application mobility service. Shall be absent in POST requests, and present otherwise."
+        },
+        "deviceInformation": {
+          "type": "array",
+          "items": {
+            "title": "RegistrationInfo.deviceInformation",
+            "required": [
+              "associateId"
+            ],
+            "type": "object",
+            "properties": {
+              "associateId": {
+                "title": "AssociateId",
+                "required": [
+                  "type",
+                  "value"
+                ],
+                "type": "object",
+                "properties": {
+                  "type": {
+                    "title": "Type",
+                    "enum": [
+                      "UE_IPv4_ADDRESS",
+                      "UE_IPV6_ADDRESS",
+                      "NATED_IP_ADDRESS",
+                      "GTP_TEID"
+                    ],
+                    "type": "string",
+                    "description": "Numeric value (0-255) corresponding to specified type of identifier",
+                    "examples": [
+                      "UE_IPv4_ADDRESS"
+                    ]
+                  },
+                  "value": {
+                    "type": "string",
+                    "description": "Value for the identifier."
+                  }
+                }
+              },
+              "appMobilityServiceLevel": {
+                "title": "AppMobilityServiceLevel",
+                "enum": [
+                  "APP_MOBILITY_NOT_ALLOWED",
+                  "APP_MOBILITY_WITH_CONFIRMATION",
+                  "APP_MOBILITY_WITHOUT_CONFIRMATION"
+                ],
+                "type": "string",
+                "description": "This attribute provides an option for the application instance (server) to communicate with the application client before relocating this application instance to another MEC host.",
+                "examples": [
+                  "APP_MOBILITY_NOT_ALLOWED"
+                ]
+              },
+              "contextTransferState": {
+                "title": "contextTransferState",
+                "enum": [
+                  "NOT_TRANSFERRED",
+                  "USER_CONTEXT_TRANSFER_COMPLETED"
+                ],
+                "type": "string",
+                "description": "If present, it represents the state of transferring the user context to another application instance.",
+                "examples": [
+                  "NOT_TRANSFERRED"
+                ]
+              }
+            }
+          },
+          "description": "If present, it specifies the device served by the application instance which is registering is registering the Application Mobility Service."
+        },
+        "expiryTime": {
+          "type": "integer",
+          "description": "If present, it indicates the time of Application Mobility Service expiration from the time of registration accepted.The value \"0\" means infinite time, i.e. no expiration.The unit of expiry time is one second.",
+          "contentEncoding": "int32"
+        },
+        "serviceConsumerId": {
+          "title": "RegistrationInfo.serviceConsumerId",
+          "type": "object",
+          "properties": {
+            "appInstanceId": {
+              "type": "string",
+              "description": "If present, it represents the identifier of the application instance registering the Application Mobility Service."
+            },
+            "mepId": {
+              "type": "string",
+              "description": "If present, it represents the identifier of the MEC platform registering the Application Mobility Service."
+            }
+          },
+          "description": "The identifier of service consumer requesting the application mobility service, i.e. either the application instance ID or the MEC platform ID."
+        }
+      }
+    },
+    "description": "",
+    "contentMediaType": "application/json"
+  }
\ No newline at end of file
diff --git a/MEC021/SRV/AMS/schemas/MobilityProcedureNotification.schema.json b/MEC021/SRV/AMS/schemas/MobilityProcedureNotification.schema.json
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/MEC021/SRV/AMS/schemas/NotificationSubscription.schema.json b/MEC021/SRV/AMS/schemas/NotificationSubscription.schema.json
new file mode 100644
index 0000000000000000000000000000000000000000..59a81981897520f9fda7cf8cc45f0005e65ca1b5
--- /dev/null
+++ b/MEC021/SRV/AMS/schemas/NotificationSubscription.schema.json
@@ -0,0 +1,248 @@
+{
+    "oneOf": [
+        {
+            "title": "MobilityProcedureSubscription",
+            "required": [
+                "filterCriteria",
+                "subscriptionType"
+            ],
+            "type": "object",
+            "properties": {
+                "_links": {
+                    "title": "MobilityProcedureSubscription.links",
+                    "required": [
+                        "self"
+                    ],
+                    "type": "object",
+                    "properties": {
+                        "self": {
+                            "title": "LinkType",
+                            "required": [
+                                "href"
+                            ],
+                            "type": "object",
+                            "properties": {
+                                "href": {
+                                    "type": "string",
+                                    "description": "The URI referring to the subscription."
+                                }
+                            },
+                            "description": "'This data type represents a type of link'"
+                        }
+                    }
+                },
+                "callbackReference": {
+                    "type": "string",
+                    "format": "uri",
+                    "description": "URI selected by the service consumer to receive notifications on the subscribed Application Mobility Service. This shall be included both in the request and in response."
+                },
+                "requestTestNotification": {
+                    "type": "boolean",
+                    "description": "Shall be set to TRUE by the service consumer to request a test notification via HTTP on the callbackReference URI, specified in ETSI GS MEC 009, as described in clause 6.12a."
+                },
+                "websockNotifConfig": {
+                    "description": "Provides details to negotiate and signal the use of a Websocket connection between AMS and the service consumer for notifications.",
+                    "type": "object",
+                    "properties": {
+                        "websocketUri": {
+                            "description": "Set by AMS to indicate to the service consumer the Websocket URI to be used for delivering notifications.",
+                            "type": "string",
+                            "format": "uri"
+                        },
+                        "requestWebsocketUri": {
+                            "type": "boolean",
+                            "description": "Set to true by the service consumer to indicate that Websocket delivery is requested."
+                        }
+                    }
+                },
+                "expiryDeadline": {
+                    "description": "Identifies a boundary after which the subscription will expire.",
+                    "title": "TimeStamp",
+                    "required": [
+                        "seconds",
+                        "nanoSeconds"
+                    ],
+                    "type": "object",
+                    "properties": {
+                        "seconds": {
+                            "type": "integer",
+                            "description": "'The seconds part of the Time. Time is defined as Unix-time since January 1, 1970, 00:00:00 UTC.'",
+                            "contentEncoding": "int32"
+                        },
+                        "nanoSeconds": {
+                            "type": "integer",
+                            "description": "'The nanoseconds part of the Time. Time is defined as Unix-time since January 1, 1970, 00:00:00 UTC.'",
+                            "contentEncoding": "int32"
+                        }
+                    }
+                },
+                "filterCriteria": {
+                    "title": "MobilityProcedureSubscription.filterCriteria",
+                    "type": "object",
+                    "properties": {
+                        "appInstanceId": {
+                            "type": "string",
+                            "description": "Identifier of the application instance that registers the Application Mobility Service."
+                        },
+                        "associateId": {
+                            "type": "array",
+                            "items": {
+                                "title": "AssociateId",
+                                "required": [
+                                    "type",
+                                    "value"
+                                ],
+                                "type": "object",
+                                "properties": {
+                                    "type": {
+                                        "title": "Type",
+                                        "enum": [
+                                            "UE_IPv4_ADDRESS",
+                                            "UE_IPV6_ADDRESS",
+                                            "NATED_IP_ADDRESS",
+                                            "GTP_TEID"
+                                        ],
+                                        "type": "string",
+                                        "description": "Numeric value (0-255) corresponding to specified type of identifier",
+                                        "examples": [
+                                            "UE_IPv4_ADDRESS"
+                                        ]
+                                    },
+                                    "value": {
+                                        "type": "string",
+                                        "description": "Value for the identifier."
+                                    }
+                                }
+                            },
+                            "description": "0 to N identifiers to associate the information for specific UE(s) and flow(s)."
+                        },
+                        "mobilityStatus": {
+                            "type": "array",
+                            "items": {
+                                "title": "MobilityStatus",
+                                "enum": [
+                                    "INTERHOST_MOVEOUT_TRIGGERED",
+                                    "INTERHOST_MOVEOUT_COMPLETED",
+                                    "INTERHOST_MOVEOUT_FAILED"
+                                ],
+                                "type": "string",
+                                "description": "Indicate the status of the UE mobility",
+                                "examples": [
+                                    "INTERHOST_MOVEOUT_TRIGGERED"
+                                ]
+                            },
+                            "description": "In case mobilityStatus is not included in the subscription request, the default value 1 = INTER_HOST_MOBILITY_TRIGGERED shall be used and included in the response."
+                        }
+                    },
+                    "description": "List of filtering criteria for the subscription. Any filtering criteria from below, which is included in the request, shall also be included in the response."
+                },
+                "subscriptionType": {
+                    "const": "MobilityProcedureSubscription",
+                    "type": "string",
+                    "description": "Shall be set to \"MobilityProcedureSubscription\".",
+                    "examples": [
+                        "MobilityProcedureSubscription"
+                    ]
+                }
+            }
+        },
+        {
+            "title": "AdjacentAppInfoSubscription",
+            "required": [
+                "callbackReference",
+                "filterCriteria",
+                "subscriptionType"
+            ],
+            "type": "object",
+            "properties": {
+                "_links": {
+                    "title": "AdjacentAppInfoSubscription.links",
+                    "required": [
+                        "self"
+                    ],
+                    "type": "object",
+                    "properties": {
+                        "self": {
+                            "title": "LinkType",
+                            "required": [
+                                "href"
+                            ],
+                            "type": "object",
+                            "properties": {
+                                "href": {
+                                    "type": "string",
+                                    "description": "The URI referring to the subscription."
+                                }
+                            },
+                            "description": "'This data type represents a type of link'"
+                        }
+                    },
+                    "description": "Hyperlink related to the resource. This shall be only included in the HTTP responses and in HTTP PUT requests."
+                },
+                "callbackReference": {
+                    "type": "string",
+                    "format": "uri",
+                    "description": "URI selected by the service consumer to receive notifications on the subscribed Application Mobility Service. This shall be included both in the request and in response."
+                },
+                "requestTestNotification": {
+                    "type": "boolean",
+                    "description": "Shall be set to TRUE by the service consumer to request a test notification via HTTP on the callbackReference URI, specified in ETSI GS MEC 009, as described in clause 6.12a."
+                },
+                "websockNotifConfig": {
+                    "type": "object",
+                    "properties": {
+                        "websocketUri": {
+                            "description": "Set by AMS to indicate to the service consumer the Websocket URI to be used for delivering notifications.",
+                            "type": "string",
+                            "format": "uri"
+                        },
+                        "requestWebsocketUri": {
+                            "type": "boolean",
+                            "description": "Set to true by the service consumer to indicate that Websocket delivery is requested."
+                        }
+                    }
+                },
+                "expiryDeadline": {
+                    "description": "Identifies a boundary after which the subscription will expire.",
+                    "title": "TimeStamp",
+                    "required": [
+                        "seconds",
+                        "nanoSeconds"
+                    ],
+                    "type": "object",
+                    "properties": {
+                        "seconds": {
+                            "type": "integer",
+                            "description": "'The seconds part of the Time. Time is defined as Unix-time since January 1, 1970, 00:00:00 UTC.'",
+                            "contentEncoding": "int32"
+                        },
+                        "nanoSeconds": {
+                            "type": "integer",
+                            "description": "'The nanoseconds part of the Time. Time is defined as Unix-time since January 1, 1970, 00:00:00 UTC.'",
+                            "contentEncoding": "int32"
+                        }
+                    }
+                },
+                "filterCriteria": {
+                    "title": "AdjacentAppInfoSubscription.filterCriteria",
+                    "type": "object",
+                    "properties": {
+                        "appInstanceId": {
+                            "type": "string"
+                        }
+                    },
+                    "description": "List of filtering criteria for the subscription. Any filtering criteria from below, which is included in the request, shall also be included in the response."
+                },
+                "subscriptionType": {
+                    "const": "AdjacentAppInfoSubscription",
+                    "type": "string",
+                    "description": "Shall be set to \"AdjacentAppInfoSubscription\".",
+                    "examples": [
+                        "AdjacentAppInfoSubscription"
+                    ]
+                }
+            }
+        }
+    ],
+    "contentMediaType": "application/json"
+}
\ No newline at end of file
diff --git a/MEC021/SRV/AMS/schemas/SubscriptionLinkList.schema.json b/MEC021/SRV/AMS/schemas/SubscriptionLinkList.schema.json
new file mode 100644
index 0000000000000000000000000000000000000000..6c29b446848105849c7b5efa90dfcb15a78c24ef
--- /dev/null
+++ b/MEC021/SRV/AMS/schemas/SubscriptionLinkList.schema.json
@@ -0,0 +1,64 @@
+{
+    "title": "SubscriptionLinkList",
+    "required": [
+        "_links"
+    ],
+    "type": "object",
+    "properties": {
+        "_links": {
+            "description": "Hyperlinks related to the resource.",
+            "title": "SubscriptionLinkList.links",
+            "required": [
+                "self"
+            ],
+            "type": "object",
+            "properties": {
+                "self": {
+                    "description": "URI of this resource.",
+                    "title": "LinkType",
+                    "required": [
+                        "href"
+                    ],
+                    "type": "object",
+                    "properties": {
+                        "href": {
+                            "type": "string",
+                            "description": "The URI referring to the subscription."
+                        }
+                    }
+                },
+                "subscription": {
+                    "type": "array",
+                    "description": "The service consumer’s subscriptions.",
+                    "items": {
+                        "title": "SubscriptionLinkList.subscription",
+                        "required": [
+                            "href",
+                            "subscriptionType"
+                        ],
+                        "type": "object",
+                        "properties": {
+                            "href": {
+                                "type": "string",
+                                "description": "The URI referring to the subscription."
+                            },
+                            "subscriptionType": {
+                                "description": "The Subscription Type",
+                                "title": "subscriptionType",
+                                "enum": [
+                                    0,
+                                    1,
+                                    2
+                                ],
+                                "type": "integer",
+                                "examples": [
+                                    0
+                                ]
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/MEC028/WAI/AP_INFO/WaiApInfo.robot b/MEC028/WAI/AP_INFO/WaiApInfo.robot
index 39b43c5130116e568759c37d8729c7fb222e12bb..a6a94ab6bf6f36d9a555617231819d526b820baf 100644
--- a/MEC028/WAI/AP_INFO/WaiApInfo.robot
+++ b/MEC028/WAI/AP_INFO/WaiApInfo.robot
@@ -22,7 +22,7 @@ TC_MEC_MEC028_SRV_WAI_001_OK
     Check HTTP Response Body Json Schema Is   ApInfo
     ## Post condition
     FOR    ${apInfo}    IN    @{response['body']}
-        ${passed}    Run Keyword And Return Status    Should Be Equal As Strings  ${apInfo['apId']['macId']}    ${MAC_ID}    
+        ${passed}    Run Keyword And Return Status    Should Be Equal As Strings  ${apInfo['apId']['bssid']}    ${BSS_ID}    
         Exit For Loop If    ${passed}
     END
     Should Be True    ${passed}
@@ -39,7 +39,7 @@ TC_MEC_MEC028_SRV_WAI_002_OK
     Check HTTP Response Body Json Schema Is   ApInfo
     ## Post condition
     FOR    ${apInfo}    IN    @{response['body']}
-        ${passed}    Run Keyword And Return Status    Should Be Equal As Strings  ${apInfo['apId']['macId']}    ${MAC_ID}    
+        ${passed}    Run Keyword And Return Status    Should Be Equal As Strings  ${apInfo['apId']['bssid']}    ${BSS_ID}    
         Exit For Loop If    ${passed}
     END
     Should Be True    ${passed}
diff --git a/MEC028/WAI/AP_INFO/environment/variables.txt b/MEC028/WAI/AP_INFO/environment/variables.txt
index b368c618a2924ad227b2a809c8d7ae4b220857fa..c19b668f78e9eae4c6961493f8d16599d6325db6 100644
--- a/MEC028/WAI/AP_INFO/environment/variables.txt
+++ b/MEC028/WAI/AP_INFO/environment/variables.txt
@@ -9,9 +9,9 @@ ${MEC-APP_PORT}                     3001
 
 ${TOKEN}                            Basic YWxhZGRpbjpvcGVuc2VzYW1l
  
-${MAC_ID}          macId01
-${filter}                           macId01
-${bad_filter}                           badMacId
+${BSS_ID}          bssId01
+${filter}                           (eq,bssid,bssId01)
+${bad_filter}                           (eq,bss_id,bssId01)
 
 ${REGISTER_ACTION}        REGISTER
 ${REMOVE_ACTION}          REMOVE 
diff --git a/MEC030/SRV/V2X/V2XInformationService.robot b/MEC030/SRV/V2X/V2XInformationService.robot
index 915cbc6a5470ad73e5b176f16061d1e13be74d15..c6449e1eab0dbc086dc43a68835f3c9a62572f86 100644
--- a/MEC030/SRV/V2X/V2XInformationService.robot
+++ b/MEC030/SRV/V2X/V2XInformationService.robot
@@ -10,173 +10,201 @@ Library     OperatingSystem
 
 ##GET on ${apiRoot}/${apiName}/${apiVersion}/queries/uu_unicast_provisioning_info
 *** Test Cases ***
-TP_MEC_MEC030_SRV_V2X_001_OK_01
+TC_MEC_MEC030_SRV_V2X_001_OK_01
     [Documentation]
     ...  Check that the IUT responds with a configured provisioning information over Uu unicast when queried by a MEC Application
-    ...  ETSI GS MEC 030 V2.1.1, clause 7.3.3.1
-    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/blob/master/MEC030_V2XInformationService.yaml
+    ...  ETSI GS MEC 030 v3.1.1, clause 7.3.3.1
+    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/-/blob/master/MEC030_V2XInformationServices.yaml
     Retrieve configured provisioning information over Uu unicast using ecgi filter    ${ECGI} 	
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is   UuUnicastProvisioningInfo
     
     
-TP_MEC_MEC030_SRV_V2X_001_OK_02
+TC_MEC_MEC030_SRV_V2X_001_OK_02
     [Documentation]
     ...  Check that the IUT responds with a configured provisioning information over Uu unicast when queried by a MEC Application
-    ...  ETSI GS MEC 030 V2.1.1, clause 7.3.3.1
-    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/blob/master/MEC030_V2XInformationService.yaml
+    ...  ETSI GS MEC 030 v3.1.1, clause 7.3.3.1
+    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/-/blob/master/MEC030_V2XInformationServices.yaml
     Retrieve configured provisioning information over Uu unicast using geographical filter    ${LAT_VALUE}     ${LON_VALUE}	
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is   UuUnicastProvisioningInfo
 
-TP_MEC_MEC030_SRV_V2X_001_BR
+TC_MEC_MEC030_SRV_V2X_001_BR
     [Documentation]
     ...  Check that the IUT responds with an error when a request with incorrect parameters is sent by a MEC Application
-    ...  ETSI GS MEC 030 V2.1.1, clause 7.3.3.1
-    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/blob/master/MEC030_V2XInformationService.yaml
+    ...  ETSI GS MEC 030 v3.1.1, clause 7.3.3.1
+    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/-/blob/master/MEC030_V2XInformationServices.yaml
     Retrieve configured provisioning information over Uu unicast using geographical filter wrong parameter    ${LAT_VALUE}     ${LON_VALUE}	
     Check HTTP Response Status Code Is    400
     
 
 
-TP_MEC_MEC030_SRV_V2X_001_NF
+TC_MEC_MEC030_SRV_V2X_001_NF
     [Documentation]
     ...  Check that the IUT responds with an error when a request with incorrect parameters is sent by a MEC Application
-    ...  ETSI GS MEC 030 V2.1.1, clause 7.3.3.1
-    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/blob/master/MEC030_V2XInformationService.yaml
+    ...  ETSI GS MEC 030 v3.1.1, clause 7.3.3.1
+    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/-/blob/master/MEC030_V2XInformationServices.yaml
     Retrieve configured provisioning information over Uu unicast using ecgi filter    ${UNKNOWN_ECGI} 
     Check HTTP Response Status Code Is    404
 
 
    
 ##GET on ${apiRoot}/${apiName}/${apiVersion}/queries/uu_mbms_provisioning_info
-TP_MEC_MEC030_SRV_V2X_002_OK_01
+TC_MEC_MEC030_SRV_V2X_002_OK_01
     [Documentation]
     ...  Check that the IUT responds with a configured provisioning information over Uu MBM when queried by a MEC Application
-    ...  ETSI GS MEC 030 V2.1.1, clause 7.4.3.1
+    ...  ETSI GS MEC 030 v3.1.1, clause 7.4.3.1
     Retrieve configured provisioning information over Uu MBM using ecgi filter    ${ECGI} 	
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is   UuMbmsProvisioningInfo
 
-TP_MEC_MEC030_SRV_V2X_002_OK_02
+TC_MEC_MEC030_SRV_V2X_002_OK_02
     [Documentation]
     ...  Check that the IUT responds with a configured provisioning information over Uu MBMS when queried by a MEC Application
-    ...  ETSI GS MEC 030 V2.1.1, clause 7.4.3.1
-    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/blob/master/MEC030_V2XInformationService.yaml
+    ...  ETSI GS MEC 030 v3.1.1, clause 7.4.3.1
+    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/-/blob/master/MEC030_V2XInformationServices.yaml
     Retrieve configured provisioning information over Uu MBM using geographical filter    ${LAT_VALUE}     ${LON_VALUE}	
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is   UuMbmsProvisioningInfo
     
-TP_MEC_MEC030_SRV_V2X_002_BR
+TC_MEC_MEC030_SRV_V2X_002_BR
     [Documentation]
     ...  Check that the IUT responds with an error when a request with incorrect parameters is sent by a MEC Application
-    ...  ETSI GS MEC 030 V2.1.1, clause 7.4.3.1
-    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/blob/master/MEC030_V2XInformationService.yaml
+    ...  ETSI GS MEC 030 v3.1.1, clause 7.4.3.1
+    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/-/blob/master/MEC030_V2XInformationServices.yaml
     Retrieve configured provisioning information over Uu MBM using geographical filter wrong parameter    ${LAT_VALUE}     ${LON_VALUE}	
     Check HTTP Response Status Code Is    400
 
-TP_MEC_MEC030_SRV_V2X_002_NF
+TC_MEC_MEC030_SRV_V2X_002_NF
     [Documentation]
     ...  Check that the IUT responds with an error when a request with incorrect parameters is sent by a MEC Application
-    ...  ETSI GS MEC 030 V2.1.1, clause 7.4.3.1
-    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/blob/master/MEC030_V2XInformationService.yaml
+    ...  ETSI GS MEC 030 v3.1.1, clause 7.4.3.1
+    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/-/blob/master/MEC030_V2XInformationServices.yaml
     Retrieve configured provisioning information over Uu MBM using geographical filter    ${UNKNOWN_LAT_VALUE}     ${LON_VALUE}	
     Check HTTP Response Status Code Is    404
         
 
 
 ##GET on ${apiRoot}/${apiName}/${apiVersion}/queries/pc5_provisioning_info
-TP_MEC_MEC030_SRV_V2X_003_OK_01
+TC_MEC_MEC030_SRV_V2X_003_OK_01
     [Documentation]
     ...  Check that the IUT responds with a configured provisioning information over PC5 when queried by a MEC Application
-    ...  ETSI GS MEC 030 V2.1.1, clause 7.5.3.1
-    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/blob/master/MEC030_V2XInformationService.yaml
+    ...  ETSI GS MEC 030 v3.1.1, clause 7.5.3.1
+    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/-/blob/master/MEC030_V2XInformationServices.yaml
     Retrieve configured provisioning information over PC5 using ecgi filter    ${ECGI} 	
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is   Pc5ProvisioningInfo
 
-TP_MEC_MEC030_SRV_V2X_003_OK_02
+TC_MEC_MEC030_SRV_V2X_003_OK_02
     [Documentation]
     ...  Check that the IUT responds with a configured provisioning information over Uu MBMS when queried by a MEC Application
-    ...  ETSI GS MEC 030 V2.1.1, clause 7.5.3.1
-    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/blob/master/MEC030_V2XInformationService.yaml
+    ...  ETSI GS MEC 030 v3.1.1, clause 7.5.3.1
+    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/-/blob/master/MEC030_V2XInformationServices.yaml
     Retrieve configured provisioning information over PC5 using geographical filter    ${LAT_VALUE}     ${LON_VALUE}	
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is   Pc5ProvisioningInfo
 
-TP_MEC_MEC030_SRV_V2X_003_BR
+TC_MEC_MEC030_SRV_V2X_003_BR
     [Documentation]
     ...  Check that the IUT responds with an error when a request with incorrect parameters is sent by a MEC Application
-    ...  ETSI GS MEC 030 V2.1.1, clause 7.5.3.1
-    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/blob/master/MEC030_V2XInformationService.yaml
+    ...  ETSI GS MEC 030 v3.1.1, clause 7.5.3.1
+    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/-/blob/master/MEC030_V2XInformationServices.yaml
     Retrieve configured provisioning information over PC5 using geographical filter wrong parameter    ${LAT_VALUE}     ${LON_VALUE}	
     Check HTTP Response Status Code Is    400
 
 
-TP_MEC_MEC030_SRV_V2X_003_NF
+TC_MEC_MEC030_SRV_V2X_003_NF
     [Documentation]
     ...  Check that the IUT responds with an error when a request with incorrect parameters is sent by a MEC Application
-    ...  ETSI GS MEC 030 V2.1.1, clause 7.5.3.1
-    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/blob/master/MEC030_V2XInformationService.yaml
+    ...  ETSI GS MEC 030 v3.1.1, clause 7.5.3.1
+    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/-/blob/master/MEC030_V2XInformationServices.yaml
     Retrieve configured provisioning information over PC5 using ecgi filter    ${UNKNOWN_ECGI} 
     Check HTTP Response Status Code Is    404
 
 
+##POST on ${apiRoot}/${apiName}/${apiVersion}/provide_v2x_msg_distribution_server_info
+TC_MEC_MEC030_SRV_V2X_004_OK
+    [Documentation]
+    ...  Check that the IUT processes properly a request to information of V2X Message Distribution servers
+    ...  ETSI GS MEC 030 v3.1.1, clause 7.6.3.4
+    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/-/blob/master/MEC030_V2XInformationServices.yaml
+    Request v2x message distribution servers    V2XDistributionServers
+    Check HTTP Response Body Json Schema Is   V2XDistributionServers
+    Check HTTP Response Status Code Is    200
+
+TC_MEC_MEC030_SRV_V2X_004_BR
+    [Documentation]
+    ...  Check that the IUT responds with an error when a request with incorrect parameters is sent by a MEC Application
+    ...  ETSI GS MEC 030 v3.1.1, clause 7.6.3.4
+    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/-/blob/master/MEC030_V2XInformationServices.yaml
+    Request v2x message distribution servers    V2XDistributionServers_BR
+    Check HTTP Response Status Code Is    400
+    
+    
+TC_MEC_MEC030_SRV_V2X_004_NF
+    [Documentation]
+    ...  Check that the IUT responds with an error when a request with incorrect parameters is sent by a MEC Application
+    ...  ETSI GS MEC 030 v3.1.1, clause 7.6.3.4
+    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/-/blob/master/MEC030_V2XInformationServices.yaml
+    Request v2x message distribution servers    V2XDistributionServers_NF
+    Check HTTP Response Status Code Is    404
+
+
 ##POST on ${apiRoot}/${apiName}/${apiVersion}/provide_predicted_qos
-TP_MEC_MEC030_SRV_V2X_004_OK
+TC_MEC_MEC030_SRV_V2X_005_OK
     [Documentation]
     ...  Check that the IUT sends a request about QoS information for a vehicular UE when queried by a MEC Application
-    ...  ETSI GS MEC 030 V2.1.1, clause 7.6.3.4
-    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/blob/master/MEC030_V2XInformationService.yaml
+    ...  ETSI GS MEC 030 v3.1.1, clause 7.6.3.4
+    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/-/blob/master/MEC030_V2XInformationServices.yaml
     Request predicted QoS   PredictedQoS.json
     Check HTTP Response Body Json Schema Is   PredictedQoS
     Check HTTP Response Status Code Is    200
     
     
-TP_MEC_MEC030_SRV_V2X_004_BR
+TC_MEC_MEC030_SRV_V2X_005_BR
     [Documentation]
     ...  Check that the IUT responds with an error when a request with incorrect parameters is sent by a MEC Application
-    ...  ETSI GS MEC 030 V2.1.1, clause 7.6.3.4
-    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/blob/master/MEC030_V2XInformationService.yaml
+    ...  ETSI GS MEC 030 v3.1.1, clause 7.6.3.4
+    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/-/blob/master/MEC030_V2XInformationServices.yaml
     ##Wrong parameter into JSON: locality instead of locationGranularity
     Request predicted QoS   PredictedQoS_BR.json 
     Check HTTP Response Status Code Is    400
 
-TP_MEC_MEC030_SRV_V2X_004_NF
+TC_MEC_MEC030_SRV_V2X_005_NF
     [Documentation]
     ...  Check that the IUT responds with an error when a request with incorrect parameters is sent by a MEC Application
-    ...  ETSI GS MEC 030 V2.1.1, clause 7.6.3.4
-    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/blob/master/MEC030_V2XInformationService.yaml
+    ...  ETSI GS MEC 030 v3.1.1, clause 7.6.3.4
+    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/-/blob/master/MEC030_V2XInformationServices.yaml
     Request predicted QoS   PredictedQoS_NF.json
     Check HTTP Response Status Code Is    404
         
 
 
 ##POST on ${apiRoot}/${apiName}/${apiVersion}/publish_v2x_message
-TP_MEC_MEC030_SRV_V2X_005_OK
+TC_MEC_MEC030_SRV_V2X_006_OK
     [Documentation]
     ...  Check that the IUT processes properly a request to publish a V2X message
-    ...  ETSI GS MEC 030 V2.1.1, clause 7.7.3.4
-    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/blob/master/MEC030_V2XInformationService.yaml
+    ...  ETSI GS MEC 030 v3.1.1, clause 7.7.3.4
+    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/-/blob/master/MEC030_V2XInformationServices.yaml
     Publish V2X message   V2xMsgPublication.json
     Check HTTP Response Status Code Is    204
     
-TP_MEC_MEC030_SRV_V2X_005_BR
+TC_MEC_MEC030_SRV_V2X_006_BR
     [Documentation]
     ...  Check that the IUT responds with an error when a request with incorrect parameters is sent by a MEC Application
-    ...  ETSI GS MEC 030 V2.1.1, clause 7.7.3.4
-    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/blob/master/MEC030_V2XInformationService.yaml
+    ...  ETSI GS MEC 030 v3.1.1, clause 7.7.3.4
+    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/-/blob/master/MEC030_V2XInformationServices.yaml
     Publish V2X message   V2xMsgPublication_BR.json
     Check HTTP Response Status Code Is    400    
 
 
 
 ##GET on ${apiRoot}/${apiName}/${apiVersion}/subscription    
-TP_MEC_MEC030_SRV_V2X_006_OK_01
+TC_MEC_MEC030_SRV_V2X_007_OK_01
     [Documentation] 
     ...  Check that the IUT responds with the requested list of subscription when queried by a MEC Application
-    ...  ETSI GS MEC 030 V2.1.1, clause 7.8.3.1
-    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/blob/master/MEC030_V2XInformationService.yaml
+    ...  ETSI GS MEC 030 v3.1.1, clause 7.8.3.1
+    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/-/blob/master/MEC030_V2XInformationServices.yaml
         
     Should Be True    ${PIC_MEC_SYSTEM} == 1
     Should Be True    ${PIC_SERVICES} == 1
@@ -189,11 +217,11 @@ TP_MEC_MEC030_SRV_V2X_006_OK_01
     END
     Should Be True    ${passed}
     
-TP_MEC_MEC030_SRV_V2X_006_OK_02
+TC_MEC_MEC030_SRV_V2X_007_OK_02
     [Documentation] 
     ...  Check that the IUT responds with the requested list of subscription when queried by a MEC Application
-    ...  ETSI GS MEC 030 V2.1.1, clause 7.8.3.1
-    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/blob/master/MEC030_V2XInformationService.yaml
+    ...  ETSI GS MEC 030 v3.1.1, clause 7.8.3.1
+    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/-/blob/master/MEC030_V2XInformationServices.yaml
         
     Should Be True    ${PIC_MEC_SYSTEM} == 1
     Should Be True    ${PIC_SERVICES} == 1
@@ -206,11 +234,11 @@ TP_MEC_MEC030_SRV_V2X_006_OK_02
     END
     Should Be True    ${passed}    
 
-TP_MEC_MEC030_SRV_V2X_006_OK_03
+TC_MEC_MEC030_SRV_V2X_007_OK_03
     [Documentation] 
     ...  Check that the IUT responds with the requested list of subscription when queried by a MEC Application
-    ...  ETSI GS MEC 030 V2.1.1, clause 7.8.3.1
-    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/blob/master/MEC030_V2XInformationService.yaml
+    ...  ETSI GS MEC 030 v3.1.1, clause 7.8.3.1
+    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/-/blob/master/MEC030_V2XInformationServices.yaml
         
     Should Be True    ${PIC_MEC_SYSTEM} == 1
     Should Be True    ${PIC_SERVICES} == 1
@@ -223,11 +251,11 @@ TP_MEC_MEC030_SRV_V2X_006_OK_03
     END
     Should Be True    ${passed}
 
-TP_MEC_MEC030_SRV_V2X_006_OK_04
+TC_MEC_MEC030_SRV_V2X_008_OK_04
     [Documentation] 
     ...  Check that the IUT responds with the requested list of subscription when queried by a MEC Application
-    ...  ETSI GS MEC 030 V2.1.1, clause 7.8.3.1
-    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/blob/master/MEC030_V2XInformationService.yaml
+    ...  ETSI GS MEC 030 v3.1.1, clause 7.8.3.1
+    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/-/blob/master/MEC030_V2XInformationServices.yaml
         
     Should Be True    ${PIC_MEC_SYSTEM} == 1
     Should Be True    ${PIC_SERVICES} == 1
@@ -241,11 +269,11 @@ TP_MEC_MEC030_SRV_V2X_006_OK_04
     Should Be True    ${passed}
 
 
-TP_MEC_MEC030_SRV_V2X_006_BR
+TC_MEC_MEC030_SRV_V2X_008_BR
     [Documentation] 
     ...  Check that the IUT responds with an error when a request with incorrect parameters is sent by a MEC Application
-    ...  ETSI GS MEC 030 V2.1.1, clause 7.8.3.1
-    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/blob/master/MEC030_V2XInformationService.yaml        
+    ...  ETSI GS MEC 030 v3.1.1, clause 7.8.3.1
+    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/-/blob/master/MEC030_V2XInformationServices.yaml        
     Should Be True    ${PIC_MEC_SYSTEM} == 1
     Should Be True    ${PIC_SERVICES} == 1
     Retrieve subscription list information    ${SUB_TYPE_INVALID}
@@ -253,11 +281,11 @@ TP_MEC_MEC030_SRV_V2X_006_BR
 
                     
 ##POST on ${apiRoot}/${apiName}/${apiVersion}/subscription  
-TP_MEC_MEC030_SRV_V2X_007_OK_01
+TC_MEC_MEC030_SRV_V2X_009_OK_01
     [Documentation] 
     ...  Check that the IUT responds with the requested to create a subscription
-    ...  ETSI GS MEC 030 V2.1.1, clause 7.8.3.4
-    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/blob/master/MEC030_V2XInformationService.yaml
+    ...  ETSI GS MEC 030 v3.1.1, clause 7.8.3.4
+    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/-/blob/master/MEC030_V2XInformationServices.yaml
     Should Be True    ${PIC_MEC_SYSTEM} == 1
     Should Be True    ${PIC_SERVICES} == 1
     ${path}    Catenate    SEPARATOR=      jsons/     ProvChgUuUniSubscription.json
@@ -271,11 +299,11 @@ TP_MEC_MEC030_SRV_V2X_007_OK_01
     Should Be Equal As Strings  ${json_object['filterCriteria']}    ${response['body']['filterCriteria']}
     Should Not Be Empty  ${response['body']['_links']['self']['href']}	
 
-TP_MEC_MEC030_SRV_V2X_007_OK_02
+TC_MEC_MEC030_SRV_V2X_009_OK_02
     [Documentation] 
     ...  Check that the IUT responds with the requested to create a subscription
-    ...  ETSI GS MEC 030 V2.1.1, clause 7.8.3.4
-    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/blob/master/MEC030_V2XInformationService.yaml       
+    ...  ETSI GS MEC 030 v3.1.1, clause 7.8.3.4
+    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/-/blob/master/MEC030_V2XInformationServices.yaml       
     Should Be True    ${PIC_MEC_SYSTEM} == 1
     Should Be True    ${PIC_SERVICES} == 1
     ${path}    Catenate    SEPARATOR=      jsons/     ProvChgUuMbmsSubscription.json
@@ -290,11 +318,11 @@ TP_MEC_MEC030_SRV_V2X_007_OK_02
     Should Not Be Empty  ${response['body']['_links']['self']['href']}	
  
 
-TP_MEC_MEC030_SRV_V2X_007_OK_03
+TC_MEC_MEC030_SRV_V2X_009_OK_03
     [Documentation] 
     ...  Check that the IUT responds with the requested to create a subscription
-    ...  ETSI GS MEC 030 V2.1.1, clause 7.8.3.4
-    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/blob/master/MEC030_V2XInformationService.yaml        
+    ...  ETSI GS MEC 030 v3.1.1, clause 7.8.3.4
+    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/-/blob/master/MEC030_V2XInformationServices.yaml        
     Should Be True    ${PIC_MEC_SYSTEM} == 1
     Should Be True    ${PIC_SERVICES} == 1
     ${path}    Catenate    SEPARATOR=      jsons/     ProvChgPc5Subscription.json
@@ -308,11 +336,11 @@ TP_MEC_MEC030_SRV_V2X_007_OK_03
     Should Be Equal As Strings  ${json_object['filterCriteria']}    ${response['body']['filterCriteria']}
     Should Not Be Empty  ${response['body']['_links']['self']['href']}	
 
-TP_MEC_MEC030_SRV_V2X_007_OK_04
+TC_MEC_MEC030_SRV_V2X_009_OK_04
     [Documentation] 
     ...  Check that the IUT responds with the requested to create a subscription
-    ...  ETSI GS MEC 030 V2.1.1, clause 7.8.3.4
-    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/blob/master/MEC030_V2XInformationService.yaml
+    ...  ETSI GS MEC 030 v3.1.1, clause 7.8.3.4
+    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/-/blob/master/MEC030_V2XInformationServices.yaml
         
     Should Be True    ${PIC_MEC_SYSTEM} == 1
     Should Be True    ${PIC_SERVICES} == 1
@@ -328,26 +356,23 @@ TP_MEC_MEC030_SRV_V2X_007_OK_04
     Should Not Be Empty  ${response['body']['_links']['self']['href']}	
 
 
-TP_MEC_MEC030_SRV_V2X_007_BR
+TC_MEC_MEC030_SRV_V2X_009_BR
     [Documentation] 
-    ...  Check that the IUT responds with the requested to create a subscription
-    ...  ETSI GS MEC 030 V2.1.1, clause 7.8.3.4
-    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/blob/master/MEC030_V2XInformationService.yaml        
+    ...  Check that the IUT responds with an error when a request with incorrect parameters is sent by a MEC Application
+    ...  ETSI GS MEC 030 V3.1.1, clause 7.10.3.1
+    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/-/blob/master/MEC030_V2XInformationServices.yaml        
     Should Be True    ${PIC_MEC_SYSTEM} == 1
     Should Be True    ${PIC_SERVICES} == 1
-    ${path}    Catenate    SEPARATOR=      jsons/     ProvChgUuMbmsSubscription_BR.json
-    ${body}    Get File    ${path}
-    ${json_object}=	Evaluate  json.loads('''${body}''')  json
-    Send a request for creating a subscription   ${body}
+    Retrieve a subscription using wrong endpoint  ${SUB_PROV_CHG_UU_UNI_ID}
     Check HTTP Response Status Code Is    400
  
           
 ##GET on ${apiRoot}/${apiName}/${apiVersion}/subscriptions/{subscriptionId}
-TP_MEC_MEC030_SRV_V2X_008_OK_01
+TC_MEC_MEC030_SRV_V2X_010_OK_01
     [Documentation] 
     ...  Check that the IUT responds with the requested of subscription information when queried by a MEC Application
-    ...  ETSI GS MEC 030 V2.1.1, clause 7.9.3.1
-    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/blob/master/MEC030_V2XInformationService.yaml
+    ...  ETSI GS MEC 030 v3.1.1, clause 7.9.3.1
+    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/-/blob/master/MEC030_V2XInformationServices.yaml
     Should Be True    ${PIC_MEC_SYSTEM} == 1
     Should Be True    ${PIC_SERVICES} == 1
     Retrieve a subscription  ${SUB_PROV_CHG_UU_UNI_ID}
@@ -358,11 +383,11 @@ TP_MEC_MEC030_SRV_V2X_008_OK_01
     Should Not Be Empty  ${response['body']['filterCriteria']}	
     Should Not Be Empty  ${response['body']['_links']['self']['href']}	
 
-TP_MEC_MEC030_SRV_V2X_008_OK_02
+TC_MEC_MEC030_SRV_V2X_010_OK_02
     [Documentation] 
     ...  Check that the IUT responds with the requested of subscription information when queried by a MEC Application
-    ...  ETSI GS MEC 030 V2.1.1, clause 7.9.3.1
-    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/blob/master/MEC030_V2XInformationService.yaml
+    ...  ETSI GS MEC 030 v3.1.1, clause 7.9.3.1
+    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/-/blob/master/MEC030_V2XInformationServices.yaml
     Should Be True    ${PIC_MEC_SYSTEM} == 1
     Should Be True    ${PIC_SERVICES} == 1
     Retrieve a subscription  ${SUB_PROV_CHG_UU_MBMS_ID}
@@ -374,11 +399,11 @@ TP_MEC_MEC030_SRV_V2X_008_OK_02
     Should Not Be Empty  ${response['body']['_links']['self']['href']}
     
 
-TP_MEC_MEC030_SRV_V2X_008_OK_03
+TC_MEC_MEC030_SRV_V2X_010_OK_03
     [Documentation] 
     ...  Check that the IUT responds with the requested of subscription information when queried by a MEC Application
-    ...  ETSI GS MEC 030 V2.1.1, clause 7.9.3.1
-    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/blob/master/MEC030_V2XInformationService.yaml
+    ...  ETSI GS MEC 030 v3.1.1, clause 7.9.3.1
+    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/-/blob/master/MEC030_V2XInformationServices.yaml
     Should Be True    ${PIC_MEC_SYSTEM} == 1
     Should Be True    ${PIC_SERVICES} == 1
     Retrieve a subscription  ${SUB_PROV_CHG_PC5_ID}
@@ -389,11 +414,11 @@ TP_MEC_MEC030_SRV_V2X_008_OK_03
     Should Not Be Empty  ${response['body']['filterCriteria']}	
     Should Not Be Empty  ${response['body']['_links']['self']['href']}
 
-TP_MEC_MEC030_SRV_V2X_008_OK_04
+TC_MEC_MEC030_SRV_V2X_010_OK_04
     [Documentation] 
     ...  Check that the IUT responds with the requested of subscription information when queried by a MEC Application
-    ...  ETSI GS MEC 030 V2.1.1, clause 7.9.3.1
-    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/blob/master/MEC030_V2XInformationService.yaml
+    ...  ETSI GS MEC 030 v3.1.1, clause 7.9.3.1
+    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/-/blob/master/MEC030_V2XInformationServices.yaml
     Should Be True    ${PIC_MEC_SYSTEM} == 1
     Should Be True    ${PIC_SERVICES} == 1
     Retrieve a subscription  ${SUB_V2X_MSG_ID}
@@ -404,22 +429,22 @@ TP_MEC_MEC030_SRV_V2X_008_OK_04
     Should Not Be Empty  ${response['body']['filterCriteria']}	
     Should Not Be Empty  ${response['body']['_links']['self']['href']}
 
-TP_MEC_MEC030_SRV_V2X_008_BR
+TC_MEC_MEC030_SRV_V2X_010_BR
     [Documentation] 
     ...  Check that the IUT responds with an error when a request with incorrect parameters is sent by a MEC Application
-    ...  ETSI GS MEC 030 V2.1.1, clause 7.9.3.1
-    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/blob/master/MEC030_V2XInformationService.yaml
+    ...  ETSI GS MEC 030 v3.1.1, clause 7.9.3.1
+    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/-/blob/master/MEC030_V2XInformationServices.yaml
     Should Be True    ${PIC_MEC_SYSTEM} == 1
     Should Be True    ${PIC_SERVICES} == 1
     Retrieve a subscription     ${SUB_WRONG_PARAM}
     Check HTTP Response Status Code Is    400  
     
 
-TP_MEC_MEC030_SRV_V2X_008_NF
+TC_MEC_MEC030_SRV_V2X_010_NF
     [Documentation] 
     ...  Check that the IUT responds with an error when a request with incorrect parameters is sent by a MEC Application
-    ...  ETSI GS MEC 030 V2.1.1, clause 7.9.3.1
-    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/blob/master/MEC030_V2XInformationService.yaml
+    ...  ETSI GS MEC 030 v3.1.1, clause 7.9.3.1
+    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/-/blob/master/MEC030_V2XInformationServices.yaml
     Should Be True    ${PIC_MEC_SYSTEM} == 1
     Should Be True    ${PIC_SERVICES} == 1
     Retrieve a subscription     ${NOT_EXISTING_SUB_ID}
@@ -428,11 +453,11 @@ TP_MEC_MEC030_SRV_V2X_008_NF
     
 
 ##PUT on ${apiRoot}/${apiName}/${apiVersion}/subscriptions/{subscriptionId}
-TP_MEC_MEC030_SRV_V2X_009_OK_01
+TC_MEC_MEC030_SRV_V2X_011_OK_01
     [Documentation] 
     ...  Check that the IUT responds with the requested of updating subscription when queried by a MEC Application
-    ...  ETSI GS MEC 030 V2.1.1, clause 7.9.3.2
-    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/blob/master/MEC030_V2XInformationService.yaml
+    ...  ETSI GS MEC 030 v3.1.1, clause 7.9.3.2
+    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/-/blob/master/MEC030_V2XInformationServices.yaml
     Should Be True    ${PIC_MEC_SYSTEM} == 1
     Should Be True    ${PIC_SERVICES} == 1
     ${path}    Catenate    SEPARATOR=      jsons/     ProvChgUuUniSubscriptionUpdate.json
@@ -446,11 +471,11 @@ TP_MEC_MEC030_SRV_V2X_009_OK_01
     Should Not Be Empty  ${response['body']['_links']['self']['href']}	
     Should Be Equal As Strings  ${json_object['filterCriteria']}  ${response['body']['filterCriteria']}
 
-TP_MEC_MEC030_SRV_V2X_009_OK_02
+TC_MEC_MEC030_SRV_V2X_011_OK_02
     [Documentation] 
     ...  Check that the IUT responds with the requested of updating subscription when queried by a MEC Application
-    ...  ETSI GS MEC 030 V2.1.1, clause 7.9.3.2
-    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/blob/master/MEC030_V2XInformationService.yaml
+    ...  ETSI GS MEC 030 v3.1.1, clause 7.9.3.2
+    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/-/blob/master/MEC030_V2XInformationServices.yaml
     Should Be True    ${PIC_MEC_SYSTEM} == 1
     Should Be True    ${PIC_SERVICES} == 1
     ${path}    Catenate    SEPARATOR=      jsons/     ProvChgUuMbmsSubscriptionUpdate.json
@@ -464,11 +489,11 @@ TP_MEC_MEC030_SRV_V2X_009_OK_02
     Should Not Be Empty  ${response['body']['_links']['self']['href']}	
     Should Be Equal As Strings  ${json_object['filterCriteria']}  ${response['body']['filterCriteria']}
 
-TP_MEC_MEC030_SRV_V2X_009_OK_03
+TC_MEC_MEC030_SRV_V2X_011_OK_03
     [Documentation] 
     ...  Check that the IUT responds with the requested of updating subscription when queried by a MEC Application
-    ...  ETSI GS MEC 030 V2.1.1, clause 7.9.3.2
-    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/blob/master/MEC030_V2XInformationService.yaml
+    ...  ETSI GS MEC 030 v3.1.1, clause 7.9.3.2
+    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/-/blob/master/MEC030_V2XInformationServices.yaml
     Should Be True    ${PIC_MEC_SYSTEM} == 1
     Should Be True    ${PIC_SERVICES} == 1
     ${path}    Catenate    SEPARATOR=      jsons/     ProvChgPc5SubscriptionUpdate.json
@@ -482,11 +507,11 @@ TP_MEC_MEC030_SRV_V2X_009_OK_03
     Should Not Be Empty  ${response['body']['_links']['self']['href']}	
     Should Be Equal As Strings  ${json_object['filterCriteria']}   ${response['body']['filterCriteria']}
  
-TP_MEC_MEC030_SRV_V2X_009_OK_04
+TC_MEC_MEC030_SRV_V2X_011_OK_04
     [Documentation] 
     ...  Check that the IUT responds with the requested of updating subscription when queried by a MEC Application
-    ...  ETSI GS MEC 030 V2.1.1, clause 7.9.3.2
-    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/blob/master/MEC030_V2XInformationService.yaml
+    ...  ETSI GS MEC 030 v3.1.1, clause 7.9.3.2
+    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/-/blob/master/MEC030_V2XInformationServices.yaml
     Should Be True    ${PIC_MEC_SYSTEM} == 1
     Should Be True    ${PIC_SERVICES} == 1
     ${path}    Catenate    SEPARATOR=      jsons/     V2xMsgSubscriptionUpdate.json
@@ -500,11 +525,11 @@ TP_MEC_MEC030_SRV_V2X_009_OK_04
     Should Not Be Empty  ${response['body']['_links']['self']['href']}	
     Should Be Equal As Strings  ${json_object['filterCriteria']}   ${response['body']['filterCriteria']}
  
-TP_MEC_MEC030_SRV_V2X_009_BR
+TC_MEC_MEC030_SRV_V2X_011_BR
     [Documentation] 
     ...  Check that the IUT responds with the requested of updating subscription when queried by a MEC Application
-    ...  ETSI GS MEC 030 V2.1.1, clause 7.9.3.2
-    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/blob/master/MEC030_V2XInformationService.yaml
+    ...  ETSI GS MEC 030 v3.1.1, clause 7.9.3.2
+    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/-/blob/master/MEC030_V2XInformationServices.yaml
     Should Be True    ${PIC_MEC_SYSTEM} == 1
     Should Be True    ${PIC_SERVICES} == 1
     ${path}    Catenate    SEPARATOR=      jsons/     ProvChgUuUniSubscriptionUpdate_BR.json
@@ -513,11 +538,11 @@ TP_MEC_MEC030_SRV_V2X_009_BR
     Update existing subscription   ${SUB_PROV_CHG_UU_UNI_ID}  ${body}
     Check HTTP Response Status Code Is    400
 
-TP_MEC_MEC030_SRV_V2X_009_NF
+TC_MEC_MEC030_SRV_V2X_011_NF
     [Documentation] 
     ...  Check that the IUT responds with the requested of updating subscription when queried by a MEC Application
-    ...  ETSI GS MEC 030 V2.1.1, clause 7.9.3.2
-    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/blob/master/MEC030_V2XInformationService.yaml
+    ...  ETSI GS MEC 030 v3.1.1, clause 7.9.3.2
+    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/-/blob/master/MEC030_V2XInformationServices.yaml
     Should Be True    ${PIC_MEC_SYSTEM} == 1
     Should Be True    ${PIC_SERVICES} == 1
     ${path}    Catenate    SEPARATOR=      jsons/     ProvChgUuUniSubscriptionUpdate.json
@@ -528,52 +553,52 @@ TP_MEC_MEC030_SRV_V2X_009_NF
     Check HTTP Response Status Code Is    404
   
 ##DELETE on ${apiRoot}/${apiName}/${apiVersion}/subscriptions/{subscriptionId}
-TP_MEC_MEC030_SRV_V2X_010_OK_01 
+TC_MEC_MEC030_SRV_V2X_012_OK_01 
     [Documentation] 
     ...  Check that the IUT responds with the requested of updating subscription when queried by a MEC Application
-    ...  ETSI GS MEC 030 V2.1.1, clause 7.9.3.2
-    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/blob/master/MEC030_V2XInformationService.yaml
+    ...  ETSI GS MEC 030 v3.1.1, clause 7.9.3.2
+    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/-/blob/master/MEC030_V2XInformationServices.yaml
     Should Be True    ${PIC_MEC_SYSTEM} == 1
     Should Be True    ${PIC_SERVICES} == 1
     Remove existing subscription    ${SUB_PROV_CHG_UU_UNI_ID}
     Check HTTP Response Status Code Is    204  
 
-TP_MEC_MEC030_SRV_V2X_010_OK_02 
+TC_MEC_MEC030_SRV_V2X_012_OK_02 
     [Documentation] 
     ...  Check that the IUT responds with the requested of updating subscription when queried by a MEC Application
-    ...  ETSI GS MEC 030 V2.1.1, clause 7.9.3.2
-    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/blob/master/MEC030_V2XInformationService.yaml
+    ...  ETSI GS MEC 030 v3.1.1, clause 7.9.3.2
+    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/-/blob/master/MEC030_V2XInformationServices.yaml
     Should Be True    ${PIC_MEC_SYSTEM} == 1
     Should Be True    ${PIC_SERVICES} == 1
     Remove existing subscription    ${SUB_PROV_CHG_UU_MBMS_ID}
     Check HTTP Response Status Code Is    204  
     
-TP_MEC_MEC030_SRV_V2X_010_OK_03 
+TC_MEC_MEC030_SRV_V2X_012_OK_03 
     [Documentation] 
     ...  Check that the IUT responds with the requested of updating subscription when queried by a MEC Application
-    ...  ETSI GS MEC 030 V2.1.1, clause 7.9.3.2
-    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/blob/master/MEC030_V2XInformationService.yaml
+    ...  ETSI GS MEC 030 v3.1.1, clause 7.9.3.2
+    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/-/blob/master/MEC030_V2XInformationServices.yaml
     Should Be True    ${PIC_MEC_SYSTEM} == 1
     Should Be True    ${PIC_SERVICES} == 1
     Remove existing subscription    ${SUB_PROV_CHG_PC5_ID}
     Check HTTP Response Status Code Is    204  
     
-TP_MEC_MEC030_SRV_V2X_010_OK_04 
+TC_MEC_MEC030_SRV_V2X_012_OK_04 
     [Documentation] 
     ...  Check that the IUT responds with the requested of updating subscription when queried by a MEC Application
-    ...  ETSI GS MEC 030 V2.1.1, clause 7.9.3.2
-    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/blob/master/MEC030_V2XInformationService.yaml
+    ...  ETSI GS MEC 030 v3.1.1, clause 7.9.3.2
+    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/-/blob/master/MEC030_V2XInformationServices.yaml
     Should Be True    ${PIC_MEC_SYSTEM} == 1
     Should Be True    ${PIC_SERVICES} == 1
     Remove existing subscription    ${SUB_V2X_MSG_ID}
     Check HTTP Response Status Code Is    204  
     
 
-TP_MEC_MEC030_SRV_V2X_010_NF
+TC_MEC_MEC030_SRV_V2X_012_NF
     [Documentation] 
     ...  Check that the IUT responds with the requested of updating subscription when queried by a MEC Application
-    ...  ETSI GS MEC 030 V2.1.1, clause 7.9.3.2
-    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/blob/master/MEC030_V2XInformationService.yaml
+    ...  ETSI GS MEC 030 v3.1.1, clause 7.9.3.2
+    ...  https://forge.etsi.org/rep/mec/gs030-vis-api/-/blob/master/MEC030_V2XInformationServices.yaml
     Should Be True    ${PIC_MEC_SYSTEM} == 1
     Should Be True    ${PIC_SERVICES} == 1
     Remove existing subscription       ${NOT_EXISTING_SUB_ID}
@@ -588,7 +613,7 @@ Retrieve configured provisioning information over Uu unicast using ecgi filter
     Set Headers    {"Accept":"application/json"}
     Set Headers    {"Content-Type":"*/*"}
     Set Headers    {"Authorization":"${TOKEN}"}
-    Set Headers    {"Content-Length":"0"}
+    Set Headers    {"Content-Length":"0"} 
     GET   ${apiRoot}/${apiName}/${apiVersion}/queries/uu_unicast_provisioning_info?location_info=ecgi,${value}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -711,7 +736,21 @@ Request predicted QoS
     Post    ${apiRoot}/${apiName}/${apiVersion}/provide_predicted_qos    ${body} 
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
-    
+
+
+Request v2x message distribution servers
+    [Arguments]    ${content}
+    Should Be True    ${PIC_MEC_PLAT} == 1
+    Should Be True    ${PIC_SERVICES} == 1
+    Set Headers    {"Accept":"application/json"}
+    Set Headers    {"Content-Type":"application/json"}
+    Set Headers    {"Authorization":"${TOKEN}"}
+    Set Headers    {"Content-Length":"0"}
+    ${path}    Catenate    SEPARATOR=      jsons/     ${content}    .json
+    ${body}    Get File    ${path}
+    Post    ${apiRoot}/${apiName}/${apiVersion}/provide_v2x_msg_distribution_server_info    ${body} 
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
 
 
 Publish V2X message
@@ -734,7 +773,7 @@ Retrieve subscription list information
     Should Be True    ${PIC_MEC_SYSTEM} == 1
     Should Be True    ${PIC_SERVICES} == 1
     Set Headers    {"Accept":"application/json"}
-    Set Headers    {"Content-Type":"*/*"}
+    Set Headers    {"Content-Type":"application/json"}
     Set Headers    {"Authorization":"${TOKEN}"}
     GET     ${apiRoot}/${apiName}/${apiVersion}/subscriptions?subscription_type=${subscription_type}
     ${output}=    Output    response
@@ -758,6 +797,15 @@ Retrieve a subscription
     GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}  
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}   
+
+Retrieve a subscription using wrong endpoint    
+    [Arguments]    ${subscriptionId}
+    Set Headers    {"Accept":"application/json"}
+    Set Headers    {"Content-Type":"*/*"}
+    Set Headers    {"Authorization":"${TOKEN}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/subs/${subscriptionId}  
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}   
     
 Update existing subscription    
     [Arguments]    ${subscriptionId}    ${body}
diff --git a/MEC030/SRV/V2X/environment/variables.txt b/MEC030/SRV/V2X/environment/variables.txt
index 198cebbdff7d5b1fe505173b11dcded159e64c7f..c4ad9e416d570953495d4c3bb3aae6af04823394 100644
--- a/MEC030/SRV/V2X/environment/variables.txt
+++ b/MEC030/SRV/V2X/environment/variables.txt
@@ -1,13 +1,13 @@
 *** Variables ***
 # Generic variables
 ${SCHEMA}                   http
-${HOST}                     127.0.0.1
-${PORT}                     8082
+${HOST}                     mockoon
+${PORT}                     3005
 ${response}                         {}
 ${TOKEN}                            Basic YWxhZGRpbjpvcGVuc2VzYW1l
 ${apiRoot}        
 ${apiName}        vis
-${apiVersion}     v1
+${apiVersion}     v2
 
 # Specific variables
 ${LOCATION_INFO_QUERY_PARAM} 		location_info 								
diff --git a/MEC030/SRV/V2X/jsons/PredictedQoS_BR.json b/MEC030/SRV/V2X/jsons/PredictedQoS_BR.json
index 1ddbf46a8e611f12eb7effde6f1592b0a3a07996..7d0cdfec420bcb24cc151a49a8976427914183f3 100644
--- a/MEC030/SRV/V2X/jsons/PredictedQoS_BR.json
+++ b/MEC030/SRV/V2X/jsons/PredictedQoS_BR.json
@@ -1,5 +1,5 @@
 {
-	"localityGranularity": "10",
+	"localityGranularity": "11",
 	"routes": [{
 		"routeinfo": [
 		  {
diff --git a/MEC030/SRV/V2X/jsons/PredictedQoS_NF.json b/MEC030/SRV/V2X/jsons/PredictedQoS_NF.json
index 3086833d1bb6ed996a3145b0d1ae1193a4bc6fd6..9ab022a3806a4a670c06519f06e1c7b690feab63 100644
--- a/MEC030/SRV/V2X/jsons/PredictedQoS_NF.json
+++ b/MEC030/SRV/V2X/jsons/PredictedQoS_NF.json
@@ -1,5 +1,5 @@
 {
-	"locationGranularity": "10",
+	"locationGranularity": "12",
 	"routes": [{
 		"routeinfo": [
 		  {
diff --git a/MEC030/SRV/V2X/jsons/ProvChgUuUniSubscriptionUpdate.json b/MEC030/SRV/V2X/jsons/ProvChgUuUniSubscriptionUpdate.json
index 40c61b4dddddff58e2f196ff18c238c73c6b7ed0..cd92101d64a53d5aab5250b802efdf87599eedda 100644
--- a/MEC030/SRV/V2X/jsons/ProvChgUuUniSubscriptionUpdate.json
+++ b/MEC030/SRV/V2X/jsons/ProvChgUuUniSubscriptionUpdate.json
@@ -23,8 +23,8 @@
 		}
 	},
 	"_links": {
-    "self": {
-      "href": "https://127.0.0.1/vis/v1/subscription/1"
-    }
-  }
+		"self": {
+			"href": "https://127.0.0.1/vis/v1/subscription/1"
+		}
+	}
 }
\ No newline at end of file
diff --git a/MEC030/SRV/V2X/jsons/V2XDistributionServers.json b/MEC030/SRV/V2X/jsons/V2XDistributionServers.json
new file mode 100644
index 0000000000000000000000000000000000000000..c8c496ae53714330446dbc517d901011dd752644
--- /dev/null
+++ b/MEC030/SRV/V2X/jsons/V2XDistributionServers.json
@@ -0,0 +1,53 @@
+{
+    "V2xMsgDistributionServerInfo": {
+        "locationInfo": [
+            {
+                "ecgi": {
+                    "cellId": {
+                        "cellId": "01010101010101010101010101"
+                    },
+                    "plmn": {
+                        "mcc": "123",
+                        "mnc": "456"
+                    }
+                },
+                "geoArea": {
+                    "latitude": 37.7749,
+                    "longitude": -122.4194
+                }
+            },
+            {
+                "ecgi": {
+                    "cellId": {
+                        "cellId": "02020202020202020202020202"
+                    },
+                    "plmn": {
+                        "mcc": "789",
+                        "mnc": "012"
+                    }
+                }
+            }
+        ],
+        "v2xMsgDistributionServer": [
+            {
+                "infoProtocol": {
+                    "msgProtocol": [
+                        0,
+                        1,
+                        2
+                    ],
+                    "protImplementation": "cpp"
+                }
+            },
+            {
+                "infoProtocol": {
+                    "msgProtocol": [
+                        3,
+                        4
+                    ],
+                    "protImplementation": "Python"
+                }
+            }
+        ]
+    }
+}
\ No newline at end of file
diff --git a/MEC030/SRV/V2X/jsons/V2XDistributionServers_BR.json b/MEC030/SRV/V2X/jsons/V2XDistributionServers_BR.json
new file mode 100644
index 0000000000000000000000000000000000000000..1362c1b9a11646fffc9cc25b65a45e44ec5476bf
--- /dev/null
+++ b/MEC030/SRV/V2X/jsons/V2XDistributionServers_BR.json
@@ -0,0 +1,61 @@
+{
+    "V2xMsgDistributionServerInfo": {
+        "locationInfo": [
+            {
+                "ecgi": {
+                    "cellId": {
+                        "cellId": "01010101010101010101010101"
+                    },
+                    "plmn": {
+                        "mcc": "123",
+                        "mnc": "456"
+                    }
+                },
+                "geoArea": {
+                    "latitude": 37.7749,
+                    "longitude": -122.4194
+                }
+            },
+            {
+                "ecgi": {
+                    "cellId": {
+                        "cellId": "02020202020202020202020202"
+                    },
+                    "plmn": {
+                        "mcc": "789",
+                        "mnc": "012"
+                    }
+                }
+            }
+        ],
+        "v2xMsgDistributionServer": [
+            {
+                "infoConnection": {
+                    "ipAddress": "192.168.1.1",
+                    "port_number": 8080
+                },
+                "infoProtocol": {
+                    "msgProtocol": [
+                        0,
+                        1,
+                        2
+                    ],
+                    "protImplementation": "cpp"
+                }
+            },
+            {
+                "infoConnection": {
+                    "ipAddress": "10.0.0.1",
+                    "port_number": 8888
+                },
+                "infoProtocol": {
+                    "msgProtocol": [
+                        3,
+                        4
+                    ],
+                    "protImplementation": "Python"
+                }
+            }
+        ]
+    }
+}
\ No newline at end of file
diff --git a/MEC030/SRV/V2X/jsons/V2XDistributionServers_NF.json b/MEC030/SRV/V2X/jsons/V2XDistributionServers_NF.json
new file mode 100644
index 0000000000000000000000000000000000000000..c61e7f7dda91604fa95d8ecb25cade1b709ddd17
--- /dev/null
+++ b/MEC030/SRV/V2X/jsons/V2XDistributionServers_NF.json
@@ -0,0 +1,42 @@
+{
+    "V2xMsgDistributionServerInfo": {
+        "locationInfo": [
+            {
+                "ecgi": {
+                    "cellId": {
+                        "cellId": "01010101010101010101010101"
+                    },
+                    "plmn": {
+                        "mcc": "123",
+                        "mnc": "456"
+                    }
+                },
+                "geoArea": {
+                    "latitude": 37.7749,
+                    "longitude": -122.4194
+                }
+            },
+            {
+                "ecgi": {
+                    "cellId": {
+                        "cellId": "02020202020202020202020202"
+                    },
+                    "plmn": {
+                        "mcc": "789",
+                        "mnc": "012"
+                    }
+                }
+            }
+        ],
+        "v2xMsgDistributionServer": [
+            {
+                "infoProtocol": {
+                    "msgProtocol": [
+                        0
+                    ],
+                    "protImplementation": "Java"
+                }
+            }
+        ]
+    }
+}
\ No newline at end of file
diff --git a/MEC030/SRV/V2X/jsons/V2xMsgPublication_BR.json b/MEC030/SRV/V2X/jsons/V2xMsgPublication_BR.json
index 638f90672157cf744477de3ea153519d2230526f..755cc2ec973ebaa4f097c637c8092fb97190c9c8 100644
--- a/MEC030/SRV/V2X/jsons/V2xMsgPublication_BR.json
+++ b/MEC030/SRV/V2X/jsons/V2xMsgPublication_BR.json
@@ -1,5 +1,5 @@
 {
-  "stdOrganization": "UNKNOWN_ORG",
+  "stdOrganization": "UNKNOWN_ORGANIZATION",
   "msgType": 2,
   "msgEncodeFormat": "base64",
   "msgContent": "V2X message content"
diff --git a/MEC030/SRV/V2X/schemas/Pc5ProvisioningInfo.schema.json b/MEC030/SRV/V2X/schemas/Pc5ProvisioningInfo.schema.json
index f6d972d890c0a61f2d2d2255d8ab383d841290b4..9b305ed47fc9c205122c00010ad4c33730b6e131 100644
--- a/MEC030/SRV/V2X/schemas/Pc5ProvisioningInfo.schema.json
+++ b/MEC030/SRV/V2X/schemas/Pc5ProvisioningInfo.schema.json
@@ -6,7 +6,7 @@
         "description": "The provisioning information per location as defined below.",
         "properties": {
           "dstLayer2Id": {
-            "description": "For sidelink communication, the Destination Layer-2 ID is set to the ProSe Layer-2 Group ID or Prose UE ID, see ETSI TS 136 321 [i.12].\nPLMN operators coordinate to make sure Destination Layer-2 ID(s) for different V2X services are configured in a consistent manner.",
+            "description": "For sidelink communication, the Destination Layer-2 ID is set to the ProSe Layer-2 Group ID or Prose UE ID, see ETSI TS136321 [i.12].\nPLMN operators coordinate to make sure Destination Layer-2 ID(s) for different V2X services are configured in a consistent manner.",
             "type": "string",
             "x-etsi-mec-cardinality": "1",
             "x-etsi-mec-origin-type": "String"
diff --git a/MEC030/SRV/V2X/schemas/ProvChgUuMbmsSubscription.schema.json b/MEC030/SRV/V2X/schemas/ProvChgUuMbmsSubscription.schema.json
index 262c1e29e113716356b31756c1cc4bf23c674c62..2905f27b8908b6d84be88877749d6f0f8f159f6f 100644
--- a/MEC030/SRV/V2X/schemas/ProvChgUuMbmsSubscription.schema.json
+++ b/MEC030/SRV/V2X/schemas/ProvChgUuMbmsSubscription.schema.json
@@ -1,485 +1,485 @@
 {
-        "properties": {
-          "_links": {
-            "description": "Hyperlink related to the resource. This shall be only included in the HTTP responses and in HTTP PUT requests.",
-            "properties": {
-              "self": {
-                "description": "'This data type represents a type of link'",
-                "type": "object",
-                "required": [
-                  "href"
-                ],
-                "properties": {
-                  "href": {
-                    "description": "The URI referring to the subscription.",
-                    "type": "string",
-                    "format": "uri"
-                  }
+  "properties": {
+    "_links": {
+      "description": "Hyperlink related to the resource. This shall be only included in the HTTP responses and in HTTP PUT requests.",
+      "properties": {
+        "self": {
+          "description": "'This data type represents a type of link'",
+          "type": "object",
+          "required": [
+            "href"
+          ],
+          "properties": {
+            "href": {
+              "description": "The URI referring to the subscription.",
+              "type": "string",
+              "format": "uri"
+            }
+          }
+        }
+      },
+      "required": [
+        "self"
+      ],
+      "type": "object",
+      "x-etsi-mec-cardinality": "0..1"
+    },
+    "callbackReference": {
+      "description": "URI selected by the service consumer to receive notifications on the subscribed VIS information. This shall be included both in the request and in response.",
+      "format": "uri",
+      "type": "string",
+      "x-etsi-mec-cardinality": "1",
+      "x-etsi-mec-origin-type": "URI"
+    },
+    "expiryDeadline": {
+      "properties": {
+        "nanoSeconds": {
+          "description": "The nanoseconds part of the time. Time is defined as Unix-time since January 1, 1970, 00:00:00 UTC.",
+          "format": "Uint32",
+          "type": "integer",
+          "x-etsi-mec-cardinality": "1",
+          "x-etsi-mec-origin-type": "Uint32"
+        },
+        "seconds": {
+          "description": "The seconds part of the time. Time is defined as Unixtime since January 1, 1970, 00:00:00 UTC.",
+          "format": "Uint32",
+          "type": "integer",
+          "x-etsi-mec-cardinality": "1",
+          "x-etsi-mec-origin-type": "Uint32"
+        }
+      },
+      "required": [
+        "seconds",
+        "nanoSeconds"
+      ],
+      "type": "object",
+      "x-etsi-ref": "6.5.2"
+    },
+    "filterCriteria": {
+      "description": "List of filtering criteria for the subscription. Any filtering criteria from below, which is included in the request, shall also be included in the response.",
+      "properties": {
+        "locationInfo": {
+          "properties": {
+            "ecgi": {
+              "properties": {
+                "cellId": {
+                  "properties": {
+                    "cellId": {
+                      "description": "E-UTRAN Cell Identity as a bit string (size (28)).",
+                      "type": "string",
+                      "x-etsi-mec-cardinality": "1",
+                      "x-etsi-mec-origin-type": "String"
+                    }
+                  },
+                  "required": [
+                    "cellId"
+                  ],
+                  "type": "object",
+                  "x-etsi-ref": "6.6.2"
+                },
+                "plmn": {
+                  "properties": {
+                    "mcc": {
+                      "description": "The Mobile Country Code part of PLMN Identity.",
+                      "type": "string",
+                      "x-etsi-mec-cardinality": "1",
+                      "x-etsi-mec-origin-type": "String"
+                    },
+                    "mnc": {
+                      "description": "The Mobile Network Code part of PLMN Identity.",
+                      "type": "string",
+                      "x-etsi-mec-cardinality": "1",
+                      "x-etsi-mec-origin-type": "String"
+                    }
+                  },
+                  "required": [
+                    "mcc",
+                    "mnc"
+                  ],
+                  "type": "object",
+                  "x-etsi-ref": "6.5.4"
                 }
-              }
-            },
-            "required": [
-              "self"
-            ],
-            "type": "object",
-            "x-etsi-mec-cardinality": "0..1"
-          },
-          "callbackReference": {
-            "description": "URI selected by the service consumer to receive notifications on the subscribed VIS information. This shall be included both in the request and in response.",
-            "format": "uri",
-            "type": "string",
-            "x-etsi-mec-cardinality": "1",
-            "x-etsi-mec-origin-type": "URI"
-          },
-          "expiryDeadline": {
-            "properties": {
-              "nanoSeconds": {
-                "description": "The nanoseconds part of the time. Time is defined as Unix-time since January 1, 1970, 00:00:00 UTC.",
-                "format": "Uint32",
-                "type": "integer",
-                "x-etsi-mec-cardinality": "1",
-                "x-etsi-mec-origin-type": "Uint32"
               },
-              "seconds": {
-                "description": "The seconds part of the time. Time is defined as Unixtime since January 1, 1970, 00:00:00 UTC.",
-                "format": "Uint32",
-                "type": "integer",
-                "x-etsi-mec-cardinality": "1",
-                "x-etsi-mec-origin-type": "Uint32"
-              }
+              "required": [
+                "plmn",
+                "cellId"
+              ],
+              "type": "object",
+              "x-etsi-ref": "6.5.5"
             },
-            "required": [
-              "seconds",
-              "nanoSeconds"
-            ],
-            "type": "object",
-            "x-etsi-ref": "6.5.2"
+            "geoArea": {
+              "description": "Information of a geographical area.",
+              "properties": {
+                "latitude": {
+                  "description": "Latitude (DATUM = WGS84) -90 to 90 in decimal degree format DDD.ddd",
+                  "format": "Float",
+                  "type": "number",
+                  "x-etsi-mec-cardinality": "1",
+                  "x-etsi-mec-origin-type": "Float"
+                },
+                "longitude": {
+                  "description": "Longitude (DATUM = WGS84)-180 to 180 in decimal degree format DDD.ddd",
+                  "format": "Float",
+                  "type": "number",
+                  "x-etsi-mec-cardinality": "1",
+                  "x-etsi-mec-origin-type": "Float"
+                }
+              },
+              "required": [
+                "latitude",
+                "longitude"
+              ],
+              "type": "object",
+              "x-etsi-mec-cardinality": "0..1"
+            }
           },
-          "filterCriteria": {
-            "description": "List of filtering criteria for the subscription. Any filtering criteria from below, which is included in the request, shall also be included in the response.",
+          "type": "object",
+          "x-etsi-notes": "NOTE:\tEither ecgi or geoArea shall be present, but not both.",
+          "x-etsi-ref": "6.5.3"
+        },
+        "neighbourCellInfo": {
+          "description": "The information of the neighbour cells in a visiting PLMN that support V2X communication over Uu MBMS.",
+          "items": {
             "properties": {
-              "locationInfo": {
+              "ecgi": {
                 "properties": {
-                  "ecgi": {
+                  "cellId": {
                     "properties": {
                       "cellId": {
-                        "properties": {
-                          "cellId": {
-                            "description": "E-UTRAN Cell Identity as a bit string (size (28)).",
-                            "type": "string",
-                            "x-etsi-mec-cardinality": "1",
-                            "x-etsi-mec-origin-type": "String"
-                          }
-                        },
-                        "required": [
-                          "cellId"
-                        ],
-                        "type": "object",
-                        "x-etsi-ref": "6.6.2"
-                      },
-                      "plmn": {
-                        "properties": {
-                          "mcc": {
-                            "description": "The Mobile Country Code part of PLMN Identity.",
-                            "type": "string",
-                            "x-etsi-mec-cardinality": "1",
-                            "x-etsi-mec-origin-type": "String"
-                          },
-                          "mnc": {
-                            "description": "The Mobile Network Code part of PLMN Identity.",
-                            "type": "string",
-                            "x-etsi-mec-cardinality": "1",
-                            "x-etsi-mec-origin-type": "String"
-                          }
-                        },
-                        "required": [
-                          "mcc",
-                          "mnc"
-                        ],
-                        "type": "object",
-                        "x-etsi-ref": "6.5.4"
+                        "description": "E-UTRAN Cell Identity as a bit string (size (28)).",
+                        "type": "string",
+                        "x-etsi-mec-cardinality": "1",
+                        "x-etsi-mec-origin-type": "String"
                       }
                     },
                     "required": [
-                      "plmn",
                       "cellId"
                     ],
                     "type": "object",
-                    "x-etsi-ref": "6.5.5"
+                    "x-etsi-ref": "6.6.2"
                   },
-                  "geoArea": {
-                    "description": "Information of a geographical area.",
+                  "plmn": {
                     "properties": {
-                      "latitude": {
-                        "description": "Latitude (DATUM = WGS84) -90 to 90 in decimal degree format DDD.ddd",
-                        "format": "Float",
-                        "type": "number",
+                      "mcc": {
+                        "description": "The Mobile Country Code part of PLMN Identity.",
+                        "type": "string",
                         "x-etsi-mec-cardinality": "1",
-                        "x-etsi-mec-origin-type": "Float"
+                        "x-etsi-mec-origin-type": "String"
                       },
-                      "longitude": {
-                        "description": "Longitude (DATUM = WGS84)-180 to 180 in decimal degree format DDD.ddd",
-                        "format": "Float",
-                        "type": "number",
+                      "mnc": {
+                        "description": "The Mobile Network Code part of PLMN Identity.",
+                        "type": "string",
                         "x-etsi-mec-cardinality": "1",
-                        "x-etsi-mec-origin-type": "Float"
+                        "x-etsi-mec-origin-type": "String"
                       }
                     },
                     "required": [
-                      "latitude",
-                      "longitude"
+                      "mcc",
+                      "mnc"
                     ],
                     "type": "object",
-                    "x-etsi-mec-cardinality": "0..1"
+                    "x-etsi-ref": "6.5.4"
                   }
                 },
+                "required": [
+                  "plmn",
+                  "cellId"
+                ],
                 "type": "object",
-                "x-etsi-notes": "NOTE:\tEither ecgi or geoArea shall be present, but not both.",
-                "x-etsi-ref": "6.5.3"
+                "x-etsi-ref": "6.5.5"
               },
-              "neighbourCellInfo": {
-                "description": "The information of the neighbour cells in a visiting PLMN that support V2X communication over Uu MBMS.",
-                "items": {
-                  "properties": {
-                    "ecgi": {
-                      "properties": {
-                        "cellId": {
-                          "properties": {
-                            "cellId": {
-                              "description": "E-UTRAN Cell Identity as a bit string (size (28)).",
-                              "type": "string",
-                              "x-etsi-mec-cardinality": "1",
-                              "x-etsi-mec-origin-type": "String"
-                            }
-                          },
-                          "required": [
-                            "cellId"
-                          ],
-                          "type": "object",
-                          "x-etsi-ref": "6.6.2"
-                        },
-                        "plmn": {
-                          "properties": {
-                            "mcc": {
-                              "description": "The Mobile Country Code part of PLMN Identity.",
-                              "type": "string",
-                              "x-etsi-mec-cardinality": "1",
-                              "x-etsi-mec-origin-type": "String"
-                            },
-                            "mnc": {
-                              "description": "The Mobile Network Code part of PLMN Identity.",
-                              "type": "string",
-                              "x-etsi-mec-cardinality": "1",
-                              "x-etsi-mec-origin-type": "String"
-                            }
-                          },
-                          "required": [
-                            "mcc",
-                            "mnc"
-                          ],
-                          "type": "object",
-                          "x-etsi-ref": "6.5.4"
-                        }
-                      },
-                      "required": [
-                        "plmn",
-                        "cellId"
-                      ],
-                      "type": "object",
-                      "x-etsi-ref": "6.5.5"
-                    },
-                    "fddInfo": {
-                      "properties": {
-                        "dlEarfcn": {
-                          "properties": {
-                            "earfcn": {
-                              "description": "E-UTRA Absolute Radio Frequency Channel Number, range (0... 65535)",
-                              "type": "integer",
-                              "x-etsi-mec-cardinality": "1",
-                              "x-etsi-mec-origin-type": "Integer"
-                            }
-                          },
-                          "required": [
-                            "earfcn"
-                          ],
-                          "type": "object",
-                          "x-etsi-ref": "6.6.3"
-                        },
-                        "dlTransmissionBandwidth": {
-                          "properties": {
-                            "transmissionBandwidth": {
-                              "description": "Numeric value corresponding to the transmission bandwidth expressed in units of resource blocks as follows:1 = bw6 (6 resource blocks)2 = bw15 (15 resource blocks) 3 = bw25 (25 resource blocks) 4 = bw50 (50 resource blocks) 5 = bw75 (75 resource blocks) 6 = bw100 (100 resource blocks)",
-                              "enum": [
-                                1,
-                                2,
-                                3,
-                                4,
-                                5,
-                                6
-                              ],
-                              "type": "integer",
-                              "x-etsi-mec-cardinality": "1",
-                              "x-etsi-mec-origin-type": "Enum"
-                            }
-                          },
-                          "required": [
-                            "transmissionBandwidth"
-                          ],
-                          "type": "object",
-                          "x-etsi-ref": "6.6.4"
-                        },
-                        "ulEarfcn": {
-                          "properties": {
-                            "earfcn": {
-                              "description": "E-UTRA Absolute Radio Frequency Channel Number, range (0... 65535)",
-                              "type": "integer",
-                              "x-etsi-mec-cardinality": "1",
-                              "x-etsi-mec-origin-type": "Integer"
-                            }
-                          },
-                          "required": [
-                            "earfcn"
-                          ],
-                          "type": "object",
-                          "x-etsi-ref": "6.6.3"
-                        },
-                        "ulTransmissionBandwidth": {
-                          "properties": {
-                            "transmissionBandwidth": {
-                              "description": "Numeric value corresponding to the transmission bandwidth expressed in units of resource blocks as follows:1 = bw6 (6 resource blocks)2 = bw15 (15 resource blocks) 3 = bw25 (25 resource blocks) 4 = bw50 (50 resource blocks) 5 = bw75 (75 resource blocks) 6 = bw100 (100 resource blocks)",
-                              "enum": [
-                                1,
-                                2,
-                                3,
-                                4,
-                                5,
-                                6
-                              ],
-                              "type": "integer",
-                              "x-etsi-mec-cardinality": "1",
-                              "x-etsi-mec-origin-type": "Enum"
-                            }
-                          },
-                          "required": [
-                            "transmissionBandwidth"
-                          ],
-                          "type": "object",
-                          "x-etsi-ref": "6.6.4"
-                        }
-                      },
-                      "required": [
-                        "ulEarfcn",
-                        "dlEarfcn",
-                        "ulTransmissionBandwidth",
-                        "dlTransmissionBandwidth"
-                      ],
-                      "type": "object",
-                      "x-etsi-ref": "6.5.6"
-                    },
-                    "mbmsServiceAreaIdentity": {
-                      "description": "Supported MBMS Service Area Identities in the cell.",
-                      "items": {
-                        "type": "string"
-                      },
-                      "minItems": 1,
-                      "type": "array",
-                      "x-etsi-mec-cardinality": "1..N",
-                      "x-etsi-mec-origin-type": "String"
+              "fddInfo": {
+                "properties": {
+                  "dlEarfcn": {
+                    "properties": {
+                      "earfcn": {
+                        "description": "E-UTRA Absolute Radio Frequency Channel Number, range (0... 65535)",
+                        "type": "integer",
+                        "x-etsi-mec-cardinality": "1",
+                        "x-etsi-mec-origin-type": "Integer"
+                      }
                     },
-                    "pci": {
-                      "description": "Physical Cell Identifier.",
-                      "type": "integer",
-                      "x-etsi-mec-cardinality": "1",
-                      "x-etsi-mec-origin-type": "Integer"
+                    "required": [
+                      "earfcn"
+                    ],
+                    "type": "object",
+                    "x-etsi-ref": "6.6.3"
+                  },
+                  "dlTransmissionBandwidth": {
+                    "properties": {
+                      "transmissionBandwidth": {
+                        "description": "Numeric value corresponding to the transmission bandwidth expressed in units of resource blocks as follows:1 = bw6 (6 resource blocks)2 = bw15 (15 resource blocks) 3 = bw25 (25 resource blocks) 4 = bw50 (50 resource blocks) 5 = bw75 (75 resource blocks) 6 = bw100 (100 resource blocks)",
+                        "enum": [
+                          1,
+                          2,
+                          3,
+                          4,
+                          5,
+                          6
+                        ],
+                        "type": "integer",
+                        "x-etsi-mec-cardinality": "1",
+                        "x-etsi-mec-origin-type": "Enum"
+                      }
                     },
-                    "plmn": {
-                      "properties": {
-                        "mcc": {
-                          "description": "The Mobile Country Code part of PLMN Identity.",
-                          "type": "string",
-                          "x-etsi-mec-cardinality": "1",
-                          "x-etsi-mec-origin-type": "String"
-                        },
-                        "mnc": {
-                          "description": "The Mobile Network Code part of PLMN Identity.",
-                          "type": "string",
-                          "x-etsi-mec-cardinality": "1",
-                          "x-etsi-mec-origin-type": "String"
-                        }
-                      },
-                      "required": [
-                        "mcc",
-                        "mnc"
-                      ],
-                      "type": "object",
-                      "x-etsi-ref": "6.5.4"
+                    "required": [
+                      "transmissionBandwidth"
+                    ],
+                    "type": "object",
+                    "x-etsi-ref": "6.6.4"
+                  },
+                  "ulEarfcn": {
+                    "properties": {
+                      "earfcn": {
+                        "description": "E-UTRA Absolute Radio Frequency Channel Number, range (0... 65535)",
+                        "type": "integer",
+                        "x-etsi-mec-cardinality": "1",
+                        "x-etsi-mec-origin-type": "Integer"
+                      }
                     },
-                    "tddInfo": {
-                      "properties": {
-                        "earfcn": {
-                          "properties": {
-                            "earfcn": {
-                              "description": "E-UTRA Absolute Radio Frequency Channel Number, range (0... 65535)",
-                              "type": "integer",
-                              "x-etsi-mec-cardinality": "1",
-                              "x-etsi-mec-origin-type": "Integer"
-                            }
-                          },
-                          "required": [
-                            "earfcn"
-                          ],
-                          "type": "object",
-                          "x-etsi-ref": "6.6.3"
-                        },
-                        "subframeAssignment": {
-                          "description": "Uplink-downlink subframe configuration information.",
-                          "type": "string",
-                          "x-etsi-mec-cardinality": "1",
-                          "x-etsi-mec-origin-type": "String"
-                        },
-                        "transmissionBandwidth": {
-                          "properties": {
-                            "transmissionBandwidth": {
-                              "description": "Numeric value corresponding to the transmission bandwidth expressed in units of resource blocks as follows:1 = bw6 (6 resource blocks)2 = bw15 (15 resource blocks) 3 = bw25 (25 resource blocks) 4 = bw50 (50 resource blocks) 5 = bw75 (75 resource blocks) 6 = bw100 (100 resource blocks)",
-                              "enum": [
-                                1,
-                                2,
-                                3,
-                                4,
-                                5,
-                                6
-                              ],
-                              "type": "integer",
-                              "x-etsi-mec-cardinality": "1",
-                              "x-etsi-mec-origin-type": "Enum"
-                            }
-                          },
-                          "required": [
-                            "transmissionBandwidth"
-                          ],
-                          "type": "object",
-                          "x-etsi-ref": "6.6.4"
-                        }
-                      },
-                      "required": [
-                        "earfcn",
-                        "transmissionBandwidth",
-                        "subframeAssignment"
-                      ],
-                      "type": "object",
-                      "x-etsi-ref": "6.5.7"
-                    }
+                    "required": [
+                      "earfcn"
+                    ],
+                    "type": "object",
+                    "x-etsi-ref": "6.6.3"
                   },
-                  "required": [
-                    "plmn",
-                    "ecgi",
-                    "pci",
-                    "fddInfo",
-                    "tddInfo",
-                    "mbmsServiceAreaIdentity"
-                  ],
-                  "type": "object",
-                  "x-etsi-ref": "6.5.11"
+                  "ulTransmissionBandwidth": {
+                    "properties": {
+                      "transmissionBandwidth": {
+                        "description": "Numeric value corresponding to the transmission bandwidth expressed in units of resource blocks as follows:1 = bw6 (6 resource blocks)2 = bw15 (15 resource blocks) 3 = bw25 (25 resource blocks) 4 = bw50 (50 resource blocks) 5 = bw75 (75 resource blocks) 6 = bw100 (100 resource blocks)",
+                        "enum": [
+                          1,
+                          2,
+                          3,
+                          4,
+                          5,
+                          6
+                        ],
+                        "type": "integer",
+                        "x-etsi-mec-cardinality": "1",
+                        "x-etsi-mec-origin-type": "Enum"
+                      }
+                    },
+                    "required": [
+                      "transmissionBandwidth"
+                    ],
+                    "type": "object",
+                    "x-etsi-ref": "6.6.4"
+                  }
+                },
+                "required": [
+                  "ulEarfcn",
+                  "dlEarfcn",
+                  "ulTransmissionBandwidth",
+                  "dlTransmissionBandwidth"
+                ],
+                "type": "object",
+                "x-etsi-ref": "6.5.6"
+              },
+              "mbmsServiceAreaIdentity": {
+                "description": "Supported MBMS Service Area Identities in the cell.",
+                "items": {
+                  "type": "string"
                 },
-                "minItems": 0,
+                "minItems": 1,
                 "type": "array",
-                "x-etsi-mec-cardinality": "0..N",
-                "x-etsi-mec-origin-type": "UuMbmsNeighbourCellInfo"
+                "x-etsi-mec-cardinality": "1..N",
+                "x-etsi-mec-origin-type": "String"
               },
-              "v2xServerUsd": {
+              "pci": {
+                "description": "Physical Cell Identifier.",
+                "type": "integer",
+                "x-etsi-mec-cardinality": "1",
+                "x-etsi-mec-origin-type": "Integer"
+              },
+              "plmn": {
                 "properties": {
-                  "sdpInfo": {
-                    "description": "SDP with IP multicast address and port number used for V2X communication via MBMS.",
+                  "mcc": {
+                    "description": "The Mobile Country Code part of PLMN Identity.",
+                    "type": "string",
+                    "x-etsi-mec-cardinality": "1",
+                    "x-etsi-mec-origin-type": "String"
+                  },
+                  "mnc": {
+                    "description": "The Mobile Network Code part of PLMN Identity.",
+                    "type": "string",
+                    "x-etsi-mec-cardinality": "1",
+                    "x-etsi-mec-origin-type": "String"
+                  }
+                },
+                "required": [
+                  "mcc",
+                  "mnc"
+                ],
+                "type": "object",
+                "x-etsi-ref": "6.5.4"
+              },
+              "tddInfo": {
+                "properties": {
+                  "earfcn": {
                     "properties": {
-                      "ipMulticastAddress": {
-                        "description": "",
-                        "type": "string",
+                      "earfcn": {
+                        "description": "E-UTRA Absolute Radio Frequency Channel Number, range (0... 65535)",
+                        "type": "integer",
                         "x-etsi-mec-cardinality": "1",
-                        "x-etsi-mec-origin-type": "String"
-                      },
-                      "portNumber": {
-                        "description": "",
-                        "type": "string",
-                        "x-etsi-mec-cardinality": "1",
-                        "x-etsi-mec-origin-type": "String"
+                        "x-etsi-mec-origin-type": "Integer"
                       }
                     },
                     "required": [
-                      "ipMulticastAddress",
-                      "portNumber"
+                      "earfcn"
                     ],
                     "type": "object",
-                    "x-etsi-mec-cardinality": "1"
+                    "x-etsi-ref": "6.6.3"
                   },
-                  "serviceAreaIdentifier": {
-                    "description": "A list of service area identifier for the applicable MBMS broadcast area.",
-                    "items": {
-                      "type": "string"
-                    },
-                    "minItems": 1,
-                    "type": "array",
-                    "x-etsi-mec-cardinality": "1..N",
+                  "subframeAssignment": {
+                    "description": "Uplink-downlink subframe configuration information.",
+                    "type": "string",
+                    "x-etsi-mec-cardinality": "1",
                     "x-etsi-mec-origin-type": "String"
                   },
-                  "tmgi": {
-                    "description": "Temporary Mobile Group Identity (TMGI), which is used within MBMS to uniquely identify Multicast and Broadcast bearer services.",
+                  "transmissionBandwidth": {
                     "properties": {
-                      "mbmsServiceId": {
-                        "description": "MBMS Service ID consisting of three octets.",
-                        "type": "string",
-                        "x-etsi-mec-cardinality": "1",
-                        "x-etsi-mec-origin-type": "String"
-                      },
-                      "mcc": {
-                        "description": "The Mobile Country Code part of PLMN Identity.",
-                        "type": "string",
-                        "x-etsi-mec-cardinality": "1",
-                        "x-etsi-mec-origin-type": "String"
-                      },
-                      "mnc": {
-                        "description": "The Mobile Network Code part of PLMN Identity.",
-                        "type": "string",
+                      "transmissionBandwidth": {
+                        "description": "Numeric value corresponding to the transmission bandwidth expressed in units of resource blocks as follows:1 = bw6 (6 resource blocks)2 = bw15 (15 resource blocks) 3 = bw25 (25 resource blocks) 4 = bw50 (50 resource blocks) 5 = bw75 (75 resource blocks) 6 = bw100 (100 resource blocks)",
+                        "enum": [
+                          1,
+                          2,
+                          3,
+                          4,
+                          5,
+                          6
+                        ],
+                        "type": "integer",
                         "x-etsi-mec-cardinality": "1",
-                        "x-etsi-mec-origin-type": "String"
+                        "x-etsi-mec-origin-type": "Enum"
                       }
                     },
                     "required": [
-                      "mbmsServiceId",
-                      "mcc",
-                      "mnc"
+                      "transmissionBandwidth"
                     ],
                     "type": "object",
-                    "x-etsi-mec-cardinality": ""
+                    "x-etsi-ref": "6.6.4"
                   }
                 },
                 "required": [
-                  "tmgi",
-                  "serviceAreaIdentifier",
-                  "sdpInfo"
+                  "earfcn",
+                  "transmissionBandwidth",
+                  "subframeAssignment"
                 ],
                 "type": "object",
-                "x-etsi-ref": "6.5.10"
+                "x-etsi-ref": "6.5.7"
               }
             },
             "required": [
-              "locationInfo",
-              "v2xServerUsd"
+              "plmn",
+              "ecgi",
+              "pci",
+              "fddInfo",
+              "tddInfo",
+              "mbmsServiceAreaIdentity"
             ],
             "type": "object",
-            "x-etsi-mec-cardinality": "1"
+            "x-etsi-ref": "6.5.11"
           },
-          "subscriptionType": {
-            "description": "Shall be set to \"ProvChgUuMbmsSubscription\".",
-            "type": "string",
-            "x-etsi-mec-cardinality": "1",
-            "x-etsi-mec-origin-type": "String"
-          }
+          "minItems": 0,
+          "type": "array",
+          "x-etsi-mec-cardinality": "0..N",
+          "x-etsi-mec-origin-type": "UuMbmsNeighbourCellInfo"
         },
-        "required": [
-          "subscriptionType",
-          "callbackReference",
-          "filterCriteria"
-        ],
-        "type": "object",
-        "x-etsi-ref": "6.3.3"
-      }
\ No newline at end of file
+        "v2xServerUsd": {
+          "properties": {
+            "sdpInfo": {
+              "description": "SDP with IP multicast address and port number used for V2X communication via MBMS.",
+              "properties": {
+                "ipMulticastAddress": {
+                  "description": "",
+                  "type": "string",
+                  "x-etsi-mec-cardinality": "1",
+                  "x-etsi-mec-origin-type": "String"
+                },
+                "portNumber": {
+                  "description": "",
+                  "type": "string",
+                  "x-etsi-mec-cardinality": "1",
+                  "x-etsi-mec-origin-type": "String"
+                }
+              },
+              "required": [
+                "ipMulticastAddress",
+                "portNumber"
+              ],
+              "type": "object",
+              "x-etsi-mec-cardinality": "1"
+            },
+            "serviceAreaIdentifier": {
+              "description": "A list of service area identifier for the applicable MBMS broadcast area.",
+              "items": {
+                "type": "string"
+              },
+              "minItems": 1,
+              "type": "array",
+              "x-etsi-mec-cardinality": "1..N",
+              "x-etsi-mec-origin-type": "String"
+            },
+            "tmgi": {
+              "description": "Temporary Mobile Group Identity (TMGI), which is used within MBMS to uniquely identify Multicast and Broadcast bearer services.",
+              "properties": {
+                "mbmsServiceId": {
+                  "description": "MBMS Service ID consisting of three octets.",
+                  "type": "string",
+                  "x-etsi-mec-cardinality": "1",
+                  "x-etsi-mec-origin-type": "String"
+                },
+                "mcc": {
+                  "description": "The Mobile Country Code part of PLMN Identity.",
+                  "type": "string",
+                  "x-etsi-mec-cardinality": "1",
+                  "x-etsi-mec-origin-type": "String"
+                },
+                "mnc": {
+                  "description": "The Mobile Network Code part of PLMN Identity.",
+                  "type": "string",
+                  "x-etsi-mec-cardinality": "1",
+                  "x-etsi-mec-origin-type": "String"
+                }
+              },
+              "required": [
+                "mbmsServiceId",
+                "mcc",
+                "mnc"
+              ],
+              "type": "object",
+              "x-etsi-mec-cardinality": ""
+            }
+          },
+          "required": [
+            "tmgi",
+            "serviceAreaIdentifier",
+            "sdpInfo"
+          ],
+          "type": "object",
+          "x-etsi-ref": "6.5.10"
+        }
+      },
+      "required": [
+        "locationInfo",
+        "v2xServerUsd"
+      ],
+      "type": "object",
+      "x-etsi-mec-cardinality": "1"
+    },
+    "subscriptionType": {
+      "description": "Shall be set to \"ProvChgUuMbmsSubscription\".",
+      "type": "string",
+      "x-etsi-mec-cardinality": "1",
+      "x-etsi-mec-origin-type": "String"
+    }
+  },
+  "required": [
+    "subscriptionType",
+    "callbackReference",
+    "filterCriteria"
+  ],
+  "type": "object",
+  "x-etsi-ref": "6.3.3"
+}
\ No newline at end of file
diff --git a/MEC030/SRV/V2X/schemas/SubscriptionLinkList.schema.json b/MEC030/SRV/V2X/schemas/SubscriptionLinkList.schema.json
index c2892e10c7ab9eb64ae52c9d93d26e525a137ab7..38b44481914cb7b99978a0da80383867985aa9cb 100644
--- a/MEC030/SRV/V2X/schemas/SubscriptionLinkList.schema.json
+++ b/MEC030/SRV/V2X/schemas/SubscriptionLinkList.schema.json
@@ -20,7 +20,7 @@
         "subscriptions": {
           "type": "array",
           "items": {
-            "description": "The service consumer’s subscriptions.",
+            "description": "The service consumers subscriptions.",
             "properties": {
               "href": {
                 "description": "The URI referring to the subscription.",
diff --git a/MEC030/SRV/V2X/schemas/V2XDistributionServers.schema.json b/MEC030/SRV/V2X/schemas/V2XDistributionServers.schema.json
new file mode 100644
index 0000000000000000000000000000000000000000..06233dd4c89719252929ef74ada3a78840377485
--- /dev/null
+++ b/MEC030/SRV/V2X/schemas/V2XDistributionServers.schema.json
@@ -0,0 +1,172 @@
+{
+    "properties": {
+      "locationInfo": {
+        "description": "Location information to identify a particular geographical area of interest to the service consumer for receiving V2X messages.",
+        "items": {
+          "properties": {
+            "ecgi": {
+              "properties": {
+                "cellId": {
+                  "properties": {
+                    "cellId": {
+                      "description": "E-UTRAN Cell Identity as a bit string (size (28)).",
+                      "type": "string",
+                      "x-etsi-mec-cardinality": "1",
+                      "x-etsi-mec-origin-type": "String"
+                    }
+                  },
+                  "required": [
+                    "cellId"
+                  ],
+                  "type": "object",
+                  "x-etsi-ref": "6.6.2"
+                },
+                "plmn": {
+                  "properties": {
+                    "mcc": {
+                      "description": "The Mobile Country Code part of PLMN Identity.",
+                      "type": "string",
+                      "x-etsi-mec-cardinality": "1",
+                      "x-etsi-mec-origin-type": "String"
+                    },
+                    "mnc": {
+                      "description": "The Mobile Network Code part of PLMN Identity.",
+                      "type": "string",
+                      "x-etsi-mec-cardinality": "1",
+                      "x-etsi-mec-origin-type": "String"
+                    }
+                  },
+                  "required": [
+                    "mcc",
+                    "mnc"
+                  ],
+                  "type": "object",
+                  "x-etsi-ref": "6.5.4"
+                }
+              },
+              "required": [
+                "plmn",
+                "cellId"
+              ],
+              "type": "object",
+              "x-etsi-ref": "6.5.5"
+            },
+            "geoArea": {
+              "description": "Information of a geographical area.",
+              "properties": {
+                "latitude": {
+                  "description": "Latitude (DATUM = WGS84) -90 to 90 in decimal degree format DDD.ddd",
+                  "format": "float",
+                  "type": "number",
+                  "x-etsi-mec-cardinality": "1",
+                  "x-etsi-mec-origin-type": "Float"
+                },
+                "longitude": {
+                  "description": "Longitude (DATUM = WGS84) -180 to 180 in decimal degree format DDD.ddd",
+                  "format": "float",
+                  "type": "number",
+                  "x-etsi-mec-cardinality": "1",
+                  "x-etsi-mec-origin-type": "Float"
+                }
+              },
+              "required": [
+                "latitude",
+                "longitude"
+              ],
+              "type": "object",
+              "x-etsi-mec-cardinality": "0..1",
+              "x-etsi-mec-origin-type": "Structure (inlined)"
+            }
+          },
+          "type": "object",
+          "x-etsi-notes": "NOTE:\tEither ecgi or geoArea shall be present, but not both.",
+          "x-etsi-ref": "6.5.3"
+        },
+        "minItems": 0,
+        "type": "array",
+        "x-etsi-mec-cardinality": "0..N",
+        "x-etsi-mec-origin-type": "LocationInfo"
+      },
+      "v2xMsgDistributionServer": {
+        "description": "Describes the information of the V2X Message Distribution Servers supported by the service consumer for direct communication.",
+        "items": {
+          "properties": {
+            "infoConnection": {
+              "description": "Connection information of the V2X Message Distribution Server the service consumer can use for direct connection. Shall only be included in the response.",
+              "properties": {
+                "ipAddress": {
+                  "description": "IP address of the V2X Message Distribution Server.",
+                  "type": "string",
+                  "x-etsi-mec-cardinality": "1",
+                  "x-etsi-mec-origin-type": "String"
+                },
+                "port_number": {
+                  "description": "Port number of the V2X Message Distribution Server.",
+                  "x-etsi-mec-cardinality'": "1",
+                  "x-etsi-mec-origin-type'": "Integer (0..65535)",
+                  "type": "integer"
+                }
+              },
+              "required": [
+                "ipAddress",
+                "port_number"
+              ],
+              "type": "object",
+              "x-etsi-mec-cardinality": "0..1",
+              "x-etsi-mec-origin-type": "Structure (inlined)"
+            },
+            "infoProtocol": {
+              "description": "Specifics of the application layer protocol of V2X Message Distribution Server.",
+              "properties": {
+                "msgProtocol": {
+                  "description": "Numerical value corresponding to the application layer protocol supported by the service consumer. For the msgProtocol, the following values are currently defined (see note): 0 = MQTT v3.1.0 1 = MQTT v3.1.1 2 = MQTT v5 3 = MQTT-SN 4 = AMQP 1.0",
+                  "items": {
+                    "enum": [
+                      0,
+                      1,
+                      2,
+                      3,
+                      4
+                    ],
+                    "type": "integer"
+                  },
+                  "minItems": 1,
+                  "type": "array",
+                  "x-etsi-mec-cardinality": "1..N",
+                  "x-etsi-mec-origin-type": "Enum"
+                },
+                "protImplementation": {
+                  "description": "Implementation specifics of application layer protocol, e.g. programming language.",
+                  "type": "string",
+                  "x-etsi-mec-cardinality": "1",
+                  "x-etsi-mec-origin-type": "String"
+                }
+              },
+              "required": [
+                "msgProtocol",
+                "protImplementation"
+              ],
+              "type": "object",
+              "x-etsi-mec-cardinality": "1",
+              "x-etsi-mec-origin-type": "Structure (inlined)"
+            }
+          },
+          "required": [
+            "infoProtocol"
+          ],
+          "type": "object",
+          "x-etsi-notes": "NOTE:\tOther application layer protocols (and versions thereof) may be added as needed.",
+          "x-etsi-ref": "6.5.16"
+        },
+        "minItems": 1,
+        "type": "array",
+        "x-etsi-mec-cardinality": "1..N",
+        "x-etsi-mec-origin-type": "V2xMsgDistributionServer"
+      }
+    },
+    "required": [
+      "v2xMsgDistributionServer"
+    ],
+    "type": "object",
+    "x-etsi-ref": "6.2.5"
+  }
\ No newline at end of file
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 ***