diff --git a/SOL005/NFVICapacityInformation-API/CapacityThresholds.robot b/SOL005/NFVICapacityInformation-API/CapacityThresholds.robot
index f914ac8b611d26cf538c5d1e18b1c9de21cf8fe4..161e3880e7b5fed10199e622c1b61a08ce3f6f47 100644
--- a/SOL005/NFVICapacityInformation-API/CapacityThresholds.robot
+++ b/SOL005/NFVICapacityInformation-API/CapacityThresholds.robot
@@ -7,7 +7,7 @@ POST Create Capacity Threshold
     ...    Test title: POST Create Capacity Threshold
     ...    Test objective: The objective is to test that POST method creates a Capacity  Threshold
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 10.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -21,7 +21,7 @@ POST Create Capacity Threshold - Unprocessible Entity
     ...    Test title: POST Create Capacity Threshold - Unprocessible Entity
     ...    Test objective: The objective is to test that POST method creates a Capacity  Threshold
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 10.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -34,7 +34,7 @@ GET Capacity Thresholds
     ...    Test title: GET Capacity Thresholds
     ...    Test objective: The objective is to GET Capacity Thresholds objects
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -47,7 +47,7 @@ GET Capacity Thresholds - Filter
     ...    Test title: GET Capacity Thresholds - Filter
     ...    Test objective: The objective is to GET Capacity Thresholds objects using filter
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -60,7 +60,7 @@ GET Capacity Thresholds Bad Request Invalid attribute-based filtering parameters
     ...    Test title: GET Capacity Thresholds Bad Request Invalid attribute-based filtering parameters
     ...    Test objective: The objective is to get information about Capacity Thresholds with Invalid attribute-based filtering parameters
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -73,7 +73,7 @@ GET Capacity Thresholds - Bad Request Response too Big
     ...    Test title: GET Capacity Thresholds - Bad Request Response too Big
     ...    Test objective: The objective is test that the retrieval of existing Capacity Thresholds list fails because response is too big, and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: NFVO does not support paged response.
     ...    Post-Conditions: none 
@@ -86,7 +86,7 @@ GET Capacity Thresholds as Paged Response
     ...    Test title: GET Capacity Thresholds as Paged Response
     ...    Test objective: The objective is to test that GET method retrieves the list of existing Capacity Thresholds as paged response.
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: NFVO supports paged response.
     ...    Post-Conditions: none    
@@ -99,7 +99,7 @@ PUT Capacity Thresholds - Method not implemented
     ...    Test title: PUT Capacity Thresholds - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions:  none
-    ...    Reference: Clause 10.4.4.3.3 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 10.4.4.3.3 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -111,7 +111,7 @@ PATCH Capacity Thresholds - Method not implemented
     ...    Test title: PATCH Capacity Thresholds - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none 
-    ...    Reference: Clause 10.4.4.3.4 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 10.4.4.3.4 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -123,7 +123,7 @@ DELETE Capacity Thresholds - Method not implemented
     ...    Test title: DELETE Capacity Thresholds - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none 
-    ...    Reference: Clause 10.4.4.3.5 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 10.4.4.3.5 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL005/NFVICapacityInformation-API/IndividualCapacityThreshold.robot b/SOL005/NFVICapacityInformation-API/IndividualCapacityThreshold.robot
index 15457a95152e4f65c0b6a30f4005a68eb1669604..7bbb7237b31f1ab277cda975f2afb5c56707fd54 100644
--- a/SOL005/NFVICapacityInformation-API/IndividualCapacityThreshold.robot
+++ b/SOL005/NFVICapacityInformation-API/IndividualCapacityThreshold.robot
@@ -7,7 +7,7 @@ POST Individual Capacity Threshold
     ...    Test title: POST Individual Capacity Threshold
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.5.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 10.4.5.3.1 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -19,7 +19,7 @@ GET Individual Capacity Thresholds
     ...    Test title: GET Capacity Thresholds
     ...    Test objective: The objective is to test that GET method reads information about Individual Capacity Threshold
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 10.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -32,7 +32,7 @@ GET Individual Capacity Thresholds - NOT FOUND
     ...    Test title: GET Capacity Thresholds - NOT FOUND
     ...    Test objective: The objective is to test that GET method returns an error when using and invalid URI
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 10.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -45,7 +45,7 @@ PUT Individual Capacity Threshold - Method not implemented
     ...    Test title: PUT Capacity Thresholds - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions:  none
