diff --git a/SOL005/NSDManagement-API/IndividualNSDescriptor.robot b/SOL005/NSDManagement-API/IndividualNSDescriptor.robot
index 9f7cca79413d9dec6ad80b46a0da2a1b134c4477..57a8b713b652a8c6b5e10f38384a36bf7582430e 100644
--- a/SOL005/NSDManagement-API/IndividualNSDescriptor.robot
+++ b/SOL005/NSDManagement-API/IndividualNSDescriptor.robot
@@ -15,7 +15,7 @@ GET Individual Network Service Descriptor Information
     ...    Test title: GET Individual Network Service Descriptor Information
     ...    Test objective: The objective is to test the retrieval of an individual Network Service Descriptor information and perform a JSON schema validation of the collected data structure
     ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO.
-    ...    Reference: clause 5.4.3.3.2 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.3.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -25,27 +25,24 @@ GET Individual Network Service Descriptor Information
     Check HTTP Response Header Contains ETag
     Check HTTP Response Body NsdInfo Identifier matches the requested Network Service Descriptor Information
 
-
 GET Individual Network Service Descriptor Information with invalid resource identifier
     [Documentation]    Test ID: 5.3.1.2.2
     ...    Test title: GET Individual Network Service Descriptor Information with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of an individual Network Service Descriptor Information fails when using an invalid resource identifier
     ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO.
-    ...    Reference: clause 5.4.3.3.2 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.3.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
     GET Individual Network Service Descriptor Information with invalid resource identifier
     Check HTTP Response Status Code Is    404
 
-
-
 Disable Individual Network Service Descriptor   
     [Documentation]    Test ID: 5.3.1.2.3
     ...    Test title: Disable Individual Network Service Descriptor  
     ...    Test objective: The objective is to test the disabling of an individual Network Service Descriptor and perform a JSON schema and content validation of the collected data structure
     ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO in enabled operational state.
-    ...    Reference: clause 5.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The Network Service Descriptor is in operational state DISABLED and usage state is not modified
@@ -60,7 +57,7 @@ Enable Individual Network Service Descriptor
     ...    Test title: Enable Individual Network Service Descriptor
     ...    Test objective: The objective is to test the enabling of an individual Network Service Descriptor and perform a JSON schema and content validation of the collected data structure
     ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO in DISABLED operational state (Test ID 5.3.1.2.3).
-    ...    Reference: clause 5.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The Network Service Descriptor is in operational state ENABLED and usage state is not modified
@@ -75,7 +72,7 @@ Enable Individual Network Service Descriptor with conflict due to operational st
     ...    Test title: Enable Individual Network Service Descriptor with conflict due to operational state ENABLED
     ...    Test objective: The objective is to test that enabling an individual Network Service Descriptor that is already in ENABLED operational state failsand perform a JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO in ENABLED operational state (Test ID 5.3.1.2.4).
-    ...    Reference: clause 5.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -88,7 +85,7 @@ Enable Individual Network Service Descriptor with conflict due to onboarding sta
     ...    Test title: Enable Individual Network Service Descriptor with conflict due to onboarding state
     ...    Test objective: The objective is to test that the retrieval of an Network Service Descriptor fails due to a conflict when the Network Service Descriptor is not in onboarding state ONBOARDED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO in ENABLED operational state. The onboarding state of the Network Service Descriptor for which the enabling is requested is different from ONBOARDED.
-    ...    Reference: clause 5.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -101,7 +98,7 @@ Enable Individual Network Service Descriptor with conflict due to onboarding sta
     ...    Test title:  Enable Individual Network Service Descriptor with HTTP Etag precondition failure
     ...    Test objective: The objective is to test that the retrieval of an Network Service Descriptor fails due to a precondition failure when using an uncorrect Http Etag identified.
     ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO in ENABLED operational state (Test ID 5.3.1.2.4).
-    ...    Reference: clause 5.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -113,7 +110,7 @@ DELETE Individual Network Service Descriptor
     ...    Test title:  DELETE Individual Network Service Descriptor
     ...    Test objective: The objective is to test the deletion of an individual Network Service Descriptor.
     ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO in DISABLED operational state and NOT_IN_USE usage state.
-    ...    Reference: clause 5.4.3.3.5 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.3.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The Network Service Descriptor is not available anymore in the NFVO 
@@ -126,7 +123,7 @@ DELETE Individual Network Service Descriptor in operational state ENABLED
     ...    Test title:  DELETE Individual Network Service Descriptor in operational state ENABLED
     ...    Test objective: The objective is to test that the deletion of an individual Network Service Descriptor in operational state ENABLED fails. The test also performs a JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO in ENABLED operational state (Test ID 5.3.1.2.4).
-    ...    Reference: clause 5.4.3.3.5 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.3.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The Network Service Descriptor is not deleted by the failed operation. 
@@ -140,7 +137,7 @@ POST Individual Network Service Descriptor - Method not implemented
     ...    Test title: POST Individual Network Service Descriptor - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new Network Service Descriptor
     ...    Pre-conditions: none
-    ...    Reference: clause 5.4.3.3.1 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.3.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -152,7 +149,7 @@ PUT Individual Network Service Descriptor - Method not implemented
     ...    Test title: PUT Individual Network Service Descriptor - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify a new Network Service Descriptor
     ...    Pre-conditions: none
-    ...    Reference: clause 5.4.3.3.3 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.3.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL005/NSDManagement-API/IndividualPnfDescriptor.robot b/SOL005/NSDManagement-API/IndividualPnfDescriptor.robot
index a80a24487f9905dbd99365866a9ae7b873db35bc..6a516a959fe0b0cd31542d65ad7bddd15fda59d0 100644
--- a/SOL005/NSDManagement-API/IndividualPnfDescriptor.robot
+++ b/SOL005/NSDManagement-API/IndividualPnfDescriptor.robot
@@ -14,7 +14,7 @@ GET Individual PNF Descriptor Information
     ...    Test title: GET Individual PNF Descriptor Information
     ...    Test objective: The objective is to test the retrieval of an individual PNF Descriptor information and perform a JSON schema validation of the collected data structure
     ...    Pre-conditions: One or more PNF Descriptors are onboarded in the NFVO.
