diff --git a/SOL009/NFVMANOFaultManagement-API/Alarms.robot b/SOL009/NFVMANOFaultManagement-API/Alarms.robot
index eb79e9bc580632104930d2c6974403938bad0306..39d286cb2376f5737fa8fc9e48193d27ebf9c7d2 100644
--- a/SOL009/NFVMANOFaultManagement-API/Alarms.robot
+++ b/SOL009/NFVMANOFaultManagement-API/Alarms.robot
@@ -7,7 +7,7 @@ POST Alarms - Method not implemented
     ...    Test title: POST Alarms - Method not implemented 
     ...    Test objective: The objective is to test that Post method is not allowed to create fault management alarms on NFV-MANO
     ...    Pre-conditions: none
-    ...    Reference: clause 7.5.3.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 7.5.3.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions:  none
@@ -19,7 +19,7 @@ Get information about multiple alarms
     ...    Test title: Get information about multiple alarms
     ...    Test objective: The objective is to retrieve information about the alarm list and perform a JSON schema of the returned alarms data structure
     ...    Pre-conditions: none
-    ...    Reference: clause 7.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 7.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -32,7 +32,7 @@ Get information about multiple alarms with filter
     ...    Test title: Get information about multiple alarms with filter
     ...    Test objective: The objective is to retrieve information about the alarm list and perform a JSON schema validation of the returned alarms data structure, and verify that the retrieved information matches the issued attribute-based filters 
     ...    Pre-conditions: none 
-    ...    Reference: clause 7.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 7.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -45,7 +45,7 @@ Get information about multiple alarms with invalid attribute-based filtering par
     ...    Test title:  Get information about multiple alarms with invalid attribute-based filtering parameters
     ...    Test objective: The objective is to try to retrieve information about the alarm list with invalid filters and perform a JSON schema validation of the returned problem details data structure
     ...    Pre-conditions: none
-    ...    Reference: clause 7.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 7.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -58,7 +58,7 @@ Get information about multiple alarms as a Paged Response
     ...    Test title: Get information about multiple alarms as a Paged Response
     ...    Test objective: The objective is to retrieve information about the alarm list as a Paged Response.
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: Clause 7.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -71,7 +71,7 @@ Get information about multiple alarms - Bad Request Response too Big
     ...    Test title:  Get information about multiple alarms - Bad Request Response too Big
     ...    Test objective: The objective is to try to retrieve information about the alarm list because response is too big and perform a JSON schema validation of the returned problem details data structure
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: Clause 7.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -84,7 +84,7 @@ GET information about alarms with attribute-based filter "id"
     ...    Test title: GET information about alarms with attribute-based filter "id"
     ...    Test objective: The objective is to retrieve information about the alarm list with alarm filter "id"
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: Clause 7.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -98,7 +98,7 @@ GET information about multiple alarms with attribute-based filter "managedObject
     ...    Test title: GET information about multiple alarms with attribute-based filter "managedObjectId"
     ...    Test objective: The objective is to retrieve information about the alarm list with attribute filter "managedObjectId"
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: Clause 7.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -112,7 +112,7 @@ GET information about multiple alarms with attribute-based filter "eventType"
     ...    Test title: GET information about multiple alarms with attribute-based filter "eventType"
     ...    Test objective: The objective is to retrieve information about the alarm list with attribute filter "eventType"
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: Clause 7.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -126,7 +126,7 @@ GET information about multiple alarms with attribute-based filter "perceivedSeve
     ...    Test title: GET information about multiple alarms with attribute-based filter "perceivedSeverity"
     ...    Test objective: The objective is to retrieve information about the alarm list with attribute filter "perceivedSeverity"
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: Clause 7.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -140,7 +140,7 @@ GET information about multiple alarms with attribute-based filter "probableCause
     ...    Test title: GET information about multiple alarms with attribute-based filter "probableCause"
     ...    Test objective: The objective is to retrieve information about the alarm list with attribute filter "probableCause"
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: Clause 7.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -154,7 +154,7 @@ Get information about multiple alarms with malformed authorization token
     ...    Test title: Get information about multiple alarms with malformed authorization token
     ...    Test objective: The objective is to test that the retrieval of information about the alarm list fails when using malformed authorization token
     ...    Pre-conditions: none
-    ...    Reference: clause 7.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 7.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: The NFV-MANO entity requires the usage of access tokens for authorizing the API requests.
     ...    Post-Conditions: none
@@ -166,7 +166,7 @@ Get information about multiple alarms without authorization token
     ...    Test title: Get information about multiple alarms without authorization token
     ...    Test objective: The objective is to test that the retrieval of information about the alarm list fails when omitting the authorization token
     ...    Pre-conditions: none
-    ...    Reference: clause 7.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 7.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: The NFV-MANO entity requires the usage of access tokens for authorizing the API requests.
     ...    Post-Conditions: none
@@ -178,7 +178,7 @@ GET information about multiple alarms with expired or revoked authorization toke
     ...    Test title: GET information about multiple alarms with expired or revoked authorization token
     ...    Test objective: The objective is to test that the retrieval of information about the alarm list fails when using expired or revoked authorization token
     ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO
-    ...    Reference: clause 7.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 7.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: The NFV-MANO entity requires the usage of access tokens for authorizing the API requests.
     ...    Post-Conditions: none
@@ -190,7 +190,7 @@ PUT Alarms - Method not implemented
     ...    Test title: PUT Alarms - Method not implemented 
     ...    Test objective: The objective is to test that PUT method is not allowed to modify fault management alarms on NFV-MANO.
     ...    Pre-conditions: none
-    ...    Reference: clause 7.5.3.3.3 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 7.5.3.3.3 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions:  none
@@ -202,7 +202,7 @@ PATCH Alarms - Method not implemented
     ...    Test title: PATCH Alarms - Method not implemented 
     ...    Test objective: The objective is to test that PATCH method is not allowed to modify fault management alarms on NFV-MANO.
     ...    Pre-conditions: none
-    ...    Reference: clause 7.5.3.3.4 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 7.5.3.3.4 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions:  none
@@ -214,7 +214,7 @@ DELETE Alarms - Method not implemented
     ...    Test title: POST Alarms - Method not implemented 
     ...    Test objective: The objective is to test that DELETE method is not allowed for fault management alarms on NFV-MANO
     ...    Pre-conditions: none
-    ...    Reference: clause 7.5.3.3.5 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 7.5.3.3.5 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions:  none
@@ -226,7 +226,7 @@ Get information about multiple alarms with permitted authorization scope
     ...    Test title: Get information about multiple alarms with permitted authorization scope
     ...    Test objective: The objective is to retrieve information about the alarm list with permitted authorization scope
     ...    Pre-conditions: none
-    ...    Reference: clause 7.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 7.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -239,7 +239,7 @@ Get information about multiple alarms with not permitted authorization scope
     ...    Test title: Get information about multiple alarms with not permitted authorization scope
     ...    Test objective: The objective is to test that retrieve information about the alarm list fails with not permitted authorization scope
     ...    Pre-conditions: none
-    ...    Reference: clause 7.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 7.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL009/NFVMANOFaultManagement-API/ApiVersion.robot b/SOL009/NFVMANOFaultManagement-API/ApiVersion.robot
index 5f51383af6c720194176964bcb03fa7b9ea08705..9f4842541a0447a2ef1cec084bb73110e9993a5e 100644
--- a/SOL009/NFVMANOFaultManagement-API/ApiVersion.robot
+++ b/SOL009/NFVMANOFaultManagement-API/ApiVersion.robot
@@ -7,7 +7,7 @@ POST API Version - Method not implemented
     ...    Test title: POST API version - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -19,7 +19,7 @@ GET API Version
     ...    Test title: GET API Version
     ...    Test objective: The objective is to test that GET method successfully return ApiVersionInformation
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -32,7 +32,7 @@ PUT API Version - Method not implemented
     ...    Test title: PUT API Version - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -44,7 +44,7 @@ PATCH API Version - Method not implemented
     ...    Test title: PATCH API Version - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -56,7 +56,7 @@ DELETE API Version - Method not implemented
     ...    Test title: DELETE API Version - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -68,7 +68,7 @@ POST API Version with apiMajorVerion - Method not implemented
     ...    Test title: POST API version with apiMajorVerion - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -80,7 +80,7 @@ GET API Version with apiMajorVerion
     ...    Test title: GET API Version with apiMajorVerion
     ...    Test objective: The objective is to test that GET method successfully return ApiVersionInformation
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -93,7 +93,7 @@ PUT API Version with apiMajorVerion - Method not implemented
     ...    Test title: PUT API Version with apiMajorVerion - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -105,7 +105,7 @@ PATCH API Version with apiMajorVerion - Method not implemented
     ...    Test title: PATCH API Version with apiMajorVerion - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -117,7 +117,7 @@ DELETE API Version with apiMajorVerion - Method not implemented
     ...    Test title: DELETE API Version with apiMajorVerion - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL009/NFVMANOFaultManagement-API/FaultManagement-APIKeyword.robot b/SOL009/NFVMANOFaultManagement-API/FaultManagement-APIKeyword.robot
index c22a255798f01c87c19dcad5e228f72a551ffddc..2695a1922809a0d57c412338f382d46a2889fd0e 100644
--- a/SOL009/NFVMANOFaultManagement-API/FaultManagement-APIKeyword.robot
+++ b/SOL009/NFVMANOFaultManagement-API/FaultManagement-APIKeyword.robot
@@ -659,8 +659,8 @@ Check Alarm List Rebuilt Notification Http POST Request Body notificationType at
     [Arguments]    ${type}
     Configure Notification Alarm List Rebuilt Handler    ${callback_endpoint_fwd}    ${type}
     Wait Until Keyword Succeeds    ${total_polling_time}    ${polling_interval}    Verify Mock Expectation    ${notification_request}
-    Clear Requests    ${callback_endpoint}
-    Clear Requests    ${callback_endpoint_fwd}
+    #Clear Requests    ${callback_endpoint}
+    #Clear Requests    ${callback_endpoint_fwd}
 
 Check Alarm Notification Http POST Request Body Json Schema Is    
     [Arguments]    ${element}
@@ -671,8 +671,8 @@ Check Alarm Notification Http POST Request Body notificationType attribute Is
     [Arguments]    ${type}
     Configure Notification Alarm Handler    ${callback_endpoint_fwd}    ${type}
     Wait Until Keyword Succeeds    ${total_polling_time}    ${polling_interval}    Verify Mock Expectation    ${notification_request}
-    Clear Requests    ${callback_endpoint}
-    Clear Requests    ${callback_endpoint_fwd}
+    #Clear Requests    ${callback_endpoint}
+    #Clear Requests    ${callback_endpoint_fwd}
 
 Check Alarm cleared Notification Http POST Request Body Json Schema Is    
     [Arguments]    ${element}
@@ -684,8 +684,8 @@ Check Alarm cleared Notification Http POST Request Body notificationType attribu
     [Arguments]    ${type}
     Configure Notification Alarm Cleareance Handler    ${callback_endpoint_fwd}    ${type}
     Wait Until Keyword Succeeds    ${total_polling_time}    ${polling_interval}    Verify Mock Expectation    ${notification_request}
-    Clear Requests    ${callback_endpoint}
-    Clear Requests    ${callback_endpoint_fwd}
+    #Clear Requests    ${callback_endpoint}
+    #Clear Requests    ${callback_endpoint_fwd}
     
     
 Check Alarm Clerance Notification Http POST Request Body changeType attribute Is
@@ -733,7 +733,116 @@ Configure Notification Forward
     &{notification_tmp}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON_SCHEMA"    body=${schema}
     &{notification_fwd}=  Create Mock Http Forward	${endpoint_fwd}
     Create Mock Expectation With Http Forward  ${notification_tmp}  ${notification_fwd}
