diff --git a/SOL003/VNFPerformanceManagement-API/IndividualPmJob.robot b/SOL003/VNFPerformanceManagement-API/IndividualPmJob.robot
index c927b5124fdcc6e27aef364082cb3971e0baf7c7..0b8228b07959abc73424e3e53fbae6961bd3fb1e 100644
--- a/SOL003/VNFPerformanceManagement-API/IndividualPmJob.robot
+++ b/SOL003/VNFPerformanceManagement-API/IndividualPmJob.robot
@@ -17,7 +17,7 @@ GET individual VNF Performance Job
     ...    Test title: Get individual VNF Performance Job
     ...    Test objective: The objective is to test the retrieval of an individual VNF performance monitoring job and perform a JSON schema and content validation of the collected job data structure
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
-    ...    Reference: Clause 6.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v3.5.1
+    ...    Reference: Clause 6.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v3.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -31,7 +31,7 @@ GET individual VNF Performance Job with invalid resource identifier
     ...    Test title: Get individual VNF Performance Job with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of an individual VNF 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 VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
-    ...    Reference: Clause 6.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v3.5.1
+    ...    Reference: Clause 6.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v3.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -44,7 +44,7 @@ DELETE Individual VNF Performance Job
     ...    Test title: Delete Individual VNF Performance Job
     ...    Test objective: The objective is to test the deletion of an individual VNF performance monitoring job
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
-    ...    Reference: Clause 6.4.3.3.5 - ETSI GS NFV-SOL 003 [1] v3.5.1
+    ...    Reference: Clause 6.4.3.3.5 - ETSI GS NFV-SOL 003 [1] v3.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF Performance Job is no more available in the VNFM    
@@ -57,7 +57,7 @@ DELETE Individual VNF Performance Job with invalid resource identifier
     ...    Test title: Delete individual VNF Performance Job with invalid resource identifier
     ...    Test objective: The objective is to test that the deletion of an individual VNF performance monitoring job fails when using an invalid resource identifier
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
-    ...    Reference: Clause 6.4.3.3.5 - ETSI GS NFV-SOL 003 [1] v3.5.1
+    ...    Reference: Clause 6.4.3.3.5 - ETSI GS NFV-SOL 003 [1] v3.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -70,7 +70,7 @@ POST Individual VNF Performance Job - Method not implemented
     ...    Test title: POST Individual VNF Performance Job - method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new VNF Performance Monitoring Job
     ...    Pre-conditions: A VNF instance is instantiated
-    ...    Reference: Clause 6.4.3.3.1 - ETSI GS NFV-SOL 003 [1] v3.5.1
+    ...    Reference: Clause 6.4.3.3.1 - ETSI GS NFV-SOL 003 [1] v3.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -82,7 +82,7 @@ PUT Individual VNF Performance Job - Method not implemented
     ...    Test title: PUT Individual VNF Performance Job - method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to update an existing VNF Performance Monitoring Job
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
-    ...    Reference: Clause 6.4.3.3.3 - ETSI GS NFV-SOL 003 [1] v3.5.1
+    ...    Reference: Clause 6.4.3.3.3 - ETSI GS NFV-SOL 003 [1] v3.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -94,7 +94,7 @@ PATCH Individual VNF Performance Job
     ...    Test title: PATCH Individual VNF Performance Job
     ...    Test objective: The objective is to test that PATCH method allows to modify individual performace management job
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
-    ...    Reference: Clause 6.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v3.5.1
+    ...    Reference: Clause 6.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v3.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: 
@@ -107,7 +107,7 @@ PATCH Individual VNF Performance Job - Precondition failed
     ...    Test title: PATCH Individual VNF Performance Job - Precondition failed
     ...    Test objective: The objective is to attempt to Modify an individual alarm resource, where the precondition was not met.
     ...    Pre-conditions:  A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
-    ...    Reference: Clause 6.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v3.5.1
+    ...    Reference: Clause 6.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v3.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions:  The VNF Performance Job is not modified by the operation
@@ -121,7 +121,7 @@ PATCH Individual VNF Performance Job - Unprocessable Entity
     ...    Test title: PATCH Individual VNF Performance Job - Unprocessable Entity
     ...    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 VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