-    ...    Reference: Clause 10.4.5.3.3 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 10.4.5.3.3 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -57,7 +57,7 @@ PATCH Individual Capacity Threshold - Success
     ...    Test title: PATCH Individual Capacity Threshold - Success
     ...    Test objective: The objective is to test that PATCH method successfully modifies an individual Capacity Threshold resource
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.5.3.3 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 10.4.5.3.3 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: Capacity Threshold modified
@@ -70,7 +70,7 @@ PATCH Individual Capacity Threshold - Precondition Failed
     ...    Test title: PATCH Individual Capacity Threshold - Precondition Failed
     ...    Test objective: The objective is to that the modification of individual Capacity Threshold fails because precondition given in an HTTP request header is not fulfilled due to an ETag mismatch.
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.5.3.4 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 10.4.5.3.4 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -83,7 +83,7 @@ PATCH Individual Capacity Threshold - Unprocessible Entity
     ...    Test title: PATCH Individual Capacity Threshold - Precondition Failed
     ...    Test objective: The objective is to that the modification of individual Capacity Threshold fails because callbackUri provided in the request body is unreachable.
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.5.3.4 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 10.4.5.3.4 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL005/NFVICapacityInformation-API/IndividualVIMsNFVICapacityInformation.robot b/SOL005/NFVICapacityInformation-API/IndividualVIMsNFVICapacityInformation.robot
index 1fc10029baee7ba075936b7fcbb9e8d31bf73899..e350cfb131e6e8bc46747896d65a5c4667d5a909 100644
--- a/SOL005/NFVICapacityInformation-API/IndividualVIMsNFVICapacityInformation.robot
+++ b/SOL005/NFVICapacityInformation-API/IndividualVIMsNFVICapacityInformation.robot
@@ -7,7 +7,7 @@ POST Individual VIMs NFVI Capacity Information - Method not implemented
     ...    Test title: POST Individual VIMs NFVI Capacity Information - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.3.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 10.4.3.3.1 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -19,7 +19,7 @@ GET Information about an Individual VIMs NFVI Capacity Information
     ...    Test title: GET Information about an Individual VIMs NFVI Capacity Information
     ...    Test objective: The objective is to retrieve information about Individual VIMs NFVI Capacity Information
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.3.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 10.4.3.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -32,7 +32,7 @@ GET Information about an Individual VIMs NFVI Capacity Information using filter
     ...    Test title: GET Information about an Individual VIMs NFVI Capacity Information using filter query parameter
     ...    Test objective: The objective is to retrieve information about Individual VIMs NFVI Capacity Information using filter query parameter
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.3.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 10.4.3.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -45,7 +45,7 @@ GET Information about an Individual VIMs NFVI Capacity Information - NOT FOUND
     ...    Test title: GET Information about an Individual VIMs NFVI Capacity Information - NOT FOUND
     ...    Test objective: The objective is to test that the retrieval of Individual VIMs NFVI Capacity Information fails when using an invalid resource identifier.
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.3.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 10.4.3.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -58,7 +58,7 @@ PUT Individual VIMs NFVI Capacity Information - Method not implemented
     ...    Test title: PUT Individual VIMs NFVI Capacity Information - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.3.3.3 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 10.4.3.3.3 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: VNF Snapshot Package not modified
@@ -70,7 +70,7 @@ PATCH Individual VIMs NFVI Capacity Information - Method Not implemented
     ...    Test title: PATCH Individual VIMs NFVI Capacity Information
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 10.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: VNF Snapshot Package modified
@@ -82,7 +82,7 @@ DELETE Individual VIMs NFVI Capacity Information - Method Not implemented
     ...    Test title: DELETE Individual VIMs NFVI Capacity Information - Method Not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.3.3.5 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 10.4.3.3.5 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: VNF Snapshot Package deleted