-    ...    Reference: clause 5.4.6.3.2 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.6.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -29,7 +29,7 @@ GET Individual PNF Descriptor Information with invalid resource identifier
     ...    Test title: GET Individual PNF Descriptor Information with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of an individual PNF Descriptor Information fails when using an invalid resource identifier
     ...    Pre-conditions: One or more PNF Descriptors are onboarded in the NFVO.
-    ...    Reference: clause 5.4.6.3.2 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.6.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -41,7 +41,7 @@ Update Individual PNF Descriptor
     ...    Test title: Update Individual PNF Descriptor
     ...    Test objective: The objective is to test the update of an individual PNF Descriptor and perform a JSON schema and content validation of the collected data structure
     ...    Pre-conditions: One or more PNF Descriptors are onboarded in the NFVO.
-    ...    Reference: clause 5.4.6.3.4 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.6.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The PNF Descriptor is modified according to the update request
@@ -56,7 +56,7 @@ Update Individual PNF Descriptor with HTTP Etag precondition failure
     ...    Test title:  Update Individual PNF Descriptor with HTTP Etag precondition failure
     ...    Test objective: The objective is to test that the update of a PNF Descriptor fails due to a precondition failure when using an uncorrect Http Etag identified.
     ...    Pre-conditions: One or more PNF Descriptors are onboarded in the NFVO.
-    ...    Reference: clause 5.4.6.3.4 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.6.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -68,7 +68,7 @@ POST Individual PNF Descriptor - Method not implemented
     ...    Test title: POST Individual PNF Descriptor - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new PNF Descriptor
     ...    Pre-conditions: none
-    ...    Reference: clause 5.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -80,7 +80,7 @@ PUT Individual PNF Descriptor - Method not implemented
     ...    Test title: PUT Individual PNF Descriptor - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify a new PNF Descriptor
     ...    Pre-conditions: One or more PNF Descriptors are onboarded in the NFVO.
-    ...    Reference: clause 5.4.6.3.3 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.6.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -92,7 +92,7 @@ DELETE Individual PNF Descriptor
     ...    Test title:  DELETE Individual PNF Descriptor
     ...    Test objective: The objective is to test the deletion of an individual PNF Descriptor.
     ...    Pre-conditions: One or more PNF Descriptors are onboarded in the NFVO.
-    ...    Reference: clause 5.4.6.3.5 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.6.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The PNF Descriptor is not available anymore in the NFVO 
diff --git a/SOL005/NSDManagement-API/IndividualSubscription.robot b/SOL005/NSDManagement-API/IndividualSubscription.robot
index 3e452b1163739223d92349bc779afe1723d736b3..923b9d96818ef5ef38f4be096a17c7465e794caf 100644
--- a/SOL005/NSDManagement-API/IndividualSubscription.robot
+++ b/SOL005/NSDManagement-API/IndividualSubscription.robot
@@ -13,7 +13,7 @@ GET Individual NSD Management Subscription
     ...    Test title: GET Individual NSD Management Subscription
     ...    Test objective: The objective is to test the retrieval of individual NSD Management subscription and perform a JSON schema and content validation of the returned subscription data structure
     ...    Pre-conditions: At least one NSD Management subscription is available in the NFVO.
-    ...    Reference: clause 5.4.9.3.2 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.9.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -27,7 +27,7 @@ GET Individual NSD Management Subscription with invalid resource identifier
     ...    Test title: GET Individual NSD Management Subscription with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of an individual NSD Management subscription fails when using an invalid resource identifier
     ...    Pre-conditions: At least one NSD Management subscription is available in the NFVO.
-    ...    Reference: clause 5.4.9.3.2 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.9.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -39,7 +39,7 @@ DELETE Individual NSD Management Subscription with invalid resource identifier
     ...    Test title: DELETE Individual NSD Management Subscription with invalid resource identifier
     ...    Test objective: The objective is to test that the deletion of an individual NSD Management subscription fails when using an invalid resource identifier
     ...    Pre-conditions: At least one NSD Management subscription is available in the NFVO.
-    ...    Reference: clause 5.4.9.3.5 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.9.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -51,7 +51,7 @@ POST Individual NSD Management Subscription - Method not implemented
     ...    Test title: POST Individual NSD Management Subscription - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new NSD Management Subscription
     ...    Pre-conditions: none
-    ...    Reference: clause 5.4.9.3.1 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.9.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NSD Management Subscription is not created on the NFVO
@@ -64,7 +64,7 @@ PUT Individual NSD Management Subscription - Method not implemented
     ...    Test title: PUT Individual NSD Management Subscription - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to update an existing NSD Management subscription
     ...    Pre-conditions: At least one NSD Management subscription is available in the NFVO.
-    ...    Reference: clause 5.4.9.3.3 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.9.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NSD Management subscription is not modified by the operation
@@ -77,7 +77,7 @@ PATCH Individual NSD Management Subscription - Method not implemented
     ...    Test title: PATCH Individual NSD Management Subscription - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to modify an existing NSD Management subscription
     ...    Pre-conditions: At least one NSD Management subscription is available in the NFVO.
-    ...    Reference: clause 5.4.9.3.4 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.9.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NSD Management subscription is not modified by the operation
@@ -90,7 +90,7 @@ DELETE Individual NSD Management Subscription
     ...    Test title: DELETE Individual NSD Management Subscription
     ...    Test objective: The objective is to test the deletion of an individual NSD Management subscription
     ...    Pre-conditions: At least one NSD Management subscription is available in the NFVO.