-    ...    Reference: Clause 6.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v3.5.1
+    ...    Reference: Clause 6.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v3.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -215,7 +215,6 @@ Send Patch request for individual VNF Performance Job - Etag mismatch
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
-   
 Send Patch request for individual VNF Performance Job with unprocessable entity
     Set Headers  {"Accept":"${ACCEPT_JSON}"} 
     Set Headers  {"Content-Type": "${CONTENT_TYPE_PATCH}"} 
diff --git a/SOL003/VNFPerformanceManagement-API/IndividualReport.robot b/SOL003/VNFPerformanceManagement-API/IndividualReport.robot
index 14613c7161d68d3407957d9523723ec16300e5e8..d177070ee0d96b6b008084c42b189b6b1e47c510 100644
--- a/SOL003/VNFPerformanceManagement-API/IndividualReport.robot
+++ b/SOL003/VNFPerformanceManagement-API/IndividualReport.robot
@@ -11,7 +11,7 @@ Get Individual Performance Report
     ...    Test title: Get Individual Performance Report
     ...    Test objective: The objective is to test the retrieval of an individual VNF performance report associated to a monitoring job and perform a JSON schema validation of the collected report data structure
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance reports are set for a monitoring job in the VNFM.
-    ...    Reference: Clause 6.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v3.5.1
+    ...    Reference: Clause 6.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v3.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -24,7 +24,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 VNF performance report associated to a monitoring job fails when using an invalid resource endpoint 
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance reports are set for a monitoring job in the VNFM.
-    ...    Reference: Clause 6.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v3.5.1
+    ...    Reference: Clause 6.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v3.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -37,7 +37,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 VNF performance report within a monitoring job
     ...    Pre-conditions: A VNF instance is instantiated.
-    ...    Reference: Clause 6.4.4.3.1 - ETSI GS NFV-SOL 003 [1] v3.5.1
+    ...    Reference: Clause 6.4.4.3.1 - ETSI GS NFV-SOL 003 [1] v3.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -49,7 +49,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 VNF performance report within a monitoring job
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance reports are set for a monitoring job in the VNFM.
-    ...    Reference: Clause 6.4.4.3.3 - ETSI GS NFV-SOL 003 [1] v3.5.1
+    ...    Reference: Clause 6.4.4.3.3 - ETSI GS NFV-SOL 003 [1] v3.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -61,7 +61,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 VNF performance report within a monitoring job
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance reports are set for a monitoring job in the VNFM.
-    ...    Reference: Clause 6.4.4.3.4 - ETSI GS NFV-SOL 003 [1] v3.5.1
+    ...    Reference: Clause 6.4.4.3.4 - ETSI GS NFV-SOL 003 [1] v3.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -73,7 +73,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 VNF performance report within a monitoring job
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance reports are set for a monitoring job in the VNFM.
-    ...    Reference: Clause 6.4.4.3.5 - ETSI GS NFV-SOL 003 [1] v3.5.1
+    ...    Reference: Clause 6.4.4.3.5 - ETSI GS NFV-SOL 003 [1] v3.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL003/VNFPerformanceManagement-API/IndividualThreshold.robot b/SOL003/VNFPerformanceManagement-API/IndividualThreshold.robot
index 542dbeb87eaae4f73e7ba40b99225b386b713da4..b9ce9c368758c8602707f2b5c2d017e39e2dd7ab 100644
--- a/SOL003/VNFPerformanceManagement-API/IndividualThreshold.robot
+++ b/SOL003/VNFPerformanceManagement-API/IndividualThreshold.robot
@@ -17,7 +17,7 @@ GET Individual Threshold
     ...    Test title: GET Individual Threshold
     ...    Test objective: The objective is to test the retrieval of an individual VNF performance threshold and perform a JSON schema and content validation of the collected threshold data structure
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v3.5.1
+    ...    Reference: Clause 6.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v3.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -31,7 +31,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 VNF performance threshold fails when using an invalid resource identifier
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
-    ...    Reference: Clause 6.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v3.5.1
+    ...    Reference: Clause 6.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v3.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -44,7 +44,7 @@ DELETE Individual Threshold
     ...    Test title: DELETE Individual Threshold
     ...    Test objective: The objective is to test the deletion of an individual VNF performance threshold
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.6.3.5 - ETSI GS NFV-SOL 003 [1] v3.5.1
+    ...    Reference: Clause 6.4.6.3.5 - ETSI GS NFV-SOL 003 [1] v3.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF Performance Threshold is not available anymore in the VNFM    
@@ -57,7 +57,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 VNF performance threshold
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.6.3.5 - ETSI GS NFV-SOL 003 [1] v3.5.1
+    ...    Reference: Clause 6.4.6.3.5 - ETSI GS NFV-SOL 003 [1] v3.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -70,7 +70,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 VNF Performance Threshold
     ...    Pre-conditions: A VNF instance is instantiated