diff --git a/SOL005/NFVICapacityInformation-API/NFVICapacityInformation.robot b/SOL005/NFVICapacityInformation-API/NFVICapacityInformation.robot
index 07113ced87406da6b4196ae4bfb986bea1d8a5f6..a4bb52686547111a2908d2c1f820752ecef6c001 100644
--- a/SOL005/NFVICapacityInformation-API/NFVICapacityInformation.robot
+++ b/SOL005/NFVICapacityInformation-API/NFVICapacityInformation.robot
@@ -7,7 +7,7 @@ POST NFVI Capacity Information - Method not implemented
     ...    Test title: POST NFVI Capacity Information - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.2.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 10.4.2.3.1 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -19,7 +19,7 @@ GET NFVI Capacity Information
     ...    Test title: GET NFVI Capacity Information
     ...    Test objective: The objective is to GET NFVI Capacity Information objects
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -32,7 +32,7 @@ GET NFVI Capacity Information - Filter
     ...    Test title: GET NFVI Capacity Information - Filter
     ...    Test objective: The objective is to GET NFVI Capacity Information objects using filter
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -45,7 +45,7 @@ GET NFVI Capacity Information Bad Request Invalid attribute-based filtering para
     ...    Test title: GET NFVI Capacity Information Bad Request Invalid attribute-based filtering parameters
     ...    Test objective: The objective is to get information about NFVI Capacity Information with Invalid attribute-based filtering parameters
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -58,7 +58,7 @@ GET NFVI Capacity Information Bad Request Invalid attribute selector
     ...    Test title: GET NFVI Capacity Information Bad Request Invalid attribute selector
     ...    Test objective: The objective is to get information about NFVI Capacity Information with Invalid attribute selector
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -71,7 +71,7 @@ GET NFVI Capacity Information with "all_fields" attribute selector
     ...    Test title: GET NFVI Capacity Information with "all_fields" attribute selector
     ...    Test objective: The objective is to query NFVI Capacity Information with "all_fields" attribute selector
     ...    Pre-conditions:  none
-    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -84,7 +84,7 @@ GET NFVI Capacity Information with "exclude_default" attribute selector
     ...    Test title: GET NFVI Capacity Information with "exclude_default" attribute selector
     ...    Test objective: The objective is to query NFVI Capacity Information with "exclude_default" attribute selector
     ...    Pre-conditions:  none
-    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -97,7 +97,7 @@ GET NFVI Capacity Information with "fields" attribute selector
     ...    Test title: GET NFVI Capacity Information with "fields" attribute selector
     ...    Test objective: The objective is to query NFVI Capacity Information with "fields" attribute selector
     ...    Pre-conditions:  none
-    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -110,7 +110,7 @@ GET NFVI Capacity Information with "exclude_default" and "fields" attribute sele
     ...    Test title: GET NFVI Capacity Information with "exclude_default" and "fields" attribute selector
     ...    Test objective: The objective is to query NFVI Capacity Information with "exclude_default" and "fields" attribute selector
     ...    Pre-conditions:  none
-    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -123,7 +123,7 @@ GET NFVI Capacity Information with "exclude_fields" attribute selector
     ...    Test title: GET NFVI Capacity Information with "exclude_fields" attribute selector
     ...    Test objective: The objective is to query NFVI Capacity Information with "exclude_fields" attribute selector
     ...    Pre-conditions:  none
-    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -136,7 +136,7 @@ GET NFVI Capacity Information - Bad Request Response too Big
     ...    Test title: GET NFVI Capacity Information - Bad Request Response too Big
     ...    Test objective: The objective is test that the retrieval of existing NFVI Capacity Information list fails because response is too big, and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: NFVO does not support paged response.
     ...    Post-Conditions: none 
@@ -149,7 +149,7 @@ GET NFVI Capacity Information as Paged Response
     ...    Test title: GET NFVI Capacity Information as Paged Response
     ...    Test objective: The objective is to test that GET method retrieves the list of existing NFVI Capacity Information as paged response.
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: NFVO supports paged response.
     ...    Post-Conditions: none    
@@ -162,7 +162,7 @@ PUT NFVI Capacity Information - Method not implemented
     ...    Test title: PUT NFVI Capacity Information - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions:  none
-    ...    Reference: Clause 10.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 10.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -174,7 +174,7 @@ PATCH NFVI Capacity Information - Method not implemented
     ...    Test title: PATCH NFVI Capacity Information - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none 