-    ...    Reference: clause 5.4.9.3.5 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.9.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NSD Management Subscription is not available anymore in the NFVO    
diff --git a/SOL005/NSDManagement-API/NSDContent.robot b/SOL005/NSDManagement-API/NSDContent.robot
index 40f5298543e7838ca271cd27420cd5be6ea1103b..d8b42047c13bfc75e1d30fa82345afab23dfe34c 100644
--- a/SOL005/NSDManagement-API/NSDContent.robot
+++ b/SOL005/NSDManagement-API/NSDContent.robot
@@ -14,7 +14,7 @@ Get single file NSD Content in Plain Format
     ...    Test title: Get single file NSD Content in Plain Format
     ...    Test objective: The objective is to test the retrieval of the NSD Content in plain format and perform a validation that returned content is in plain format
     ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
-    ...    Reference: clause 5.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NSD is implemented as a single file
     ...    Post-Conditions: none
@@ -27,7 +27,7 @@ Get NSD Content in Zip Format
     ...    Test title: Get NSD Content in Zip Format
     ...    Test objective: The objective is to test the retrieval of the NSD Content in zip format and perform a validation that returned content is in zip format
     ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
-    ...    Reference: clause 5.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -40,7 +40,7 @@ Get single file NSD Content in Plain or Zip Format
     ...    Test title: Get single file NSD Content in Plain or Zip Format
     ...    Test objective: The objective is to test the retrieval of the single file NSD Content when requesting Plain or Zip format to NFVO by including both formats in the request, and perform a validation that returned content is in Plain or Zip format
     ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
-    ...    Reference: clause 5.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NSD Content is implemented as a single file
     ...    Post-Conditions: none
@@ -53,7 +53,7 @@ Get multi file NSD Content in Plain or Zip Format
     ...    Test title: Get multi file NSD Content in Plain or Zip Format
     ...    Test objective: The objective is to test the retrieval of the multi file NSD Content when requesting Plain or Zip format to NFVO by including both formats in the request, and perform a validation that returned content is in Zip format
     ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
-    ...    Reference: clause 5.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NSD is implemented as a multi file
     ...    Post-Conditions: none
@@ -66,7 +66,7 @@ Get multi file NSD Content in Plain Format
     ...    Test title: Get multi file NSD Content in Plain Format
     ...    Test objective: The objective is to test that the retrieval of the multi file NSD Content fails when requesting it in Plain format, and perform a validation of the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
-    ...    Reference: clause 5.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NSD Content is implemented as a multi file
     ...    Post-Conditions: none
@@ -79,7 +79,7 @@ Get NSD Content with invalid resource identifier
     ...    Test title: Get NSD Content with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of the NSD Content fails when using an invalid resource identifier
     ...    Pre-conditions: none
-    ...    Reference: clause 5.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -91,7 +91,7 @@ Get NSD Content with conflict due to onboarding state
     ...    Test title: Get NSD Content with conflict due to onboarding state
     ...    Test objective: The objective is to test that the retrieval of the NSD Content fails due to a conflict when the NSD is not in onboarding state ONBOARDED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: The onboarding state of the NSD for which the NSD Content is requested is different from ONBOARDED.
-    ...    Reference: clause 5.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -104,7 +104,7 @@ GET NSD Content with Range Request and NFVO supporting Range Requests
     ...    Test title: GET NSD Content with Range Request and NFVO supporting Range Requests
     ...    Test objective: The objective is to test the retrieval of NSD Content when using a range request to return single range of bytes from the file, with the NFVO supporting it. The test also perform a validation that returned content matches the issued range
     ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
-    ...    Reference: clause 5.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO supports range requests to return single range of bytes from the NSD file
     ...    Post-Conditions: none
@@ -119,7 +119,7 @@ GET NSD Content with Range Request and NFVO not supporting Range Requests
     ...    Test title: GET NSD Content with Range Request and NFVO not supporting Range Requests
     ...    Test objective: The objective is to test that the retrieval of NSD Content, when using a range request to return single range of bytes from the file and the NFVO not supporting it, returns the full NSD file.
     ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
-    ...    Reference: clause 5.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO does not support range requests to return single range of bytes from the NSD file
     ...    Post-Conditions: none    
@@ -132,7 +132,7 @@ GET NSD Content with invalid Range Request
     ...    Test title: GET NSD Content with invalid Range Request
     ...    Test objective: The objective is to test that the retrieval of NSD Content fails when using a range request that does not match any available byte range in the file.
     ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
-    ...    Reference: clause 5.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO supports range requests to return single range of bytes from the NSD file
     ...    Post-Conditions: none      
@@ -144,7 +144,7 @@ Upload NSD Content as Zip file in asynchronous mode
     ...    Test title: Upload NSD Content as Zip file in asynchronous mode
     ...    Test objective: The objective is to test the upload of an NSD Content in Zip format when the NFVO supports the asynchronous upload mode.
     ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
-    ...    Reference: clause 5.4.4.3.4 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.4.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO supports the upload of NSD contents in asynchronous mode
     ...    Post-Conditions: NSD Uploaded
@@ -158,7 +158,7 @@ Upload NSD Content as plain text file in asynchronous mode
     ...    Test title: Upload NSD Content as plain text file in asynchronous mode
     ...    Test objective: The objective is to test the upload of an NSD Content in plain text format when the NFVO supports the asynchronous upload mode.
     ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
-    ...    Reference: clause 5.4.4.3.4 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.4.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO supports the upload of NSD contents in asynchronous mode
     ...    Post-Conditions: none
@@ -171,7 +171,7 @@ Upload NSD Content as Zip file in synchronous mode
     ...    Test title: Upload NSD Content as Zip file in synchronous mode
     ...    Test objective: The objective is to test the upload of an NSD Content in Zip format when the NFVO supports the synchronous upload mode.
     ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
-    ...    Reference: clause 5.4.4.3.4 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.4.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO supports the upload of NSD contents in synchronous mode
     ...    Post-Conditions: The NSD content is successfully uploaded and available in the NFVO
@@ -184,7 +184,7 @@ Upload NSD Content as plain text file in synchronous mode
     ...    Test title: Upload NSD Content as plain text file in synchronous mode
     ...    Test objective: The objective is to test the upload of an NSD Content in plain text format when the NFVO supports the synchronous upload mode.
     ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