-    ...    Reference: Clause 6.4.6.3.1 - ETSI GS NFV-SOL 003 [1] v3.5.1
+    ...    Reference: Clause 6.4.6.3.1 - ETSI GS NFV-SOL 003 [1] v3.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -82,7 +82,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 VNF Performance threshold
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.6.3.3 - ETSI GS NFV-SOL 003 [1] v3.5.1
+    ...    Reference: Clause 6.4.6.3.3 - ETSI GS NFV-SOL 003 [1] v3.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -94,33 +94,33 @@ PATCH Individual Threshold
     ...    Test title: PATCH Individual Threshold
     ...    Test objective: The objective is to test that PATCH method allows to modify an Individual threshold resource.
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.6.3.4 - ETSI GS NFV-SOL 003 [1] v3.5.1
+    ...    Reference: Clause 6.4.6.3.4 - ETSI GS NFV-SOL 003 [1] v3.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: 
     Send Patch request for individual VNF Performance Threshold
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    ThresholdModifications
-    
+
 PATCH Individual Threshold - Precondition failed
     [Documentation]    Test ID: 7.3.4.5.8
     ...    Test title: PATCH Individual Threshold - Preconition failed
     ...    Test objective: The objective is to attempt to modify an individual threshold resource, where the precondition was not met.
     ...    Pre-conditions:  A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
-    ...    Reference: Clause 6.4.6.3.4 - ETSI GS NFV-SOL 003 [1] v3.5.1
+    ...    Reference: Clause 6.4.6.3.4 - ETSI GS NFV-SOL 003 [1] v3.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions:  none
     Send Patch request for individual VNF Performance Threshold - Etag mismatch
     Check HTTP Response Status Code Is    412
     Check HTTP Response Body Json Schema Is   ProblemDetails
-    
+
 PATCH Individual Threshold - Unprocessible Entity
     [Documentation]    Test ID: 7.3.4.5.9
     ...    Test title: PATCH Individual Threshold - Unprocessible Entity 
     ...    Test objective: The objective is to test that PATCH method cannot modify an individual threshold resource when a request contains syntactically correct data but the data cannot be processed.
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.6.3.4 - ETSI GS NFV-SOL 003 [1] v3.5.1
+    ...    Reference: Clause 6.4.6.3.4 - ETSI GS NFV-SOL 003 [1] v3.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL003/VNFPerformanceManagement-API/NotificationEndpoint.robot b/SOL003/VNFPerformanceManagement-API/NotificationEndpoint.robot
index b22d7e0e8e8c41003675665bdb172bfc2d41f9a0..bd73241f8962b7fd8a7d64d15df69d1f0c065243 100644
--- a/SOL003/VNFPerformanceManagement-API/NotificationEndpoint.robot
+++ b/SOL003/VNFPerformanceManagement-API/NotificationEndpoint.robot
@@ -13,25 +13,25 @@ Performance Information Available Notification
     ...    Test title: Performance Information Available Notification
     ...    Test objective: The objective is to test that the POST request triggers Performance Information Available Notification.
     ...    Pre-conditions: A VNF performance job is created, and a subscription for performance information available notification is available in the VNFM.
-    ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 003 [1] v3.5.1
+    ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 003 [1] v3.6.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
     Post Performance Information Available Notification
     Check HTTP Response Status Code Is    204
-    
+
 Threshold Crossed Notification
     [Documentation]    Test ID: 7.3.4.10.2
     ...    Test title: Threshold Crossed Notification
     ...    Test objective: The objective is to test that the POST request triggers Threshold Crossed Notification
     ...    Pre-conditions: A VNF performance job is created, and a subscription for threshold crossed notification is available in the VNFM.
-    ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 003 [1] v3.5.1
+    ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 003 [1] v3.6.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
     Post Threshold Crossed Notification
     Check HTTP Response Status Code Is    204
-    
+
 *** Keywords ***
 Check resource existence and get CallbackUri
     Set Headers  {"Accept":"${ACCEPT_JSON}"}  
@@ -41,7 +41,7 @@ Check resource existence and get CallbackUri
     Integer    response status    200
     Validate Json    response body    PmJob.schema.json
     Set Global Variable    ${callbackResp}    response body callbackUri