-    ...    Reference: Clause 10.4.2.3.4 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 10.4.2.3.4 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -186,7 +186,7 @@ DELETE NFVI Capacity Information - Method not implemented
     ...    Test title: DELETE NFVI Capacity Information - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none 
-    ...    Reference: Clause 10.4.2.3.5 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 10.4.2.3.5 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL005/NFVICapacityInformation-API/NotificationEndpoint.robot b/SOL005/NFVICapacityInformation-API/NotificationEndpoint.robot
index 81f641fef341bd7ab264c62f0a7c2eebe113e730..d921f74a32d0cf31dda87fdfc29f4d83990fa6d1 100644
--- a/SOL005/NFVICapacityInformation-API/NotificationEndpoint.robot
+++ b/SOL005/NFVICapacityInformation-API/NotificationEndpoint.robot
@@ -8,7 +8,7 @@ Capacity Shortage Notification
     ...    Test title: Capacity Shortage Notification
     ...    Test objective: The objective is to test that Capacity Shortage Notification is delivered with success to the notification consumer.
     ...    Pre-conditions: The consumer has already created an Individual Capacity Threshold resource
-    ...    Reference: Clause 10.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 10.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -20,7 +20,7 @@ Test the Notification Endpoint - Successful
     ...    Test title: Test the Notification Endpoint - Successful
     ...    Test objective: The objective is to test the Notification Endpoint provided by the notification consumer.
     ...    Pre-conditions: The consumer has already created an Individual Capacity Threshold resource
-    ...    Reference: Clause 10.4.6.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 10.4.6.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -32,7 +32,7 @@ Test the Notification Endpoint - UNREACHABLE
     ...    Test title: Test the Notification Endpoint - UNREACHABLE
     ...    Test objective: The objective is to test the Notification Endpoint provided by the notification consumer.
     ...    Pre-conditions: The consumer has already created an Individual Capacity Threshold resource
-    ...    Reference: Clause 10.4.6.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 10.4.6.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: The notification endpoint is unreachable by the API producer.
     ...    Post-Conditions: none 
@@ -45,7 +45,7 @@ PUT Notification endpoint - Method Not Implemented
     ...    Test title: PUT Notification endpoint - Method Not Implemented
     ...    Test objective: The objective is to test the PUT method for Notification Endpoint provided by the consumer is not implemented.
     ...    Pre-conditions: A notification endpoint is provided by the API consumer upon subscription.
-    ...    Reference: Clause 10.4.6.3.3 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 10.4.6.3.3 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -57,7 +57,7 @@ PATCH Notification endpoint - Method Not Implemented
     ...    Test title: PATCH Notification endpoint - Method Not Implemented
     ...    Test objective: The objective is to test the PATCH method for Notification Endpoint provided by the consumer is not implemented.
     ...    Pre-conditions: A notification endpoint is provided by the API consumer upon subscription.
-    ...    Reference: Clause 10.4.6.3.4 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 10.4.6.3.4 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -69,7 +69,7 @@ DELETE Notification endpoint - Method Not Implemented
     ...    Test title: DELETE Notification endpoint - Method Not Implemented
     ...    Test objective: The objective is to test the DELETE method for Notification Endpoint provided by the consumer is not implemented.
     ...    Pre-conditions: A notification endpoint is provided by the API consumer upon subscription.
-    ...    Reference: Clause 10.4.6.3.5 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 10.4.6.3.5 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL005/NFVICapacityInformation-API/environment/variables.txt b/SOL005/NFVICapacityInformation-API/environment/variables.txt
index c27cc8636e85d3f863d0ba244c546200c49788cd..d5ee2bb0c86df5df96262559ea20fd6efb3a75a4 100644
--- a/SOL005/NFVICapacityInformation-API/environment/variables.txt
+++ b/SOL005/NFVICapacityInformation-API/environment/variables.txt
@@ -7,8 +7,6 @@ ${AUTHORIZATION_TOKEN}    Bearer 0b79bab50daca910b000d4f1a2b675d604257e42
 ${ACCEPT_JSON}    application/json
 ${AUTH_USAGE}     1
 ${CONTENT_TYPE_JSON}    application/json
