diff --git a/SOL009/NFVMANOPerformanceManagement-API/IndividualPmJob.robot b/SOL009/NFVMANOPerformanceManagement-API/IndividualPmJob.robot
index 720195b44b51b872b8f6de1f95716983cec87592..dffecf063f382f05cb733defeff084453ee66edf 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] v4.5.1
+    ...    Reference: clause 6.5.4.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.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] v4.5.1
+    ...    Reference: clause 6.5.4.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.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] v4.5.1
+    ...    Reference: clause 6.5.4.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.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] v4.5.1
+    ...    Reference: clause 6.5.4.3.4 - ETSI GS NFV-SOL 009 [7] v5.1.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] v4.5.1
+    ...    Reference: clause 6.5.4.3.4 - ETSI GS NFV-SOL 009 [7] v5.1.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] v4.5.1
+    ...    Reference: clause 6.5.4.3.5 - ETSI GS NFV-SOL 009 [7] v5.1.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] v4.5.1
+    ...    Reference: clause 6.5.4.3.5 - ETSI GS NFV-SOL 009 [7] v5.1.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] v4.5.1
+    ...    Reference: clause 6.5.4.3.4 - ETSI GS NFV-SOL 009 [7] v5.1.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] v4.5.1
+    ...    Reference: clause 6.5.4.3.4 - ETSI GS NFV-SOL 009 [7] v5.1.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] v4.5.1
+    ...    Reference: clause 6.5.4.3.4 - ETSI GS NFV-SOL 009 [7] v5.1.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] v4.5.1
+    ...    Reference: clause 6.5.4.3.4 - ETSI GS NFV-SOL 009 [7] v5.1.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 08af11fe6e479fe6765d7015a79e4958730bd7fe..96dca371bdb362847bb772732c13b89c5cff61f5 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] v4.5.1
+    ...    Reference: clause 6.5.5.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.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] v4.5.1
+    ...    Reference: clause 6.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.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] v4.5.1
+    ...    Reference: clause 6.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.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] v4.5.1
+    ...    Reference: clause 6.5.5.3.3 - ETSI GS NFV-SOL 009 [7] v5.1.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] v4.5.1
+    ...    Reference: clause 6.5.5.3.4 - ETSI GS NFV-SOL 009 [7] v5.1.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] v4.5.1
+    ...    Reference: clause 6.5.5.3.5 - ETSI GS NFV-SOL 009 [7] v5.1.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] v4.5.1
+    ...    Reference: clause 6.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.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] v4.5.1
+    ...    Reference: clause 6.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.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 ae9cff74ca771c109435e17a3467478e2f1b02c3..bc0796fa841c8733642fa6ed7902a3348c55e3cd 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] v4.5.1
+    ...    Reference: clause 6.5.7.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.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] v4.5.1
+    ...    Reference: clause 6.5.7.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.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] v4.5.1
+    ...    Reference: clause 6.5.7.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.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] v4.5.1
+    ...    Reference: clause 6.5.7.3.3 - ETSI GS NFV-SOL 009 [7] v5.1.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] v4.5.1
+    ...    Reference: clause 6.5.7.3.4 - ETSI GS NFV-SOL 009 [7] v5.1.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] v4.5.1
+    ...    Reference: clause 6.5.7.3.5 - ETSI GS NFV-SOL 009 [7] v5.1.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] v4.5.1
+    ...    Reference: clause 6.5.7.3.5 - ETSI GS NFV-SOL 009 [7] v5.1.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] v4.5.1
+    ...    Reference: clause 6.5.7.3.4 - ETSI GS NFV-SOL 009 [7] v5.1.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] v4.5.1
+    ...    Reference: clause 6.5.7.3.4 - ETSI GS NFV-SOL 009 [7] v5.1.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] v4.5.1
+    ...    Reference: clause 6.5.7.3.4 - ETSI GS NFV-SOL 009 [7] v5.1.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] v4.5.1
+    ...    Reference: clause 6.5.7.3.4 - ETSI GS NFV-SOL 009 [7] v5.1.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 ac39e32dbf8462c067eb5ff3f5c6446a97e60c65..9fb0b107536a5027af8797e5a6ebf34ed3adaac0 100644
--- a/SOL009/NFVMANOPerformanceManagement-API/NFVMANOPMKeywords.robot
+++ b/SOL009/NFVMANOPerformanceManagement-API/NFVMANOPMKeywords.robot
@@ -234,7 +234,18 @@ Check HTTP Response Header Contains
     [Arguments]    ${CONTENT_TYPE}
     Should Contain    ${response['headers']}    ${CONTENT_TYPE}
     Log    Header is present
-    
+
+Check Postcondition Resource Returned in Location Header Is Available
+    Log    Going to check postcondition
+    GET    ${response['headers']['Location']}
+    Integer    response status    200
+    Log    Received a 200 OK as expected
+    ${contentType}=    Output    response headers Content-Type
+    Should Contain    ${contentType}    application/json
+    ${result}=    Output    response body
+    Validate Json    schemas/PmJobschema.json    ${result}
+    Log    Validated PmJobschema schema
+
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
     Run Keyword If    '${input}' == 'ProblemDetails'    Should Contain    ${response['headers']['Content-Type']}    application/problem+json