-    
+
 Check HTTP Response Status Code Is
     [Arguments]    ${expected_status}
     ${status}=    Convert To Integer    ${expected_status}    
diff --git a/SOL003/VNFPerformanceManagement-API/Notifications.robot b/SOL003/VNFPerformanceManagement-API/Notifications.robot
index 7cfc35a22111bf50df5256d1ed2df7314271c629..f8114e200d9e41bec1f0155f12312610dfb0105d 100644
--- a/SOL003/VNFPerformanceManagement-API/Notifications.robot
+++ b/SOL003/VNFPerformanceManagement-API/Notifications.robot
@@ -16,7 +16,7 @@ VNF Performance Information Availability Notification
     ...    Test title: VNF Performance Information Availability Notification
     ...    Test objective: The objective is to test the dispatch of VNF Performance Information Availability Notification when new VNF performance information is available in the NFVO, 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 VNF performance job is created, and a subscription for information availability notifications is available in the VNFM.
-    ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 003 [1] v3.5.1
+    ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 003 [1] v3.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -29,7 +29,7 @@ VNF Threshold Crossed Notification
     ...    Test title: VNF Threshold Crossed Notification
     ...    Test objective: The objective is to test the dispatch of VNF Threshold Crossed Notification when a previously set VNF 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 VNF performance job is created, and a threshold subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 003 [1] v3.5.1
+    ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 003 [1] v3.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -46,7 +46,7 @@ Trigger the availability of VNF Performance Information (external action)
 Trigger the cross of VNF Performance Threshold (external action) 
     #do nothing
     Log    do nothing   
-  
+
 Check Performance Information Available Notification Http POST Request Body Json Schema Is    
     [Arguments]    ${element}
     ${schema}=	Get File	schemas/${element}.schema.json
@@ -71,14 +71,12 @@ Check Threshold Crossed Notification Http POST Request Body notificationType att
     Wait Until Keyword Succeeds    2 min   10 sec   Verify Mock Expectation    ${notification_request}
     Clear Requests    ${callback_endpoint}
     Clear Requests    ${callback_endpoint_fwd}
-    
-    
+
 Check Threshold Crossed Notification Http POST Request Body changeType attribute Is
     [Arguments]    ${type}
     #do nothing
     Log    do nothing 
-    
-    
+
 Configure Notification Performance Information Available Handler
     [Arguments]    ${endpoint}    ${type}
     ${json}=    evaluate    {}
@@ -100,7 +98,7 @@ Configure Notification Threshold Crossed Handler
     Set Global Variable    ${notification_request}    ${req}
     &{notification_response}=  Create Mock Response    status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}
-  
+
 Configure Notification Forward
     [Arguments]    ${schema}    ${endpoint}    ${endpoint_fwd}    
     Log  Creating mock Http POST forward to handle ${schema}
diff --git a/SOL003/VNFPerformanceManagement-API/PMJobs.robot b/SOL003/VNFPerformanceManagement-API/PMJobs.robot
index b7cf83befc2c582e79980663b73d8c8941b84e4d..765330c76705547c60361132017d447395281743 100644
--- a/SOL003/VNFPerformanceManagement-API/PMJobs.robot
+++ b/SOL003/VNFPerformanceManagement-API/PMJobs.robot
@@ -18,7 +18,7 @@ GET all VNF Performance Monitoring Jobs
     ...    Test title: GET all VNF Performance Monitoring Jobs
     ...    Test objective: The objective is to test the retrieval of all the available VNF performance monitoring jobs and perform a JSON schema and content validation of the collected jobs data structure
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v3.5.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v3.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -32,7 +32,7 @@ GET VNF Performance Monitoring Jobs with attribute-based filter
     ...    Test title: GET all VNF Performance Monitoring Jobs with attribute-based filter
     ...    Test objective: The objective is to test the retrieval of VNF performance monitoring jobs using attribute-based filter, perform a JSON schema validation of the collected jobs data structure, and verify that the retrieved information matches the issued attribute-based filter
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v3.5.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v3.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -46,7 +46,7 @@ GET all VNF Performance Monitoring Jobs with all_fields attribute selector
     ...    Test title: GET all VNF Performance Monitoring Jobs with all_fields attribute selector
     ...    Test objective: The objective is to test the retrieval of all VNF performance monitoring jobs all_fields attribute selector, perform a JSON schema validation of the collected jobs data structure, and verify that the retrieved information matches the issued all_fileds selector
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v3.5.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v3.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -60,7 +60,7 @@ GET all VNF Performance Monitoring Jobs with exclude_default attribute selector
     ...    Test title: GET all VNF Performance Monitoring Jobs with exclude_default attribute selector
     ...    Test objective: The objective is to test the retrieval of all VNF performance monitoring jobs exclude_default attribute selector, perform a JSON schema validation of the collected jobs data structure, and verify that the retrieved information matches the issued exclude_default selector
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v3.5.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v3.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -74,7 +74,7 @@ GET all VNF Performance Monitoring Jobs with fields attribute selector
     ...    Test title: GET all VNF Performance Monitoring Jobs with fields attribute selector
     ...    Test objective: The objective is to test the retrieval of all VNF performance monitoring jobs fields attribute selector, perform a JSON schema validation of the collected jobs data structure, and verify that the retrieved information matches the issued fields selector
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v3.5.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v3.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: The VNFM supports the use of exclude_fields attribute selector
     ...    Post-Conditions: none