-${NEG_AUTHORIZATION}    Bearer negativetoken
-${NFVO_FIELDS}    1
 
 ${CONTENT_TYPE_PATCH}    application/merge-patch+json
 
@@ -19,75 +17,19 @@ ${apiRoot}        /
 ${apiMajorVersion}     v1
 ${apiName}        nfvici
 
-${NFVO_CHECKS_NOTIF_ENDPOINT}    1        ## If true, during subscription, the FUT performs a get to the notification endpoint
-
-${NFVO_ALLOWS_DUPLICATE_SUBS}    1
-
 ${PAGING_SUPPORTED}    1
 
 ${response}    httpresponse
 
-${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
 
 ${callback_uri}    http://localhost
-${callback_port}    9091
-${callback_endpoint}    /endpoint
-${callback_endpoint_fwd}    /endpoint/check
-${callback_endpoint_error}    /endpoint_404
-${sleep_interval}    20s
-${total_polling_time}   2 min
-${polling_interval}     10 sec
 ${new_callback_uri}    http://newcallbackuri/for/modifications
 ${unreachable_callback_uri}    http://unreachable/endpoint
 
-${notification_request}    []
-${notification_response}    []
-
-${NFVO_non-MANO_OK}    1    # If 1 means that non-MANO artifacts are supported by the NFVO
-${non_mano_artifact_sets}    
-
-
-${subscriptionId}    f3ae6df7-07e1-47c9-8924-9ebe10343586
-${erroneousSubscriptionId}    442e3ee5-0499-4849-9b31-eb91ce1638f1    # Not existing ID on the subscriptions
-${newSubscriptionId}    newSubsciptionId
-
-${origResponse}    httpresponse
-
-${filter_ok}      callbackUri=http://172.22.1.7:9091/vnfpkgm/subscriptions
-${filter_ko}      nfvId=f9f130e4-05eb-4082-a676-4c97d13a883d    # Not existant filter attribute-based
-${SEPERATOR}      =
-
-
-${ACCEPT_PLAIN}    text/plain
-${CONTENT_TYPE_PLAIN}    text/plain
-${vnfPkgPlainVNFD}    c26ad7fb-072b-48c4-a663-7d71646d9e98    # The VNF Pakcage contains a VNFD which is a Single Plain File
-${ACCEPT_ZIP}     application/zip
-${ACCEPT_OCTET}    application/octet-stream
-${CONTENT_TYPE_ZIP}    application/zip
-${vnfPkgZipVNFD}    f5b220d4-6177-4ebb-a554-a43311e16075    # The VNF Package contains a VNFD composed by multiple files
-${erroneousVnfPkgId}    erroneousVnfPackageId    # Given ID for vnfPkg not present in database
-${vndIdZipVnfd}       f5b220d4-6177-4ebb-a554-a43311e16075 
-
-
-${artifactPath}    artifactPath
-${CONTENT_TYPE_OCTET}    application/octet-stream
-${NFVO_RANGE_OK}    1    # If 1 means that Range is supported by the NFVO
-${range}          bytes=0-1023
-${full_size}        2000            # Size of the requested artifact to be downloaded via partial downloads
-${erroneousRange}    bytes=10000000-1000000000    # Requesting a out of range number of bytes
-${vnfPackageOctetStreamId}    octetStreamPkgId
-${vnfdOctetStreamId}    octetStreamVnfdId
-${vndEncryptedArtifactID}    encryptedId
-
-
-${length}          1024
-
 ${POS_FILTER_info}     vimId=41fdd38a-3d4c-465c-83e0-f80e014425f8 ,resourceType=VR_COMPUTE    # Positive case, suing compiant fields name for filtering get request
 ${POS_FILTER_threshold}     id=41fdd38a-3d4c-465c-83e0-f80e014425f8    # Positive case, suing compiant fields name for filtering get request
 ${NEG_FILTER}     nfvId=41fdd38a-3d4c-465c-83e0-f80e014425f8    # Negative case, using wrong name of field
 ${fields_capacityInfo}         timeInterval
-${fields_capacityThreshold}         subObjectInstanceIds
-${VAR_SEPERATOR}    &
 
 ${callbackResp}    localhost