-    ...    Reference: clause 5.4.4.3.4 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.4.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO supports the upload of NSD contents in synchronous mode
     ...    Post-Conditions: The NSD content is successfully uploaded and available in the NFVO
@@ -198,7 +198,7 @@ Upload NSD Content with conflict due to onboarding state
     ...    Test title: Upload NSD Content with conflict due to onboarding state
     ...    Test objective: The objective is to test that the upload of the NSD Content fails due to a conflict when the NSD is not in onboarding state CREATED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: The onboarding state of the NSD for which the NSD Content is requested is different from ONBOARDED.
-    ...    Reference: clause 5.4.4.3.4 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.4.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -211,7 +211,7 @@ POST NSD Content - Method not implemented
     ...    Test title: POST NSD Content - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new Network Service Descriptor content
     ...    Pre-conditions: none
-    ...    Reference: clause 5.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -219,11 +219,11 @@ POST NSD Content - Method not implemented
     Check HTTP Response Status Code Is    405
 
 PATCH NSD Content - Method not implemented
-    [Documentation]    Test ID: 5.3.1.3.16
+    [Documentation]    Test ID: 5.3.1.3.17
     ...    Test title: PATCH NSD Content - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update Network Service Descriptor content
     ...    Pre-conditions: none
-    ...    Reference: clause 5.4.4.3.4 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.4.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -231,11 +231,11 @@ PATCH NSD Content - Method not implemented
     Check HTTP Response Status Code Is    405
 
 DELETE NSD Content - Method not implemented
-    [Documentation]    Test ID: 5.3.1.3.17
+    [Documentation]    Test ID: 5.3.1.3.18
     ...    Test title: DELETE NSD Content - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete Network Service Descriptor content
     ...    Pre-conditions: none