@@ -88,7 +88,7 @@ GET all VNF Performance Monitoring Jobs with exclude_fields attribute selector
     ...    Test title: GET all VNF Performance Monitoring Jobs with exclude_fields attribute selector
     ...    Test objective: The objective is to test the retrieval of all VNF performance monitoring jobs exclude_fields attribute selector, perform a JSON schema validation of the collected jobs data structure, and verify that the retrieved information matches the issued exclude_fields selector
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v3.5.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v3.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: The VNFM supports the use of exclude_fields attribute selector
     ...    Post-Conditions: none
@@ -102,7 +102,7 @@ GET VNF Performance Monitoring Jobs with invalid attribute-based filter
     ...    Test title: GET VNF Performance Monitoring Jobs with invalid attribute-based filter
     ...    Test objective: The objective is to test that the retrieval of VNF 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 VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v3.5.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v3.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -115,7 +115,7 @@ GET VNF Performance Monitoring Jobs with invalid resource endpoint
     ...    Test title: GET VNF Performance Monitoring Jobs with invalid resource endpoint
     ...    Test objective: The objective is to test that the retrieval of VNF performance monitoring jobs fails when using invalid resource endpoint
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v3.5.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v3.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -127,7 +127,7 @@ Create new VNF Performance Monitoring Job
     ...    Test title:  Create a new VNF Performance Monitoring Job
     ...    Test objective: The objective is to test the creation of a new VNF performance monitoring job and perform the JSON schema validation of the returned job data structure
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.1 - ETSI GS NFV-SOL 003 [1] v3.5.1
+    ...    Reference: Clause 6.4.2.3.1 - ETSI GS NFV-SOL 003 [1] v3.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF Performance Job is successfully created on the VNFM
@@ -141,44 +141,44 @@ PUT all VNF Performance Monitoring Jobs - Method not implemented
     ...    Test title: PUT all VNF Performance Monitoring Jobs - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify VNF Performance Monitoring Jobs
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.3 - ETSI GS NFV-SOL 003 [1] v3.5.1
+    ...    Reference: Clause 6.4.2.3.3 - ETSI GS NFV-SOL 003 [1] v3.6.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
     Send PUT Request for all VNF Performance Monitoring Jobs
     Check HTTP Response Status Code Is    405
-    
+
 PATCH all VNF Performance Monitoring Jobs - (Method not implemented)
     [Documentation]    Test ID: 7.3.4.1.11
     ...    Test title: PATCH all VNF Performance Monitoring Jobs - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update VNF Performance Monitoring Jobs
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.3 - ETSI GS NFV-SOL 003 [1] v3.5.1
+    ...    Reference: Clause 6.4.2.3.3 - ETSI GS NFV-SOL 003 [1] v3.6.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
     Send PATCH Request for all VNF Performance Monitoring Jobs
     Check HTTP Response Status Code Is    405
-    
+
 DELETE all VNF Performance Monitoring Jobs - Method not implemented
     [Documentation]    Test ID: 7.3.4.1.12
     ...    Test title: DELETE all VNF Performance Monitoring Jobs - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to update VNF Performance Monitoring Jobs
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.3 - ETSI GS NFV-SOL 003 [1] v3.5.1
+    ...    Reference: Clause 6.4.2.3.3 - ETSI GS NFV-SOL 003 [1] v3.6.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
     Send PATCH Request for all VNF Performance Monitoring Jobs
     Check HTTP Response Status Code Is    405
     Check Postcondition VNF Performance Monitoring Jobs Exist