-    
+
+Check Alarm Notification Validation
+    [Arguments]    ${expected_notification_type}=alarmNotification
+    ${requests}=    Retrieve Requests    ${callback_endpoint_fwd}
+    Should Not Be Empty    ${requests}    msg=No notification received at callback endpoint!
+
+    ${request_type}=    Evaluate    type(${requests})
+    Log    Request type: ${request_type}
+
+    ${last_request}=    Run Keyword If    "${request_type}" == "<class 'list'>"
+    ...    Get From List    ${requests}    -1
+    ...    ELSE
+    ...    Set Variable    ${requests}
+
+    ${body}=    Get From Dictionary    ${last_request}    body
+    ${body_text}=    Get From Dictionary    ${body}    string
+
+    ${notification}=    Evaluate    json.loads(r'''${body_text}''')    json
+    Log    Parsed notification: ${notification}
+
+    Should Be Equal As Strings    ${notification['notificationType']}    ${expected_notification_type}
+
+    ${alarm}=    Get From Dictionary    ${notification}    alarm
+
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Set Headers    {"Version": "${API_VERSION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1
+    ...    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+
+    # Validate entity exists
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarm['id']}
+    Integer    response status    200
+    ${output}=    Output    response
+    Should Be Equal    ${output['body']['id']}    ${alarm['id']} 
+
+    Clear Requests    ${callback_endpoint}
+    Clear Requests    ${callback_endpoint_fwd}
+
+Check Alarm cleared Notification Validation
+    [Arguments]    ${expected_notification_type}=PerformanceInformationAvailableNotification
+    ${requests}=    Retrieve Requests    ${callback_endpoint_fwd}
+    Should Not Be Empty    ${requests}    msg=No notification received at callback endpoint!
+
+    ${request_type}=    Evaluate    type(${requests})
+    Log    Request type: ${request_type}
+
+    ${last_request}=    Run Keyword If    "${request_type}" == "<class 'list'>"
+    ...    Get From List    ${requests}    -1
+    ...    ELSE
+    ...    Set Variable    ${requests}
+
+    ${body}=    Get From Dictionary    ${last_request}    body
+    ${body_text}=    Get From Dictionary    ${body}    string
+
+    ${notification}=    Evaluate    json.loads(r'''${body_text}''')    json
+    Log    Parsed notification: ${notification}
+
+    Should Be Equal As Strings    ${notification['notificationType']}    ${expected_notification_type}
+
+    ${alarmId}=    Get From Dictionary    ${notification}    alarmId
+
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Set Headers    {"Version": "${API_VERSION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1
+    ...    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+
+    # Validate entity exists
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${alarmId}
+    Integer    response status    200
+    ${output}=    Output    response
+    Should Be Equal    ${output['body']['id']}    ${alarmId} 
+
+    Clear Requests    ${callback_endpoint}
+    Clear Requests    ${callback_endpoint_fwd}
+
+Check Alarm list rebuilt Notification Validation
+    [Arguments]    ${expected_notification_type}=PerformanceInformationAvailableNotification
+    ${requests}=    Retrieve Requests    ${callback_endpoint_fwd}
+    Should Not Be Empty    ${requests}    msg=No notification received at callback endpoint!
+
+    ${request_type}=    Evaluate    type(${requests})
+    Log    Request type: ${request_type}
+
+    ${last_request}=    Run Keyword If    "${request_type}" == "<class 'list'>"
+    ...    Get From List    ${requests}    -1
+    ...    ELSE
+    ...    Set Variable    ${requests}
+
+    ${body}=    Get From Dictionary    ${last_request}    body
+    ${body_text}=    Get From Dictionary    ${body}    string
+
+    ${notification}=    Evaluate    json.loads(r'''${body_text}''')    json
+    Log    Parsed notification: ${notification}
+
+    Should Be Equal As Strings    ${notification['notificationType']}    ${expected_notification_type}
+
+    ${_links}=    Get From Dictionary    ${notification}    _links
+
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Set Headers    {"Version": "${API_VERSION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1
+    ...    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+
+    # Validate entity exists
+    GET    ${_links['alarms']}
+    Integer    response status    200
+
+    Clear Requests    ${callback_endpoint}
+    Clear Requests    ${callback_endpoint_fwd}
+
 Create Sessions
     Start Process  java  -jar  ${MOCK_SERVER_JAR}  -serverPort  ${callback_port}  alias=mockInstance
     Wait For Process  handle=mockInstance  timeout=5s  on_timeout=continue
diff --git a/SOL009/NFVMANOFaultManagement-API/IndividualAlarm.robot b/SOL009/NFVMANOFaultManagement-API/IndividualAlarm.robot
index c4f0afec0d98b406c70f05a044ff54f954f86db4..b3e1753fe27268ed47bbd78f822bf7ae953b4df7 100644
--- a/SOL009/NFVMANOFaultManagement-API/IndividualAlarm.robot
+++ b/SOL009/NFVMANOFaultManagement-API/IndividualAlarm.robot
@@ -7,7 +7,7 @@ POST Individual Alarm - Method not implemented
     ...    Test title: POST Individual Alarm - Method not implemented
     ...    Test objective: The objective is to test that Post method is not allowed to create fault management individual alarm on NFV-MANO 
     ...    Pre-conditions: none
-    ...    Reference: clause 7.5.4.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 7.5.4.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none  
@@ -19,7 +19,7 @@ Get information about an fault management individual alarm
     ...    Test title: Get information about an fault management individual alarm
     ...    Test objective: The objective is to retrieve information about an individual alarm and perform a JSON schema and content validation of the returned alarm data structure
     ...    Pre-conditions: The related alarm exists
-    ...    Reference: clause 7.5.4.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 7.5.4.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions:  none 
@@ -32,7 +32,7 @@ Get information about an fault management individual alarm - Not Found
     ...    Test title: Get information about an fault management individual alarm
     ...    Test objective: The objective is to test the retrieval of information about an individual alarm fails when the resource is not present.
     ...    Pre-conditions: none
-    ...    Reference: clause 7.5.4.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 7.5.4.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -45,7 +45,7 @@ PUT Individual Alarm - Method not implemented
     ...    Test title: PUT Individual Alarm - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to for fault management individual alarm on NFV-MANO 
     ...    Pre-conditions: none
-    ...    Reference: clause 7.5.4.3.3 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 7.5.4.3.3 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions:  none 
@@ -57,7 +57,7 @@ PATCH Fault Management Individual Alarm
     ...    Test title: PATCH Fault Management Individual Alarm
     ...    Test objective: The objective is to Modify an individual alarm resource, and perform a JSON schema validation of the returned alarm data structure.
     ...    Pre-conditions: The related alarm exists
-    ...    Reference: clause 7.5.4.3.4 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 7.5.4.3.4 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: Alarm is modified.
@@ -70,7 +70,7 @@ Modify an individual alarm resource - Precondition failed
     ...    Test title: Modify an individual alarm resource - Precondition failed
     ...    Test objective: The objective is to test that an individual alarm resource cannot be modified if the alarm is already in the state that is requested to be set, and perform a JSON schema validation of the returned data structure.
     ...    Pre-conditions: The related alarm exists
-    ...    Reference: clause 7.5.4.3.4 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 7.5.4.3.4 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: Alarm is not modified.
@@ -84,7 +84,7 @@ Modify an individual alarm resource - Conflict
     ...    Test title: Modify an individual alarm resource - Conflict
     ...    Test objective: The objective is to test that an individual alarm resource cannot be modified if the resource was modified by another entity , and perform a JSON schema validation of the returned data structure.
     ...    Pre-conditions: The related alarm exists
-    ...    Reference: clause 7.5.4.3.4 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 7.5.4.3.4 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: Alarm is not modified.
@@ -98,7 +98,7 @@ DELETE Individual Alarm - Method not implemented
     ...    Test title: DELETE Individual Alarm - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete fault management individual alarm on NFV-MANO.
     ...    Pre-conditions: none
-    ...    Reference: clause 7.5.4.3.5 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 7.5.4.3.5 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -110,7 +110,7 @@ PATCH Fault Management Individual Alarm with permitted authorization scope
     ...    Test title: PATCH Fault Management Individual Alarm with permitted authorization scope
     ...    Test objective: The objective is to Modify an individual alarm resource with permitted authorization scope.
     ...    Pre-conditions: The related alarm exists
-    ...    Reference: clause 7.5.4.3.4 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 7.5.4.3.4 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: Alarm is modified.
@@ -123,7 +123,7 @@ PATCH Fault Management Individual Alarm with not permitted authorization scope
     ...    Test title: PATCH Fault Management Individual Alarm with not permitted authorization scope
     ...    Test objective: The objective is to test that Modification of an individual alarm resource fails with not permitted authorization scope.
     ...    Pre-conditions: The related alarm exists
-    ...    Reference: clause 7.5.4.3.4 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 7.5.4.3.4 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: Alarm is modified.
diff --git a/SOL009/NFVMANOFaultManagement-API/IndividualSubscription.robot b/SOL009/NFVMANOFaultManagement-API/IndividualSubscription.robot
index 6dcd444210d3f4291ea3a6dd8fe2970694289004..8f26273d60e54a29361aec1355340c9a40c33f76 100644
--- a/SOL009/NFVMANOFaultManagement-API/IndividualSubscription.robot
+++ b/SOL009/NFVMANOFaultManagement-API/IndividualSubscription.robot
@@ -7,7 +7,7 @@ Post Individual Subscription - Method not implemented
     ...    Test title: Post Individual Subscription - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed for fault management subscription on NFV-MANO  
     ...    Pre-conditions: none
-    ...    Reference: clause 7.5.6.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 7.5.6.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability:  none
     ...    Post-Conditions:  none
@@ -19,7 +19,7 @@ Get Information about an individual subscription
     ...    Test title: Get Information about an individual subscription
     ...    Test objective: The objective is to read an individual subscription from NFV-MANO alarms subscribed by the client and perform a JSON schema and content validation of the returned fault management individual subscription data structure
     ...    Pre-conditions: The subscription with the given id exists
-    ...   Reference: clause 7.5.6.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...   Reference: clause 7.5.6.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability:   none
     ...    Post-Conditions:  none
@@ -32,7 +32,7 @@ Get Information about an individual subscription - Not Found
     ...    Test title: Get Information about an individual subscription - Not Found
     ...    Test objective: The objective is to test the retrieval of individual subscription from NFV-MANO alarms fails when the resource is not present.
     ...    Pre-conditions: none
-    ...    Reference: clause 7.5.6.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 7.5.6.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -44,7 +44,7 @@ PUT an individual subscription - Method not implemented
     ...    Test title:PUT an individual subscription - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed for fault management individual subscription on VNF  
     ...    Pre-conditions:  none
-    ...    Reference: clause 7.5.6.3.3 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 7.5.6.3.3 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability:  none
     ...    Post-Conditions:  none
@@ -56,7 +56,7 @@ PATCH an individual subscription - Method not implemented
     ...    Test title:PATCH an individual subscription - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed for fault management individual subscription on VNF  
     ...    Pre-conditions:  none
-    ...    Reference: clause 7.5.6.3.4 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 7.5.6.3.4 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability:  none
     ...    Post-Conditions:  none
@@ -68,7 +68,7 @@ DELETE an individual subscription
     ...    Test title:DELETE an individual subscription
     ...    Test objective: The objective is to test that DELETE method removes individual subscription on VNF   
     ...    Pre-conditions: The Subsbcription already exists
-    ...    Reference: clause 7.5.6.3.5 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 7.5.6.3.5 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability:  none
     ...    Post-Conditions:  subscription is deleted
@@ -81,7 +81,7 @@ Get Information about an individual subscription with permitted authorization sc
     ...    Test title: Get Information about an individual subscription with permitted authorization scope
     ...    Test objective: The objective is to read an individual subscription from NFV-MANO alarms subscribed by the client with permitted authorization scope
     ...    Pre-conditions: The subscription with the given id exists
-    ...   Reference: clause 7.5.6.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...   Reference: clause 7.5.6.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability:   none
     ...    Post-Conditions:  none
@@ -94,7 +94,7 @@ Get Information about an individual subscription with not permitted authorizatio
     ...    Test title: Get Information about an individual subscription with not permitted authorization scope
     ...    Test objective: The objective is to test that reading an individual subscription from NFV-MANO alarms subscribed by the client fails with not permitted authorization scope
     ...    Pre-conditions: The subscription with the given id exists
-    ...   Reference: clause 7.5.6.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...   Reference: clause 7.5.6.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability:   none
     ...    Post-Conditions:  none
diff --git a/SOL009/NFVMANOFaultManagement-API/NotificationEndpoint.robot b/SOL009/NFVMANOFaultManagement-API/NotificationEndpoint.robot
index e0c45f68f2bdcc8accf008e116b38b97fa58995d..82657d5e5f858b201f5fafbcc053e329ab085610 100644
--- a/SOL009/NFVMANOFaultManagement-API/NotificationEndpoint.robot
+++ b/SOL009/NFVMANOFaultManagement-API/NotificationEndpoint.robot
@@ -8,7 +8,7 @@ Alarm Notification
     ...    Test title: Alarm Notification
     ...    Test objective: The objective is to test that Alarm Notification is delivered with success to the notification consumer.
     ...    Pre-conditions: A subscription for alarm notification is available in the NFV-MANO.
-    ...    Reference: clause 7.5.7.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 7.5.7.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -20,7 +20,7 @@ Alarm Cleared Notification
     ...    Test title: Alarm Cleared Notification
     ...    Test objective: The objective is to test that Alarm Cleared Notification is delivered with success to the notification consumer.
     ...    Pre-conditions: A subscription for alarm cleared notification is available in the NFV-MANO.
-    ...    Reference: clause 7.5.7.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 7.5.7.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -32,7 +32,7 @@ Alarm List Rebuilt Notification
     ...    Test title: Alarm List Rebuilt Notification
     ...    Test objective: The objective is to test that Alarm List Rebuilt Notification is delivered with success to the notification consumer.
     ...    Pre-conditions: A subscription for alarm list rebuilt notification is available in the NFV-MANO.
-    ...    Reference: clause 7.5.7.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 7.5.7.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL009/NFVMANOFaultManagement-API/Notifications.robot b/SOL009/NFVMANOFaultManagement-API/Notifications.robot
index bd6530fbc5246447476ca9251f62151b3dcec4a5..d2b84f0fbe9b902ddabb1568bd76e500b2afbd1c 100644
--- a/SOL009/NFVMANOFaultManagement-API/Notifications.robot
+++ b/SOL009/NFVMANOFaultManagement-API/Notifications.robot
@@ -10,36 +10,40 @@ NFV-MANO Fault Alarm Notification
     ...    Test title: NFV-MANO Fault Alarm Notification
     ...    Test objective: The objective is to test the dispatch of NFV-MANO Fault Alarm Notification when a resource within an NFV-MANO instance fails, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A NFV-MANO instance is instantiated, and a subscription for fault alarm notifications is available.
-    ...    Reference: clause 7.5.7.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 7.5.7.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none 
     Trigger the fault of a virtualised resource in the NFV-MANO instance (external action) 
     Check Alarm Notification Http POST Request Body Json Schema Is    alarmNotification
     Check Alarm Notification Http POST Request Body notificationType attribute Is    alarmNotification
+    Check Alarm Notification Validation
 
 NFV-MANO Fault Alarm Cleared Notification
     [Documentation]    Test ID: 8.3.3.5.2
     ...    Test title: NFV-MANO Fault Alarm Cleared Notification
     ...    Test objective: The objective is to test the dispatch of NFV-MANO Fault Alarm Cleared Notification when a faulty resource within an NFV-MANO instance is cleared, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A NFV-MANO instance is instantiated, a virtualised resource is in faulty state, and a subscription for fault alarm cleared notifications is available.
-    ...    Reference: clause 7.5.7.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 7.5.7.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none 
     Trigger the clear of a faulty virtualised resource in the NFV-MANO instance (external action)
     Check Alarm cleared Notification Http POST Request Body Json Schema Is    alarmClearedNotification
     Check Alarm cleared Notification Http POST Request Body notificationType attribute Is    alarmClearedNotification
+    Check Alarm cleared Notification Validation
+
 
 NFV-MANO Fault Alarm List Rebuilt Notification 
     [Documentation]    Test ID: 8.3.3.5.3
     ...    Test title: NFV-MANO Fault Alarm List Rebuilt Notification 
     ...    Test objective: The objective is to test the dispatch of NFV-MANO Fault Alarm List Rebuilt Notification when the NFV-MANO decides to rebuild the list of its NFV-MANO alarms, e.g. due to a corruption in the alarm storage, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A NFV-MANO instance is instantiated, one or more virtualised resource are in faulty state, and a subscription for fault alarm list rebuilt notifications is available.
-    ...    Reference: clause 7.5.7.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 7.5.7.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none 
     Trigger the NFV-MANO fault alarm list rebuild in the NFVO (external action) 
     Check Alarm list rebuilt Notification Http POST Request Body Json Schema Is    alarmListRebuiltNotification
     Check Alarm list rebuilt Notification Http POST Request Body notificationType attribute Is    alarmListRebuiltNotification
+    Check Alarm list rebuilt Notification Validation
\ No newline at end of file
diff --git a/SOL009/NFVMANOFaultManagement-API/Subscriptions.robot b/SOL009/NFVMANOFaultManagement-API/Subscriptions.robot
index 6267b94f6ff09f8bf88109ffd1b99fffa5254a90..1893981b097bac106142016d79dea19d98cf04cc 100644
--- a/SOL009/NFVMANOFaultManagement-API/Subscriptions.robot
+++ b/SOL009/NFVMANOFaultManagement-API/Subscriptions.robot
@@ -7,7 +7,7 @@ POST Create a new Fault Management alarm subscription
     ...    Test title: POST Create a new fault management alarm subscription
     ...    Test objective: The objective is to create a new fault management alarm subscription and perform a JSON schema validation of the returned fault management alarms subscription data structure
     ...    Pre-conditions: No subscription with the same filter and callbackUri exists
-    ...    Reference: clause 7.5.5.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 7.5.5.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID:   Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: subscription is created
@@ -23,7 +23,7 @@ POST Create a new alarm subscription - DUPLICATION
     ...    Test title: POST Create a new alarm subscription - DUPLICATION
     ...    Test objective: The objective is to create a new subscription with the NFV-MANO allowing duplication and perform a JSON schema validation of the returned fault management alarms subscription data structure.
     ...    Pre-conditions: subscription with the same filter and callbackUri exists
-    ...    Reference: clause 7.5.5.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 7.5.5.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID:   Config_prod_NFV-MANO
     ...    Applicability: the NFV-MANO allows creating a subscription resource if another subscription resource with the same filter and callbackUri already exists
     ...    Post-Conditions: duplicated subscription is created
@@ -39,7 +39,7 @@ POST Create a new alarm subscription - NO DUPLICATION
     ...    Test title: POST Create a new alarm subscription - NO DUPLICATION
     ...    Test objective: The objective is to create a new subscription with the NFV-MANO not allowing duplication and perform a JSON schema validation of the returned fault management alarms subscription data structure.
     ...    Pre-conditions: subscription with the same filter and callbackUri exists
-    ...    Reference: clause 7.5.5.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 7.5.5.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID:   Config_prod_NFV-MANO
     ...    Applicability: the NFV-MANO does not allow to create a duplicate subscription resource 
     ...    Post-Conditions: duplicated subscription is not created
@@ -54,7 +54,7 @@ Retrieve a list of alarm subscriptions
     ...    Test title: Retrieve a list of alarm subscriptions
     ...    Test objective: The objective is to retrieve the list of active subscriptions and perform a JSON schema validation of the returned fault management alarms subscription data structure.
     ...    Pre-conditions: none
-    ...    Reference: clause 7.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 7.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID:   Config_prod_NFV-MANO
     ...    Applicability:  none
     ...    Post-Conditions: noe
@@ -67,7 +67,7 @@ Retrieve a list of alarm subscriptions with filter
     ...    Test title: Retrieve a list of alarm subscriptions with filter
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter and perform a JSON schema validation of the returned fault management alarms subscription data structure.
     ...    Pre-conditions: none 
-    ...    Reference: clause 7.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 7.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID:   Config_prod_NFV-MANO
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -80,7 +80,7 @@ Get information about multiple alarms as a Paged Response
     ...    Test title: Get information about multiple alarms as a Paged Response
     ...    Test objective: The objective is to retrieve information about active list subscriptions as a Paged Response
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: Clause 7.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -93,7 +93,7 @@ GET subscriptions - Bad Request Invalid attribute-based filtering parameters
     ...    Test title: GET subscriptions - Bad Request Invalid attribute-based filtering parameters
     ...    Test objective: The objective is to retrieve the list of active subscriptions with Invalid attribute-based filtering parameters and perform a JSON schema validation of the returned problem details data structure.
     ...    Pre-conditions: none
-    ...    Reference: clause 7.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 7.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID:   Config_prod_NFV-MANO
     ...    Applicability:  none
     ...    Post-Conditions:    none 
@@ -106,7 +106,7 @@ Get information about multiple alarms - Bad Request Response too Big
     ...    Test title:  Get information about multiple alarms - Bad Request Response too Big
     ...    Test objective: The objective is to try to retrieve information about active list subscription to check that response is too big and perform a JSON schema validation of the returned problem details data structure
     ...    Pre-conditions: none
-    ...    Reference: Clause clause 7.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: Clause clause 7.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -119,7 +119,7 @@ GET Subscription with attribute-based filter "id"
     ...    Test title: GET Subscription with attribute-based filter "id"
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "id"
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: Clause 7.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -133,7 +133,7 @@ Get subscriptions with filter "filter.notificationTypes"
     ...    Test title: GET Subscription with attribute-based filter "filter.notificationTypes"
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "filter.notificationTypes"
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: Clause 7.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability:  none
     ...    Post-Conditions: none 
@@ -147,7 +147,7 @@ Get subscriptions with filter "filter.perceivedSeverities"
     ...    Test title: GET Subscription with attribute-based filter "filter.perceivedSeverities"
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "filter.perceivedSeverities"
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: Clause 7.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -161,7 +161,7 @@ Get subscriptions with filter "filter.eventTypes"
     ...    Test title: GET Subscription with attribute-based filter "filter.eventTypes"
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "filter.eventTypes"
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: Clause 7.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -175,7 +175,7 @@ Get subscriptions with filter "filter.probableCauses"
     ...    Test title: GET Subscription with attribute-based filter "filter.probableCauses"
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "filter.probableCauses"
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: Clause 7.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -189,7 +189,7 @@ PUT subscriptions - Method not implemented
     ...    Test title:PUT subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to for fault management subscriptions on VNF 
     ...    Pre-conditions: none
-    ...    RReference: clause 7.5.5.3.3 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    RReference: clause 7.5.5.3.3 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID:  Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions:  none
@@ -201,7 +201,7 @@ PATCH subscriptions - Method not implemented
     ...    Test title: PATCH subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to for fault management subscriptions on VNF  
     ...    Pre-conditions: none
-    ...    Reference: clause 7.5.5.3.4 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 7.5.5.3.4 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID:  Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions:  none
@@ -213,7 +213,7 @@ DELETE subscriptions - Method not implemented
     ...    Test title: DELETE subscriptions - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to for fault management subscriptions on VNF  
     ...    Pre-conditions: none 
-    ...    Reference: clause 7.5.5.3.5 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 7.5.5.3.5 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID:  Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -225,7 +225,7 @@ POST Create a new Fault Management alarm subscription - Unprocessable content
     ...    Test title: POST Create a new fault management alarm subscription - Unprocessable content
     ...    Test objective: The objective is to test that a new fault management alarm subscription is not created if the notification endpoint is unreachable by the NFV-MANO.
     ...    Pre-conditions: No subscription with the same filter and callbackUri exists.
-    ...    Reference: clause 7.5.5.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 7.5.5.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID:   Config_prod_NFV-MANO
     ...    Applicability: Notification endpoint is unreachable by the NFV-MANO.
     ...    Post-Conditions: none
@@ -238,7 +238,7 @@ Get list of alarm subscriptions with permitted authorization scope
     ...    Test title: Retrieve a list of alarm subscriptions with permitted authorization scope
     ...    Test objective: The objective is to retrieve the list of active subscriptions with permitted authorization scope.
     ...    Pre-conditions: none
-    ...    Reference: clause 7.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 7.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID:   Config_prod_NFV-MANO
     ...    Applicability:  none
     ...    Post-Conditions: noe
@@ -251,7 +251,7 @@ Get list of alarm subscriptions with not permitted authorization scope
     ...    Test title: Retrieve a list of alarm subscriptions with not permitted authorization scope
     ...    Test objective: The objective is to test that retrieving the list of active subscriptions fails with not permitted authorization scope.
     ...    Pre-conditions: none
-    ...    Reference: clause 7.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 7.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID:   Config_prod_NFV-MANO
     ...    Applicability:  none
     ...    Post-Conditions: noe
diff --git a/SOL009/NFVMANOFaultManagement-API/environment/variables.txt b/SOL009/NFVMANOFaultManagement-API/environment/variables.txt
index 068c4dff4765bc88f0fda9432ad14aa7b3fe275d..c611e4e7489cf483763d3d4765c11de06c4c335b 100644
--- a/SOL009/NFVMANOFaultManagement-API/environment/variables.txt
+++ b/SOL009/NFVMANOFaultManagement-API/environment/variables.txt
@@ -7,6 +7,7 @@ ${AUTHORIZATION_TOKEN}    Bearer    QWxhZGRpbjpvcGVuIHNlc2FtZQ==
 ${CONTENT_TYPE}    application/json
 ${ACCEPT}         application/json
 ${ACCEPT_JSON}         application/json
+${API_VERSION}      1.2.0
 ${AUTH_USAGE}     1
 ${NEG_AUTHORIZATION_TOKEN}    Bearer negativetoken
 ${BAD_AUTHORIZATION_TOKEN}    Bear sometoken
diff --git a/SOL009/NFVMANOLogManagement-API/CompileLogTask.robot b/SOL009/NFVMANOLogManagement-API/CompileLogTask.robot
index 5b5483934962115e1369011f0c68bee6150b40f0..2c514890580bb5e0d1ba78beb5c4ec7df4cf6460 100644
--- a/SOL009/NFVMANOLogManagement-API/CompileLogTask.robot
+++ b/SOL009/NFVMANOLogManagement-API/CompileLogTask.robot
@@ -8,7 +8,7 @@ Request to compile the logged data into a file - Synchronous mode
     ...    Test title: Request to compile the logged data into a file - Synchronous mode
     ...    Test objective: The objective is to request to compile the logged data into a file in synchronous mode and perform a JSON schema validation on the returned log report data structure
     ...    Pre-conditions: logging job is available
-    ...    Reference: clause 8.5.6.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.6.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: The NFV-MANO can decide immediately what to respond to a compile request
     ...    Post-Conditions: none
@@ -23,7 +23,7 @@ Request to compile the logged data into a file - Asynchronous mode
     ...    Test title: Request to compile the logged data into a file - Asynchronous mode
     ...    Test objective: The objective is to request to compile the logged data into a file in asynchronous mode
     ...    Pre-conditions: logging job is available
-    ...    Reference: clause 8.5.6.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.6.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: The NFV-MANO can not decide immediately what to respond to a compile request
     ...    Post-Conditions: log report is available to the API consumer
@@ -38,7 +38,7 @@ Request to compile the logged data into a file - Already Processing
     ...    Test title: Request to compile the logged data into a file - Already Processing
     ...    Test objective: The objective is to request to compile the logged data into a file when a log data compilation and report creation is already ongoing, or a log report has just been created, for the specified logging job at the time of processing the request
     ...    Pre-conditions: none
-    ...    Reference: clause 8.5.6.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.6.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -52,7 +52,7 @@ Request to compile the logged data into a file with unprocessable content
     ...    Test title: Request to compile the logged data into a file with unprocessable content
     ...    Test objective:  The objective is to test that the rrequest to compile the logged data into a file fails when error in request body. 
     ...    Pre-conditions: none
-    ...    Reference: clause 8.5.6.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.6.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -65,7 +65,7 @@ GET Compiled Log Data - Method not implemented
     ...    Test title: GET Compiled Log Data - Method not implemented
     ...    Test objective: The objective is to test that GET method is not allowed to retrieve compiled log data.
     ...    Pre-conditions: none
-    ...    Reference: clause 8.5.6.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.6.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -77,7 +77,7 @@ PUT Compiled Log Data - Method not implemented
     ...    Test title: PUT Compiled Log Data - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to update compiled log data.
     ...    Pre-conditions: none
-    ...    Reference: clause 8.5.6.3.3 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.6.3.3 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -89,7 +89,7 @@ PATCH Compiled Log Data - Method not implemented
     ...    Test title: PATCH Compiled Log Data - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update compiled log data.
     ...    Pre-conditions: none
-    ...    Reference: clause 8.5.6.3.4 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.6.3.4 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -101,7 +101,7 @@ DELETE Compiled Log Data - Method not implemented
     ...    Test title: DELETE Compiled Log Data - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to update compiled log data.
     ...    Pre-conditions: none
-    ...    Reference: clause 8.5.6.3.5 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.6.3.5 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -113,7 +113,7 @@ Request to compile the logged data into a file with a permitted authorization sc
     ...    Test title: Request to compile the logged data into a file with a permitted authorization scope - Synchronous mode
     ...    Test objective: The objective is to request to compile the logged data into a file in synchronous mode with a permitted authorization scope
     ...    Pre-conditions: logging job is available
-    ...    Reference: clause 8.5.6.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.6.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: The NFV-MANO can decide immediately what to respond to a compile request
     ...    Post-Conditions: none
@@ -127,7 +127,7 @@ Request to compile the logged data into a file with not permitted authorization
     ...    Test title: Request to compile the logged data into a file with not permitted authorization scope - Synchronous mode
     ...    Test objective: The objective is to test that requesting to compile the logged data into a file in synchronous mode fails when using not permitted authorization scope
     ...    Pre-conditions: logging job is available
-    ...    Reference: clause 8.5.6.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.6.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: The NFV-MANO can decide immediately what to respond to a compile request
     ...    Post-Conditions: none
diff --git a/SOL009/NFVMANOLogManagement-API/IndividualLoggingJob.robot b/SOL009/NFVMANOLogManagement-API/IndividualLoggingJob.robot
index 3a67d69c93345407c644454ac675b01511ba8e78..f0ea54dfe40999f98ea773070952225cd6b56ba8 100644
--- a/SOL009/NFVMANOLogManagement-API/IndividualLoggingJob.robot
+++ b/SOL009/NFVMANOLogManagement-API/IndividualLoggingJob.robot
@@ -7,7 +7,7 @@ POST Individual Logging Job - Method not implemented
     ...    Test title: POST Individual Logging Job - method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create an Indiviual Logging
     ...    Pre-conditions: none
-    ...    Reference: clause 8.5.4.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.4.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -19,7 +19,7 @@ GET individual Logging Job
     ...    Test title: Get individual Logging Job
     ...    Test objective: The objective is to test the retrieval of an individual logging job and perform a JSON schema validation of the collected job data structure
     ...    Pre-conditions: Logging Job is already created.
-    ...    Reference: clause 8.5.4.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.4.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -33,7 +33,7 @@ GET individual Logging Job with invalid resource identifier
     ...    Test title: Get individual Logging Job with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of an individual logging job fails when using an invalid resource identifier, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: Logging Job is already created.
-    ...    Reference: clause 8.5.4.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.4.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -46,7 +46,7 @@ PUT Individual Logging Job - Method not implemented
     ...    Test title: PUT Individual Logging Job - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to update an existing Logging Job
     ...    Pre-conditions: none
-    ...    Reference: clause 8.5.4.3.3 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.4.3.3 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -58,7 +58,7 @@ PATCH Individual Logging Job - Method not implemented
     ...    Test title: PATCH Individual Logging Job - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to modify an existing new Logging Job
     ...    Pre-conditions: none
-    ...    Reference: clause 6.5.4.3.4 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.4.3.4 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -70,7 +70,7 @@ DELETE Individual Logging Job
     ...    Test title: DELETE Individual Logging Job
     ...    Test objective: The objective is to test the deletion of an individual logging job
     ...    Pre-conditions: Logging Job is already created.
-    ...    Reference: clause 8.5.4.3.5 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.4.3.5 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: The Logging Job is no more available.   
@@ -83,7 +83,7 @@ DELETE Individual Logging Job with invalid resource identifier
     ...    Test title: DELETE Individual Logging Job with invalid resource identifier
     ...    Test objective: The objective is to test that the deletion of an individual logging job fails when using an invalid resource identifier
     ...    Pre-conditions: Logging Job is already created.
-    ...    Reference: clause 8.5.4.3.5 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.4.3.5 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -96,7 +96,7 @@ DELETE Individual Logging Job with permitted authorization scope
     ...    Test title: DELETE Individual Logging Job with permitted authorization scope
     ...    Test objective: The objective is to test the deletion of an individual logging job with permitted authorization scope
     ...    Pre-conditions: Logging Job is already created.
-    ...    Reference: clause 8.5.4.3.5 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.4.3.5 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: The Logging Job is no more available.   
@@ -109,7 +109,7 @@ DELETE Individual Logging Job with not permitted authorization scope
     ...    Test title: DELETE Individual Logging Job with not permitted authorization scope
     ...    Test objective: The objective is to test that the deletion of an individual logging job fails when using a not permitted authorization scope
     ...    Pre-conditions: Logging Job is already created.
-    ...    Reference: clause 8.5.4.3.5 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.4.3.5 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: The Logging Job is no more available.   
diff --git a/SOL009/NFVMANOLogManagement-API/IndividualReport.robot b/SOL009/NFVMANOLogManagement-API/IndividualReport.robot
index 48b34eb32a19334878ecb2acf7a1a23b9f27499d..f313808fcd2d1c3aba1960d4e00915ac2c7ce5a1 100644
--- a/SOL009/NFVMANOLogManagement-API/IndividualReport.robot
+++ b/SOL009/NFVMANOLogManagement-API/IndividualReport.robot
@@ -7,7 +7,7 @@ POST Individual Log Report - Method not implemented
     ...    Test title: POST Individual Log Report - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new log report.
     ...    Pre-conditions: none
-    ...    Reference: clause 8.5.5.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.5.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -19,7 +19,7 @@ Get Individual Log Report
     ...    Test title: Get Individual Log Report
     ...    Test objective: The objective is to test the retrieval of an individual log report and perform a JSON schema validation of the collected report data structure
     ...    Pre-conditions: One or more log reports are set.
-    ...    Reference: clause 8.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -32,7 +32,7 @@ Get Individual Log Report (asynchronous)
     ...    Test title: Get Individual Log Report  (asynchronous)
     ...    Test objective: The objective is to test the retrieval of an individual log report is ongoing and no log report is available yet.
     ...    Pre-conditions: One or more log reports are set.
-    ...    Reference: clause 8.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -44,7 +44,7 @@ Get Individual Log Report with invalid resource endpoint
     ...    Test title: Get Individual Log Report with invalid resource endpoint
     ...    Test objective:  The objective is to test that the retrieval of an individual log report  fails when using an invalid resource endpoint. 
     ...    Pre-conditions: One or more log reports are set.
-    ...    Reference: clause 8.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -57,7 +57,7 @@ PUT Individual Log Report - Method not implemented
     ...    Test title: PUT Individual Log Report - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to update an existing log report.
     ...    Pre-conditions: none
-    ...    Reference: clause 8.5.5.3.3 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.5.3.3 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -69,7 +69,7 @@ PATCH Individual Log Report - Method not implemented
     ...    Test title: PATCH Individual Log Report - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to modify an existinglog report.
     ...    Pre-conditions: none
-    ...    Reference: clause 8.5.5.3.4 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.5.3.4 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -81,7 +81,7 @@ DELETE Individual Log Report - Method not implemented
     ...    Test title: DELETE Individual Log Report - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete an existing log report.
     ...    Pre-conditions: none
-    ...    Reference: clause 8.5.5.3.5 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.5.3.5 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -93,7 +93,7 @@ Get Individual Log Report with permitted authorization scope
     ...    Test title: Get Individual Log Report with permitted authorization scope
     ...    Test objective: The objective is to test the retrieval of an individual log report with permitted authorization scope
     ...    Pre-conditions: One or more log reports are set.
-    ...    Reference: clause 8.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -106,7 +106,7 @@ Get Individual Log Report with not permitted authorization scope
     ...    Test title: Get Individual Log Report with not permitted authorization scope
     ...    Test objective: The objective is to test that the retrieval of an individual log report fails when using not permitted authorization scope
     ...    Pre-conditions: One or more log reports are set.
-    ...    Reference: clause 8.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL009/NFVMANOLogManagement-API/IndividualSubscription.robot b/SOL009/NFVMANOLogManagement-API/IndividualSubscription.robot
index 0a6e4a3ac2d9ec3af9af58c2f5f3c6bd5391161f..603e3431ce0fa7084405748ce37477c6dd161996 100644
--- a/SOL009/NFVMANOLogManagement-API/IndividualSubscription.robot
+++ b/SOL009/NFVMANOLogManagement-API/IndividualSubscription.robot
@@ -7,7 +7,7 @@ GET Individual Subscription
     ...    Test title: GET Individual  Subscription
     ...    Test objective: The objective is to test the retrieval of individual subscription and perform a JSON schema validation of the returned subscription data structure
     ...    Pre-conditions: At least one subscription is available in the NFV-MANO.
-    ...    Reference: clause 8.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -21,7 +21,7 @@ GET Individual Subscription - invalid resource identifier
     ...    Test title: GET Individual Subscription - invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of an individual subscription fails when using an invalid resource identifier
     ...    Pre-conditions: At least one subscription is available in the NFV-MANO.
-    ...    Reference: clause 8.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -34,7 +34,7 @@ DELETE Individual Subscription
     ...    Test title: DELETE Individual Subscription
     ...    Test objective: The objective is to test the deletion of an individual subscription
     ...    Pre-conditions: At least one subscription is available in the NFV-MANO.
-    ...    Reference: clause 8.5.8.3.5 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.8.3.5 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: The is not available anymore in the NFV-MANO    
@@ -47,7 +47,7 @@ DELETE Individual Subscription - invalid resource identifier
     ...    Test title: DELETE Individual Subscription - invalid resource identifier
     ...    Test objective: The objective is to test that the deletion of an individual  subscription fails when using an invalid resource identifier
     ...    Pre-conditions: At least one subscription is available in the NFV-MANO.
-    ...    Reference: clause 8.5.8.3.5 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.8.3.5 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -59,7 +59,7 @@ POST Individual Subscription - Method not implemented
     ...    Test title: POST Individual Subscription - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new Subscription
     ...    Pre-conditions: none
-    ...    Reference: clause 8.5.8.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.8.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -71,7 +71,7 @@ PUT Individual Subscription - Method not implemented
     ...    Test title: PUT Individual Subscription - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to update an existing subscription
     ...    Pre-conditions: none
-    ...    Reference: clause 8.5.8.3.3 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.8.3.3 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -83,7 +83,7 @@ PATCH Individual Subscription - Method not implemented
     ...    Test title: PATCH Individual Subscription - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to modify an existing subscription
     ...    Pre-conditions: none
-    ...    Reference: clause 8.5.8.3.4 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.8.3.4 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -95,7 +95,7 @@ GET Individual Subscription with permitted authorization scope
     ...    Test title: GET Individual  Subscription with permitted authorization scope
     ...    Test objective: The objective is to test the retrieval of individual subscription with permitted authorization scope
     ...    Pre-conditions: At least one subscription is available in the NFV-MANO.
-    ...    Reference: clause 8.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -109,7 +109,7 @@ GET Individual Subscription with not permitted authorization scope
     ...    Test title: GET Individual  Subscription with not permitted authorization scope
     ...    Test objective: The objective is to test that the retrieval of individual subscription fails when using not permitted authorization scope
     ...    Pre-conditions: At least one subscription is available in the NFV-MANO.
-    ...    Reference: clause 8.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL009/NFVMANOLogManagement-API/LoggingJobs.robot b/SOL009/NFVMANOLogManagement-API/LoggingJobs.robot
index af23e8122555d9aa1b71f2b1fb7a00b8bf718824..d130123fb4c2e826b93d0f12e8939d2de9a92909 100644
--- a/SOL009/NFVMANOLogManagement-API/LoggingJobs.robot
+++ b/SOL009/NFVMANOLogManagement-API/LoggingJobs.robot
@@ -7,7 +7,7 @@ POST Create a new logging job
     ...    Test title: POST Create a new logging job
     ...    Test objective: The objective is to create a new logging job, and perform the JSON schema validation of the operation HTTP response.
     ...    Pre-conditions: none
-    ...    Reference: clause 8.5.3.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.3.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: logging job created
@@ -23,7 +23,7 @@ GET information about logging jobs
     ...    Test title: GET information logging jobs
     ...    Test objective: The objective is to retrieve information about logging jobs, and perform the JSON schema validation of the operation HTTP response.
     ...    Pre-conditions: At least one logging job is created.
-    ...    Reference: clause 8.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions:  none
@@ -36,7 +36,7 @@ GET Logging jobs - invalid attribute-based filter
     ...    Test title: GET Logging jobs - invalid attribute-based filter
     ...    Test objective:  The objective is to test that the retrieval of logging jobs fails when using invalid attribute-based filter, and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: At least one logging job is created.
-    ...    Reference: clause 8.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -49,7 +49,7 @@ GET Logging jobs - invalid attribute selector
     ...    Test title: GET Logging jobs - invalid attribute selector
     ...    Test objective: The objective is to test that the retrieval of logging jobs fails when using invalid attribute selector, and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: At least one logging job is created.
-    ...    Reference: clause 8.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -62,7 +62,7 @@ GET Logging jobs - Bad Request Response too Big
     ...    Test title: GET Logging jobs - Bad Request Response too Big
     ...    Test objective: The objective is to test that the retrieval of Logging job fails when response is too big, and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: At least one logging job is created.
-    ...    Reference: clause 8.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -75,7 +75,7 @@ GET information about logging jobs with attribute-based filter
     ...    Test title: GET information about logging jobs with attribute-based filter
     ...    Test objective: The objective is to retrieve information about the logging jobs with attribute filters, and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: At least one logging job is created.
-    ...    Reference: clause 8.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -88,7 +88,7 @@ GET information about logging jobs with "all_fields" attribute selector
     ...    Test title: GET information about logging jobs with "all_fields" attribute selector
     ...    Test objective: The objective is to retrieve information about logging jobs with "all_fields" attribute selector, and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: At least one logging job is created.
-    ...    Reference: clause 8.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -101,7 +101,7 @@ GET information about Logging Jobs with "exclude_default" attribute selector
     ...    Test title: GET information about Logging Jobs with "exclude_default" attribute selector
     ...    Test objective: The objective is to retrieve information about logging jobs with "exclude_default" attribute selector, and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: At least one logging job is created.
-    ...    Reference: clause 8.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -114,7 +114,7 @@ GET information about Logging Jobs with "fields" attribute selector
     ...    Test title: GET information about Logging Jobs with fields attribute selector
     ...    Test objective: The objective is to retrieve information about Logging Jobs with fields attribute selector, and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: At least one logging job is created.
-    ...    Reference: clause 8.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -127,7 +127,7 @@ GET information about Logging Jobs with "exclude_fields" attribute selector
     ...    Test title: GET information about Logging Jobs with "exclude_fields" attribute selector
     ...    Test objective: The objective is to retrieve information about the Logging Jobs with "exclude_fields" attribute selector, and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: At least one logging job is created.
-    ...    Reference: clause 8.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -140,7 +140,7 @@ GET information about Logging Jobs with "fields" and "exclude_default" attribute
     ...    Test title: GET information about Logging Jobs with fields and exclude_default attribute selector
     ...    Test objective: The objective is to retrieve information about Logging Jobs with fields and exclude_default attribute selector, and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: At least one logging job is created.
-    ...    Reference: clause 8.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -153,7 +153,7 @@ GET information about Logging Jobs with Paged Response
     ...    Test title: GET information about Logging Jobs with Paged Response
     ...    Test objective: The objective is to query information about Logging Jobs to get Paged Response.
     ...    Pre-conditions:  At least one logging job is created.
-    ...    Reference: clause 8.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -166,7 +166,7 @@ GET information about Logging Jobs with malformed authorization token
     ...    Test title: GET information about Logging Jobs with malformed authorization token
     ...    Test objective: The objective is to test that the retrieval of information about Logging Jobs fails when using malformed authorization token.
     ...    Pre-conditions: none
-    ...    Reference: clause 8.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: The Peer Entity requires the usage of access tokens for authorizing the API requests.
     ...    Post-Conditions: none
@@ -178,7 +178,7 @@ GET information about Logging Jobs without authorization token
     ...    Test title: GET information about Logging Jobs without authorization token
     ...    Test objective: The objective is to test that the retrieval of information about Logging Jobs fails when omitting the authorization token.
     ...    Pre-conditions: none
-    ...    Reference: clause 8.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: The Peer Entity requires the usage of access tokens for authorizing the API requests.
     ...    Post-Conditions: none
@@ -190,7 +190,7 @@ GET information about Logging Jobs with expired or revoked authorization token
     ...    Test title: GET information about Logging Jobs with expired or revoked authorization token
     ...    Test objective: The objective is to test that the retrieval of information about Logging Jobs fails when using expired or revoked authorization token.
     ...    Pre-conditions: none
-    ...    Reference: clause 8.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: The Peer Entity requires the usage of access tokens for authorizing the API requests.
     ...    Post-Conditions: none
@@ -202,7 +202,7 @@ PUT Logging Jobs - Method not implemented
     ...    Test title: PUT Logging Jobs - Method not implemented
     ...    Test objective: The objective is to test that the method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: clause 8.5.3.3.3 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.3.3.3 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -214,7 +214,7 @@ PATCH Logging Jobs - Method not implemented
     ...    Test title: PATCH Logging Jobs - Method not implemented
     ...    Test objective: The objective is to test that the method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: clause 8.5.3.3.4 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.3.3.4 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -226,7 +226,7 @@ DELETE Logging Jobs - Method not implemented
     ...    Test title: DELETE Logging Jobs - Method not implemented
     ...    Test objective: The objective is to test that the method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: clause 8.5.3.3.5 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.3.3.5 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -238,7 +238,7 @@ POST Create a new logging job with permitted authorization scope
     ...    Test title: POST Create a new logging job with permitted authorization scope
     ...    Test objective: The objective is to create a new logging job with permitted authorization scope.
     ...    Pre-conditions: none
-    ...    Reference: clause 8.5.3.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.3.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: logging job created
@@ -253,7 +253,7 @@ POST Create a new logging job with not permitted authorization scope
     ...    Test title: POST Create a new logging job with not permitted authorization scope
     ...    Test objective: The objective is to test that the creation of a new logging job fails when a not permitted authorization scope is used.
     ...    Pre-conditions: none
-    ...    Reference: clause 8.5.3.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.3.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL009/NFVMANOLogManagement-API/NFVMANOLogManagementKeywords.robot b/SOL009/NFVMANOLogManagement-API/NFVMANOLogManagementKeywords.robot
index 10b25c4084c2c305d559e8bcb3d144953e1a85da..b0db5509a240eb46558790b30c20026deb390d5f 100644
--- a/SOL009/NFVMANOLogManagement-API/NFVMANOLogManagementKeywords.robot
+++ b/SOL009/NFVMANOLogManagement-API/NFVMANOLogManagementKeywords.robot
@@ -789,8 +789,8 @@ Check Log Report Available Notification Http POST Request Body notificationType
     [Arguments]    ${type}
     Configure Notification Log Report Available Handler    ${callback_endpoint_fwd}    ${type}
     Wait Until Keyword Succeeds    ${total_polling_time}   ${polling_interval}   Verify Mock Expectation    ${notification_request}
-    Clear Requests    ${callback_endpoint}
-    Clear Requests    ${callback_endpoint_fwd}
+    #Clear Requests    ${callback_endpoint}
+    #Clear Requests    ${callback_endpoint_fwd}
 
 Check Threshold Crossed Notification Http POST Request Body Json Schema Is    
     [Arguments]    ${element}
@@ -820,6 +820,41 @@ Create Sessions for Notifications
     Wait For Process  handle=mockInstance  timeout=5s  on_timeout=continue
     Create Mock Session  ${callback_uri}:${callback_port}
 
+Check Log Report Notification Validation
+    [Arguments]    ${expected_notification_type}=LogReportAvailableNotification
+    ${requests}=    Retrieve Requests    ${callback_endpoint_fwd}
+    Should Not Be Empty    ${requests}    msg=No notification received at callback endpoint!
+
+    ${request_type}=    Evaluate    type(${requests})
+    Log    Request type: ${request_type}
+
+    ${last_request}=    Run Keyword If    "${request_type}" == "<class 'list'>"
+    ...    Get From List    ${requests}    -1
+    ...    ELSE
+    ...    Set Variable    ${requests}
+
+    ${body}=    Get From Dictionary    ${last_request}    body
+    ${body_text}=    Get From Dictionary    ${body}    string
+
+    ${notification}=    Evaluate    json.loads(r'''${body_text}''')    json
+    Log    Parsed notification: ${notification}
+
+    Should Be Equal As Strings    ${notification['notificationType']}    ${expected_notification_type}
+
+    ${_links}=    Get From Dictionary    ${notification}    _links
+
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Set Headers    {"Version": "${API_VERSION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1
+    ...    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+
+    # Validate entity exists
+    GET    ${_links['logReports'][0]}
+    Integer    response status    200
+
+    Clear Requests    ${callback_endpoint}
+    Clear Requests    ${callback_endpoint_fwd}
+
 Check resource existence and get CallbackUri
     Set Headers  {"Accept":"${ACCEPT_JSON}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
diff --git a/SOL009/NFVMANOLogManagement-API/NotificationEndpoint.robot b/SOL009/NFVMANOLogManagement-API/NotificationEndpoint.robot
index 0bb5eeef7e74bee50eceeedbb0271f6cb0af437f..bd12c6ac5a5e26aeefc283273641fa87b32963c8 100644
--- a/SOL009/NFVMANOLogManagement-API/NotificationEndpoint.robot
+++ b/SOL009/NFVMANOLogManagement-API/NotificationEndpoint.robot
@@ -8,7 +8,7 @@ Log Report Available Notification
     ...    Test title: Log Report Available Notification
     ...    Test objective: The objective is to test that Log Report Available Notification is delivered with success to the notification consumer.
     ...    Pre-conditions: A subscription for log report available notification is available in the NFV-MANO.
-    ...    Reference: clause 8.5.9.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.9.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL009/NFVMANOLogManagement-API/Notifications.robot b/SOL009/NFVMANOLogManagement-API/Notifications.robot
index 898999502c9127e96f3920b56c93955de0edb926..e08a609642c7a2015b4a1e8136bbe48523b431a5 100644
--- a/SOL009/NFVMANOLogManagement-API/Notifications.robot
+++ b/SOL009/NFVMANOLogManagement-API/Notifications.robot
@@ -9,10 +9,11 @@ Log Report Avaliable Notification
     ...    Test title: Log Report Avaliable Notification
     ...    Test objective: The objective is to test the dispatch of Log Report Avaliable Notification when new log report is available in the NFV-MANO, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: none
-    ...    Reference: clause 8.5.9.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.9.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none 
     Trigger the availability of Log Report (external action) 
     Check Log Report Available Notification Http POST Request Body Json Schema Is    LogReportAvailableNotification
     Check Log Report Available Notification Http POST Request Body notificationType attribute Is    LogReportAvailableNotification
+    Check Log Report Notification Validation
diff --git a/SOL009/NFVMANOLogManagement-API/Subscriptions.robot b/SOL009/NFVMANOLogManagement-API/Subscriptions.robot
index 57f599847d15a0a08e4749a2b17682b8b223de79..6916536b9b1f0c83c57ae44a6baf9a4985bab68f 100644
--- a/SOL009/NFVMANOLogManagement-API/Subscriptions.robot
+++ b/SOL009/NFVMANOLogManagement-API/Subscriptions.robot
@@ -9,7 +9,7 @@ GET all Subscriptions
     ...    Test title: GET all Subscriptions
     ...    Test objective: The objective is to test the retrieval list of active subscriptions list to log management notifications and perform a JSON schema validation of the returned subscriptions data structure
     ...    Pre-conditions:  At least one subscription is available in the NFV-MANO.
-    ...    Reference: clause 8.5.7.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.7.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -22,7 +22,7 @@ GET Subscriptions with attribute-based filter
     ...    Test title: GET Subscriptions with attribute-based filter
     ...    Test objective: The objective is to test the retrieval of active subscriptions list to log management notifications using attribute-based filter, perform a JSON schema validation of the collected indicators data structure, and verify that the retrieved information matches the issued attribute-based filters 
     ...    Pre-conditions: At least one subscription is available in the NFV-MANO.
-    ...    Reference: clause 8.5.7.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.7.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -35,7 +35,7 @@ GET Subscriptions with Paged Response
     ...    Test title: GET Subscriptions with Paged Response
     ...    Test objective: The objective is to query information of active subscriptions list to log management notifications to get Paged Response.
     ...    Pre-conditions:  At least one subscription is available in the NFV-MANO.
-    ...    Reference: clause 8.5.7.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.7.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -48,7 +48,7 @@ GET Subscriptions - invalid attribute-based filter
     ...    Test title: GET Subscriptions - invalid attribute-based filter
     ...    Test objective: The objective is to test that the retrieval of active subscriptions list to log management notifications fails when using invalid attribute-based filters, and perform the JSON schema validation of the failed operation HTTP response. 
     ...    Pre-conditions: At least one subscription is available in the NFV-MANO.
-    ...    Reference: clause 8.5.7.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.7.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -61,7 +61,7 @@ GET Subscriptions - Bad Request Response too Big
     ...    Test title: GET Subscriptions - Bad Request Response too Big
     ...    Test objective: The objective is to test that the retrieval of active subscriptions list to log management notifications fails when response is too big, and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: At least one subscription is available in the NFV-MANO.
-    ...    Reference: clause 8.5.7.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.7.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -74,7 +74,7 @@ GET Subscriptions - invalid resource endpoint
     ...    Test title: GET Subscriptions - invalid resource endpoint
     ...    Test objective: The objective is to test that the retrieval of active subscriptions list to log management notifications fails when using invalid resource endpoint.
     ...    Pre-conditions: At least one subscription is available in the NFV-MANO.
-    ...    Reference: clause 8.5.7.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.7.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -87,7 +87,7 @@ GET Subscription with attribute-based filter "id"
     ...    Test title: GET Subscription with attribute-based filter "id"
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "id"
     ...    Pre-conditions: none 
-    ...    Reference: clause 8.5.7.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.7.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability:  none 
     ...    Post-Conditions: none 
@@ -101,7 +101,7 @@ Get subscriptions with filter "filter.notificationTypes"
     ...    Test title: GET Subscription with attribute-based filter "filter.notificationTypes"
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "filter.notificationTypes"
     ...    Pre-conditions: none 
-    ...    Reference: clause 8.5.7.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.7.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability:  none 
     ...    Post-Conditions: none 
@@ -115,7 +115,7 @@ POST Create new Subscription
     ...    Test title: POST Create new Subscription
     ...    Test objective: The objective is to test the creation of a new subscription to log management notification and perform a JSON schema and content validation of the returned subscription data structure
     ...    Pre-conditions: none
-    ...    Reference: clause 8.5.7.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.7.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: The subscription is successfully set and it matches the issued subscription    
@@ -133,7 +133,7 @@ POST Create request for duplicated Subscription not creating duplicated subscrip
     ...    Test title: POST Create request for duplicated Subscription not creating duplicated subscriptions
     ...    Test objective: The objective is to test the attempt of a creation of a duplicated subscription failed and check that no new subscription is created and a link to the original subscription is returned
     ...    Pre-conditions: At least one subscription is available in the NFV-MANO.
-    ...    Reference: clause 8.5.7.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.7.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: The NFV-MANO does not support the creation of duplicated subscriptions
     ...    Post-Conditions: The existing Subscription returned is available in the NFV-MANO 
@@ -149,7 +149,7 @@ POST Create request for duplicated Subscription creating duplicated subscription
     ...    Test title: POST Create request for duplicated Subscription creating duplicated subscriptions
     ...    Test objective: The objective is to test the creation of a duplicated subscription and perform a JSON schema and content validation of the returned duplicated subscription data structure
     ...    Pre-conditions: At least one subscription is available in the NFV-MANO.
-    ...    Reference: clause 8.5.7.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.7.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: The NFV-MANO supports the creation of duplicated subscriptions
     ...    Post-Conditions: The duplicated subscription is successfully set and it matches the issued subscription
@@ -166,7 +166,7 @@ PUT Subscriptions - Method not implemented
     ...    Test title: PUT Subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify subscriptions
     ...    Pre-conditions: none
-    ...    Reference: clause 8.5.7.3.3 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.7.3.3 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -178,7 +178,7 @@ PATCH Subscriptions - Method not implemented
     ...    Test title: PATCH Subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update subscriptions
     ...    Pre-conditions: none
-    ...    Reference: clause 8.5.7.3.4 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.7.3.4 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -190,7 +190,7 @@ DELETE Subscriptions - Method not implemented
     ...    Test title: DELETE Subscriptions - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete subscriptions
     ...    Pre-conditions: none
-    ...    Reference: clause 8.5.7.3.5 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.7.3.5 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none  
@@ -202,7 +202,7 @@ POST Create new Subscription - Unprocessable content
     ...    Test title: POST Create new Subscription - Unprocessable content
     ...    Test objective: The objective is to test that a new log management subscription is not created if the notification endpoint is unreachable by the NFV-MANO.
     ...    Pre-conditions: none
-    ...    Reference: clause 8.5.7.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.7.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: Notification endpoint is unreachable by the NFV-MANO.
     ...    Post-Conditions: none
@@ -215,7 +215,7 @@ GET all Subscriptions with permitted authorization scope
     ...    Test title: GET all Subscriptions with permitted authorization scope
     ...    Test objective: The objective is to test the retrieval list of active subscriptions list to log management notifications with permitted authorization scope
     ...    Pre-conditions:  At least one subscription is available in the NFV-MANO.
-    ...    Reference: clause 8.5.7.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.7.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -228,7 +228,7 @@ GET all Subscriptions with not permitted authorization scope
     ...    Test title: GET all Subscriptions with not permitted authorization scope
     ...    Test objective: The objective is to test that the retrieval list of active subscriptions list to log management notifications fails when using not permitted authorization scope
     ...    Pre-conditions:  At least one subscription is available in the NFV-MANO.
-    ...    Reference: clause 8.5.7.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 8.5.7.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none    
diff --git a/SOL009/NFVMANOLogManagement-API/environment/variables.txt b/SOL009/NFVMANOLogManagement-API/environment/variables.txt
index 779b3d4a99f092da87e998feabcae334d8eb01f8..c3ab44df5afe3da8a86d20f75b3c1f8f81cf1f61 100644
--- a/SOL009/NFVMANOLogManagement-API/environment/variables.txt
+++ b/SOL009/NFVMANOLogManagement-API/environment/variables.txt
@@ -23,6 +23,7 @@ ${CONTENT_TYPE_JSON}    application/json
 ${ACCEPT_JSON}    application/json
 ${ACCEPT}         application/json
 ${AUTH_USAGE}     1
+${API_VERSION}      1.1.0
 
 ${NFVMANO_CHECKS_NOTIF_ENDPOINT}    1        ## If true, during subscription, the FUT performs a get to the notification endpoint
 
diff --git a/SOL009/NFVMANOPerformanceManagement-API/ApiVersion.robot b/SOL009/NFVMANOPerformanceManagement-API/ApiVersion.robot
index 8ee0b4b64cb4229eb184d1f32c7e36da8bb45bdb..6c6015a3773373703b44b61b1e96fb6a1eb243f7 100644
--- a/SOL009/NFVMANOPerformanceManagement-API/ApiVersion.robot
+++ b/SOL009/NFVMANOPerformanceManagement-API/ApiVersion.robot
@@ -7,7 +7,7 @@ POST API Version - Method not implemented
     ...    Test title: POST API version - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -19,7 +19,7 @@ GET API Version
     ...    Test title: GET API Version
     ...    Test objective: The objective is to test that GET method successfully return ApiVersionInformation
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -32,7 +32,7 @@ PUT API Version - Method not implemented
     ...    Test title: PUT API Version - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -44,7 +44,7 @@ PATCH API Version - Method not implemented
     ...    Test title: PATCH API Version - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -56,7 +56,7 @@ DELETE API Version - Method not implemented
     ...    Test title: DELETE API Version - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -68,7 +68,7 @@ POST API Version with apiMajorVerion - Method not implemented
     ...    Test title: POST API version with apiMajorVerion - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -80,7 +80,7 @@ GET API Version with apiMajorVerion
     ...    Test title: GET API Version with apiMajorVerion
     ...    Test objective: The objective is to test that GET method successfully return ApiVersionInformation
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -93,7 +93,7 @@ PUT API Version with apiMajorVerion - Method not implemented
     ...    Test title: PUT API Version with apiMajorVerion - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -105,7 +105,7 @@ PATCH API Version with apiMajorVerion - Method not implemented
     ...    Test title: PATCH API Version with apiMajorVerion - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -117,7 +117,7 @@ DELETE API Version with apiMajorVerion - Method not implemented
     ...    Test title: DELETE API Version with apiMajorVerion - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL009/NFVMANOPerformanceManagement-API/IndividualPmJob.robot b/SOL009/NFVMANOPerformanceManagement-API/IndividualPmJob.robot
index 1c2f57cf70828b0abc88efe91dbb0882d48a7256..3ec285072a990156c8e0a460fe0fcb15ecf471b7 100644
--- a/SOL009/NFVMANOPerformanceManagement-API/IndividualPmJob.robot
+++ b/SOL009/NFVMANOPerformanceManagement-API/IndividualPmJob.robot
@@ -7,7 +7,7 @@ POST Individual NFV-MANO Performance Job - Method not implemented
     ...    Test title: POST Individual NFV-MANO Performance Job - method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new NFV-MANO Performance Monitoring Job
     ...    Pre-conditions: none
-    ...    Reference: clause 6.5.4.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.4.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -19,7 +19,7 @@ GET individual NFV-MANO Performance Job
     ...    Test title: Get individual NFV-MANO Performance Job
     ...    Test objective: The objective is to test the retrieval of an individual performance monitoring job and perform a JSON schema validation of the collected job data structure
     ...    Pre-conditions: A NFV-MANO instance is instantiated.
-    ...    Reference: clause 6.5.4.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.4.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -33,7 +33,7 @@ GET individual NFV-MANO Performance Job with invalid resource identifier
     ...    Test title: Get individual NFV-MANO Performance Job with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of an individual performance monitoring job fails when using an invalid resource identifier, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more NFV-MANO performance jobs are set in the NFV-MANO.
-    ...    Reference: clause 6.5.4.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.4.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -46,7 +46,7 @@ PUT Individual NFV-MANO Performance Job - Method not implemented
     ...    Test title: PUT Individual NFV-MANO Performance Job - method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to update an existing NFV-MANO Performance Monitoring Job
     ...    Pre-conditions: none
-    ...    Reference: clause 6.5.4.3.4 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.4.3.4 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -58,7 +58,7 @@ PATCH Individual NFV-MANO Performance Job
     ...    Test title: PATCH Individual NFV-MANO Performance Job
     ...    Test objective: The objective is to test that PATCH method modify an existing individual NFV-MANO Performance Monitoring Job
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more NFV-MANO performance jobs are set in the NFV-MANO.
-    ...    Reference: clause 6.5.4.3.4 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.4.3.4 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: PM Job resource is modified.
@@ -71,7 +71,7 @@ DELETE Individual NFV-MANO Performance Job
     ...    Test title: Delete Individual NFV-MANO Performance Job
     ...    Test objective: The objective is to test the deletion of an individual performance monitoring job
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more NFV-MANO performance jobs are set in the NFV-MANO.
-    ...    Reference: clause 6.5.4.3.5 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.4.3.5 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: The NFV-MANO Performance Job is no more available.   
@@ -84,7 +84,7 @@ DELETE Individual NFV-MANO Performance Job with invalid resource identifier
     ...    Test title: Delete individual NFV-MANO Performance Job with invalid resource identifier
     ...    Test objective: The objective is to test that the deletion of an individual NFV-MANO performance monitoring job fails when using an invalid resource identifier
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more NFV-MANO performance jobs are set in the NFV-MANO.
-    ...    Reference: clause 6.5.4.3.5 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.4.3.5 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -96,7 +96,7 @@ PATCH Individual NFV-MANO Performance Job - Precondition failed
     ...    Test title: PATCH Individual NFV-MANO Performance Job - Precondition failed
     ...    Test objective: The objective is to test that the PATCH method cannot modify an individual NFV-MANO Performance job where the precondition was not met.
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more NFV-MANO performance jobs are set in the NFV-MANO.
-    ...    Reference: clause 6.5.4.3.4 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.4.3.4 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: PM Job resource is not modified.
@@ -109,7 +109,7 @@ PATCH Individual NFV-MANO Performance Job - Unprocessable content
     ...    Test title: PATCH Individual NFV-MANO Performance Job - Unprocessable content
     ...    Test objective: The objective is to test that PATCH method cannot modify an exsisting individual PM job resource when a request contains syntactically correct data but the data cannot be processed.
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more NFV-MANO performance jobs are set in the NFV-MANO.
-    ...    Reference: clause 6.5.4.3.4 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.4.3.4 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: PM Job resource is not modified.
@@ -122,7 +122,7 @@ PATCH Individual NFV-MANO Performance Job with permitted authorization scope
     ...    Test title: PATCH Individual NFV-MANO Performance Job with permitted authorization scope
     ...    Test objective: The objective is to test that PATCH method with permitted authorization scope modify an existing individual NFV-MANO Performance Monitoring Job
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more NFV-MANO performance jobs are set in the NFV-MANO.
-    ...    Reference: clause 6.5.4.3.4 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.4.3.4 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: PM Job resource is modified.
@@ -135,7 +135,7 @@ PATCH Individual NFV-MANO Performance Job with not permitted authorization scope
     ...    Test title: PATCH Individual NFV-MANO Performance Job with not permitted authorization scope
     ...    Test objective: The objective is to test that PATCH method with not permitted authorization scope fails
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more NFV-MANO performance jobs are set in the NFV-MANO.
-    ...    Reference: clause 6.5.4.3.4 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.4.3.4 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: PM Job resource is modified.
diff --git a/SOL009/NFVMANOPerformanceManagement-API/IndividualReport.robot b/SOL009/NFVMANOPerformanceManagement-API/IndividualReport.robot
index 20354fce4b1ed4e22af76f33c4ce9ffd015bbcac..3f4bede5b19e42f185ded9f4a23886fc02130571 100644
--- a/SOL009/NFVMANOPerformanceManagement-API/IndividualReport.robot
+++ b/SOL009/NFVMANOPerformanceManagement-API/IndividualReport.robot
@@ -7,7 +7,7 @@ POST Individual Performance Report - Method not implemented
     ...    Test title: POST Individual Performance Report - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new NFV-MANO performance report within a monitoring job.
     ...    Pre-conditions: none
-    ...    Reference: clause 6.5.5.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.5.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -19,7 +19,7 @@ Get Individual Performance Report
     ...    Test title: Get Individual Performance Report
     ...    Test objective: The objective is to test the retrieval of an individual performance report associated to a monitoring job and perform a JSON schema validation of the collected report data structure
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more NFV-MANO performance reports are set for a monitoring job.
-    ...    Reference: clause 6.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -32,7 +32,7 @@ Get Individual Performance Report with invalid resource endpoint
     ...    Test title: Get Individual Performance Report with invalid resource endpoint
     ...    Test objective:  The objective is to test that the retrieval of an individual NFV-MANO performance report associated to a monitoring job fails when using an invalid resource endpoint. 
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more NFV-MANO performance reports are set for a monitoring job.
-    ...    Reference: clause 6.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -44,7 +44,7 @@ PUT Individual Performance Report - Method not implemented
     ...    Test title: PUT Individual Performance Report - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to update an existing NFV-MANO performance report within a monitoring job.
     ...    Pre-conditions: none
-    ...    Reference: clause 6.5.5.3.3 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.5.3.3 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -56,7 +56,7 @@ PATCH Individual Performance Report - Method not implemented
     ...    Test title: PATCH Individual Performance Report - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to modify an existing NFV-MANO performance report within a monitoring job.
     ...    Pre-conditions: none
-    ...    Reference: clause 6.5.5.3.4 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.5.3.4 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -68,7 +68,7 @@ DELETE Individual Performance Report - Method not implemented
     ...    Test title: DELETE Individual Performance Report - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete an existing NFV-MANO performance report within a monitoring job
     ...    Pre-conditions: none
-    ...    Reference: clause 6.5.5.3.5 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.5.3.5 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANOM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -80,7 +80,7 @@ Get Individual Performance Report with permitted authorization scope
     ...    Test title: Get Individual Performance Report with permitted authorization scope
     ...    Test objective: The objective is to test the retrieval of an individual performance report associated to a monitoring job with permitted authorization scope
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more NFV-MANO performance reports are set for a monitoring job.
-    ...    Reference: clause 6.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -93,7 +93,7 @@ Get Individual Performance Report with not permitted authorization scope
     ...    Test title: Get Individual Performance Report with not permitted authorization scope
     ...    Test objective: The objective is to test the retrieval of an individual performance report associated to a monitoring job fails with not permitted authorization scope
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more NFV-MANO performance reports are set for a monitoring job.
-    ...    Reference: clause 6.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL009/NFVMANOPerformanceManagement-API/IndividualThreshold.robot b/SOL009/NFVMANOPerformanceManagement-API/IndividualThreshold.robot
index c3d416c44088007dd6896375ffa415f90172c45f..badb18250c4a559ea49ceef123688fdd549172ba 100644
--- a/SOL009/NFVMANOPerformanceManagement-API/IndividualThreshold.robot
+++ b/SOL009/NFVMANOPerformanceManagement-API/IndividualThreshold.robot
@@ -7,7 +7,7 @@ POST Individual Threshold - Method not implemented
     ...    Test title: POST Individual Threshold - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new Performance Threshold
     ...    Pre-conditions: none
-    ...    Reference: clause 6.5.7.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.7.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -19,7 +19,7 @@ GET Individual Threshold
     ...    Test title: GET Individual Threshold
     ...    Test objective: The objective is to test the retrieval of an individual NFV-MANO performance threshold and perform a JSON schema and content validation of the collected threshold data structure
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more performance thresholds are set.
-    ...    Reference: clause 6.5.7.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.7.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -33,7 +33,7 @@ GET Individual Threshold with invalid resource identifier
     ...    Test title: GET Individual Threshold with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of an individual performance threshold fails when using an invalid resource identifier
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more performance jobs are set.
-    ...    Reference: clause 6.5.7.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.7.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -45,7 +45,7 @@ PUT Individual Threshold - Method not implemented
     ...    Test title: PUT Individual Threshold - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to update an existing Performance threshold
     ...    Pre-conditions: none
-    ...    Reference: clause 6.5.7.3.3 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.7.3.3 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -57,7 +57,7 @@ PATCH Individual Threshold
     ...    Test title: PATCH Individual Threshold
     ...    Test objective: The objective is to test that PATCH method modify an existing NFV_MANO performance threshold.
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more performance thresholds are set.
-    ...    Reference: clause 6.5.7.3.4 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.7.3.4 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: Threshold resource is modified.
@@ -70,7 +70,7 @@ DELETE Individual Threshold
     ...    Test title: DELETE Individual Threshold
     ...    Test objective: The objective is to test the deletion of an individual performance threshold
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more performance thresholds are set.
-    ...    Reference: clause 6.5.7.3.5 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.7.3.5 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: The Performance Threshold is not available anymore in the NFV-MANO    
@@ -83,7 +83,7 @@ DELETE Individual Threshold with invalid resource identifier
     ...    Test title: DELETE Individual Threshold with invalid resource identifier
     ...    Test objective: The objective is to test the deletion of an individual performance threshold
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more performance thresholds are set.
-    ...    Reference: clause 6.5.7.3.5 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.7.3.5 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -95,7 +95,7 @@ PATCH Individual Threshold - Precondition failed
     ...    Test title: PATCH Individual Threshold - Precondition failed
     ...    Test objective: The objective is to test that the PATCH method cannot modify an individual NFV-MANO threshold where the precondition was not met.
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more performance thresholds are set.
-    ...    Reference: clause 6.5.7.3.4 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.7.3.4 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: Threshold resource is not modified.
@@ -108,7 +108,7 @@ PATCH Individual Threshold - Unprocessable content
     ...    Test title: PATCH Individual Threshold - Unprocessable content
     ...    Test objective: The objective is to test that PATCH method cannot modify an exsisting individual threshold resource when a request contains syntactically correct data but the data cannot be processed.
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more performance thresholds are set.
-    ...    Reference: clause 6.5.7.3.4 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.7.3.4 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: Threshold resource is not modified.
@@ -121,7 +121,7 @@ PATCH Individual Threshold with permitted authorization scope
     ...    Test title: PATCH Individual Threshold with permitted authorization scope
     ...    Test objective: The objective is to test that PATCH method modify an existing NFV_MANO performance threshold with permitted authorization scope.
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more performance thresholds are set.
-    ...    Reference: clause 6.5.7.3.4 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.7.3.4 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: Threshold resource is modified.
@@ -134,7 +134,7 @@ PATCH Individual Threshold with not permitted authorization scope
     ...    Test title: PATCH Individual Threshold with not permitted authorization scope
     ...    Test objective: The objective is to test that PATCH method fails with not permitted authorization scope.
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more performance thresholds are set.
-    ...    Reference: clause 6.5.7.3.4 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.7.3.4 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: Threshold resource is modified.
diff --git a/SOL009/NFVMANOPerformanceManagement-API/NFVMANOPMKeywords.robot b/SOL009/NFVMANOPerformanceManagement-API/NFVMANOPMKeywords.robot
index 11de54515f69b133557d7ba26fd002116e7bb71d..5140e2130af03f6f7fb8f81aaa2219dc368d57f2 100644
--- a/SOL009/NFVMANOPerformanceManagement-API/NFVMANOPMKeywords.robot
+++ b/SOL009/NFVMANOPerformanceManagement-API/NFVMANOPMKeywords.robot
@@ -897,6 +897,80 @@ Configure Notification Forward
     &{notification_fwd}=  Create Mock Http Forward	${endpoint_fwd}
     Create Mock Expectation With Http Forward  ${notification_tmp}  ${notification_fwd}
 
+Check Performance Information Notification Validation
+    [Arguments]    ${expected_notification_type}=PerformanceInformationAvailableNotification
+    ${requests}=    Retrieve Requests    ${callback_endpoint_fwd}
+    Should Not Be Empty    ${requests}    msg=No notification received at callback endpoint!
+
+    ${request_type}=    Evaluate    type(${requests})
+    Log    Request type: ${request_type}
+
+    ${last_request}=    Run Keyword If    "${request_type}" == "<class 'list'>"
+    ...    Get From List    ${requests}    -1
+    ...    ELSE
+    ...    Set Variable    ${requests}
+
+    ${body}=    Get From Dictionary    ${last_request}    body
+    ${body_text}=    Get From Dictionary    ${body}    string
+
+    ${notification}=    Evaluate    json.loads(r'''${body_text}''')    json
+    Log    Parsed notification: ${notification}
+
+    Should Be Equal As Strings    ${notification['notificationType']}    ${expected_notification_type}
+
+    ${pmJobId}=    Get From Dictionary    ${notification}    pmJobId
+
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Set Headers    {"Version": "${API_VERSION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1
+    ...    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+
+    # Validate entity exists
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}
+    Integer    response status    200
+    ${output}=    Output    response
+    Should Be Equal    ${output['body']['id']}    ${pmJobId} 
+
+    Clear Requests    ${callback_endpoint}
+    Clear Requests    ${callback_endpoint_fwd}
+
+Check Threshold Crossed Notification Validation
+    [Arguments]    ${expected_notification_type}=InformationChangedNotification
+    ${requests}=    Retrieve Requests    ${callback_endpoint_fwd}
+    Should Not Be Empty    ${requests}    msg=No notification received at callback endpoint!
+
+    ${request_type}=    Evaluate    type(${requests})
+    Log    Request type: ${request_type}
+
+    ${last_request}=    Run Keyword If    "${request_type}" == "<class 'list'>"
+    ...    Get From List    ${requests}    -1
+    ...    ELSE
+    ...    Set Variable    ${requests}
+
+    ${body}=    Get From Dictionary    ${last_request}    body
+    ${body_text}=    Get From Dictionary    ${body}    string
+
+    ${notification}=    Evaluate    json.loads(r'''${body_text}''')    json
+    Log    Parsed notification: ${notification}
+
+    Should Be Equal As Strings    ${notification['notificationType']}    ${expected_notification_type}
+
+    ${thresholdId}=    Get From Dictionary    ${notification}    thresholdId
+
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Set Headers    {"Version": "${API_VERSION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1
+    ...    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+
+    # Validate entity exists
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}
+    Integer    response status    200
+    ${output}=    Output    response
+    Should Be Equal    ${output['body']['id']}    ${thresholdId} 
+
+    Clear Requests    ${callback_endpoint}
+    Clear Requests    ${callback_endpoint_fwd}
+
 Create Sessions
     Start Process  java  -jar  ${MOCK_SERVER_JAR}  -serverPort  ${callback_port}  alias=mockInstance
     Wait For Process  handle=mockInstance  timeout=5s  on_timeout=continue
diff --git a/SOL009/NFVMANOPerformanceManagement-API/NotificationEndpoint.robot b/SOL009/NFVMANOPerformanceManagement-API/NotificationEndpoint.robot
index 5cc11a4346cca2ea1ea48bca8b4fb8dfec796dbe..96472b76787d93928e8faa6644bcdd3a6a16925c 100644
--- a/SOL009/NFVMANOPerformanceManagement-API/NotificationEndpoint.robot
+++ b/SOL009/NFVMANOPerformanceManagement-API/NotificationEndpoint.robot
@@ -8,7 +8,7 @@ Performance Information Available Notification
     ...    Test title: Performance Information Available Notification
     ...    Test objective: The objective is to test that Performance Available Notification is delivered with success to the notification consumer
     ...    Pre-conditions: A subscription for performance available notification is available in the NFV-MANO.
-    ...    Reference: clause 6.5.10.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.10.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -21,7 +21,7 @@ Threshold Crossed Notification
     ...    Test title: Threshold Crossed Notification
     ...    Test objective: The objective is to test that Threshold Crossed Notification is delivered with success to the notification consumer
     ...    Pre-conditions: A subscription for threshold crosssed notification is available in the NFV-MANO.
-    ...    Reference: clause 6.5.10.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.10.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL009/NFVMANOPerformanceManagement-API/Notifications.robot b/SOL009/NFVMANOPerformanceManagement-API/Notifications.robot
index f7aa8c32f24c28d3d204367f9af96365ee6aa0a7..77e4987686cee7914eea0f921bb651c5b5c9a95a 100644
--- a/SOL009/NFVMANOPerformanceManagement-API/Notifications.robot
+++ b/SOL009/NFVMANOPerformanceManagement-API/Notifications.robot
@@ -9,23 +9,25 @@ Performance Information Availability Notification
     ...    Test title: Performance Information Availability Notification
     ...    Test objective: The objective is to test the dispatch of Performance Information Availability Notification when new performance information is available in the NFV-MANO, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A performance job is created, and a subscription for information availability notifications is available in the NFV-MANO.
-    ...    Reference: clause 6.5.10.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.10.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none 
     Trigger the availability of Performance Information (external action) 
     Check Performance Information Available Notification Http POST Request Body Json Schema Is    PerformanceInformationAvailableNotification
     Check Performance Information Available Notification Http POST Request Body notificationType attribute Is    PerformanceInformationAvailableNotification
+    Check Performance Information Notification Validation
 
 Threshold Crossed Notification
     [Documentation]    Test ID: 8.3.2.8.2
     ...    Test title: Threshold Crossed Notification
     ...    Test objective: The objective is to test the dispatch of Threshold Crossed Notification when a previously set performance metric threshold is crossed, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A performance job is created, and a threshold subscription is available in the NFV-MANO.
-    ...    Reference: clause 6.5.10.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.10.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none 
     Trigger the cross of Performance Threshold (external action) 
     Check Threshold Crossed Notification Http POST Request Body Json Schema Is    ThresholdCrossedNotification
     Check Threshold Crossed Notification Http POST Request Body notificationType attribute Is    ThresholdCrossedNotification
+    Check Threshold Crossed Notification Validation
diff --git a/SOL009/NFVMANOPerformanceManagement-API/PMJobs.robot b/SOL009/NFVMANOPerformanceManagement-API/PMJobs.robot
index b5c77a55ac3da875837f6d517a3fccb6cd8766fe..a60517d711febac516ef70659b8a32849bea028b 100644
--- a/SOL009/NFVMANOPerformanceManagement-API/PMJobs.robot
+++ b/SOL009/NFVMANOPerformanceManagement-API/PMJobs.robot
@@ -7,7 +7,7 @@ POST Create new NFV-MANO Performance Monitoring Job
     ...    Test title:  POST Create a new NFV-MANO Performance Monitoring Job
     ...    Test objective: The objective is to test the creation of a new NFV-MANO performance monitoring job and perform the JSON schema validation of the returned job data structure
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more NFV-MANO performance jobs are set in the NFV-MANO.
-    ...    Reference: clause 6.5.3.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.3.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: The NFV-MANO Performance Job is successfully created on the NFV-MANO
@@ -23,7 +23,7 @@ GET all NFV-MANO Performance Monitoring Jobs
     ...    Test title: GET all NFV-MANO Performance Monitoring Jobs
     ...    Test objective: The objective is to test the retrieval of all the available NFV-MANO performance monitoring jobs and perform a JSON schema validation
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more NFV-MANO performance jobs are set in the NFV-MANO.
-    ...    Reference: clause 6.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -36,7 +36,7 @@ GET NFV-MANO Performance Monitoring Jobs with attribute-based filter
     ...    Test title: GET all NFV-MANO Performance Monitoring Jobs with attribute-based filter
     ...    Test objective: The objective is to test the retrieval of NFV-MANO performance monitoring jobs using attribute-based filter, perform a JSON schema validation of the collected jobs data structure
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more NFV-MANO performance jobs are set in the NFV-MANO.
-    ...    Reference: clause 6.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -49,7 +49,7 @@ GET all NFV-MANO Performance Monitoring Jobs with all_fields attribute selector
     ...    Test title: GET all NFV-MANO Performance Monitoring Jobs with all_fields attribute selector
     ...    Test objective: The objective is to test the retrieval of all NFV-MANO performance monitoring jobs all_fields attribute selector, perform a JSON schema validation of the collected jobs data structure
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more NFV-MANO performance jobs are set in the NFV-MANO.
-    ...    Reference: clause 6.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -62,7 +62,7 @@ GET all NFV-MANO Performance Monitoring Jobs with exclude_default attribute sele
     ...    Test title: GET all NFV-MANO Performance Monitoring Jobs with exclude_default attribute selector
     ...    Test objective: The objective is to test the retrieval of all NFV-MANO performance monitoring jobs exclude_default attribute selector, perform a JSON schema validation of the collected jobs data structure
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more NFV-MANO performance jobs are set in the NFV-MANO.
-    ...    Reference: clause 6.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -75,7 +75,7 @@ GET all NFV-MANO Performance Monitoring Jobs with fields attribute selector
     ...    Test title: GET all NFV-MANO Performance Monitoring Jobs with fields attribute selector
     ...    Test objective: The objective is to test the retrieval of all NFV-MANO performance monitoring jobs fields attribute selector, perform a JSON schema validation of the collected jobs data structure
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more NFV-MANO performance jobs are set in the NFV-MANO.
-    ...    Reference: clause 6.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: The NFV-MANO supports the use of fields attribute selector
     ...    Post-Conditions: none
@@ -88,7 +88,7 @@ GET all NFV-MANO Performance Monitoring Jobs with exclude_fields attribute selec
     ...    Test title: GET all NFV-MANO Performance Monitoring Jobs with exclude_fields attribute selector
     ...    Test objective: The objective is to test the retrieval of all NFV-MANO performance monitoring jobs exclude_fields attribute selector, perform a JSON schema validation of the collected jobs data structure
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more NFV-MANO performance jobs are set in the NFV-MANO.
-    ...    Reference: clause 6.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: The NFV-MANO supports the use of exclude_fields attribute selector
     ...    Post-Conditions: none
@@ -101,7 +101,7 @@ GET NFV-MANO Performance Monitoring Jobs with invalid attribute-based filter
     ...    Test title: GET NFV-MANO Performance Monitoring Jobs with invalid attribute-based filter
     ...    Test objective: The objective is to test that the retrieval of NFV-MANO performance monitoring jobs fails when using invalid attribute-based filter, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more NFV-MANO performance jobs are set in the NFV-MANO.
-    ...    Reference: clause 6.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -114,7 +114,7 @@ GET NFV-MANO Performance Monitoring Jobs with invalid attribute selector
     ...    Test title: GET NFV-MANO Performance Monitoring Jobs with invalid resource endpoint
     ...    Test objective: The objective is to test that the retrieval of NFV-MANO performance monitoring jobs fails with invalid attribute selector
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more NFV-MANO performance jobs are set in the NFV-MANO.
-    ...    Reference: clause 6.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -127,7 +127,7 @@ GET information about multiple Performance Monitoring Jobs to get Paged Response
     ...    Test title: GET information about multiple Performance Monitoring Jobs to get Paged Response
     ...    Test objective: The objective is to retrieve information about the performance monitoring jobs to get paged response
     ...    Pre-conditions: none
-    ...    Reference: clause 6.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions:  none
@@ -140,7 +140,7 @@ GET information about multiple Performance Monitoring Jobs for Bad Request Respo
     ...    Test title: GET information about multiple Performance Monitoring Jobs for Bad Request Response too big
     ...    Test objective: The objective is to test that GET method fail retrieving status information about performance monitoring jobs when Response is too big, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: none
-    ...    Reference: clause 6.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -153,7 +153,7 @@ GET information about multiple Performance Monitoring Jobs with "fields" and "ex
     ...    Test title: GET all NFV-MANO Performance Monitoring Jobs with "fields" and "exclude_default" attribute selector
     ...    Test objective: The objective is to retrieve all performance monitoring jobs with fields and exclude default attribute selector, and perform the JSON schema validation of the HTTP response.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -166,7 +166,7 @@ Get information about multiple Performance Monitoring Jobs with malformed author
     ...    Test title: Get information about multiple Performance Monitoring Jobs with malformed authorization token
     ...    Test objective: The objective is to test that the retrieval of information about Performance Monitoring Jobs fails when using malformed authorization token
     ...    Pre-conditions: none
-    ...    Reference: clause 6.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: The NFV-MANO entity requires the usage of access tokens for authorizing the API requests.
     ...    Post-Conditions: none
@@ -178,7 +178,7 @@ Get information about multiple Performance Monitoring Jobs without authorization
     ...    Test title: Get information about multiple Performance Monitoring Jobs without authorization token
     ...    Test objective: The objective is to test that the retrieval of information about Performance Monitoring Jobs fails when omitting the authorization token
     ...    Pre-conditions: none
-    ...    Reference: clause 6.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: The NFV-MANO entity requires the usage of access tokens for authorizing the API requests.
     ...    Post-Conditions: none
@@ -190,7 +190,7 @@ GET information about multiple Performance Monitoring Jobs with expired or revok
     ...    Test title: GET information about multiple Performance Monitoring Jobs with expired or revoked authorization token
     ...    Test objective: The objective is to test that the retrieval of information about Performance Monitoring Jobs fails when using expired or revoked authorization token
     ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO
-    ...    Reference: clause 6.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: The NFV-MANO entity requires the usage of access tokens for authorizing the API requests.
     ...    Post-Conditions: none
@@ -202,7 +202,7 @@ PUT all NFV-MANO Performance Monitoring Jobs - Method not implemented
     ...    Test title: PUT all NFV-MANO Performance Monitoring Jobs - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify NFV-MANO Performance Monitoring Jobs
     ...    Pre-conditions: none
-    ...    Reference: clause 6.5.3.3.3 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.3.3.3 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -214,7 +214,7 @@ PATCH all NFV-MANO Performance Monitoring Jobs - (Method not implemented)
     ...    Test title: PATCH all NFV-MANO Performance Monitoring Jobs - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update NFV-MANO Performance Monitoring Jobs
     ...    Pre-conditions: none
-    ...    Reference: clause 6.5.3.3.4 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.3.3.4 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -226,7 +226,7 @@ DELETE all NFV-MANO Performance Monitoring Jobs - Method not implemented
     ...    Test title: DELETE all NFV-MANO Performance Monitoring Jobs - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to update NFV-MANO Performance Monitoring Jobs
     ...    Pre-conditions: none
-    ...    Reference: clause 6.5.3.3.5 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.3.3.5 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -238,7 +238,7 @@ POST Create new NFV-MANO Performance Monitoring Job - Unreachable Notification E
     ...    Test title:  POST Create a new NFV-MANO Performance Monitoring Job
     ...    Test objective: The objective is to test that a new NFV_MANO Performance Monitoring Job is not created if the notification endpoint is unreachable by the NFV-MANO.
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more NFV-MANO performance jobs are set in the NFV-MANO.
-    ...    Reference: clause 6.5.3.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.3.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: Notification endpoint is unreachable by the NFV-MANO.
     ...    Post-Conditions: none
@@ -251,7 +251,7 @@ POST Create new NFV-MANO Performance Monitoring Job with permitted authorization
     ...    Test title:  POST Create a new NFV-MANO Performance Monitoring Job with permitted authorization scope
     ...    Test objective: The objective is to test the creation of a new NFV-MANO performance monitoring job with permitted authorization scope
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more NFV-MANO performance jobs are set in the NFV-MANO.
-    ...    Reference: clause 6.5.3.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.3.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: The NFV-MANO Performance Job is successfully created on the NFV-MANO
@@ -265,7 +265,7 @@ POST Create new NFV-MANO Performance Monitoring Job with not permitted authoriza
     ...    Test title:  POST Create a new NFV-MANO Performance Monitoring Job with not permitted authorization scope
     ...    Test objective: The objective is to test that the creation of a new NFV-MANO performance monitoring job fails with not permitted authorization scope
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more NFV-MANO performance jobs are set in the NFV-MANO.
-    ...    Reference: clause 6.5.3.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.3.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: The NFV-MANO Performance Job is successfully created on the NFV-MANO
diff --git a/SOL009/NFVMANOPerformanceManagement-API/Thresholds.robot b/SOL009/NFVMANOPerformanceManagement-API/Thresholds.robot
index 500da8499fa5d0df94b45d7c865f9859eb340da3..f3e49e3bdbe377a03e4afd1ad730bc816f4f1e3f 100644
--- a/SOL009/NFVMANOPerformanceManagement-API/Thresholds.robot
+++ b/SOL009/NFVMANOPerformanceManagement-API/Thresholds.robot
@@ -7,7 +7,7 @@ POST Create new Performance Threshold
     ...    Test title:  POST Create new Performance Threshold
     ...    Test objective: The objective is to test the creation of a new NFV-MANO performance threshold and perform the JSON schema validation of the returned threshold data structure.
     ...    Pre-conditions: A NFV-MANO instance is instantiated.
-    ...    Reference: clause 6.5.6.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.6.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: The NFV-MANO Performance Threshold is successfully created on the NFV-MANO
@@ -23,7 +23,7 @@ GET All Performance Thresholds
     ...    Test title: GET All Performance Thresholds
     ...    Test objective: The objective is to test the retrieval of all the available NFV-MANO performance thresholds and perform a JSON schema validation of the collected thresholds data structure.
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more NFV-MANO performance thresholds are set.
-    ...    Reference: clause 6.5.6.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.6.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -36,7 +36,7 @@ GET Performance Thresholds with attribute-based filter
     ...    Test title: GET Performance Thresholds with attribute-based filter
     ...    Test objective: The objective is to test the retrieval of all the available NFV-MANO performance thresholds when using attribute-based filters, perform a JSON schema validation of the collected thresholds data structure, and verify that the retrieved information matches the issued attribute-based filter
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more NFV-MANO performance thresholds are set in the NFV-MANO.
-    ...    Reference: clause 6.5.6.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.6.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -50,7 +50,7 @@ GET Performance Threshold with Paged Response
     ...    Test title: GET Performance Threshold with Paged Response
     ...    Test objective: The objective is to query information about NFV-MANO Performance Thresholds to get Paged Response.
     ...    Pre-conditions:  A NFV-MANO instance is instantiated. One or more NFV-MANO performance thresholds are set.
-    ...    Reference: clause 6.5.6.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.6.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -63,7 +63,7 @@ GET Performance Thresholds - Invalid attribute-based filter
     ...    Test title: GET Performance Thresholds - Invalid attribute-based filter
     ...    Test objective: The objective is to test that the retrieval of NFV-MANO performance thresholds fails when using invalid attribute-based filter, and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more NFV-MANO performance thresholds are set.
-    ...    Reference: clause 6.5.6.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.6.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -76,7 +76,7 @@ GET Performance Threshold - Bad Request Response too Big
     ...    Test title: GET Performance Threshold - Bad Request Response too Big
     ...    Test objective: The objective is to test that the retrieval of NFV-MANO performance thresholds fails when response is too big, and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions:  A NFV-MANO instance is instantiated. One or more NFV-MANO performance thresholds are set.
-    ...    Reference: clause 6.5.6.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.6.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -89,7 +89,7 @@ PUT Performance Thresholds - Method not implemented
     ...    Test title: PUT Performance Thresholds - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify NFV-MANO Performance Thresholds
     ...    Pre-conditions: none
-    ...    Reference: clause 6.5.6.3.3 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.6.3.3 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -101,7 +101,7 @@ PATCH Performance Thresholds - Method not implemented
     ...    Test title: PATCH Performance Thresholds - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to modify NFV-MANO Performance Thresholds
     ...    Pre-conditions: none
-    ...    Reference: clause 6.5.6.3.4 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.6.3.4 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -113,7 +113,7 @@ DELETE Performance Thresholds - Method not implemented
     ...    Test title: DELETE Performance Thresholds - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to update NFV-MANO Performance Thresholds
     ...    Pre-conditions: none
-    ...    Reference: clause 6.5.6.3.5 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.6.3.5 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -126,7 +126,7 @@ POST Create new Performance Threshold - Unprocessable content
     ...    Test objective: The objective is to test the creation of a new NFV-MANO performance threshold and perform the JSON schema validation of the returned threshold data structure.
     ...    Test objective: The objective is to test that a new NFV-MANO performance threshold is not created if the notification endpoint is unreachable by the NFV-MANO.
     ...    Pre-conditions: A NFV-MANO instance is instantiated.
-    ...    Reference: clause 6.5.6.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.6.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: Notification endpoint is unreachable by the NFV-MANO.
     ...    Post-Conditions: none
@@ -139,7 +139,7 @@ POST Create new Performance Threshold with permitted authorization scope
     ...    Test title:  POST Create new Performance Threshold with permitted authorization scope
     ...    Test objective: The objective is to test the creation of a new NFV-MANO performance threshold with permitted authorization scope.
     ...    Pre-conditions: A NFV-MANO instance is instantiated.
-    ...    Reference: clause 6.5.6.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.6.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: The NFV-MANO Performance Threshold is successfully created on the NFV-MANO
@@ -154,7 +154,7 @@ POST Create new Performance Threshold with not permitted authorization scope
     ...    Test title:  POST Create new Performance Threshold with not permitted authorization scope
     ...    Test objective: The objective is to test the creation of a new NFV-MANO performance threshold fails with not permitted authorization scope.
     ...    Pre-conditions: A NFV-MANO instance is instantiated.
-    ...    Reference: clause 6.5.6.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 6.5.6.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: The NFV-MANO Performance Threshold is successfully created on the NFV-MANO
diff --git a/SOL009/NFVMANOPerformanceManagement-API/environment/variables.txt b/SOL009/NFVMANOPerformanceManagement-API/environment/variables.txt
index c58fdd8ced044f1bb1c30599d4e465c2ba52aa52..18eb916e2327256cf0378433daace2fefddf50b0 100644
--- a/SOL009/NFVMANOPerformanceManagement-API/environment/variables.txt
+++ b/SOL009/NFVMANOPerformanceManagement-API/environment/variables.txt
@@ -24,8 +24,7 @@ ${AUTH_USAGE}     1
 ${FIELD_USAGE}    1
 #${NFVMANO_CHECKS_NOTIF_ENDPOINT}    1        ## If true, during subscription, the FUT performs a get to the notification endpoint
 
-
-
+${API_VERSION}    2.1.0
 ${apiRoot}        /
 ${apiMajorVersion}     v1
 ${apiName}        nfvmanopm
diff --git a/SOL009/NFVManoConfigurationAndInformationManagement-API/ApiVersion.robot b/SOL009/NFVManoConfigurationAndInformationManagement-API/ApiVersion.robot
index 45e119475bb34334c479a68c855c137724bfda32..e3be7302d45bb7f77bac211310a6f863e7db2055 100644
--- a/SOL009/NFVManoConfigurationAndInformationManagement-API/ApiVersion.robot
+++ b/SOL009/NFVManoConfigurationAndInformationManagement-API/ApiVersion.robot
@@ -11,7 +11,7 @@ POST API Version - Method not implemented
     ...    Test title: POST API version - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -23,7 +23,7 @@ GET API Version
     ...    Test title: GET API Version
     ...    Test objective: The objective is to test that GET method successfully return ApiVersionInformation
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -36,7 +36,7 @@ PUT API Version - Method not implemented
     ...    Test title: PUT API Version - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -48,7 +48,7 @@ PATCH API Version - Method not implemented
     ...    Test title: PATCH API Version - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -60,7 +60,7 @@ DELETE API Version - Method not implemented
     ...    Test title: DELETE API Version - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -72,7 +72,7 @@ POST API Version with apiMajorVerion - Method not implemented
     ...    Test title: POST API version with apiMajorVerion - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -84,7 +84,7 @@ GET API Version with apiMajorVerion
     ...    Test title: GET API Version with apiMajorVerion
     ...    Test objective: The objective is to test that GET method successfully return ApiVersionInformation
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -97,7 +97,7 @@ PUT API Version with apiMajorVerion - Method not implemented
     ...    Test title: PUT API Version with apiMajorVerion - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -109,7 +109,7 @@ PATCH API Version with apiMajorVerion - Method not implemented
     ...    Test title: PATCH API Version with apiMajorVerion - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -121,7 +121,7 @@ DELETE API Version with apiMajorVerion - Method not implemented
     ...    Test title: DELETE API Version with apiMajorVerion - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL009/NFVManoConfigurationAndInformationManagement-API/ChangeConsumedNFVMANOInterfaceStateTask.robot b/SOL009/NFVManoConfigurationAndInformationManagement-API/ChangeConsumedNFVMANOInterfaceStateTask.robot
index 29c70a8aac79510cad6120d6af52f3a4e9e6047e..66417686b80add988ed4efe15979268c114a40f7 100644
--- a/SOL009/NFVManoConfigurationAndInformationManagement-API/ChangeConsumedNFVMANOInterfaceStateTask.robot
+++ b/SOL009/NFVManoConfigurationAndInformationManagement-API/ChangeConsumedNFVMANOInterfaceStateTask.robot
@@ -13,7 +13,7 @@ POST Change consumed NFV MANO interface state task
     ...    Test title: POST Change cosumed NFV MANO interface state task
     ...    Test objective: The objective is send put request to change the state of the NFV-MANO consumed service interface produced by the NFV-MANO functional entity
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.15.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.15.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: Consumed interface status changed
@@ -28,7 +28,7 @@ POST Change consumed NFV MANO interface state task - Conflict
     ...    Test title: POST Change consumed NFV MANO interface state task - Conflict
     ...    Test objective: The objective is to test that request to cchange the state of the NFV-MANO consumed service interface produced by the NFV-MANO functional entity failed due to a conflict with the state of the NFV-MANO entity resource and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.15.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.15.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -41,7 +41,7 @@ GET Change consumed NFV MANO interface state task - Method not implemented
     ...    Test title: GET Change consumed NFV MANO interface state task - Method not implemented
     ...    Test objective: The objective is to test that GET method is not allowed to retrieve the changed state of the NFV-MANO functional entity application.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.15.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.15.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -53,7 +53,7 @@ PUT Change consumed NFV MANO interface state task - Conflict - Method not implem
     ...    Test title: PUT Change consumed NFV MANO interface state task - Conflict - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to update the changed state of the NFV-MANO functional entity application.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.15.3.3 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.15.3.3 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -65,7 +65,7 @@ PATCH Change consumed NFV MANO interface state task - Conflict - Method not impl
     ...    Test title: PATCH Change consumed NFV MANO interface state task - Conflict - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update the changed state of the NFV-MANO functional entity application.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.15.3.4 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.15.3.4 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -77,7 +77,7 @@ DELETE Change consumed NFV MANO interface state task - Conflict - Method not imp
     ...    Test title: DELETE Change consumed NFV MANO interface state task - Conflict - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete the changed state of the NFV-MANO functional entity application.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.15.3.5 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.15.3.5 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -89,7 +89,7 @@ POST Change consumed NFV MANO interface state task with permitted authorization
     ...    Test title: POST Change consumed NFV MANO interface state task with permitted authorization scope
     ...    Test objective: The objective is send put request to change the state of the NFV-MANO consumed service interface with permitted authorization scope
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.15.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.15.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: interface status changed
@@ -103,7 +103,7 @@ POST Change consumed NFV MANO interface state task with not permitted authorizat
     ...    Test title: POST Change consumed NFV MANO interface state task with permitted authorization scope
     ...    Test objective: The objective is to verify that put request to change the state of the NFV-MANO consumed service interface fails with not permitted authorization scope
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.15.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.15.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: interface status changed
diff --git a/SOL009/NFVManoConfigurationAndInformationManagement-API/ChangeInterfaceStateTask.robot b/SOL009/NFVManoConfigurationAndInformationManagement-API/ChangeInterfaceStateTask.robot
index 82259da1115545733906d3f0b4d260ef57582809..41640a71cdafc07ed76f0fc3f88bd51f5a2ada78 100644
--- a/SOL009/NFVManoConfigurationAndInformationManagement-API/ChangeInterfaceStateTask.robot
+++ b/SOL009/NFVManoConfigurationAndInformationManagement-API/ChangeInterfaceStateTask.robot
@@ -13,7 +13,7 @@ POST Change interface state task
     ...    Test title: POST Change interface state task
     ...    Test objective: The objective is send put request to change the state of the NFV-MANO service interface produced by the NFV-MANO functional entity
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.12.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.12.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: interface status changed
@@ -28,7 +28,7 @@ POST Change interface state task - Conflict
     ...    Test title: POST Change interface state task - Conflict
     ...    Test objective: The objective is to test that request to cchange the state of the NFV-MANO service interface produced by the NFV-MANO functional entity failed due to a conflict with the state of the NFV-MANO entity resource and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.12.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.12.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -41,7 +41,7 @@ GET Change interface state task - Method not implemented
     ...    Test title: GET Change interface state task - Method not implemented
     ...    Test objective: The objective is to test that GET method is not allowed to retrieve the changed state of the NFV-MANO functional entity application.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.12.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.12.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -53,7 +53,7 @@ PUT Change interface state task - Conflict - Method not implemented
     ...    Test title: PUT Change interface state task - Conflict - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to update the changed state of the NFV-MANO functional entity application.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.12.3.3 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.12.3.3 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -65,7 +65,7 @@ PATCH Change interface state task - Conflict - Method not implemented
     ...    Test title: PATCH Change interface state task - Conflict - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update the changed state of the NFV-MANO functional entity application.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.12.3.4 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.12.3.4 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -77,7 +77,7 @@ DELETE Change interface state task - Conflict - Method not implemented
     ...    Test title: DELETE Change interface state task - Conflict - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete the changed state of the NFV-MANO functional entity application.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.12.3.5 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.12.3.5 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -89,7 +89,7 @@ POST Change interface state task with permitted authorization scope
     ...    Test title: POST Change interface state task with permitted authorization scope
     ...    Test objective: The objective is send put request to change the state of the NFV-MANO service interface with permitted authorization scope
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.12.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.12.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: interface status changed
@@ -103,7 +103,7 @@ POST Change interface state task with not permitted authorization scope
     ...    Test title: POST Change interface state task with permitted authorization scope
     ...    Test objective: The objective is to verify that put request to change the state of the NFV-MANO service interface fails with not permitted authorization scope
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.12.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.12.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: interface status changed
diff --git a/SOL009/NFVManoConfigurationAndInformationManagement-API/ChangeNFVMANOEntityStateTask.robot b/SOL009/NFVManoConfigurationAndInformationManagement-API/ChangeNFVMANOEntityStateTask.robot
index 21aef822171e5f58e25d4457512526c9379ae994..2ed8e4fb05ab33a3b4a609641eb9b0dfc1f87c2c 100644
--- a/SOL009/NFVManoConfigurationAndInformationManagement-API/ChangeNFVMANOEntityStateTask.robot
+++ b/SOL009/NFVManoConfigurationAndInformationManagement-API/ChangeNFVMANOEntityStateTask.robot
@@ -12,7 +12,7 @@ POST NFV-MANO functional entity application state change
     ...    Test title: POST NFV-MANO functional entity application state change
     ...    Test objective: The objective is to request state change of the NFV-MANO functional entity application.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.7.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.7.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: entity status changed
@@ -27,7 +27,7 @@ POST NFV-MANO functional entity application state change - Conflict
     ...    Test title: POST NFV-MANO functional entity application state change - Conflict
     ...    Test objective: The objective is to test that request to change the state of the NFV-MANO functional entity application fails due to a conflict with the state of the NFV-MANO entity resource and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.7.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.7.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -40,7 +40,7 @@ GET NFV-MANO functional entity application state change - Method not implemented
     ...    Test title: GET NFV-MANO functional entity application state change - Method not implemented
     ...    Test objective: The objective is to test that GET method is not allowed to retrieve the changed state of the NFV-MANO functional entity application.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.7.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.7.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -52,7 +52,7 @@ PUT NFV-MANO functional entity application state change - Method not implemented
     ...    Test title: PUT NFV-MANO functional entity application state change - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to update the changed state of the NFV-MANO functional entity application.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.7.3.3 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.7.3.3 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -64,7 +64,7 @@ PATCH NFV-MANO functional entity application state change - Method not implement
     ...    Test title: PATCH NFV-MANO functional entity application state change - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update the changed state of the NFV-MANO functional entity application.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.7.3.4 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.7.3.4 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -76,7 +76,7 @@ DELETE NFV-MANO functional entity application state change - Method not implemen
     ...    Test title: DELETE NFV-MANO functional entity application state change - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete the changed state of the NFV-MANO functional entity application.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.7.3.5 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.7.3.5 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -88,7 +88,7 @@ POST NFV-MANO functional entity application state change with permitted authoriz
     ...    Test title: POST NFV-MANO functional entity application state change with permitted authorization scope
     ...    Test objective: The objective is to test a state change of the NFV-MANO functional entity application with permitted authorization scope.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.7.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.7.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: entity status changed
@@ -102,7 +102,7 @@ POST NFV-MANO functional entity application state change with not permitted auth
     ...    Test title: POST NFV-MANO functional entity application state change with not permitted authorization scope
     ...    Test objective: The objective is to test that state change of the NFV-MANO functional entity application fails with not permitted authorization scope.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.7.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.7.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: entity status changed
diff --git a/SOL009/NFVManoConfigurationAndInformationManagement-API/ChangeStateOperationOccurrences.robot b/SOL009/NFVManoConfigurationAndInformationManagement-API/ChangeStateOperationOccurrences.robot
index b5104837eea89ecc57b67bfb0f39fd7a274a0fe1..bdd3c9b9e076a944610d51a5bc6ad6336121ce7b 100644
--- a/SOL009/NFVManoConfigurationAndInformationManagement-API/ChangeStateOperationOccurrences.robot
+++ b/SOL009/NFVManoConfigurationAndInformationManagement-API/ChangeStateOperationOccurrences.robot
@@ -13,7 +13,7 @@ POST Change State Operation Occurrences - Method not implemented
     ...    Test title: POST Change State Operation Occurrences - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemeted.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.8.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.8.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -25,7 +25,7 @@ GET Change State Operation Occurrences
     ...    Test title: GET Change State Operation Occurrences
     ...    Test objective: The objective is to query status information about multiple change state operation occurrences, and perform the JSON schema validation of the HTTP response.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -38,7 +38,7 @@ GET Change State Operation Occurrences - invalid attribute-based filter
     ...    Test title: GET Change State Operation Occurrences - invalid attribute-based filter
     ...    Test objective:  The objective is to test that the retrieval of Change State Operation Occurrences fails when using invalid attribute-based filter, and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -51,7 +51,7 @@ GET Change State Operation Occurrences - invalid attribute selector
     ...    Test title: GET Change State Operation Occurrences - invalid attribute selector
     ...    Test objective: The objective is to test that the retrieval of Change State Operation Occurrences fails when using invalid attribute selector, and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -64,7 +64,7 @@ GET Change State Operation Occurrences - Bad Request Response too Big
     ...    Test title: GET Change State Operation Occurrences - Bad Request Response too Big
     ...    Test objective: The objective is to test that the retrieval of Change State Operation Occurrences fails when response is too big, and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -77,7 +77,7 @@ GET Change State Operation Occurrences with attribute-based filter
     ...    Test title: GET Change State Operation Occurrences with attribute-based filter
     ...    Test objective: The objective is to query status information about multiple change state operation occurrences with attribute filters, and perform the JSON schema validation of the HTTP response.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -90,7 +90,7 @@ GET Change State Operation Occurrences with "all_fields" attribute selector
     ...    Test title: GET Change State Operation Occurrences with "all_fields" attribute selector
     ...    Test objective: The objective is to retrieve Change State Operation Occurrences with "all_fields" attribute selector, and perform the JSON schema validation of the HTTP response.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -103,7 +103,7 @@ GET Change State Operation Occurrences with "exclude_default" attribute selector
     ...    Test title: GET Change State Operation Occurrence with "exclude_default" attribute selector
     ...    Test objective: The objective is to retrieve Change State Operation Occurrence with "exclude_default" attribute selector, and perform the JSON schema validation of the HTTP response.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -116,7 +116,7 @@ GET Change State Operation Occurrences with "fields" attribute selector
     ...    Test title: GET Change State Operation Occurrences with "fields" attribute selector
     ...    Test objective: The objective is to retrieve Change State Operation Occurrences with fields attribute selector, and perform the JSON schema validation of the HTTP response.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -129,7 +129,7 @@ GET Change State Operation Occurrences with "exclude_fields" attribute selector
     ...    Test title: GET Change State Operation Occurrences with "exclude_fields" attribute selector
     ...    Test objective: The objective is to retrieve Change State Operation Occurrences with "exclude_fields" attribute selector, and perform the JSON schema validation of the HTTP response.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -142,7 +142,7 @@ GET Change State Operation Occurrences with Paged Response
     ...    Test title: GET Change State Operation Occurrence with Paged Response
     ...    Test objective: The objective is to query Change State Operation Occurrence to get Paged Response.
     ...    Pre-conditions:  none
-    ...    Reference: clause 5.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -155,7 +155,7 @@ GET Change State Operation Occurrences with "fields" and "exclude_default" attri
     ...    Test title: GET Change State Operation Occurrences with "fields" and "exclude_default" attribute selector
     ...    Test objective: The objective is to retrieve Change State Operation Occurrences with fields and exclude default attribute selector, and perform the JSON schema validation of the HTTP response.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -168,7 +168,7 @@ PUT Change State Operation Occurrences - Method not implemented
     ...    Test title: PUT Change State Operation Occurrences - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemeted.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.8.3.3 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.8.3.3 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -180,7 +180,7 @@ PATCH Change State Operation Occurrences - Method not implemented
     ...    Test title: PATCH Change State Operation Occurrences - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemeted.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.8.3.4 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.8.3.4 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -192,7 +192,7 @@ DELETE Change State Operation Occurrences - Method not implemented
     ...    Test title: DELETE Change State Operation Occurrences - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemeted.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.8.3.5 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.8.3.5 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -204,7 +204,7 @@ GET Change State Operation Occurrences with permitted authorization scope
     ...    Test title: GET Change State Operation Occurrences with permitted authorization scope
     ...    Test objective: The objective is to query status information about multiple change state operation occurrences with permitted authorization scope.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -217,7 +217,7 @@ GET Change State Operation Occurrences with not permitted authorization scope
     ...    Test title: GET Change State Operation Occurrences with not permitted authorization scope
     ...    Test objective: The objective is to query status information about multiple change state operation occurrences and verify the failure when using a not permitted authorization scope.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL009/NFVManoConfigurationAndInformationManagement-API/IndividualNFVMANOServiceInterface.robot b/SOL009/NFVManoConfigurationAndInformationManagement-API/IndividualNFVMANOServiceInterface.robot
index 29c7d79c496ca1fae63b0387165717aa7770aaa5..3104a4c7a386f9d928566586176caa93895f5167 100644
--- a/SOL009/NFVManoConfigurationAndInformationManagement-API/IndividualNFVMANOServiceInterface.robot
+++ b/SOL009/NFVManoConfigurationAndInformationManagement-API/IndividualNFVMANOServiceInterface.robot
@@ -13,7 +13,7 @@ POST Individual NFV-MANO Service Interface - Method not implemented
     ...    Test title: POST Individual NFV-MANO Service Interface - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemeted.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.11.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.11.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -25,7 +25,7 @@ GET Individual NFV-MANO Service Interface
     ...    Test title: GET Individual NFV-MANO Service Interface
     ...    Test objective: The objective is to query status information about an NFV-MANO service interface of the producer NFV-MANO functional entity by reading an "Individual NFV-MANO service interface" resource, and perform the JSON schema validation of the HTTP response.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.11.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.11.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions:  none
@@ -38,7 +38,7 @@ GET Individual NFV-MANO Service Interface - Not Found
     ...    Test title: GET Individual NFV-MANO Service Interface - Not Found
     ...    Test objective: The objective is to test the retrieval of information about an NFV-MANO service interface of the producer NFV-MANO functional entity by reading an "Individual NFV-MANO service interface" resource fails when the resource is not present.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.11.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.11.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -51,7 +51,7 @@ PUT Individual NFV-MANO Service Interface - Method not implemented
     ...    Test title: PUT Individual NFV-MANO Service Interface - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemeted.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.11.3.3 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.11.3.3 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -63,7 +63,7 @@ PATCH Individual NFV-MANO Service Interface
     ...    Test title: PATCH Individual NFV-MANO Service Interface
     ...    Test objective: This method modifies the Individual NFV-MANO Service Interface resource, and perform the JSON schema validation of the HTTP response.
     ...    Pre-conditions: Individual NFV-MANO Service Interface resource is already created.
-    ...    Reference: clause 5.5.11.3.4 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.11.3.4 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: The Individual NFV-MANO Service Interface is modified by the operation
@@ -76,7 +76,7 @@ PATCH Individual NFV-MANO Service Interface - Conflict
     ...    Test title: PATCH Individual NFV-MANO Service Interface - Conflict
     ...    Test objective: The objective is to test that the modification of the Individual NFV-MANO Service Interface resource failed due to a conflict with the state of the Individual NFV-MANO Service Interface resource and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: Individual NFV-MANO Service Interface resource is already created.
-    ...    Reference: clause 5.5.11.3.4 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.11.3.4 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: The Individual NFV-MANO Service Interface is not modified by the operation
@@ -89,7 +89,7 @@ PATCH Individual NFV-MANO Service Interface - PreCondition Failed
     ...    Test title: PATCH Individual NFV-MANO Service Interface - PreCondition Failed
     ...    Test objective: The objective is to test that the modification of the Individual NFV-MANO Service Interface resource failed because precondition given in an HTTP request header is not fulfilled and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: Individual NFV-MANO Service Interface resource is already created.
-    ...    Reference: clause 5.5.11.3.4 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.11.3.4 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: The Individual NFV-MANO Service Interface is not modified by the operation
@@ -102,7 +102,7 @@ DELETE Individual NFV-MANO Service Interface - Method not implemented
     ...    Test title: DELETE Individual NFV-MANO Service Interface - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemeted.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.11.3.5 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.11.3.5 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -114,7 +114,7 @@ PATCH Individual NFV-MANO Service Interface with permitted authorization scope
     ...    Test title: PATCH Individual NFV-MANO Service Interface with permitted authorization scope
     ...    Test objective: This method modifies the Individual NFV-MANO Service Interface resource with permitted authorization scope.
     ...    Pre-conditions: Individual NFV-MANO Service Interface resource is already created.
-    ...    Reference: clause 5.5.11.3.4 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.11.3.4 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: The Individual NFV-MANO Service Interface is modified by the operation
@@ -127,7 +127,7 @@ PATCH Individual NFV-MANO Service Interface with not permitted authorization sco
     ...    Test title: PATCH Individual NFV-MANO Service Interface with not permitted authorization scope
     ...    Test objective: The objective is to test that modification of Individual NFV-MANO Service Interface resource fails with not permitted authorization scope.
     ...    Pre-conditions: Individual NFV-MANO Service Interface resource is already created.
-    ...    Reference: clause 5.5.11.3.4 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.11.3.4 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: The Individual NFV-MANO Service Interface is modified by the operation
diff --git a/SOL009/NFVManoConfigurationAndInformationManagement-API/IndividualPeerEntity.robot b/SOL009/NFVManoConfigurationAndInformationManagement-API/IndividualPeerEntity.robot
index fa05c0d74fb4503a36db975aa8cb28f013e1b0f6..0297ad30fcc0e97126ddac7cfa126d30b74f0f2d 100644
--- a/SOL009/NFVManoConfigurationAndInformationManagement-API/IndividualPeerEntity.robot
+++ b/SOL009/NFVManoConfigurationAndInformationManagement-API/IndividualPeerEntity.robot
@@ -13,7 +13,7 @@ POST Individual Peer Entity - Method not implemented
     ...    Test title: POST Individual Peer Entity - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemeted.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.14.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.14.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -25,7 +25,7 @@ GET Individual Peer Entity
     ...    Test title: GET Individual Peer Entity
     ...    Test objective: The objective is to retrieves information and configuration hold in the producer NFV-MANO functional entity with regards to a peer entity by reading an individual peer entity resource
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.14.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.14.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions:  none
@@ -38,7 +38,7 @@ GET Individual Peer Entity - Not Found
     ...    Test title: GET Individual Peer Entity - Not Found
     ...    Test objective: The objective is to test the retrieval of information and configuration hold in the producer NFV-MANO functional entity with regards to a peer entity by reading an individual peer entity resource fails when the resource is not present.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.14.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.14.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -50,7 +50,7 @@ PUT Individual Peer Entity - Method not implemented
     ...    Test title: PUT Individual Peer Entity - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemeted.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.14.3.3 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.14.3.3 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -62,7 +62,7 @@ PATCH Individual Peer Entity
     ...    Test title: PATCH Individual Peer Entity
     ...    Test objective: This method modifies configuration and information of the producer NFV-MANO functional entity with regards to a peer functional entity by updating the corresponding "Individual peer entity" resource.
     ...    Pre-conditions: At least one Peer Entity resource is created
-    ...    Reference: clause 5.5.14.3.4 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.14.3.4 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: Peer Entity Resource is modified by the operation
@@ -75,7 +75,7 @@ PATCH Individual Peer Entity - Conflict
     ...    Test title: PATCH Individual Peer Entity - Conflict
     ...    Test objective: The objective is to test that the modification of configuration and information of the producer NFV-MANO functional entity with regards to a peer functional entity by updating the corresponding "Individual peer entity" resource failed due to a conflict with the state of the Individual Peer Entity resource and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: At least one Peer Entity resource is created
-    ...    Reference: clause 5.5.14.3.4 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.14.3.4 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: Peer Entity Resource is not modified by the operation
@@ -88,7 +88,7 @@ PATCH Individual Peer Entity - PreCondition Failed
     ...    Test title: PATCH Individual Peer Entity - PreCondition Failed
     ...    Test objective: The objective is to test that the modification of the Individual Peer Entity resource failed because precondition given in an HTTP request header is not fulfilled and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: At least one Peer Entity resource is created
-    ...    Reference: clause 5.5.14.3.4 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.14.3.4 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: Peer Entity Resource is not modified by the operation
@@ -101,7 +101,7 @@ DELETE Individual Peer Entity - Method not implemented
     ...    Test title: DELETE Individual Peer Entity - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemeted.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.14.3.5 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.14.3.5 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -113,7 +113,7 @@ PATCH Individual Peer Entity with permitted authorization scope
     ...    Test title: PATCH Individual Peer Entity with permitted authorization scope
     ...    Test objective: This method modifies configuration and information of the producer NFV-MANO functional entity with permitted authorization scope.
     ...    Pre-conditions: At least one Peer Entity resource is created
-    ...    Reference: clause 5.5.14.3.4 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.14.3.4 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: Peer Entity Resource is modified by the operation
@@ -126,7 +126,7 @@ PATCH Individual Peer Entity with not permitted authorization scope
     ...    Test title: PATCH Individual Peer Entity with not permitted authorization scope
     ...    Test objective: This method tests that modification of configuration and information of the producer NFV-MANO functional entity fails with not permitted authorization scope.
     ...    Pre-conditions: At least one Peer Entity resource is created
-    ...    Reference: clause 5.5.14.3.4 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.14.3.4 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: Peer Entity Resource is modified by the operation
diff --git a/SOL009/NFVManoConfigurationAndInformationManagement-API/IndividualStateChangeOperationOccurrence.robot b/SOL009/NFVManoConfigurationAndInformationManagement-API/IndividualStateChangeOperationOccurrence.robot
index 55736e4b9a212882f8ebfa3d4f8e713e952d6362..253f7f86b1e08e00dcfca36de517ff22a5afed48 100644
--- a/SOL009/NFVManoConfigurationAndInformationManagement-API/IndividualStateChangeOperationOccurrence.robot
+++ b/SOL009/NFVManoConfigurationAndInformationManagement-API/IndividualStateChangeOperationOccurrence.robot
@@ -13,7 +13,7 @@ POST Individual Change State Operation Occurrence - Method not implemented
     ...    Test title: POST Individual Change State Operation Occurrence - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemeted.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.9.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.9.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -25,7 +25,7 @@ GET Individual Change State Operation Occurrence
     ...    Test title: GET Individual Change State Operation Occurrence
     ...    Test objective: The objective is to query status information about Individual change state operation occurrence.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.9.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.9.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions:  none
@@ -38,7 +38,7 @@ GET Individual Change State Operation Occurrence - Not Found
     ...    Test title: GET Individual Change State Operation Occurrence - Not Found
     ...    Test objective: The objective is to test the retrieval of information about individual change state operation occurence fails when the resource is not present.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.9.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.9.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -50,7 +50,7 @@ PUT Individual Change State Operation Occurrence - Method not implemented
     ...    Test title: PUT Individual Change State Operation Occurrence - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemeted.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.9.3.3 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.9.3.3 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -62,7 +62,7 @@ PATCH Individual Change State Operation Occurrence - Method not implemented
     ...    Test title: PATCH Individual Change State Operation Occurrence - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemeted.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.9.3.4 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.9.3.4 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -74,7 +74,7 @@ DELETE Individual Change State Operation Occurrence - Method not implemented
     ...    Test title: DELETE Individual Change State Operation Occurrence - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemeted.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.9.3.5 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.9.3.5 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -86,7 +86,7 @@ GET Individual Change State Operation Occurrence with permitted authorization sc
     ...    Test title: GET Individual Change State Operation Occurrence with permitted authorization scope
     ...    Test objective: The objective is to query status information about Individual change state operation occurrence with permitted authorization scope.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.9.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.9.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions:  none
@@ -99,7 +99,7 @@ GET Individual Change State Operation Occurrence with not permitted authorizatio
     ...    Test title: GET Individual Change State Operation Occurrence with not permitted authorization scope
     ...    Test objective: The objective is test that the query status information about Individual change state operation occurrence fails with not permitted authorization scope.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.9.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.9.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions:  none
diff --git a/SOL009/NFVManoConfigurationAndInformationManagement-API/IndividualSubscription.robot b/SOL009/NFVManoConfigurationAndInformationManagement-API/IndividualSubscription.robot
index 5858371fe960ea8a78fe9f91f1b17b94dc0ca8d6..e030ba0963111fe8fe6520019cd2a08440ec495e 100644
--- a/SOL009/NFVManoConfigurationAndInformationManagement-API/IndividualSubscription.robot
+++ b/SOL009/NFVManoConfigurationAndInformationManagement-API/IndividualSubscription.robot
@@ -12,7 +12,7 @@ GET Individual Subscription
     ...    Test title: GET Individual  Subscription
     ...    Test objective: The objective is to test the retrieval of individual subscription and perform a JSON schema and content validation of the returned subscription data structure
     ...    Pre-conditions: At least one subscription is available in the NFV-MANO.
-    ...    Reference: clause 5.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -26,7 +26,7 @@ GET Individual Subscription - invalid resource identifier
     ...    Test title: GET Individual Subscription - invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of an individual subscription fails when using an invalid resource identifier
     ...    Pre-conditions: At least one subscription is available in the NFV-MANO.
-    ...    Reference: clause 5.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -38,7 +38,7 @@ DELETE Individual Subscription
     ...    Test title: DELETE Individual Subscription
     ...    Test objective: The objective is to test the deletion of an individual subscription
     ...    Pre-conditions: At least one subscription is available in the NFV-MANO.
-    ...    Reference: clause 5.5.5.3.5 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.5.3.5 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: The resource is not available anymore in the NFV-MANO    
@@ -51,7 +51,7 @@ DELETE Individual Subscription - invalid resource identifier
     ...    Test title: DELETE Individual Subscription - invalid resource identifier
     ...    Test objective: The objective is to test that the deletion of an individual  subscription fails when using an invalid resource identifier
     ...    Pre-conditions: At least one subscription is available in the NFV-MANO.
-    ...    Reference: clause 5.5.5.3.5 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.5.3.5 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -63,7 +63,7 @@ POST Individual Subscription - Method not implemented
     ...    Test title: POST Individual Subscription - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new Subscription
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.5.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.5.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -75,7 +75,7 @@ PUT Individual Subscription - Method not implemented
     ...    Test title: PUT Individual Subscription - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to update an existing subscription
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.5.3.3 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.5.3.3 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -87,7 +87,7 @@ PATCH Individual Subscription - Method not implemented
     ...    Test title: PATCH Individual Subscription - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to modify an existing subscription
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.5.3.4 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.5.3.4 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -99,7 +99,7 @@ GET Individual Subscription with permitted authorization scope
     ...    Test title: GET Individual  Subscription with permitted authorization scope
     ...    Test objective: The objective is to test the retrieval of individual subscription when a permitted authorization scope is used.
     ...    Pre-conditions: At least one subscription is available in the NFV-MANO.
-    ...    Reference: clause 5.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -113,7 +113,7 @@ GET Individual Subscription with not permitted authorization scope
     ...    Test title: GET Individual  Subscription with not permitted authorization scope
     ...    Test objective: The objective is to test the retrieval of individual subscription fails when a not permitted authorization scope is used.
     ...    Pre-conditions: At least one subscription is available in the NFV-MANO.
-    ...    Reference: clause 5.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL009/NFVManoConfigurationAndInformationManagement-API/NFVMANOEntity.robot b/SOL009/NFVManoConfigurationAndInformationManagement-API/NFVMANOEntity.robot
index c1c93b1ab2ab16c1a6d591098ba388303721d437..76c60b67d68b062e42406304eb93b5cac9da6e6b 100644
--- a/SOL009/NFVManoConfigurationAndInformationManagement-API/NFVMANOEntity.robot
+++ b/SOL009/NFVManoConfigurationAndInformationManagement-API/NFVMANOEntity.robot
@@ -13,7 +13,7 @@ POST NFV-MANO entity - Method not implemented
     ...    Test title: POST NFV-MANO entity - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create an NFV-MANO Entity.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.3.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.3.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -25,7 +25,7 @@ GET NFV-MANO entity
     ...    Test title: Get NFV-MANO entity
     ...    Test objective: The objective is to test the retrieval of information about an NFV-MANO functional entity by reading the NFV-MANO entity resource and perform a JSON schema and content validation of the collected job data structure.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -38,7 +38,7 @@ GET NFV-MANO entity - Not Found
     ...    Test title: Get NFV-MANO entity - Not Found
     ...    Test objective: The objective is to test the retrieval of information about an NFV-MANO functional entity by reading the NFV-MANO entity resource fails when the resource is not present.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -50,7 +50,7 @@ PUT NFV-MANO entity - Method not implemented
     ...    Test title: PUT NFV-MANO entity - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to update an NFV-MANO Entity.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.3.3.3 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.3.3.3 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -62,7 +62,7 @@ PATCH NFV-MANO entity
     ...    Test title: PATCH NFV-MANO entity
     ...    Test objective: The objective is to test that PATCH method modifies the NFV-MANO entity resource and perform a JSON schema and content validation of the modified response.
     ...    Pre-conditions: NFV-MANO entity resource is already created.
-    ...    Reference: clause 5.5.3.3.4 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.3.3.4 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: The NFV-MANO entity is modified by the operation
@@ -75,7 +75,7 @@ PATCH NFV-MANO entity - Conflict
     ...    Test title: PATCH NFV-MANO entity - Conflict
     ...    Test objective: The objective is to test that the modification of the NFV-MANO entity resource failed due to a conflict with the state of the NFV-MANO entity resource and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: NFV-MANO entity resource is already created.
-    ...    Reference: clause 5.5.3.3.4 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.3.3.4 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: The NFV-MANO entity is not modified by the operation
@@ -88,7 +88,7 @@ PATCH NFV-MANO entity - PreCondition Failed
     ...    Test title: PATCH NFV-MANO entity - PreCondition Failed
     ...    Test objective: The objective is to test that the modification of the NFV-MANO entity resource failed because precondition given in an HTTP request header is not fulfilled and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: NFV-MANO entity resource is already created.
-    ...    Reference: clause 5.5.3.3.4 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.3.3.4 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: The NFV-MANO entity is not modified by the operation
@@ -101,7 +101,7 @@ DELETE NFV-MANO entity - Method not implemented
     ...    Test title: DELETE NFV-MANO entity - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete an NFV-MANO Entity.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.3.3.5 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.3.3.5 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -113,7 +113,7 @@ GET NFV-MANO entity with permitted authorization scope
     ...    Test title: Get NFV-MANO entity with permitted authorization scope
     ...    Test objective: The objective is to test the retrieval of information about an NFV-MANO functional entity by reading the NFV-MANO entity resource when a permitted authorization scope is used.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -126,7 +126,7 @@ GET NFV-MANO entity with not permitted authorization scope
     ...    Test title: Get NFV-MANO entity with not permitted authorization scope
     ...    Test objective: The objective is to test the retrieval of information about an NFV-MANO functional entity fails when a not permitted authorization scope is used.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL009/NFVManoConfigurationAndInformationManagement-API/NFVMANOServiceInterfaces.robot b/SOL009/NFVManoConfigurationAndInformationManagement-API/NFVMANOServiceInterfaces.robot
index f5dfecc3e5bc51b8b72c22bb0c630f0c0f2aeedc..e497cf6f317e8deea545b5536730a94537a90393 100644
--- a/SOL009/NFVManoConfigurationAndInformationManagement-API/NFVMANOServiceInterfaces.robot
+++ b/SOL009/NFVManoConfigurationAndInformationManagement-API/NFVMANOServiceInterfaces.robot
@@ -13,7 +13,7 @@ POST NFV-MANO Service Interfaces - Method not implemented
     ...    Test title: POST NFV-MANO Service Interfaces - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemeted.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.10.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.10.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -25,7 +25,7 @@ GET NFV-MANO Service Interfaces
     ...    Test title: GET NFV-MANO Service Interfaces
     ...    Test objective: The objective is to query status information about multiple NFV-MANO service interfaces of the NFV-MANO functional entity, and perform the JSON schema validation of the HTTP response.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.10.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.10.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions:  none
@@ -38,7 +38,7 @@ GET NFV-MANO Service Interfaces - invalid attribute-based filter
     ...    Test title: GET NFV-MANO Service Interfaces - invalid attribute-based filter
     ...    Test objective:  The objective is to test that the retrieval of NFV-MANO Service Interfaces fails when using invalid attribute-based filter, and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.10.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.10.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -51,7 +51,7 @@ GET NFV-MANO Service Interfaces - invalid attribute selector
     ...    Test title: GET NFV-MANO Service Interfaces - invalid attribute selector
     ...    Test objective: The objective is to test that the retrieval of NFV-MANO Service Interfaces fails when using invalid attribute selector, and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.10.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.10.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -64,7 +64,7 @@ GET NFV-MANO Service Interfaces - Bad Request Response too Big
     ...    Test title: GET NFV-MANO Service Interfaces - Bad Request Response too Big
     ...    Test objective: The objective is to test that the retrieval of NFV-MANO Service Interfaces fails when response is too big, and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.10.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.10.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -77,7 +77,7 @@ GET NFV-MANO Service Interfaces with attribute-based filter
     ...    Test title: GET NFV-MANO Service Interfaces with attribute-based filter
     ...    Test objective: The objective is to query status information about multiple NFV-MANO service interfaces of the NFV-MANO functional entities with attribute filters, and perform the JSON schema validation of the HTTP response.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.10.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.10.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -90,7 +90,7 @@ GET NFV-MANO Service Interfaces with "all_fields" attribute selector
     ...    Test title: GET NFV-MANO Service Interface with "all_fields" attribute selector
     ...    Test objective: The objective is to retrieve NFV-MANO Service Interfaces with "all_fields" attribute selector, and perform the JSON schema validation of the HTTP response.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.10.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.10.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -103,7 +103,7 @@ GET NFV-MANO Service Interfaces with "exclude_default" attribute selector
     ...    Test title: GET NFV-MANO Service Interfaces with "exclude_default" attribute selector
     ...    Test objective: The objective is to retrieve NFV-MANO Service Interfaces with "exclude_default" attribute selector, and perform the JSON schema validation of the HTTP response.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.10.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.10.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -116,7 +116,7 @@ GET NFV-MANO Service Interfaces with "fields" attribute selector
     ...    Test title: GET NFV-MANO Service Interfaces with "fields" attribute selector
     ...    Test objective: The objective is to retrieve NFV-MANO Service Interfaces with fields attribute selector, and perform the JSON schema validation of the HTTP response.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.10.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.10.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -129,7 +129,7 @@ GET NFV-MANO Service Interfaces with "exclude_fields" attribute selector
     ...    Test title: GET NFV-MANO Service Interfaces with "exclude_fields" attribute selector
     ...    Test objective: The objective is to retrieve NFV-MANO Service Interfaces with "exclude_fields" attribute selector, and perform the JSON schema validation of the HTTP response.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.10.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.10.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -142,7 +142,7 @@ GET NFV-MANO Service Interfaces with "exclude_default" and "fields" attribute se
     ...    Test title: GET NFV-MANO Service Interfaces with "exclude_default" and "fields" attribute selector
     ...    Test objective: The objective is to retrieve NFV-MANO Service Interfaces with "exclude_default" and "fields" attribute selector, and perform the JSON schema validation of the HTTP response.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.10.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.10.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -155,7 +155,7 @@ GET NFV-MANO Service Interfaces with Paged Response
     ...    Test title: GET NFV-MANO Service Interfaces with Paged Response
     ...    Test objective: The objective is to query NFV-MANO Service Interface to get Paged Response.
     ...    Pre-conditions:  none
-    ...    Reference: clause 5.5.10.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.10.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -168,7 +168,7 @@ PUT NFV-MANO Service Interfaces - Method not implemented
     ...    Test title: PUT NFV-MANO Service Interfaces - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemeted.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.10.3.3 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.10.3.3 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -180,7 +180,7 @@ PATCH NFV-MANO Service Interfaces - Method not implemented
     ...    Test title: PATCH NFV-MANO Service Interfaces - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemeted.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.10.3.4 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.10.3.4 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -192,7 +192,7 @@ DELETE NFV-MANO Service Interfaces - Method not implemented
     ...    Test title: DELETE NFV-MANO Service Interfaces - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemeted.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.10.3.5 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.10.3.5 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -204,7 +204,7 @@ GET NFV-MANO Service Interfaces with permitted authorization scope
     ...    Test title: GET NFV-MANO Service Interfaces with permitted authorization scope
     ...    Test objective: The objective is to query status information about multiple NFV-MANO service interfaces of the NFV-MANO functional entity with permitted authorization scope.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.10.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.10.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions:  none
@@ -217,7 +217,7 @@ GET NFV-MANO Service Interfaces with not permitted authorization scope
     ...    Test title: GET NFV-MANO Service Interfaces with not permitted authorization scope
     ...    Test objective: The objective is test that the query status information about multiple NFV-MANO service interfaces of the NFV-MANO functional entity fails when using not permitted authorization scope.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.10.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.10.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions:  none
diff --git a/SOL009/NFVManoConfigurationAndInformationManagement-API/NotificationEndpoint.robot b/SOL009/NFVManoConfigurationAndInformationManagement-API/NotificationEndpoint.robot
index 046c51e1088a562137bef61d2c502bb2d549db1d..c36f2bab11887e2a80a29f1ede1d678f2c8f7f2a 100644
--- a/SOL009/NFVManoConfigurationAndInformationManagement-API/NotificationEndpoint.robot
+++ b/SOL009/NFVManoConfigurationAndInformationManagement-API/NotificationEndpoint.robot
@@ -13,7 +13,7 @@ Information Changed Notification
     ...    Test title: Information Changed Notification
     ...    Test objective: The objective is to test that Information Changed Notification is delivered with success to the notification consumer
     ...    Pre-conditions: A subscription for information availability notification is available in the NFV-MANO.
-    ...    Reference: clause 5.5.6.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.6.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -25,7 +25,7 @@ Change State Notification
     ...    Test title: Change State Notification
     ...    Test objective: The objective is to test that Change State Notification is delivered with success to the notification consumer
     ...    Pre-conditions: A subscription for change state notification is available in the NFV-MANO.
-    ...    Reference: clause 5.5.6.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.6.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL009/NFVManoConfigurationAndInformationManagement-API/Notifications.robot b/SOL009/NFVManoConfigurationAndInformationManagement-API/Notifications.robot
index 4213c9dc94e29c8dadd1acc97f398cc093e206c1..916f9be8586378a4eaf365919d963db30584f8c2 100644
--- a/SOL009/NFVManoConfigurationAndInformationManagement-API/Notifications.robot
+++ b/SOL009/NFVManoConfigurationAndInformationManagement-API/Notifications.robot
@@ -8,6 +8,7 @@ Library    OperatingSystem
 Library    BuiltIn
 Library    Collections
 Library    String
+Library    REST    ${NFVMANO_SCHEMA}://${NFVMANO_HOST}:${NFVMANO_PORT}    ssl_verify=false
 
 
 *** Test Cases ***
@@ -16,26 +17,28 @@ Information Changed Notification
     ...    Test title: Information Changed Notification
     ...    Test objective: The objective is to test the dispatch of Information Changed Notification when configuration or information is changed in the NFV-MANO, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A subscription for information availability notifications is available in the NFV-MANO.
-    ...    Reference: clause 5.5.6.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.6.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none 
     Trigger the availability of Information Changed Notification (external action) 
     Check Information Changed Notification Available Http POST Request Body Json Schema Is    InformationChangedNotification
     Check Information Changed Notification Available Http POST Request Body notificationType attribute Is    InformationChangedNotification
+    Check Information Changed Notification Validation
 
 Change State Notification
     [Documentation]    Test ID: 8.3.1.12.2
     ...    Test title: Change State Notification
     ...    Test objective: The objective is to test the dispatch of Change State Notification when state changes of the NFV-MANO functional entity and its managed objects, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A performance job is created, and a state change subscription is available in the NFV-MANO.
-    ...    Reference: clause 5.5.6.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.6.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANOz
     ...    Applicability: none
     ...    Post-Conditions: none 
     Trigger the cross of Change State (external action) 
     Check Change State Notification Http POST Request Body Json Schema Is    ChangeStateNotification
     Check Change State Notification Http POST Request Body notificationType attribute Is    ChangeStateNotification
+    Check Change State Notification Validation
 
 
 *** Keywords ***
@@ -56,8 +59,8 @@ Check Information Changed Notification Available Http POST Request Body notifica
     [Arguments]    ${type}
     Configure Notification Information Changed Notification Available Handler    ${callback_endpoint_fwd}    ${type}
     Wait Until Keyword Succeeds    2 min   10 sec   Verify Mock Expectation    ${notification_request}
-    Clear Requests    ${callback_endpoint}
-    Clear Requests    ${callback_endpoint_fwd}
+    #Clear Requests    ${callback_endpoint}
+    #Clear Requests    ${callback_endpoint_fwd}
 
 Check Change State Notification Http POST Request Body Json Schema Is    
     [Arguments]    ${element}
@@ -69,8 +72,8 @@ Check Change State Notification Http POST Request Body notificationType attribut
     [Arguments]    ${type}
     Configure Notification State Crossed Handler    ${callback_endpoint_fwd}    ${type}
     Wait Until Keyword Succeeds    2 min   10 sec   Verify Mock Expectation    ${notification_request}
-    Clear Requests    ${callback_endpoint}
-    Clear Requests    ${callback_endpoint_fwd}
+    #Clear Requests    ${callback_endpoint}
+    #Clear Requests    ${callback_endpoint_fwd}
     
     
 Check Change State Notification Http POST Request Body changeType attribute Is
@@ -108,6 +111,80 @@ Configure Notification Forward
     &{notification_fwd}=  Create Mock Http Forward  ${endpoint_fwd}
     Create Mock Expectation With Http Forward  ${notification_tmp}  ${notification_fwd}
 
+Check Information Changed Notification Validation
+    [Arguments]    ${expected_notification_type}=InformationChangedNotification
+    ${requests}=    Retrieve Requests    ${callback_endpoint_fwd}
+    Should Not Be Empty    ${requests}    msg=No notification received at callback endpoint!
+
+    ${request_type}=    Evaluate    type(${requests})
+    Log    Request type: ${request_type}
+
+    ${last_request}=    Run Keyword If    "${request_type}" == "<class 'list'>"
+    ...    Get From List    ${requests}    -1
+    ...    ELSE
+    ...    Set Variable    ${requests}
+
+    ${body}=    Get From Dictionary    ${last_request}    body
+    ${body_text}=    Get From Dictionary    ${body}    string
+
+    ${notification}=    Evaluate    json.loads(r'''${body_text}''')    json
+    Log    Parsed notification: ${notification}
+
+    Should Be Equal As Strings    ${notification['notificationType']}    ${expected_notification_type}
+
+    ${manoEntityId}=    Get From Dictionary    ${notification}    manoEntityId
+
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Set Headers    {"Version": "${API_VERSION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1
+    ...    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+
+    # Validate entity exists
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/mano_entity
+    Integer    response status    200
+    ${output}=    Output    response
+    Should Be Equal    ${output['body']['id']}    ${manoEntityId} 
+
+    Clear Requests    ${callback_endpoint}
+    Clear Requests    ${callback_endpoint_fwd}
+
+Check Change State Notification Validation
+    [Arguments]    ${expected_notification_type}=ChangeStateNotification
+    ${requests}=    Retrieve Requests    ${callback_endpoint_fwd}
+    Should Not Be Empty    ${requests}    msg=No notification received at callback endpoint!
+
+    ${request_type}=    Evaluate    type(${requests})
+    Log    Request type: ${request_type}
+
+    ${last_request}=    Run Keyword If    "${request_type}" == "<class 'list'>"
+    ...    Get From List    ${requests}    -1
+    ...    ELSE
+    ...    Set Variable    ${requests}
+
+    ${body}=    Get From Dictionary    ${last_request}    body
+    ${body_text}=    Get From Dictionary    ${body}    string
+
+    ${notification}=    Evaluate    json.loads(r'''${body_text}''')    json
+    Log    Parsed notification: ${notification}
+
+    Should Be Equal As Strings    ${notification['notificationType']}    ${expected_notification_type}
+
+    ${managedObjectRef}=    Get From Dictionary    ${notification}    managedObjectRef
+
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Set Headers    {"Version": "${API_VERSION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1
+    ...    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+
+    # Validate entity exists
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/mano_entity
+    Integer    response status    200
+    ${output}=    Output    response
+    Should Be Equal    ${output['body']['id']}    ${managedObjectRef['objectId']} 
+
+    Clear Requests    ${callback_endpoint}
+    Clear Requests    ${callback_endpoint_fwd}
+
 Create Sessions
     Start Process  java  -jar  ${MOCK_SERVER_JAR}  -serverPort  ${callback_port}  alias=mockInstance
     Wait For Process  handle=mockInstance  timeout=5s  on_timeout=continue
diff --git a/SOL009/NFVManoConfigurationAndInformationManagement-API/PeerEntities.robot b/SOL009/NFVManoConfigurationAndInformationManagement-API/PeerEntities.robot
index 858383ec4e76c83e6deddabb1b67d74efba39dac..14a6d51e26cfe1462a761f69c9a8f2dd3b70423c 100644
--- a/SOL009/NFVManoConfigurationAndInformationManagement-API/PeerEntities.robot
+++ b/SOL009/NFVManoConfigurationAndInformationManagement-API/PeerEntities.robot
@@ -13,7 +13,7 @@ POST Peer Entity
     ...    Test title: POST Peer Entity
     ...    Test objective: The objective is to creates in the producer NFV-MANO functional entity a new peer entity resource which contains configuration and information with regards to the peer functional entity and perform the JSON schema validation of the returned job data structure.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.13.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.13.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: Peer Entity is created
@@ -28,7 +28,7 @@ GET Peer Entities
     ...    Test title: GET Peer Entities
     ...    Test objective: The objective is to query information and configuration in the producer NFV-MANO functional entity with regards to multiple peer entities, and perform the JSON schema validation of the returned job data structure.
     ...    Pre-conditions: At least one Peer Entity is already created.
-    ...    Reference: clause 5.5.13.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.13.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions:  none
@@ -41,7 +41,7 @@ GET Peer Entities - invalid attribute-based filter
     ...    Test title: GET Peer Entities - invalid attribute-based filter
     ...    Test objective:  The objective is to test that the retrieval of information and configuration in the producer NFV-MANO functional entity with regards to multiple peer entities fails when using invalid attribute-based filter, and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: At least one Peer Entity is already created. 
-    ...    Reference: clause 5.5.13.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.13.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -54,7 +54,7 @@ GET Peer Entities - invalid attribute selector
     ...    Test title: GET Peer Entities - invalid attribute selector
     ...    Test objective: The objective is to test that the retrieval of information and configuration in the producer NFV-MANO functional entity with regards to multiple peer entities fails when using invalid attribute selector, and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: At least one Peer Entity is already created. 
-    ...    Reference: clause 5.5.13.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.13.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -67,7 +67,7 @@ GET Peer Entities - Bad Request Response too Big
     ...    Test title: GET Peer Entities - Bad Request Response too Big
     ...    Test objective: The objective is to test that the retrieval of information and configuration in the producer NFV-MANO functional entity with regards to multiple peer entities fails when response is too big, and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: At least one Peer Entity is already created. 
-    ...    Reference: clause 5.5.13.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.13.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -80,7 +80,7 @@ GET Peer Entities with attribute-based filter
     ...    Test title: GET Peer Entities with attribute-based filter
     ...    Test objective: The objective is to query information and configuration in the producer NFV-MANO functional entity with regards to multiple peer entities with attribute filters, and perform the JSON schema validation of the returned job data structure.
     ...    Pre-conditions: At least one Peer Entity is already created. 
-    ...    Reference: clause 5.5.13.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.13.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -93,7 +93,7 @@ GET Peer Entities with "all_fields" attribute selector
     ...    Test title: GET Peer Entities with "all_fields" attribute selector
     ...    Test objective: The objective is to retrieve information and configuration in the producer NFV-MANO functional entity with regards to multiple peer entities with "all_fields" attribute selector, and perform the JSON schema validation of the returned job data structure.
     ...    Pre-conditions: At least one Peer Entity is already created. 
-    ...    Reference: clause 5.5.13.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.13.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -106,7 +106,7 @@ GET Peer Entities with "exclude_default" attribute selector
     ...    Test title: GET Peer Entities with "exclude_default" attribute selector
     ...    Test objective: The objective is to retrieve information and configuration in the producer NFV-MANO functional entity with regards to multiple peer entities with "exclude_default" attribute selector, and perform the JSON schema validation of the returned job data structure.
     ...    Pre-conditions: At least one Peer Entity is already created. 
-    ...    Reference: clause 5.5.13.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.13.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -119,7 +119,7 @@ GET Peer Entities with "fields" attribute selector
     ...    Test title: GET Peer Entities with "fields" attribute selector
     ...    Test objective: The objective is to retrieve information and configuration in the producer NFV-MANO functional entity with regards to multiple peer entities with fields attribute selector, and perform the JSON schema validation of the returned job data structure.
     ...    Pre-conditions: At least one Peer Entity is already created. 
-    ...    Reference: clause 5.5.13.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.13.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -132,7 +132,7 @@ GET Peer Entities with "exclude_fields" attribute selector
     ...    Test title: GET Peer Entities with "exclude_fields" attribute selector
     ...    Test objective: The objective is to retrieve information and configuration in the producer NFV-MANO functional entity with regards to multiple peer entities with "exclude_fields" attribute selector, and perform the JSON schema validation of the returned job data structure.
     ...    Pre-conditions: At least one Peer Entity is already created. 
-    ...    Reference: clause 5.5.13.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.13.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -145,7 +145,7 @@ GET Peer Entities with "exclude_default" and "fields" attribute selector
     ...    Test title: GET Peer Entities with "exclude_default" and "fields" attribute selector
     ...    Test objective: The objective is to retrieve information and configuration in the producer NFV-MANO functional entity with regards to multiple peer entities with "exclude_default" and "fields" attribute selector, and perform the JSON schema validation of the returned job data structure.
     ...    Pre-conditions: At least one Peer Entity is already created. 
-    ...    Reference: clause 5.5.13.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.13.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -158,7 +158,7 @@ GET Peer Entity with Paged Response
     ...    Test title: GET Peer Entity with Paged Response
     ...    Test objective: The objective is to query information and configuration in the producer NFV-MANO functional entity with regards to multiple peer entities to get Paged Response.
     ...    Pre-conditions: At least one Peer Entity is already created.  
-    ...    Reference: clause 5.5.13.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.13.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -171,7 +171,7 @@ Get Peer Entity with malformed authorization token
     ...    Test title: Get Peer Entity with malformed authorization token
     ...    Test objective: The objective is to test that the retrieval of information and configuration in the producer NFV-MANO functional entity with regards to multiple peer entities fails when using malformed authorization token.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.13.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.13.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: The Peer Entity requires the usage of access tokens for authorizing the API requests.
     ...    Post-Conditions: none
@@ -183,7 +183,7 @@ Get Peer Entity without authorization token
     ...    Test title: Get Peer Entity without authorization token
     ...    Test objective: The objective is to test that the retrieval of information and configuration in the producer NFV-MANO functional entity with regards to multiple peer entities fails when omitting the authorization token.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.13.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.13.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: The Peer Entity requires the usage of access tokens for authorizing the API requests.
     ...    Post-Conditions: none
@@ -195,7 +195,7 @@ GET information about multiple alarms with expired or revoked authorization toke
     ...    Test title: GET information about multiple alarms with expired or revoked authorization token
     ...    Test objective: The objective is to test that the retrieval of information and configuration in the producer NFV-MANO functional entity with regards to multiple peer entities fails when using expired or revoked authorization token.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.13.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.13.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: The Peer Entity requires the usage of access tokens for authorizing the API requests.
     ...    Post-Conditions: none
@@ -207,7 +207,7 @@ PUT Peer Entities - Method not implemented
     ...    Test title: PUT Peer Entities - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemeted.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.13.3.3 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.13.3.3 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -219,7 +219,7 @@ PATCH Peer Entities - Method not implemented
     ...    Test title: PATCH Peer Entities - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemeted.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.13.3.4 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.13.3.4 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -231,7 +231,7 @@ DELETE Peer Entities - Method not implemented
     ...    Test title: DELETE Peer Entities - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemeted.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.13.3.5 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.13.3.5 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -243,7 +243,7 @@ POST Peer Entity with permitted authorization scope
     ...    Test title: POST Peer Entity with permitted authorization scope
     ...    Test objective: The objective is to create in the producer NFV-MANO functional entity a new peer entity resource with permitted authorization scope.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.13.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.13.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: Peer Entity is created
@@ -258,7 +258,7 @@ POST Peer Entity with not permitted authorization scope
     ...    Test title: POST Peer Entity with not permitted authorization scope
     ...    Test objective: The objective is to test that creation in the producer NFV-MANO functional entity of a new peer entity resource fails with not permitted authorization scope.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.13.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.13.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: Peer Entity is created
diff --git a/SOL009/NFVManoConfigurationAndInformationManagement-API/Subscriptions.robot b/SOL009/NFVManoConfigurationAndInformationManagement-API/Subscriptions.robot
index 9ad4c352c7386e8cdd4d0e3f3b2d327302aff96d..61c8fcc1ddc776dc487e755c762babd23ae0e9a6 100644
--- a/SOL009/NFVManoConfigurationAndInformationManagement-API/Subscriptions.robot
+++ b/SOL009/NFVManoConfigurationAndInformationManagement-API/Subscriptions.robot
@@ -16,7 +16,7 @@ GET all Subscriptions
     ...    Test title: GET all Subscriptions
     ...    Test objective: The objective is to test the retrieval list of active subscriptions of API consumer and perform a JSON schema validation of the returned subscriptions data structure.
     ...    Pre-conditions:  At least one subscription is available in the NFV-MANO.
-    ...    Reference: clause 5.5.4.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.4.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -29,7 +29,7 @@ GET Subscriptions with attribute-based filter
     ...    Test title: GET Subscriptions with attribute-based filter
     ...    Test objective: The objective is to test the retrieval of active subscriptions list of API consumer using attribute-based filter and perform a JSON schema validation of the collected indicators data structure. 
     ...    Pre-conditions: At least one subscription is available in the NFV-MANO.
-    ...    Reference: clause 5.5.4.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.4.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -42,7 +42,7 @@ GET Subscriptions with Paged Response
     ...    Test title: GET Subscriptions with Paged Response
     ...    Test objective: The objective is to query information of active subscriptions list to of API consumer to get Paged Response.
     ...    Pre-conditions:  At least one subscription is available in the NFV-MANO.
-    ...    Reference: clause 5.5.4.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.4.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: 
     ...    Post-Conditions: 
@@ -55,7 +55,7 @@ GET Subscriptions - invalid attribute-based filter
     ...    Test title: GET Subscriptions - invalid attribute-based filter
     ...    Test objective: The objective is to test that the retrieval of active subscriptions list of API consumer fails when using invalid attribute-based filters, and perform the JSON schema validation of the failed operation HTTP response. 
     ...    Pre-conditions: At least one subscription is available in the NFV-MANO.
-    ...    Reference: clause 5.5.4.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.4.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -69,7 +69,7 @@ GET Subscriptions - Bad Request Response too Big
     ...    Test title: GET Subscriptions - Bad Request Response too Big
     ...    Test objective: The objective is to test that the retrieval of active subscriptions list of API consumer fails when response is too big, and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: At least one subscription is available in the NFV-MANO.
-    ...    Reference: clause 5.5.4.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.4.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -82,7 +82,7 @@ GET Subscriptions - invalid resource endpoint
     ...    Test title: GET Subscriptions - invalid resource endpoint
     ...    Test objective: The objective is to test that the retrieval of active subscriptions list of API consumer fails when using invalid resource endpoint.
     ...    Pre-conditions: At least one subscription is available in the NFV-MANO.
-    ...    Reference: clause 5.5.4.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.4.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -94,7 +94,7 @@ POST Create new Subscription
     ...    Test title: Create new Subscription
     ...    Test objective: The objective is to test the creation of a new subscription and perform a JSON schema and content validation of the returned subscription data structure
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.4.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.4.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: The subscription is successfully set and it matches the issued subscription    
@@ -113,7 +113,7 @@ POST Create request for duplicated Subscription not creating duplicated subscrip
     ...    Test title: Create request for duplicated Subscription not creating duplicated subscriptions
     ...    Test objective: The objective is to test the attempt of a creation of a duplicated subscription failed and check that no new subscription is created and a link to the original subscription is returned
     ...    Pre-conditions: At least one subscription is available in the NFV-MANO.
-    ...    Reference: clause 5.5.4.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.4.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: The NFV-MANO does not support the creation of duplicated subscriptions
     ...    Post-Conditions: The existing Subscription returned is available in the NFV-MANO 
@@ -129,7 +129,7 @@ POST Create request for duplicated Subscription creating duplicated subscription
     ...    Test title: Create request for duplicated Subscription creating duplicated subscriptions
     ...    Test objective: The objective is to test the creation of a duplicated subscription and perform a JSON schema and content validation of the returned duplicated subscription data structure
     ...    Pre-conditions: At least one subscription is available in the NFV-MANO.
-    ...    Reference: clause 5.5.4.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.4.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: The NFV-MANO supports the creation of duplicated subscriptions
     ...    Post-Conditions: The duplicated subscription is successfully set and it matches the issued subscription
@@ -144,7 +144,7 @@ POST new subscription - Unprocessable Content
     ...    Test title: POST new subscription - Unprocessable Content
     ...    Test objective:  The objective is to test the creation of a new subscription fails when a request contains syntactically correct data but the data cannot be processed.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.4.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.4.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -157,7 +157,7 @@ PUT Subscriptions - Method not implemented
     ...    Test title: PUT Subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify subscriptions
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.4.3.3 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.4.3.3 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -169,7 +169,7 @@ PATCH Subscriptions - Method not implemented
     ...    Test title: PATCH Subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update subscriptions
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.4.3.4 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.4.3.4 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -181,7 +181,7 @@ DELETE Subscriptions - Method not implemented
     ...    Test title: DELETE Subscriptions - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete subscriptions
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.4.3.5 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.4.3.5 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -193,7 +193,7 @@ POST Create a new subscription - Unprocessable Content
     ...    Test title: POST Create a new Subscription - Unprocessable Content
     ...    Test objective: The objective is to test that a new subscription is not created if the notification endpoint is unreachable by the NFV-MANO.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.4.3.1 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.4.3.1 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: Notification endpoint is unreachable by the NFV-MANO
     ...    Post-Conditions: none 
@@ -206,7 +206,7 @@ GET all Subscriptions with permitted authorization scope
     ...    Test title: GET all Subscriptions with permitted authorization scope
     ...    Test objective: The objective is to test the retrieval list of active subscriptions of API consumer when a permitted authorization scope is used.
     ...    Pre-conditions:  At least one subscription is available in the NFV-MANO.
-    ...    Reference: clause 5.5.4.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.4.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -219,7 +219,7 @@ GET all Subscriptions with not permitted authorization scope
     ...    Test title: GET all Subscriptions with not permitted authorization scope
     ...    Test objective: The objective is to test the retrieval list of active subscriptions of API consumer ffails when a not permitted authorization scope is used.
     ...    Pre-conditions:  At least one subscription is available in the NFV-MANO.
-    ...    Reference: clause 5.5.4.3.2 - ETSI GS NFV-SOL 009 [7] v5.2.1
+    ...    Reference: clause 5.5.4.3.2 - ETSI GS NFV-SOL 009 [7] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none    
diff --git a/SOL009/NFVManoConfigurationAndInformationManagement-API/environment/variables.txt b/SOL009/NFVManoConfigurationAndInformationManagement-API/environment/variables.txt
index a814512371c74ad7481af963083a07ba9c855fe7..254a1acfa56ad21f64d902be1e9ff99a481d825d 100644
--- a/SOL009/NFVManoConfigurationAndInformationManagement-API/environment/variables.txt
+++ b/SOL009/NFVManoConfigurationAndInformationManagement-API/environment/variables.txt
@@ -23,6 +23,7 @@ ${CONTENT_TYPE_JSON}    application/json
 ${ACCEPT_JSON}    application/json
 ${CONTENT_TYPE_PATCH}    application/merge-patch+json
 ${AUTH_USAGE}     1
+${API_VERSION}      2.15.0     
 
 ${NFVMANO_CHECKS_NOTIF_ENDPOINT}    1        ## If true, during subscription, the FUT performs a get to the notification endpoint
 
diff --git a/SOL009/NFVManoConfigurationAndInformationManagement-API/schemas/ManoConfigModifications.schema.json b/SOL009/NFVManoConfigurationAndInformationManagement-API/schemas/ManoConfigModifications.schema.json
index 9ecde8ddb025d0c6b242d1acbc50f91a6a56bc70..ee5bb196689574f7a1a5076067a710568b767afa 100644
--- a/SOL009/NFVManoConfigurationAndInformationManagement-API/schemas/ManoConfigModifications.schema.json
+++ b/SOL009/NFVManoConfigurationAndInformationManagement-API/schemas/ManoConfigModifications.schema.json
@@ -1,86 +1,90 @@
 {
-  "description": "This type represents attribute modifications that were performed on the  \"NFV-MANO entity\" resource of the producer NFV-MANO functional entity.  The attributes that can be included consist of those requested to be  modified explicitly in the \"ManoConfigModificationRequest\" data structure. \n",
-  "type": "object",
-  "properties": {
-    "name": {
-      "description": "If present, this attribute signals modifications of the \"name\"  attribute in \"ManoEntity\", as defined in clause 5.6.2.3\n",
-      "type": "string"
-    },
-    "description": {
-      "description": "If present, this attribute signals modifications of the \"description\"  attribute in \"ManoEntity\", as defined in clause 5.6.2.3.\n",
-      "type": "string"
-    },
-    "clockSyncs": {
-      "description": "If present, this attribute signals modifications of the \"clockSyncs\" attribute in \"ManoEntityConfigurableParams\", as defined in clause 5.6.2.3.\n",
-      "type": "object",
-      "additionalProperties": {
-        "description": "This type represents parameters for connecting to an NTP server. * NOTE:\tEither ipAddress or hostname shall be set, but not both at the same time.\n",
-        "type": "object",
-        "required": [
-          "type"
-        ],
-        "properties": {
-          "type": {
-            "description": "Type of clock synchronization.\nPermitted values:\n  - NTP: For Network Time Protocol (NTP) based clock synchronization.\n  - OTHER: For other types of clock synchronization.\n",
-            "type": "string",
-            "enum": [
-              "NTP",
-              "OTHER"
-            ]
-          },
-          "ntpServerInfo": {
-            "description": "Information for the NTP based clock synchronization. Shall be present if type = \"NTP\".\n",
-            "type": "object",
-            "properties": {
-              "ipAddress": {
-                "description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that consists of groups of zero to four hexadecimal digits, separated by colons.\n",
-                "type": "string",
-                "format": "IP"
-              },
-              "hostname": {
-                "description": "Indicates the hostname of the NTP server. See note.\n",
-                "type": "string"
-              }
-            }
-          },
-          "otherClockSyncParams": {
-            "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of keyvalue pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 8259. In the following example, a list of key-value pairs with four keys (\"aString\", \"aNumber\", \"anArray\" and \"anObject\") is provided to illustrate that the values associated with different keys can be of different type.\n",
-            "type": "object"
-          }
-        }
-      }
-    },
-    "defaultLogCompileBySizeValue": {
-      "description": "Unsigned integer\n",
-      "type": "number"
-    },
-    "defaultLogCompileByTimerValue": {
-      "description": "Unsigned integer\n",
-      "type": "number"
-    },
-    "manoServiceModifications": {
-      "description": "If present, this attribute signals modifications of the \"manoServices\"  attribute array in the \"ManoEntity\", as defined in clause 5.6.2.3.\n",
-      "type": "array",
-      "items": {
-        "type": "object",
-        "properties": {
-          "id": {
-            "description": "An identifier that is unique for the respective type within a NFV-MANO functional entity, but that need not be globally unique. Representation: string of variable length..\n",
-            "type": "string"
-          },
-          "name": {
-            "description": "If present, this attribute signals modification of the \"name\"  attribute in the \"ManoService\".\n",
+    "description": "This type represents attribute modifications that were performed on the \"NFV-MANO entity\" resource of the producer NFV-MANO functional entity. The attributes that can be included consist of those requested to be modified explicitly in the \"ManoConfigModificationRequest\" data structure.\n",
+    "type": "object",
+    "properties": {
+        "name": {
+            "description": "If present, this attribute signals modifications of the \"name\" attribute in \"ManoEntity\", as defined in clause 5.6.2.3\n",
             "type": "string"
-          },
-          "description": {
-            "description": "If present, this attribute signals modification of the  \"description\" attribute in the \"ManoService\".\n",
+        },
+        "description": {
+            "description": "If present, this attribute signals modifications of the \"description\" attribute in \"ManoEntity\", as defined in clause 5.6.2.3.\n",
             "type": "string"
-          }
         },
-        "required": [
-          "id"
-        ]
-      }
+        "clockSyncs": {
+            "description": "If present, this attribute signals modifications of the \"clockSyncs\" attribute in \"ManoEntityConfigurableParams\", as defined in clause 5.6.2.3.\n",
+            "type": "object",
+            "additionalProperties": {
+                "description": "This type represents parameters for connecting to an NTP server. * NOTE:\tEither ipAddress or hostname shall be set, but not both at the same time.\n",
+                "type": "object",
+                "required": [
+                    "type"
+                ],
+                "properties": {
+                    "type": {
+                        "description": "Type of clock synchronization.\nPermitted values:\n  - NTP: For Network Time Protocol (NTP) based clock synchronization.\n  - OTHER: For other types of clock synchronization.\n",
+                        "type": "string",
+                        "enum": [
+                            "NTP",
+                            "OTHER"
+                        ]
+                    },
+                    "ntpServerInfo": {
+                        "description": "Information for the NTP based clock synchronization. Shall be present if type = \"NTP\".\n",
+                        "type": "object",
+                        "properties": {
+                            "ipAddress": {
+                                "description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that consists of groups of zero to four hexadecimal digits, separated by colons.\n",
+                                "type": "string",
+                                "format": "IP"
+                            },
+                            "hostname": {
+                                "description": "Indicates the hostname of the NTP server. See note.\n",
+                                "type": "string"
+                            }
+                        }
+                    },
+                    "otherClockSyncParams": {
+                        "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of keyvalue pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 8259. In the following example, a list of key-value pairs with four keys (\"aString\", \"aNumber\", \"anArray\" and \"anObject\") is provided to illustrate that the values associated with different keys can be of different type.\n",
+                        "type": "object"
+                    }
+                }
+            }
+        },
+        "defaultLogCompileBySizeValue": {
+            "description": "Unsigned integer\n",
+            "type": "number"
+        },
+        "defaultLogCompileByTimerValue": {
+            "description": "Unsigned integer\n",
+            "type": "number"
+        },
+        "defaultLcmOpOccExpiryTime": {
+            "description": "Unsigned integer\n",
+            "type": "number"
+        },
+        "manoServiceModifications": {
+            "description": "If present, this attribute signals modifications of the \"manoServices\" attribute array in the \"ManoEntity\", as defined in clause 5.6.2.3.\n",
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "description": "An identifier that is unique for the respective type within a NFV-MANO functional entity, but that need not be globally unique. Representation: string of variable length..\n",
+                        "type": "string"
+                    },
+                    "name": {
+                        "description": "If present, this attribute signals modification of the \"name\" attribute in the \"ManoService\".\n",
+                        "type": "string"
+                    },
+                    "description": {
+                        "description": "If present, this attribute signals modification of the \"description\" attribute in the \"ManoService\".\n",
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id"
+                ]
+            }
+        }
     }
-  }
 }
\ No newline at end of file
diff --git a/SOL009/NFVManoConfigurationAndInformationManagement-API/schemas/ManoEntity.schema.json b/SOL009/NFVManoConfigurationAndInformationManagement-API/schemas/ManoEntity.schema.json
index 59165a362f5e255f0e8dcd3eef90d0477995c9c4..4d4830d32ad791ee17cb20c7704402eeb1606d0b 100644
--- a/SOL009/NFVManoConfigurationAndInformationManagement-API/schemas/ManoEntity.schema.json
+++ b/SOL009/NFVManoConfigurationAndInformationManagement-API/schemas/ManoEntity.schema.json
@@ -144,7 +144,7 @@
             }
         },
         "manoConfigurableParams": {
-            "description": "# Warning: No definition found in the document ManoConfigurableParams\n"
+            "description": "Information and current values of the configurable parameters. This attribute can be modified with the PATCH method. # Warning: No definition found in the document ManoConfigurableParams\n"
         },
         "manoApplicationState": {
             "description": "Information and current values of the NFV-MANO functional entity’s application state.\n",