-    ...    Reference: clause 5.4.4.3.5 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.4.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NSD content is not deleted by the failed operation
diff --git a/SOL005/NSDManagement-API/NSDManagementKeywords.robot b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
index c6888eedc1c1e0e7a6c7e221b404990ba01f0048..f91c81b876561409be112e7ad76eb4488887c959 100644
--- a/SOL005/NSDManagement-API/NSDManagementKeywords.robot
+++ b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
@@ -1036,17 +1036,19 @@ Check HTTP Response Header Contains Etag
     Log    Header is present
     Set Suite Variable    ${original_etag}    ${response['headers]['ETag']}
 
-
 Create Sessions
     Pass Execution If    ${NFVO_CHECKS_NOTIF_ENDPOINT} == 0    MockServer not started as NFVO is not checking the notification endpoint
     Start Process  java  -jar  ${MOCK_SERVER_JAR}    -serverPort  ${callback_port}  alias=mockInstance
     Wait For Process  handle=mockInstance  timeout=5s  on_timeout=continue
     Create Mock Session  ${callback_uri}
-    
-    
+       
 Check Notification Endpoint
     &{notification_request}=  Create Mock Request Matcher	GET  ${callback_endpoint}    
     &{notification_response}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}
     Wait Until Keyword Succeeds    ${total_polling_time}   ${polling_interval}   Verify Mock Expectation    ${notification_request}
     Clear Requests  ${callback_endpoint}
+
+Check LINK in Header
+    ${linkURL}=    Get Value From Json    ${response.headers}    $..Link
+    Should Not Be Empty    ${linkURL}
diff --git a/SOL005/NSDManagement-API/NSDManagementNotification.robot b/SOL005/NSDManagement-API/NSDManagementNotification.robot
index 88a901f4e1e0260ed57a2d296159479aa41d6f33..8cad24909b3b2e2ec37265588a9ffdc13ed4a653 100644
--- a/SOL005/NSDManagement-API/NSDManagementNotification.robot
+++ b/SOL005/NSDManagement-API/NSDManagementNotification.robot
@@ -16,7 +16,7 @@ NSD Onboarding Notification
     ...    Test title: NSD Onboarding Notification
     ...    Test objective: The objective is to test the dispatch of NSD Onboarding notification when the NSD onboarding operation is successfully completed, 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 NSD management subscription for onboarding notifications is available in the NFVO.
-    ...    Reference: clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -29,7 +29,7 @@ NSD Onboarding Failure Notification
     ...    Test title: NSD Onboarding Failure Notification
     ...    Test objective: The objective is to test the dispatch of NSD Onboarding failure notification when the NSD onboarding operation fails, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A NSD management subscription for onboarding failure notifications is available in the NFVO.
-    ...    Reference: clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -42,7 +42,7 @@ NSD Operational State Change Notification
     ...    Test title: NSD Operational State Change Notification
     ...    Test objective: The objective is to test the dispatch of NSD Operational State Change notification when the NSD operational status change 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 NSD management subscription for operational state change notifications is available in the NFVO.
-    ...    Reference: clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -55,7 +55,7 @@ NSD Deletion Notification
     ...    Test title: NSD Deletion Notification
     ...    Test objective: The objective is to test the dispatch of NSD Deletion notification when the NSD is deleted from 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 NSD management subscription for deletion notifications is available in the NFVO.
-    ...    Reference: clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -68,7 +68,7 @@ PNFD Onboarding Notification
     ...    Test title: PNFD Onboarding Notification
     ...    Test objective: The objective is to test the dispatch of PNFD Onboarding notification when the PNFD onboarding operation is successfully completed, 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 PNFD management subscription for onboarding notifications is available in the NFVO.
-    ...    Reference: clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -81,7 +81,7 @@ PNFD Onboarding Failure Notification
     ...    Test title: PNFD Onboarding Failure Notification
     ...    Test objective: The objective is to test the dispatch of PNFD Onboarding failure notification when the PNFD onboarding operation fails, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A PNFD management subscription for onboarding failure notifications is available in the NFVO.
-    ...    Reference: clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -94,7 +94,7 @@ PNFD Deletion Notification
     ...    Test title: PNFD Deletion Notification
     ...    Test objective: The objective is to test the dispatch of PNFD Deletion notification when the PNFD is deleted from 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 PNFD management subscription for deletion notifications is available in the NFVO.
-    ...    Reference: clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL005/NSDManagement-API/NSDescriptors.robot b/SOL005/NSDManagement-API/NSDescriptors.robot
index 99b7fd405248d0affdcb324f843f1752e02cc881..b723e31aa9f110f7b891f027501e0fd956cf4159 100644
--- a/SOL005/NSDManagement-API/NSDescriptors.robot
+++ b/SOL005/NSDManagement-API/NSDescriptors.robot
@@ -14,7 +14,7 @@ GET all Network Service Descriptors Information
     ...    Test title: GET all Network Service Descriptors Information
     ...    Test objective: The objective is to test the retrieval of all the Network Service Descriptors information and perform a JSON schema and content validation of the collected data structure
     ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO
-    ...    Reference: clause 5.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -27,7 +27,7 @@ GET Network Service Descriptors Information with attribute-based filter
     ...    Test title: GET Network Service Descriptors Information with attribute-based filter
     ...    Test objective: The objective is to test the retrieval of Network Service Descriptors information using attribute-based filter, perform a JSON schema validation of the collected data structure, and verify that the retrieved information matches the issued attribute-based filter
     ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO
-    ...    Reference: clause 5.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -41,7 +41,7 @@ GET Network Service Descriptors Information with invalid attribute-based filter
     ...    Test title: GET Network Service Descriptors Information with invalid attribute-based filter
     ...    Test objective: The objective is to test that the retrieval of Network Service Descriptors information fails when using invalid attribute-based filter, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO
-    ...    Reference: clause 5.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -54,7 +54,7 @@ Get all Network Service Descriptors Information with malformed authorization tok
     ...    Test title: Get all Network Service Descriptors Information with malformed authorization token
     ...    Test objective: The objective is to test that the retrieval of Network Service Descriptors Information fails when using malformed authorization token
     ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO
-    ...    Reference: clause 4.5.3.3, 5.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO requires the usage of access tokens for authorizing the API requests.
     ...    Post-Conditions: none
@@ -66,7 +66,7 @@ Get all Network Service Descriptors Information without authorization token
     ...    Test title: Get all Network Service Descriptors Information without authorization token
     ...    Test objective: The objective is to test that the retrieval of Network Service Descriptors Information fails when omitting the authorization token
     ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO
-    ...    Reference: clause 4.5.3.3, 5.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO requires the usage of access tokens for authorizing the API requests.
     ...    Post-Conditions: none
@@ -78,7 +78,7 @@ GET all Network Service Descriptors Information with expired or revoked authoriz
     ...    Test title: GET all Network Service Descriptors Information with expired or revoked authorization token
     ...    Test objective: The objective is to test that the retrieval of Network Service Descriptors Information fails when using expired or revoked authorization token
     ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO
-    ...    Reference: clause 4.5.3.3, 5.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO requires the usage of access tokens for authorizing the API requests.
     ...    Post-Conditions: none
@@ -90,7 +90,7 @@ GET all Network Service Descriptors Information with "all_fields" attribute sele
     ...    Test title: GET all Network Service Descriptors Information with "all_fields" attribute selector
     ...    Test objective: The objective is to test the retrieval of all Network Service Descriptors Information with "all_fields" attribute selector, perform a JSON schema validation of the collected data structure, and verify that the retrieved information matches the issued "all_fileds" selector
     ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO
-    ...    Reference: clause 4.3.3.2.1, 5.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -104,7 +104,7 @@ GET all Network Service Descriptors Information with "exclude_default" attribute
     ...    Test title: GET all Network Service Descriptors Information with "exclude_default" attribute selector
     ...    Test objective: The objective is to test the retrieval of all Network Service Descriptors Information with "exclude_default" attribute selector, perform a JSON schema validation of the collected data structure, and verify that the retrieved information matches the issued "exclude_default" selector
     ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO
-    ...    Reference: clause 4.3.3.2.1, 5.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -118,7 +118,7 @@ GET all Network Service Descriptors Information with "fields" attribute selector
     ...    Test title: GET all Network Service Descriptors Information with "fields" attribute selector
     ...    Test objective: The objective is to test the retrieval of all Network Service Descriptors Information with "fields" attribute selector, perform a JSON schema validation of the collected data structure, and verify that the retrieved information matches the issued "fields" selector
     ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO
-    ...    Reference: clause 4.3.3.2.1, 5.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO supports the use of "fields" attribute selector
     ...    Post-Conditions: none
@@ -132,7 +132,7 @@ GET all Network Service Descriptors Information with "exclude_fields" attribute
     ...    Test title: GET all Network Service Descriptors Information with "exclude_fields" attribute selector
     ...    Test objective: The objective is to test the retrieval of all Network Service Descriptors Information with "exclude_fields" attribute selector, perform a JSON schema validation of the collected data structure, and verify that the retrieved information matches the issued "exclude_fields" selector
     ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO
-    ...    Reference: clause 4.3.3.2.1, 5.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO supports the use of "exclude_fields" attribute selector
     ...    Post-Conditions: none
@@ -146,7 +146,7 @@ Create new Network Service Descriptor Resource
     ...    Test title:  Create new Network Service Descriptor Resource
     ...    Test objective: The objective is to test the creation of a new Create new Network Service Descriptor resource and perform the JSON schema validation of the returned structure
     ...    Pre-conditions: none
-    ...    Reference: clause 5.4.2.3.1 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.2.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The Network Service Descriptor resource is successfully created on the NFVO
@@ -161,7 +161,7 @@ PUT all Network Service Descriptors - Method not implemented
     ...    Test title: PUT all Network Service Descriptors Information - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify Network Service Descriptors Information
     ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO
-    ...    Reference: clause 5.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -173,7 +173,7 @@ PATCH all Network Service Descriptors - Method not implemented
     ...    Test title: PATCH all Network Service Descriptors Information - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update Network Service Descriptors Information
     ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO
-    ...    Reference: clause 5.4.2.3.4 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.2.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -185,10 +185,36 @@ DELETE all Network Service Descriptors - Method not implemented
     ...    Test title: DELETE all Network Service Descriptors Information - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete Network Service Descriptors Information
     ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO
-    ...    Reference: clause 5.4.2.3.5 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.2.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The Network Service Descriptors are not deleted by the failed operation
     Send DELETE Request for all Network Service Descriptors
     Check HTTP Response Status Code Is    405
     Check Postcondition Network Service Descriptors Exist
+    
+GET all Network Service Descriptors Information as Paged Response
+    [Documentation]    Test ID: 5.3.1.1.15
+    ...    Test title: GET all Network Service Descriptors Information as Paged Response
+    ...    Test objective: The objective is to test the retrieval of all the Network Service Descriptors information as a Paged Response.
+    ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO
+    ...    Reference: clause 5.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    GET all Network Service Descriptors Information
+    Check HTTP Response Status Code Is    200
+    Check LINK in Header
+
+Get all Network Service Descriptors Information - Bad Request Response too Big
+    [Documentation]    Test ID: 5.3.1.1.16
+    ...    Test title: Get all Network Service Descriptors Information - Bad Request Response too Big
+    ...    Test objective: The objective is to test that the retrieval of Network Service Descriptors Information fails because response is too big, and perform the JSON schema validation of the failed operation HTTP response
+    ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO
+    ...    Reference: clause 5.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: The NFVO requires the usage of access tokens for authorizing the API requests.
+    ...    Post-Conditions: none
+    GET all Network Service Descriptors Information
+    Check HTTP Response Status Code Is    400
+    Check HTTP Response Body Json Schema Is   ProblemDetails
\ No newline at end of file
diff --git a/SOL005/NSDManagement-API/PNFDContent.robot b/SOL005/NSDManagement-API/PNFDContent.robot
index a3b3458bfd8d090fbcb1d519aa215370aef950e1..8670dbf6caa80266deef5c7af345c953eba7b243 100644
--- a/SOL005/NSDManagement-API/PNFDContent.robot
+++ b/SOL005/NSDManagement-API/PNFDContent.robot
@@ -14,7 +14,7 @@ Get PNFD Content
     ...    Test title: Get PNFD Content
     ...    Test objective: The objective is to test the retrieval of the PNFD Content in plain format and perform a validation that returned content is in plain format
     ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
-    ...    Reference: clause 5.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -27,7 +27,7 @@ Get PNFD Content with invalid resource identifier
     ...    Test title: Get PNFD Content with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of the PNFD Content fails when using an invalid resource identifier
     ...    Pre-conditions: none
-    ...    Reference: clause 5.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -39,7 +39,7 @@ Get PNFD Content with conflict due to onboarding state
     ...    Test title: Get PNFD Content with conflict due to onboarding state
     ...    Test objective: The objective is to test that the retrieval of the PNFD Content fails due to a conflict when the PNFD is not in onboarding state ONBOARDED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: The onboarding state of the PNFD for which the PNFD Content is requested is different from ONBOARDED.
-    ...    Reference: clause 5.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -53,7 +53,7 @@ Upload PNFD Content as plain text file
     ...    Test title: Upload PNFD Content as plain text file
     ...    Test objective: The objective is to test the upload of a PNFD Content in plain text format.
     ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
-    ...    Reference: clause 5.4.7.3.3 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.7.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The uploaded PNFD content is available in the NFVO
@@ -67,7 +67,7 @@ Upload PNFD Content with conflict due to onboarding state
     ...    Test title: Upload PNFD Content with conflict due to onboarding state
     ...    Test objective: The objective is to test that the upload of the PNFD Content fails due to a conflict when the PNFD is not in onboarding state CREATED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: The onboarding state of the PNFD for which the PNFD Content is requested is different from CREATED.
-    ...    Reference: clause 5.4.7.3.3 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.7.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -80,7 +80,7 @@ POST PNFD Content - Method not implemented
     ...    Test title: POST PNFD Content - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new PNF Descriptor content
     ...    Pre-conditions: none
-    ...    Reference: clause 5.4.7.3.1 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.7.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -92,7 +92,7 @@ PATCH PNFD Content - Method not implemented
     ...    Test title: PATCH PNFD Content - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update PNF Descriptor content
     ...    Pre-conditions: none
-    ...    Reference: clause 5.4.7.3.4 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.7.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -104,7 +104,7 @@ DELETE PNFD Content - Method not implemented
     ...    Test title: DELETE PNFD Content - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete PNF Descriptor content
     ...    Pre-conditions: none
-    ...    Reference: clause 5.4.7.3.5 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.7.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The PNFD content is not deleted by the failed operation
diff --git a/SOL005/NSDManagement-API/PNFDescriptors.robot b/SOL005/NSDManagement-API/PNFDescriptors.robot
index 8182f4c5b8963ede34931c06218052571fb30f0b..f9a74e9833b7c701a52f05c3a63ac281b0075f58 100644
--- a/SOL005/NSDManagement-API/PNFDescriptors.robot
+++ b/SOL005/NSDManagement-API/PNFDescriptors.robot
@@ -14,7 +14,7 @@ GET all PNF Descriptors Information
     ...    Test title: GET all PNF Descriptors Information
     ...    Test objective: The objective is to test the retrieval of all the PNF Descriptors information and perform a JSON schema and content validation of the collected data structure
     ...    Pre-conditions: One or more PNF Descriptors are onboarded in the NFVO.
-    ...    Reference: clause 5.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -27,7 +27,7 @@ GET PNF Descriptors Information with attribute-based filter
     ...    Test title: GET PNF Descriptors Information with attribute-based filter
     ...    Test objective: The objective is to test the retrieval of PNF Descriptors information using attribute-based filter, perform a JSON schema validation of the collected data structure, and verify that the retrieved information matches the issued attribute-based filter
     ...    Pre-conditions: One or more PNF Descriptors are onboarded in the NFVO.
-    ...    Reference: clause 5.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -41,7 +41,7 @@ GET PNF Descriptors Information with invalid attribute-based filter
     ...    Test title: GET PNF Descriptors Information with invalid attribute-based filter
     ...    Test objective: The objective is to test that the retrieval of PNF Descriptors information fails when using invalid attribute-based filter, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: One or more PNF Descriptors are onboarded in the NFVO.
-    ...    Reference: clause 5.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -54,7 +54,7 @@ GET all PNF Descriptors Information with "all_fields" attribute selector
     ...    Test title: GET all PNF Descriptors Information with "all_fields" attribute selector
     ...    Test objective: The objective is to test the retrieval of all PNF Descriptors Information with "all_fields" attribute selector, perform a JSON schema validation of the collected data structure, and verify that the retrieved information matches the issued "all_fileds" selector
     ...    Pre-conditions: One or more PNF Descriptors are onboarded in the NFVO.
-    ...    Reference: clause 4.3.3.2.1, 5.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -68,7 +68,7 @@ GET all PNF Descriptors Information with "exclude_default" attribute selector
     ...    Test title: GET all PNF Descriptors Information with "exclude_default" attribute selector
     ...    Test objective: The objective is to test the retrieval of all PNF Descriptors Information with "exclude_default" attribute selector, perform a JSON schema validation of the collected data structure, and verify that the retrieved information matches the issued "exclude_default" selector
     ...    Pre-conditions: One or more PNF Descriptors are onboarded in the NFVO.
-    ...    Reference: clause 4.3.3.2.1, 5.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -82,7 +82,7 @@ GET all PNF Descriptors Information with "fields" attribute selector
     ...    Test title: GET all PNF Descriptors Information with "fields" attribute selector
     ...    Test objective: The objective is to test the retrieval of all PNF Descriptors Information with "fields" attribute selector, perform a JSON schema validation of the collected data structure, and verify that the retrieved information matches the issued "fields" selector
     ...    Pre-conditions: One or more PNF Descriptors are onboarded in the NFVO.
-    ...    Reference: clause 4.3.3.2.1, 5.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO supports the use of "fields" attribute selector
     ...    Post-Conditions: none
@@ -96,7 +96,7 @@ GET all PNF Descriptors Information with "exclude_fields" attribute selector
     ...    Test title: GET all PNF Descriptors Information with "exclude_fields" attribute selector
     ...    Test objective: The objective is to test the retrieval of all PNF Descriptors Information with "exclude_fields" attribute selector, perform a JSON schema validation of the collected data structure, and verify that the retrieved information matches the issued "exclude_fields" selector
     ...    Pre-conditions: One or more PNF Descriptors are onboarded in the NFVO.
-    ...    Reference: clause 4.3.3.2.1, 5.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO supports the use of "exclude_fields" attribute selector
     ...    Post-Conditions: none
@@ -110,7 +110,7 @@ Create new PNF Descriptor Resource
     ...    Test title:  Create new PNF Descriptor Resource
     ...    Test objective: The objective is to test the creation of a new Create new PNF Descriptor resource and perform the JSON schema validation of the returned structure
     ...    Pre-conditions: none
-    ...    Reference: clause 5.4.5.3.1 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.5.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The PNF Descriptor resource is successfully created on the NFVO
@@ -125,7 +125,7 @@ PUT all PNF Descriptors - Method not implemented
     ...    Test title: PUT all PNF Descriptors Information - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify PNF Descriptors Information
     ...    Pre-conditions: One or more PNF Descriptors are onboarded in the NFVO.
-    ...    Reference: clause 5.4.5.3.3 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.5.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -137,7 +137,7 @@ PATCH all PNF Descriptors - Method not implemented
     ...    Test title: PATCH all PNF Descriptors Information - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update NF Descriptors Information
     ...    Pre-conditions: One or more PNF Descriptors are onboarded in the NFVO.
-    ...    Reference: clause 5.4.5.3.4 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.5.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -149,10 +149,36 @@ DELETE all PNF Descriptors - Method not implemented
     ...    Test title: DELETE all PNF Descriptors Information - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete PNF Descriptors Information
     ...    Pre-conditions: One or more PNF Descriptors are onboarded in the NFVO.
-    ...    Reference: clause 5.4.5.3.5 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.5.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The PNF Descriptors are not deleted by the failed operation
     Send DELETE Request for all PNF Descriptors
     Check HTTP Response Status Code Is    405
     Check Postcondition PNF Descriptors Exist
+    
+GET all PNF Descriptors Information as Paged Response
+    [Documentation]    Test ID: 5.3.1.4.12
+    ...    Test title: GET all PNF Descriptors Information as Paged Response
+    ...    Test objective: The objective is to test the retrieval of all the PNF Descriptors information as a Paged Response.
+    ...    Pre-conditions: One or more PNF Descriptors are onboarded in the NFVO.
+    ...    Reference: clause 5.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    GET all PNF Descriptors Information
+    Check HTTP Response Status Code Is    200
+    Check LINK in Heade
+    
+GET PNF Descriptors Information - Bad Request Response too Big
+        [Documentation]    Test ID: 5.3.1.4.13
+    ...    Test title: GET PNF Descriptors Information - Bad Request Response too Big
+    ...    Test objective: The objective is to test that the retrieval of PNF Descriptors information fails because response is too big, and perform the JSON schema validation of the failed operation HTTP response
+    ...    Pre-conditions: One or more PNF Descriptors are onboarded in the NFVO.
+    ...    Reference: clause 5.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    GET all PNF Descriptors Information
+    Check HTTP Response Status Code Is    400
+    Check HTTP Response Body Json Schema Is   ProblemDetails
\ No newline at end of file
diff --git a/SOL005/NSDManagement-API/Subscriptions.robot b/SOL005/NSDManagement-API/Subscriptions.robot
index 508c4589d106cecdc72c9eaf81b66015dc2e169e..0b9dff93aab5df5cf0c04cd6334e6522afabd108 100644
--- a/SOL005/NSDManagement-API/Subscriptions.robot
+++ b/SOL005/NSDManagement-API/Subscriptions.robot
@@ -16,7 +16,7 @@ Get All NSD Management Subscriptions
     ...    Test title: Get All NSD Management Subscriptions
     ...    Test objective: The objective is to test the retrieval of all NSD Management subscriptions and perform a JSON schema validation of the returned subscriptions data structure
     ...    Pre-conditions: At least one NSD Management subscription is available in the NFVO.
-    ...    Reference: clause 5.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -30,7 +30,7 @@ Get NSD Management Subscriptions with attribute-based filter
     ...    Test title: Get NSD Management Subscriptions with attribute-based filter
     ...    Test objective: The objective is to test the retrieval of NSD Management subscriptions using attribute-based filter, perform a JSON schema validation of the collected data structure, and verify that the retrieved information matches the issued attribute-based filters 
     ...    Pre-conditions: At least one NSD Management subscription is available in the NFVO.
-    ...    Reference: clause 5.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -45,7 +45,7 @@ Get NSD Management Subscriptions with invalid attribute-based filter
     ...    Test title: Get NSD Management Subscriptions with attribute-based filters
     ...    Test objective: The objective is to test that the retrieval of NSD Management subscriptions fails when using invalid attribute-based filters, and perform the JSON schema validation of the failed operation HTTP response. 
     ...    Pre-conditions: At least one NSD Management subscription is available in the NFVO.
-    ...    Reference: clause 5.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -58,7 +58,7 @@ GET NSD Management Subscription with invalid resource endpoint
     ...    Test title: GET NSD Management Subscription with invalid resource endpoint
     ...    Test objective: The objective is to test that the retrieval of all NSD Management subscriptions fails when using invalid resource endpoint.
     ...    Pre-conditions: At least one NSD Management subscription is available in the NFVO.
-    ...    Reference: clause 5.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -70,7 +70,7 @@ Create new NSD Management subscription
     ...    Test title: Create new NSD Management subscription
     ...    Test objective: The objective is to test the creation of a new NSD Management subscription and perform a JSON schema and content validation of the returned subscription data structure
     ...    Pre-conditions: none
-    ...    Reference: clause 5.4.8.3.1 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.8.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NSD Management subscription is successfully set and it matches the issued subscription
@@ -87,7 +87,7 @@ Create duplicated NSD Management subscription with NFVO not creating duplicated
     ...    Test title: Create duplicated NSD Management subscription with NFVO not creating duplicated subscriptions
     ...    Test objective: The objective is to test the attempt of a creation of a duplicated NSD Management subscription and check that no new subscription is created by the NFVO and a link to the original subscription is returned
     ...    Pre-conditions: At least one NSD Management subscription is available in the NFVO.
-    ...    Reference: clause 5.4.8.3.1 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.8.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO does not support the creation of duplicated subscriptions
     ...    Post-Conditions: The existing NSD Management subscription returned is available in the NFVO
@@ -104,7 +104,7 @@ Create duplicated NSD Management subscription with NFVO creating duplicated subs
     ...    Test title: Create duplicated NSD Management subscription with NFVO creating duplicated subscriptions
     ...    Test objective: The objective is to test the creation of a duplicated NSD Management subscription and perform a JSON schema and content validation of the returned duplicated subscription data structure
     ...    Pre-conditions: At least one NSD Management subscription is available in the NFVO.
-    ...    Reference: clause 5.4.8.3.1 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.8.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO supports the creation of duplicated subscriptions
     ...    Post-Conditions: The duplicated NSD Management subscription is successfully set and it matches the issued subscription    
@@ -120,7 +120,7 @@ PUT NSD Management Subscriptions - Method not implemented
     ...    Test title: PUT NSD Management Subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify NSD Management subscriptions
     ...    Pre-conditions: At least one NSD Management subscription is available in the NFVO.
-    ...    Reference: clause 5.4.8.3.3 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.8.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -133,7 +133,7 @@ PATCH NSD Management Subscriptions - Method not implemented
     ...    Test title: PATCH NSD Management Subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update NSD Management subscriptions
     ...    Pre-conditions: At least one NSD Management subscription is available in the NFVO.
-    ...    Reference: clause 5.4.8.3.4 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.8.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -146,7 +146,7 @@ DELETE NSD Management Subscriptions - Method not implemented
     ...    Test title: DELETE NSD Management Subscriptions - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete NSD Management subscriptions
     ...    Pre-conditions: At least one NSD Management subscription is available in the NFVO.
-    ...    Reference: clause 5.4.8.3.5 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.8.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NSD Management subscriptions are not deleted by the failed operation 
@@ -154,3 +154,28 @@ DELETE NSD Management Subscriptions - Method not implemented
     Check HTTP Response Status Code Is    405
     Check Postcondition NSD Management Subscriptions Exists
     
+Get All NSD Management Subscriptions as Paged Response
+    [Documentation]    Test ID: 5.3.1.7.11
+    ...    Test title: Get All NSD Management Subscriptions as Paged Response
+    ...    Test objective: The objective is to test the retrieval of all NSD Management subscriptions as a Paged Response.
+    ...    Pre-conditions: At least one NSD Management subscription is available in the NFVO.
+    ...    Reference: clause 5.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none    
+    Get all NSD Management Subscriptions
+    Check HTTP Response Status Code Is    200
+    Check LINK in Header
+
+Get NSD Management Subscriptions - Bad Request Response too Big
+    [Documentation]    Test ID: 5.3.1.7.12
+    ...    Test title: Get NSD Management Subscriptions - Bad Request Response too Big
+    ...    Test objective: The objective is to test that the retrieval of NSD Management subscriptions fails because reponse is too big, and perform the JSON schema validation of the failed operation HTTP response. 
+    ...    Pre-conditions: At least one NSD Management subscription is available in the NFVO.
+    ...    Reference: clause 5.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get all NSD Management Subscriptions
+    Check HTTP Response Status Code Is    400
+    Check HTTP Response Body Json Schema Is   ProblemDetails
\ No newline at end of file