-    
+
 GET all VNF Performance Monitoring Jobs as Paged Response
     [Documentation]    Test ID: 7.3.4.1.13
     ...    Test title: GET all VNF Performance Monitoring Jobs as Paged Response
     ...    Test objective: The objective is to test the retrieval of all the available VNF performance monitoring jobs as Paged Response.
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v3.5.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v3.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: The VNFM supports response paging for the VNF performance jobs resources
     ...    Post-Conditions: none
@@ -187,11 +187,11 @@ GET all VNF Performance Monitoring Jobs as Paged Response
     Check HTTP Response Header Contain Link
 
 GET all VNF Performance Monitoring Jobs as Paged Response with nextpage_opauque_marker parameter 
-     [Documentation]    Test ID: 7.3.4.1.13a
+    [Documentation]    Test ID: 7.3.4.1.13a
     ...    Test title: GET all VNF Performance Monitoring Jobs as Paged Response with nextpage_opauque_marker parameter 
     ...    Test objective: The objective is to query information about all the available VNF performance monitoring jobs as a Paged Response and retrieve the next page using the nextpage_opaque_marker parameter
     ...    Pre-conditions: A request for retrieving the available VNF performance monitoring jobs as a paged response has been successfully issued (Test ID 7.3.4.1.13)
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v3.5.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v3.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: The VNFM supports response paging for the VNF performance jobs resources
     ...    Post-Conditions: none 
@@ -203,20 +203,20 @@ GET VNF Performance Monitoring Jobs - Bad Request Response too Big
     ...    Test title: GET VNF Performance Monitoring Jobs - Bad Request Response too Big
     ...    Test objective: The objective is to test that the retrieval of VNF performance monitoring jobs fails because response is too big, and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v3.5.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v3.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
     GET all VNF Performance Monitoring Jobs
     Check HTTP Response Status Code Is    400
     Check HTTP Response Body Json Schema Is   ProblemDetails
-    
+
 GET all VNF Performance Monitoring Jobs with fields and exclude_default attribute selector
     [Documentation]    Test ID: 7.3.4.1.15
     ...    Test title: GET all VNF Performance Monitoring Jobs with fields and exclude_default attribute selector
     ...    Test objective: The objective is to test the retrieval of all VNF performance monitoring jobs fields and exclude_default attribute selector, perform a JSON schema validation of the collected jobs data structure, and verify that the retrieved information matches the issued fields selector
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v3.5.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v3.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: The VNFM supports the use of fields and exclude_fields attribute selector
     ...    Post-Conditions: none
@@ -224,13 +224,13 @@ GET all VNF Performance Monitoring Jobs with fields and exclude_default attribut
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is   PmJobs
     Check HTTP Response Body PmJobs Matches the requested fields selector
-    
+
 POST Create new VNF Performance Monitoring Job - Unprocessable Entity
     [Documentation]    Test ID: 7.3.4.1.16
     ...    Test title: POST Create new VNF Performance Monitoring Job - Unprocessable Entity
     ...    Test objective:  The objective is to test the creation of a new VNF performance monitoring job fails when a request contains syntactically correct data but the data cannot be processed.
     ...    Pre-conditions: none
-    ...    Reference: clause 6.4.2.3.1 - ETSI GS NFV-SOL 003 [1] v3.5.1
+    ...    Reference: clause 6.4.2.3.1 - ETSI GS NFV-SOL 003 [1] v3.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -313,7 +313,7 @@ GET VNF Performance Monitoring Jobs with fields and exclude_default attribute se
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs?fields=${fields}&exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
-    
+
 GET VNF Performance Monitoring Jobs with exclude_fields attribute selector
     Log    Trying to get all VNF Packages present in the VNFM, using filter params
     Pass Execution If    ${FIELD_USAGE} == 0    Skipping test as VNFM is not supporting 'fields'
@@ -372,7 +372,7 @@ Send PATCH Request for all VNF Performance Monitoring Jobs
     PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
-    
+
 Send DELETE Request for all VNF Performance Monitoring Jobs 
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
@@ -384,7 +384,7 @@ Send DELETE Request for all VNF Performance Monitoring Jobs
 Check Postcondition VNF Performance Monitoring Jobs Exist
     Log    Checking that Pm Job still exists
     GET all VNF Performance Monitoring Jobs