diff --git a/SOL009/NFVMANOPerformanceManagement-API/NotificationEndpoint.robot b/SOL009/NFVMANOPerformanceManagement-API/NotificationEndpoint.robot
index 23b5b9ac3cc01256070db4dc35401d9509216957..e1c2660c6c5274a7a069d7e34d03c775fad12b7b 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] v4.5.1
+    ...    Reference: clause 6.5.10.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.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] v4.5.1
+    ...    Reference: clause 6.5.10.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.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 7287db0a9b05ce9e819ba663f7473c80725bdbf4..cfff4995c7b4f0171c3a1f5fedb1594de5605675 100644
--- a/SOL009/NFVMANOPerformanceManagement-API/Notifications.robot
+++ b/SOL009/NFVMANOPerformanceManagement-API/Notifications.robot
@@ -9,7 +9,7 @@ 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] v4.5.1
+    ...    Reference: clause 6.5.10.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -22,7 +22,7 @@ Threshold Crossed Notification
     ...    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] v4.5.1
+    ...    Reference: clause 6.5.10.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL009/NFVMANOPerformanceManagement-API/PMJobs.robot b/SOL009/NFVMANOPerformanceManagement-API/PMJobs.robot
index 818f5330e7fe9ccaec39dc2f2cc5b5a4078d30fe..d280713b2f4591c46bbaac89080b68797040257a 100644
--- a/SOL009/NFVMANOPerformanceManagement-API/PMJobs.robot
+++ b/SOL009/NFVMANOPerformanceManagement-API/PMJobs.robot
@@ -7,13 +7,15 @@ 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] v4.5.1
+    ...    Reference: clause 6.5.3.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: The NFV-MANO Performance Job is successfully created on the NFV-MANO
     Send Post Request to create new NFV-MANO Performance Monitoring Job
     Check HTTP Response Status Code Is    201
     Check HTTP Response Body Json Schema Is   PmJob
+    Check HTTP Response Header Contains    Location
+    Check Postcondition Resource Returned in Location Header Is Available
     Check Postcondition PmJob Exists
     
 GET all NFV-MANO Performance Monitoring Jobs
@@ -21,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] v4.5.1
+    ...    Reference: clause 6.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -34,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] v4.5.1
+    ...    Reference: clause 6.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -47,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] v4.5.1
+    ...    Reference: clause 6.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -60,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] v4.5.1
+    ...    Reference: clause 6.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -73,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] v4.5.1
+    ...    Reference: clause 6.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: The NFV-MANO supports the use of fields attribute selector
     ...    Post-Conditions: none
@@ -86,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] v4.5.1
+    ...    Reference: clause 6.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: The NFV-MANO supports the use of exclude_fields attribute selector
     ...    Post-Conditions: none
@@ -99,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] v4.5.1
+    ...    Reference: clause 6.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -112,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] v4.5.1
+    ...    Reference: clause 6.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -125,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] v4.5.1
+    ...    Reference: clause 6.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions:  none
@@ -138,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] v4.5.1
+    ...    Reference: clause 6.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -151,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] v4.5.1
+    ...    Reference: clause 5.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -164,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] v4.5.1
+    ...    Reference: clause 6.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.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
@@ -176,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] v4.5.1
+    ...    Reference: clause 6.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.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
@@ -188,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] v4.5.1
+    ...    Reference: clause 6.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.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
@@ -200,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] v4.5.1
+    ...    Reference: clause 6.5.3.3.3 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -212,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] v4.5.1
+    ...    Reference: clause 6.5.3.3.4 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -224,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] v4.5.1
+    ...    Reference: clause 6.5.3.3.5 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -236,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] v4.5.1
+    ...    Reference: clause 6.5.3.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: Notification endpoint is unreachable by the NFV-MANO.
     ...    Post-Conditions: none
@@ -249,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] v4.5.1
+    ...    Reference: clause 6.5.3.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: The NFV-MANO Performance Job is successfully created on the NFV-MANO
@@ -263,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] v4.5.1
+    ...    Reference: clause 6.5.3.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.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 24a6970262e89dffd979c58476b11288550ede93..b351c76f22f0afa02edb695827030216b2c34789 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] v4.5.1
+    ...    Reference: clause 6.5.6.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: The NFV-MANO Performance Threshold is successfully created on the NFV-MANO
@@ -22,7 +22,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] v4.5.1
+    ...    Reference: clause 6.5.6.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -35,7 +35,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] v4.5.1
+    ...    Reference: clause 6.5.6.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -49,7 +49,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] v4.5.1
+    ...    Reference: clause 6.5.6.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -62,7 +62,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] v4.5.1
+    ...    Reference: clause 6.5.6.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -75,7 +75,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] v4.5.1
+    ...    Reference: clause 6.5.6.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -88,7 +88,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] v4.5.1
+    ...    Reference: clause 6.5.6.3.3 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -100,7 +100,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] v4.5.1
+    ...    Reference: clause 6.5.6.3.4 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -112,7 +112,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] v4.5.1
+    ...    Reference: clause 6.5.6.3.5 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -125,7 +125,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] v4.5.1
+    ...    Reference: clause 6.5.6.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: Notification endpoint is unreachable by the NFV-MANO.
     ...    Post-Conditions: none
@@ -138,7 +138,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] v4.5.1
+    ...    Reference: clause 6.5.6.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: The NFV-MANO Performance Threshold is successfully created on the NFV-MANO
@@ -153,7 +153,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] v4.5.1
+    ...    Reference: clause 6.5.6.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: The NFV-MANO Performance Threshold is successfully created on the NFV-MANO