-    
+
 Check Postcondition PmJob Exists
     Log    Checking that Pm Job exists
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
@@ -394,7 +394,7 @@ Check Postcondition PmJob Exists
     Set Suite Variable    ${response}    ${output}
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    PmJob
-    
+
 Check HTTP Response Body PmJobs Matches the requested exclude_fields selector
     Log    Checking that reports element is missing
     ${reports}=    Get Value From Json    ${response['body']}    $..reports
@@ -413,7 +413,7 @@ Check HTTP Response Body PmJobs Matches the requested fields selector
     ${reports}=    Get Value From Json    ${response['body']}    $..reports
     Validate Json    reports.schema.json    ${reports[0]}
     Log    Validation for reports schema OK
-    
+
 Check HTTP Response Body PmJobs Matches the requested exclude_default selector
     Log    Checking that reports element is missing
     ${reports}=    Get Value From Json    ${response['body']}    $..reports
@@ -433,7 +433,7 @@ Check HTTP Response Body PmJobs Matches the requested all_fields selector
     ${links}=    Get Value From Json    ${response['body']}    $.._links
     Validate Json    links.schema.json    ${links[0]}
     Log    Validation for _links schema OK
-    
+
 Check HTTP Response Body PmJobs Matches the requested Attribute-Based Filter 
     Log    Checking that attribute-based filter is matched
     @{words} =  Split String    ${POS_FILTER}       ,${SEPERATOR} 
@@ -444,13 +444,13 @@ Check HTTP Response Body Does Not Contain reports
     ${reports}=    Get Value From Json    ${response['body']}    $..reports
     Should Be Empty    ${reports}
     Log    Reports element is empty as expected
-    
+
 Check HTTP Response Status Code Is
     [Arguments]    ${expected_status}
     ${status}=    Convert To Integer    ${expected_status}    
     Should Be Equal As Strings    ${response['status']}    ${status} 
     Log    Status code validated
-    
+
 Check HTTP Response Status Code Is 40x  
     Should Contain Any    ${response['status']}    401    403
     Log    Status code validated
@@ -459,7 +459,7 @@ Check HTTP Response Header Contains
     [Arguments]    ${CONTENT_TYPE}
     Should Contain    ${response['headers']}    ${CONTENT_TYPE}
     Log    Header is present
-    
+
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
     Run Keyword If    '${input}' == 'ProblemDetails'    Should Contain    ${response['headers']['Content-Type']}    application/problem+json
@@ -467,11 +467,11 @@ Check HTTP Response Body Json Schema Is
     ${schema} =    Catenate    SEPARATOR=    ${input}    .schema.json
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
-    
+
 Check LINK in Header
     ${linkURL}=    Get Value From Json    ${response['headers']}    $..Link
     Should Not Be Empty    ${linkURL}
-    
+
 Send Post Request for VNF Performance Monitoring Job with unprocessable entity
     Log    trying to create a new PM Job
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
diff --git a/SOL003/VNFPerformanceManagement-API/Thresholds.robot b/SOL003/VNFPerformanceManagement-API/Thresholds.robot
index 4b8b1a2a0666e4b9697f0ce6b3fb68f801cf385b..821caefe7595b7a2c52e04615d3efc428a7371b1 100644
--- a/SOL003/VNFPerformanceManagement-API/Thresholds.robot
+++ b/SOL003/VNFPerformanceManagement-API/Thresholds.robot
@@ -17,7 +17,7 @@ GET All Performance Thresholds
     ...    Test title: GET All Performance Thresholds
     ...    Test objective: The objective is to test the retrieval of all the available VNF performance thresholds and perform a JSON schema validation of the collected thresholds data structure
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v3.5.1
+    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v3.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -30,7 +30,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 VNF 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 VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v3.5.1
+    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v3.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -44,7 +44,7 @@ GET Performance Thresholds with invalid attribute-based filter
     ...    Test title: GET Performance Thresholds with invalid attribute-based filter
     ...    Test objective: The objective is to test that the retrieval of VNF performance thresholds fails when using invalid attribute-based filter, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v3.5.1
+    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v3.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -56,7 +56,7 @@ GET Performance Thresholds with invalid resource endpoint
     ...    Test title: GET Performance Thresholds with invalid resource endpoint
     ...    Test objective: The objective is to test that the retrieval of VNF performance thresholds fails when using invalid resource endpoint, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v3.5.1
+    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v3.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -69,7 +69,7 @@ Create new Performance Threshold
     ...    Test title:  Create new Performance Threshold
     ...    Test objective: The objective is to test the creation of a new VNF performance threshold and perform the JSON schema validation of the returned threshold data structure
     ...    Pre-conditions: A VNF instance is instantiated.
-    ...    Reference: Clause 6.4.5.3.1 - ETSI GS NFV-SOL 003 [1] v3.5.1
+    ...    Reference: Clause 6.4.5.3.1 - ETSI GS NFV-SOL 003 [1] v3.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF Performance Threshold is successfully created on the VNFM
@@ -84,7 +84,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 VNF Performance Thresholds
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNF.
-    ...    Reference: Clause 6.4.5.3.3 - ETSI GS NFV-SOL 003 [1] v3.5.1
+    ...    Reference: Clause 6.4.5.3.3 - ETSI GS NFV-SOL 003 [1] v3.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -96,7 +96,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 VNF Performance Thresholds
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.5.3.4 - ETSI GS NFV-SOL 003 [1] v3.5.1
+    ...    Reference: Clause 6.4.5.3.4 - ETSI GS NFV-SOL 003 [1] v3.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -108,7 +108,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 VNF Performance Thresholds
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.5.3.5 - ETSI GS NFV-SOL 003 [1] v3.5.1
+    ...    Reference: Clause 6.4.5.3.5 - ETSI GS NFV-SOL 003 [1] v3.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF performance thresholds are not deleted by the failed operation
@@ -121,7 +121,7 @@ GET All Performance Thresholds as Paged Response
     ...    Test title: GET All Performance Thresholds as Paged Response
     ...    Test objective: The objective is to test the retrieval of all the available VNF performance thresholds as a Paged Response.
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v3.5.1
+    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v3.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -134,7 +134,7 @@ GET Performance Thresholds - Bad Request Response too Big
     ...    Test title: GET Performance Thresholds - Bad Request Response too Big
     ...    Test objective: The objective is to test that the retrieval of VNF performance thresholds fails because response is too big, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v3.5.1
+    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v3.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -147,7 +147,7 @@ POST create new Performance Threshold - Unprocessable Entity
     ...    Test title:  POST create new Performance Threshold - Unprocessable Entity
     ...    Test objective: The objective is to test that creation of new VNF performance threshold fails when a request contains syntactically correct data but the data cannot be processed.
     ...    Pre-conditions: A VNF instance is instantiated.
-    ...    Reference: Clause 6.4.5.3.1 - ETSI GS NFV-SOL 003 [1] v3.5.1
+    ...    Reference: Clause 6.4.5.3.1 - ETSI GS NFV-SOL 003 [1] v3.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -203,7 +203,7 @@ Send Post Request Create new Performance Threshold
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds    ${request}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
-    
+
 Send Post Request Create new Performance Threshold with unprocessable entity
     Log    trying to create a new Threshold
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
@@ -250,7 +250,7 @@ Send DELETE Request for all Performance Thresholds
 Check Postcondition Thresholds Exist
     Log    Checking that Thresholds still exists
     GET all Performance Thresholds
-    
+
 Check Postcondition Threshold Exists
     Log    Checking that Threshold exists
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
@@ -260,7 +260,7 @@ Check Postcondition Threshold Exists
     Set Suite Variable    ${response}    ${output}
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    Threshold
-        
+
 Check HTTP Response Body Thresholds match the requested attribute-based filter
     Log    Checking that attribute-based filter is matched
     #todo
diff --git a/SOL003/VNFPerformanceManagement-API/environment/variables.txt b/SOL003/VNFPerformanceManagement-API/environment/variables.txt
index 2d8ec14a78dfc8f9031cf01b6301b4c25be6919f..67a7c28a748b22832108b83cd2284e3b37e2d065 100644
--- a/SOL003/VNFPerformanceManagement-API/environment/variables.txt
+++ b/SOL003/VNFPerformanceManagement-API/environment/variables.txt
@@ -37,6 +37,7 @@ ${pmJobId}        29f4ff6a-be91-4ec8-856e-fcf1e2479e4e
 ${erroneousPmJobId}    erroneousPmJobId
 ${newPmJobId}    newPmJobId
 ${response}=    httpresponse
+${origresponse}
 
 
 ${thresholdId}    1f50d68b-82e8-4deb-bd40-c934d4d1ac0a