diff --git a/SOL003/VNFSnapshotPackageManagement-API/IndividualVNFSnapshotPackage.robot b/SOL003/VNFSnapshotPackageManagement-API/IndividualVNFSnapshotPackage.robot
index 4bacf523e0683c80ee3d6403e6cdd2df1a2268c3..f8888a3f0169b90cfe784dd1adc80d1aacaa9ac3 100644
--- a/SOL003/VNFSnapshotPackageManagement-API/IndividualVNFSnapshotPackage.robot
+++ b/SOL003/VNFSnapshotPackageManagement-API/IndividualVNFSnapshotPackage.robot
@@ -7,7 +7,7 @@ POST Individual VNF Snapshot Package - Method not implemented
     ...    Test title: POST Individual VNF Snapshot Package - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 12.4.3.3.1 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 12.4.3.3.1 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -19,7 +19,7 @@ GET Information about an individual VNF Snapshot Package - SUCCESSFUL
     ...    Test title: GET Information about an individual VNF Snapshot Package - SUCCESSFUL
     ...    Test objective: The objective is to query information about a VNF Snapshot Package resource
     ...    Pre-conditions: none
-    ...    Reference: Clause 12.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 12.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -32,7 +32,7 @@ GET Information about an individual VNF Snapshot Package - NOT FOUND
     ...    Test title: GET Information about an individual VNF Snapshot Package - NOT FOUND
     ...    Test objective: The objective is to test that the retrieval of individual VNF Snapshot Package fails when using an invalid resource identifier.
     ...    Pre-conditions: At least one individual VNF Snapshot Package is available in the NFV-MANO.
-    ...    Reference: Clause 12.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 12.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -45,7 +45,7 @@ PUT Individual VNF Snapshot Package - Method not implemented
     ...    Test title: PUT Individual VNF Snapshot Package - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 12.4.3.3.3 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 12.4.3.3.3 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: VNF Snapshot Package not modified
@@ -57,7 +57,7 @@ PATCH Individual VNF Snapshot Package - Method Not implemented
     ...    Test title: PATCH Individual VNF Snapshot Package
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 12.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 12.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: VNF Snapshot Package modified
@@ -69,7 +69,7 @@ DELETE Individual VNF Snapshot Package - Method Not implemented
     ...    Test title: DELETE Individual VNF Snapshot Package - Method Not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 12.4.3.3.5 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 12.4.3.3.5 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: VNF Snapshot Package deleted
@@ -81,7 +81,7 @@ GET Information about an individual VNF Snapshot Package - SUCCESSFUL with permi
     ...    Test title: GET Information about an individual VNF Snapshot Package - SUCCESSFUL with permitted authorization scope
     ...    Test objective: The objective is to query information about a VNF Snapshot Package resource
     ...    Pre-conditions: none
-    ...    Reference: Clause 12.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 12.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -94,7 +94,7 @@ GET Information about an individual VNF Snapshot Package with not permitted auth
     ...    Test title: GET Information about an individual VNF Snapshot Package with not permitted authorization scope
     ...    Test objective: The objective is to query information about a VNF Snapshot Package resource
     ...    Pre-conditions: none
-    ...    Reference: Clause 12.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 12.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL003/VNFSnapshotPackageManagement-API/IndividualVNFSnapshotPackageArtifact.robot b/SOL003/VNFSnapshotPackageManagement-API/IndividualVNFSnapshotPackageArtifact.robot
index 7e1b637fd4d42e28273a7bd21d280dac157107aa..5b0ed96309f756c3f69661fdc64e3784306a67e1 100644
--- a/SOL003/VNFSnapshotPackageManagement-API/IndividualVNFSnapshotPackageArtifact.robot
+++ b/SOL003/VNFSnapshotPackageManagement-API/IndividualVNFSnapshotPackageArtifact.robot
@@ -7,7 +7,7 @@ POST Individual VNF Snapshot Package Artifact - Method not implemented
     ...    Test title: POST Individual VNF Snapshot Package Artifact - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 12.4.5.3.1 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 12.4.5.3.1 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -19,7 +19,7 @@ GET Individual VNF Snapshot Package Artifact - Complete File
     ...    Test title: GET Information about an individual VNF Snapshot Package - Complete File
     ...    Test objective: The objective is to fetch the whole content of a VNF snapshot package using GET method.
     ...    Pre-conditions: none
-    ...    Reference: Clause 12.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 12.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -32,7 +32,7 @@ GET Individual VNF Snapshot Package Artifact - Partial Content
     ...    Test title: GET Individual VNF Snapshot Package Artifact - Partial Content
     ...    Test objective: The objective is to fetch partial content of a VNF snapshot package by sending a range request using GET method.
     ...    Pre-conditions: none
-    ...    Reference: Clause 12.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 12.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: NFVO supports range requests
     ...    Post-Conditions: none
@@ -47,7 +47,7 @@ GET Individual VNF Snapshot Package Artifact - Range Request Not Supported
     ...    Test title: GET Information about an individual VNF Snapshot Package - Range Request Not Supported
     ...    Test objective: The objective is to test that the whole content of a VNF snapshot package is delivered even with a range request when NFVO does not support range requests.
     ...    Pre-conditions: none
-    ...    Reference: Clause 12.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 12.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: NFVO does not support range requests
     ...    Post-Conditions: none
@@ -60,7 +60,7 @@ GET Individual VNF Snapshot Package Artifact - Range Not Satisfiable
     ...    Test title: GET Information about an individual VNF Snapshot Package - Range Not Satisfiable
     ...    Test objective: The objective is to test that an error is returned when the byte range passed in the "Range" header does not match any available byte range in the VNF snapshot package file.
     ...    Pre-conditions: none
-    ...    Reference: Clause 12.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 12.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: NFVO supports range requests
     ...    Post-Conditions: none
@@ -72,7 +72,7 @@ GET Individual VNF Snapshot Package Artifact - Conflict
     ...    Test title: GET Information about an individual VNF Snapshot Package - Conflict
     ...    Test objective: The objective is to test that an error is returned when the "state" of the VNF snapshot package has a value different from "AVAILABLE".
     ...    Pre-conditions: none
-    ...    Reference: Clause 12.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 12.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The "state" of the VNF snapshot package has a value different from "AVAILABLE".
     ...    Post-Conditions: none
@@ -84,7 +84,7 @@ PUT Individual VNF Snapshot Package Artifact - Method not implemented
     ...    Test title: PUT Individual VNF Snapshot Package Artifact - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 12.4.5.3.3 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 12.4.5.3.3 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: VNF Snapshot Package not modified
@@ -96,7 +96,7 @@ PATCH Individual VNF Snapshot Package Artifact - Method Not implemented
     ...    Test title: PATCH Individual VNF Snapshot Package Artifact
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 12.4.5.3.4 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 12.4.5.3.4 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -108,7 +108,7 @@ DELETE Individual VNF Snapshot Package Artifact - Method Not implemented
     ...    Test title: DELETE Individual VNF Snapshot Package Artifact - Method Not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 12.4.5.3.5 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 12.4.5.3.5 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -120,7 +120,7 @@ GET Individual VNF Snapshot Package Artifact - Complete File with permitted auth
     ...    Test title: GET Information about an individual VNF Snapshot Package - Complete File with permitted authorization scope
     ...    Test objective: The objective is to fetch the whole content of a VNF snapshot package using GET method with permitted authorization scope.
     ...    Pre-conditions: none
-    ...    Reference: Clause 12.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 12.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -133,7 +133,7 @@ GET Individual VNF Snapshot Package Artifact - Complete File with not permitted
     ...    Test title: GET Information about an individual VNF Snapshot Package - Complete File with not permitted authorization scope
     ...    Test objective: The objective is to fetch the whole content of a VNF snapshot package using GET method with not permitted authorization scope.
     ...    Pre-conditions: none
-    ...    Reference: Clause 12.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 12.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL003/VNFSnapshotPackageManagement-API/VNFSnapshotPackageContent.robot b/SOL003/VNFSnapshotPackageManagement-API/VNFSnapshotPackageContent.robot
index 5a04bbd15df3c819a01fe4608250586f5f75bce6..aadde8a91ac7a375f5c93f1a9e2f3e852bf85e0d 100644
--- a/SOL003/VNFSnapshotPackageManagement-API/VNFSnapshotPackageContent.robot
+++ b/SOL003/VNFSnapshotPackageManagement-API/VNFSnapshotPackageContent.robot
@@ -7,7 +7,7 @@ POST VNF Snapshot Package Content - Method not implemented
     ...    Test title: POST VNF Snapshot Package Content - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 12.4.4.3.1 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 12.4.4.3.1 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -19,7 +19,7 @@ GET VNF Snapshot Package Content - Complete File
     ...    Test title: GET Information about an individual VNF Snapshot Package - Complete File
     ...    Test objective: The objective is to fetch the whole content of a VNF snapshot package using GET method.
     ...    Pre-conditions: none
-    ...    Reference: Clause 12.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 12.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -32,7 +32,7 @@ GET VNF Snapshot Package Content - Partial Content
     ...    Test title: GET VNF Snapshot Package Content - Partial Content
     ...    Test objective: The objective is to fetch partial content of a VNF snapshot package by sending a range request using GET method.
     ...    Pre-conditions: none
-    ...    Reference: Clause 12.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 12.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: NFVO supports range requests
     ...    Post-Conditions: none
@@ -47,7 +47,7 @@ GET VNF Snapshot Package Content - Range Request Not Supported
     ...    Test title: GET Information about an individual VNF Snapshot Package - Range Request Not Supported
     ...    Test objective: The objective is to test that the whole content of a VNF snapshot package is delivered even with a range request when NFVO does not support range requests.
     ...    Pre-conditions: none
-    ...    Reference: Clause 12.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 12.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: NFVO does not support range requests
     ...    Post-Conditions: none
@@ -60,7 +60,7 @@ GET VNF Snapshot Package Content - Range Not Satisfiable
     ...    Test title: GET Information about an individual VNF Snapshot Package - Range Not Satisfiable
     ...    Test objective: The objective is to test that an error is returned when the byte range passed in the "Range" header does not match any available byte range in the VNF snapshot package file.
     ...    Pre-conditions: none
-    ...    Reference: Clause 12.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 12.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: NFVO supports range requests
     ...    Post-Conditions: none
@@ -72,7 +72,7 @@ GET VNF Snapshot Package Content - Conflict
     ...    Test title: GET Information about an individual VNF Snapshot Package - Conflict
     ...    Test objective: The objective is to test that an error is returned when the "state" of the VNF snapshot package has a value different from "AVAILABLE".
     ...    Pre-conditions: none
-    ...    Reference: Clause 12.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 12.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The "state" of the VNF snapshot package has a value different from "AVAILABLE".
     ...    Post-Conditions: none
@@ -84,7 +84,7 @@ PUT VNF Snapshot Package Content - Method not implemented
     ...    Test title: PUT VNF Snapshot Package Content - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 12.4.4.3.3 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 12.4.4.3.3 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: VNF Snapshot Package not modified
@@ -96,7 +96,7 @@ PATCH VNF Snapshot Package Content - Method Not implemented
     ...    Test title: PATCH VNF Snapshot Package Content
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 12.4.4.3.4 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 12.4.4.3.4 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -108,7 +108,7 @@ DELETE VNF Snapshot Package Content - Method Not implemented
     ...    Test title: DELETE VNF Snapshot Package Content - Method Not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 12.4.4.3.5 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 12.4.4.3.5 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL003/VNFSnapshotPackageManagement-API/VNFSnapshotPackages.robot b/SOL003/VNFSnapshotPackageManagement-API/VNFSnapshotPackages.robot
index 0cd1588a9594a6d31071fab9d3d6aabdece79548..91cae0e326cbc148d8cda1daa80392c13b18dbdc 100644
--- a/SOL003/VNFSnapshotPackageManagement-API/VNFSnapshotPackages.robot
+++ b/SOL003/VNFSnapshotPackageManagement-API/VNFSnapshotPackages.robot
@@ -7,7 +7,7 @@ POST VNF Snapshot Packages - Method not implemented
     ...    Test title: POST VNF Snapshot Packages - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 12.4.2.3.1 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 12.4.2.3.1 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -19,7 +19,7 @@ GET information about multiple VNF Snapshot Packages
     ...    Test title: GET information about multiple VNF Snapshot Packages
     ...    Test objective: The objective is to get information about multiples VNF Snapshot Packages
     ...    Pre-conditions: none
-    ...    Reference: Clause 12.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 12.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -32,7 +32,7 @@ GET information about multiple VNF Snapshot Packages Bad Request Invalid attribu
     ...    Test title: GET information about multiple VNF Snapshot Packages Bad Request Invalid attribute-based filtering parameters
     ...    Test objective: The objective is to get information about multiples VNF Snapshot Packages with Invalid attribute-based filtering parameters
     ...    Pre-conditions: none
-    ...    Reference: Clause 12.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 12.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -45,7 +45,7 @@ GET information about multiple VNF Snapshot Packages Bad Request Invalid attribu
     ...    Test title: GET information about multiple VNF Snapshot Packages Bad Request Invalid attribute selector
     ...    Test objective: The objective is to get information about multiples VNF Snapshot Packages with Invalid attribute-based filtering parameters
     ...    Pre-conditions: none
-    ...    Reference: Clause 12.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 12.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -58,7 +58,7 @@ GET information about multiple VNF Snapshot Packages with "all_fields" attribute
     ...    Test title: GET information about multiple VNF Snapshot Packages with "all_fields" attribute selector
     ...    Test objective: The objective is to query information about multiple VNF Snapshot Packages
     ...    Pre-conditions:  none
-    ...    Reference: Clause 12.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 12.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -71,7 +71,7 @@ GET information about multiple VNF Snapshot Packages with "exclude_default" attr
     ...    Test title: GET information about multiple VNF Snapshot Packages with "exclude_default" attribute selector
     ...    Test objective: The objective is to query information about multiple VNF Snapshot Packages
     ...    Pre-conditions:  none
-    ...    Reference: Clause 12.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 12.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -84,7 +84,7 @@ GET information about multiple VNF Snapshot Packages with "fields" attribute sel
     ...    Test title: GET information about multiple VNF Snapshot Packages with "fields" attribute selector
     ...    Test objective: The objective is to query information about multiple VNF Snapshot Packages
     ...    Pre-conditions:  none
-    ...    Reference: Clause 12.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 12.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -97,7 +97,7 @@ GET information about multiple VNF Snapshot Packages with "exclude_default" and
     ...    Test title: GET information about multiple VNF Snapshot Packages with "exclude_default" and "fields" attribute selector
     ...    Test objective: The objective is to query information about multiple VNF Snapshot Packages
     ...    Pre-conditions:  none
-    ...    Reference: Clause 12.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 12.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -110,7 +110,7 @@ GET information about multiple VNF Snapshot Packages with "exclude_fields" attri
     ...    Test title: GET information about multiple VNF Snapshot Packages with "exclude_fields" attribute selector
     ...    Test objective: The objective is to query information about multiple VNF Snapshot Packages
     ...    Pre-conditions:  none
-    ...    Reference: Clause 12.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 12.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -123,7 +123,7 @@ GET VNF Snapshot Packages - Bad Request Response too Big
     ...    Test title: GET VNF Snapshot Packages - Bad Request Response too Big
     ...    Test objective: The objective is test that the retrieval of existing VNF Snapshot Packages list fails because response is too big, and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: none
-    ...    Reference: Clause 12.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 12.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: NFVO does not support paged response.
     ...    Post-Conditions: none 
@@ -136,7 +136,7 @@ GET VNF Snapshot Packages as Paged Response
     ...    Test title: GET VNF Snapshot Packages as Paged Response
     ...    Test objective: The objective is to test that GET method retrieves the list of existing VNF Snapshot Packages as paged response.
     ...    Pre-conditions: none
-    ...    Reference: Clause 12.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 12.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: NFVO supports paged response.
     ...    Post-Conditions: none    
@@ -149,7 +149,7 @@ PUT VNF Snapshot Packages - Method not implemented
     ...    Test title: PUT VNF Snapshot Packages - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions:  none
-    ...    Reference: Clause 12.4.2.3.3 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 12.4.2.3.3 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -161,7 +161,7 @@ PATCH VNF Snapshot Packages - Method not implemented
     ...    Test title: PATCH VNF Snapshot Packages - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none 
-    ...    Reference: Clause 12.4.2.3.4 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 12.4.2.3.4 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -173,7 +173,7 @@ DELETE VNF Snapshot Packages - Method not implemented
     ...    Test title: DELETE VNF Snapshot Packages - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none 
-    ...    Reference: Clause 12.4.2.3.5 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 12.4.2.3.5 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: VNF snapshot package is not deleted
@@ -185,7 +185,7 @@ GET information about multiple VNF Snapshot Packages using filter
     ...    Test title: GET information about multiple VNF Snapshot Packages using filter
     ...    Test objective: The objective is to get information about multiples VNF Snapshot Packages using filter
     ...    Pre-conditions: none
-    ...    Reference: Clause 12.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 12.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -198,7 +198,7 @@ GET information about multiple VNF Snapshot Packages with permitted authorizatio
     ...    Test title: GET information about multiple VNF Snapshot Packages with permitted authorization scope 
     ...    Test objective: The objective is to get information about multiples VNF Snapshot Packages with permitted authorization scope 
     ...    Pre-conditions: none
-    ...    Reference: Clause 12.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 12.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -211,7 +211,7 @@ GET information about multiple VNF Snapshot Packages with not permitted authoriz
     ...    Test title: GET information about multiple VNF Snapshot Packages with not permitted authorization scope 
     ...    Test objective: The objective is to get information about multiples VNF Snapshot Packages with not permitted authorization scope 
     ...    Pre-conditions: none
-    ...    Reference: Clause 12.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 12.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL003/VNFSnapshotPackageManagement-API/VnfSnapshotPackageManagementKeywords.robot b/SOL003/VNFSnapshotPackageManagement-API/VnfSnapshotPackageManagementKeywords.robot
index 7c5317040b0307573fc9dfcf6bcb33e0b7aff96e..a6e48ec04ffa19549a903ade7b5ef8d7315c1d09 100644
--- a/SOL003/VNFSnapshotPackageManagement-API/VnfSnapshotPackageManagementKeywords.robot
+++ b/SOL003/VNFSnapshotPackageManagement-API/VnfSnapshotPackageManagementKeywords.robot
@@ -9,6 +9,7 @@ Library     String
 *** Keywords ***
 POST API Version
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
@@ -16,6 +17,7 @@ POST API Version
 	
 GET API Version
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
@@ -23,6 +25,7 @@ GET API Version
 	
 PUT API Version
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
@@ -30,6 +33,7 @@ PUT API Version
 	
 PATCH API Version
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
@@ -37,6 +41,7 @@ PATCH API Version
 	
 DELETE API Version
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
@@ -44,6 +49,7 @@ DELETE API Version
 	
 POST API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
@@ -51,6 +57,7 @@ POST API Version with apiMajorVersion
 	
 GET API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
@@ -58,6 +65,7 @@ GET API Version with apiMajorVersion
 	
 PUT API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
@@ -65,6 +73,7 @@ PUT API Version with apiMajorVersion
 	
 PATCH API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
@@ -72,6 +81,7 @@ PATCH API Version with apiMajorVersion
 	
 DELETE API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
@@ -95,6 +105,7 @@ POST VNF Snapshot Packages
     Log    Trying to perform a POST. This method should not be implemented.
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Set Headers    {"Content-Type":"${CONTENT_TYPE_JSON}"}
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages
     ${outputResponse}=    Output    response
@@ -104,6 +115,7 @@ GET multiple VNF Snapshot Packages
     Log    Query VNF The GET method queries information about multiple VNF Snapshot Packages.
     Set Headers  {"Accept":"${ACCEPT_JSON}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Set Headers    {"Version": "${API_VERSION}"}
     Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages 
     ${outputResponse}=    Output    response
@@ -113,6 +125,7 @@ GET multiple VNF Snapshot Packages with bad attribute
     Log    Query VNF The GET method queries information about multiple VNF Snapshot Packages.
     Set Headers  {"Accept":"${ACCEPT_JSON}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Set Headers    {"Version": "${API_VERSION}"}
     Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"} 
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages?attribute_not_exist=some_value
     ${outputResponse}=    Output    response
@@ -122,6 +135,7 @@ GET multiple VNF Snapshot Packages with bad filter
     Log    Query VNF The GET method queries information about multiple VNF Snapshot Packages.
     Set Headers  {"Accept":"${ACCEPT_JSON}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"} 
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages?${NEG_FILTER}
     ${outputResponse}=    Output    response
@@ -131,6 +145,7 @@ GET multiple VNF Snapshot Packages using filter
     Log    Query VNF The GET method queries information about multiple VNF Snapshot Packages.
     Set Headers  {"Accept":"${ACCEPT_JSON}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"} 
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages?${POS_FILTER}
     ${outputResponse}=    Output    response
@@ -139,6 +154,7 @@ GET multiple VNF Snapshot Packages using filter
 GET multiple VNF Snapshot Packages with all_fields attribute selector
     Log    Query status information about multiple VNF Snapshot Packages, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages?all_fields
     ${output}=    Output    response
@@ -147,6 +163,7 @@ GET multiple VNF Snapshot Packages with all_fields attribute selector
 GET multiple VNF Snapshot Packages with exclude_default attribute selector
     Log    Query status information about multiple VNF Snapshot Packages using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages?exclude_default
     ${output}=    Output    response
@@ -155,6 +172,7 @@ GET multiple VNF Snapshot Packages with exclude_default attribute selector
 GET multiple VNF Snapshot Packages with fields attribute selector
     Log    Query status information about multiple VNF Snapshot Packages, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages?fields=${fields}
     ${output}=    Output    response
@@ -163,6 +181,7 @@ GET multiple VNF Snapshot Packages with fields attribute selector
 GET multiple VNF Snapshot Packages with exclude_default and fields attribute selector
     Log    Query status information about multiple VNF Snapshot Packages, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages?fields=${fields}&exclude_default
     ${output}=    Output    response
@@ -171,6 +190,7 @@ GET multiple VNF Snapshot Packages with exclude_default and fields attribute sel
 GET multiple VNF Snapshot Packages with exclude_fields attribute selector
     Log    Query status information about multiple VNF Snapshot Packages, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages?exclude_fields=${fields}
     ${output}=    Output    response
@@ -180,6 +200,7 @@ GET multiple VNF Snapshot Packages with permitted authorization scope
     Log    Query VNF The GET method queries information about multiple VNF Snapshot Packages with permitted authorization scope .
     Set Headers  {"Accept":"${ACCEPT_JSON}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Set Headers    {"Version": "${API_VERSION}"}
     ${scopeValue}=    Create Dictionary    scopeValue=${VNF_SNAPSHOT_PACKAGES_READONLY_PERMITTED_SCOPE}
     ${authorizationToken}=    JWT Encode    payload=${scopeValue}    key=${OAUTH_KEY}    algorithm=${OAUTH_ENCRYPTION_ALGORITHM}
     Set Headers    {"${AUTHORIZATION_HEADER}":"${authorizationToken}"}
@@ -191,6 +212,7 @@ GET multiple VNF Snapshot Packages with not permitted authorization scope
     Log    Query VNF The GET method queries information about multiple VNF Snapshot Packages with not permitted authorization scope .
     Set Headers  {"Accept":"${ACCEPT_JSON}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Set Headers    {"Version": "${API_VERSION}"}
     ${scopeValue}=    Create Dictionary    scopeValue=${VNF_SNAPSHOT_PACKAGES_READONLY_NOT_PERMITTED_SCOPE}
     ${authorizationToken}=    JWT Encode    payload=${scopeValue}    key=${OAUTH_KEY}    algorithm=${OAUTH_ENCRYPTION_ALGORITHM}
     Set Headers    {"${AUTHORIZATION_HEADER}":"${authorizationToken}"}
@@ -212,6 +234,7 @@ PUT VNF Snapshot Packages
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT_JSON}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages   	
     ${outputResponse}=    Output    response
@@ -220,12 +243,14 @@ PUT VNF Snapshot Packages
 PATCH VNF Snapshot Packages
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT_JSON}"}  
+    Set Headers    {"Version": "${API_VERSION}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages	 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
 DELETE VNF Snapshot Packages
     Log    Trying to perform a DELETE. This method should not be implemented
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages	 	
     ${outputResponse}=    Output    response
@@ -235,6 +260,7 @@ POST individual VNF Snapshot Package
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT_JSON}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages/${vnfSnapshotPkgId}    
     ${outputResponse}=    Output    response
@@ -244,6 +270,7 @@ GET individual VNF Snapshot Package
     log    Trying to get information about an individual VNF Snapshot Package
     Set Headers    {"Accept":"${ACCEPT_JSON}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages/${vnfSnapshotPkgId} 		
     ${outputResponse}=    Output    response
@@ -253,6 +280,7 @@ GET individual VNF Snapshot Package with invalid URI
     log    Trying to get information about an individual VNF Snapshot Package
     Set Headers    {"Accept":"${ACCEPT_JSON}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages/${invalidVnfSnapshotPkgId} 		
     ${outputResponse}=    Output    response
@@ -262,6 +290,7 @@ GET individual VNF Snapshot Package with permitted authorization scope
     log    Trying to get information about an individual VNF Snapshot Package with permitted authorization scope
     Set Headers    {"Accept":"${ACCEPT_JSON}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Set Headers    {"Version": "${API_VERSION}"}
     ${scopeValue}=    Create Dictionary    scopeValue=${VNF_SNAPSHOT_PACKAGES_READONLY_PERMITTED_SCOPE}
     ${authorizationToken}=    JWT Encode    payload=${scopeValue}    key=${OAUTH_KEY}    algorithm=${OAUTH_ENCRYPTION_ALGORITHM}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${authorizationToken}"}
@@ -273,6 +302,7 @@ GET individual VNF Snapshot Package with not permitted authorization scope
     log    Trying to get information about an individual VNF Snapshot Package with not permitted authorization scope
     Set Headers    {"Accept":"${ACCEPT_JSON}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Set Headers    {"Version": "${API_VERSION}"}
     ${scopeValue}=    Create Dictionary    scopeValue=${VNF_SNAPSHOT_PACKAGES_READONLY_NOT_PERMITTED_SCOPE}
     ${authorizationToken}=    JWT Encode    payload=${scopeValue}    key=${OAUTH_KEY}    algorithm=${OAUTH_ENCRYPTION_ALGORITHM}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${authorizationToken}"}
@@ -284,6 +314,7 @@ PUT individual VNF Snapshot Package
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT_JSON}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages/${vnfSnapshotPkgId} 		
     ${outputResponse}=    Output    response
@@ -293,6 +324,7 @@ PATCH individual VNF Snapshot Package
     log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT_JSON}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages/${vnfSnapshotPkgId} 		
     ${outputResponse}=    Output    response
@@ -301,6 +333,7 @@ PATCH individual VNF Snapshot Package
 DELETE individual VNF Snapshot Package
     log    Trying to perform a DELETE. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT_JSON}"}  
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages/${vnfSnapshotPkgId} 		
     ${outputResponse}=    Output    response
@@ -310,6 +343,7 @@ POST VNF Snapshot Package Content
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT_ZIP}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages/${vnfSnapshotPkgId}/package_content   
     ${outputResponse}=    Output    response
@@ -318,6 +352,7 @@ POST VNF Snapshot Package Content
 GET VNF Snapshot Package Content - Complete
     log    Trying to fetch the complete contents of VNF Snapshot Package
     Set Headers    {"Accept":"${ACCEPT_ZIP}"}  
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages/${vnfSnapshotPkgId}/package_content 		
     ${outputResponse}=    Output    response
@@ -328,6 +363,7 @@ GET VNF Snapshot Package Content - Range Request
     log    Trying to get information about an individual VNF Snapshot Package using a range request
     Set Headers    {"Accept":"${ACCEPT_ZIP}"}  
     Set Headers    {"Range":"${range}"}  
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages/${vnfSnapshotPkgId}/package_content 		
     Unset Headers  ["Range"]
@@ -339,6 +375,7 @@ GET VNF Snapshot Package Content - Invalid Range
     log    Trying to get information about an individual VNF Snapshot Package with invalid range
     Set Headers    {"Accept":"${ACCEPT_ZIP}"}  
     Set Headers    {"Range":"${erroneousRange}"}  
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages/${vnfSnapshotPkgId}/package_content 		
     Unset Headers  ["Range"]
@@ -348,6 +385,7 @@ GET VNF Snapshot Package Content - Invalid Range
 GET VNF Snapshot Package Content - Not Available 
     Log    Trying to fetch the contents of a VNF Snapshot Package which is not in AVAILABLE state
     Set Headers    {"Accept":"${ACCEPT_ZIP}"}  
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages/${vnfSnapshotPkgId_notInAvailableState}/package_content 		
     ${outputResponse}=    Output    response
@@ -375,6 +413,7 @@ PUT VNF Snapshot Package Content
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT_ZIP}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE_ZIP}"}
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages/${vnfSnapshotPkgId}/package_content 		
     ${outputResponse}=    Output    response
@@ -384,6 +423,7 @@ PATCH VNF Snapshot Package Content
     log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT_ZIP}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE_ZIP}"}
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages/${vnfSnapshotPkgId}/package_content 		
     ${outputResponse}=    Output    response
@@ -392,6 +432,7 @@ PATCH VNF Snapshot Package Content
 DELETE VNF Snapshot Package Content
     log    Trying to perform a DELETE. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT_ZIP}"}  
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages/${vnfSnapshotPkgId}/package_content 		
     ${outputResponse}=    Output    response
@@ -401,6 +442,7 @@ POST Individual VNF Snapshot Package Artifact
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT_OCTET}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE_OCTET}"}
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages/${vnfSnapshotPkgId}/artifacts/${artifactPath}   
     ${outputResponse}=    Output    response
@@ -409,6 +451,7 @@ POST Individual VNF Snapshot Package Artifact
 GET Individual VNF Snapshot Package Artifact - Complete
     log    Trying to fetch the complete contents of an individual VNF Snapshot Package artifact
     Set Headers    {"Accept":"${ACCEPT_OCTET}"}  
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages/${vnfSnapshotPkgId}/artifacts/${artifactPath} 		
     ${outputResponse}=    Output    response
@@ -419,6 +462,7 @@ GET Individual VNF Snapshot Package Artifact - Range Request
     log    Trying to get information about an individual VNF Snapshot Package artifact using a range request
     Set Headers    {"Accept":"${ACCEPT_OCTET}"}  
     Set Headers    {"Range":"${range}"}  
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages/${vnfSnapshotPkgId}/artifacts/${artifactPath} 		
     Unset Headers  ["Range"]
@@ -430,6 +474,7 @@ GET Individual VNF Snapshot Package Artifact - Invalid Range
     log    Trying to get information about an individual VNF Snapshot Package artifact with invalid range
     Set Headers    {"Accept":"${CONTENT_TYPE_OCTET}"}  
     Set Headers    {"Range":"${erroneousRange}"}  
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages/${vnfSnapshotPkgId}/artifacts/${artifactPath} 		
     Unset Headers  ["Range"]
@@ -439,6 +484,7 @@ GET Individual VNF Snapshot Package Artifact - Invalid Range
 GET Individual VNF Snapshot Package Artifact - Not Available 
     Log    Trying to get information about an individual artifact of a VNF Snapshot Package which is not in AVAILABLE state
     Set Headers    {"Accept":"${ACCEPT_OCTET}"}  
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages/${vnfSnapshotPkgId_notInAvailableState}/artifacts/${artifactPath} 		
     ${outputResponse}=    Output    response
@@ -447,6 +493,7 @@ GET Individual VNF Snapshot Package Artifact - Not Available
 GET Individual VNF Snapshot Package Artifact - Complete with permitted authorization scope
     log    Trying to fetch the complete contents of an individual VNF Snapshot Package artifact with permitted authorization scope
     Set Headers    {"Accept":"${ACCEPT_OCTET}"}  
+    Set Headers    {"Version": "${API_VERSION}"}
     ${scopeValue}=    Create Dictionary    scopeValue=${VNF_ARTIFACTS_READONLY_PERMITTED_SCOPE}
     ${authorizationToken}=    JWT Encode    payload=${scopeValue}    key=${OAUTH_KEY}    algorithm=${OAUTH_ENCRYPTION_ALGORITHM}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${authorizationToken}"}
@@ -457,6 +504,7 @@ GET Individual VNF Snapshot Package Artifact - Complete with permitted authoriza
 GET Individual VNF Snapshot Package Artifact - Complete with not permitted authorization scope
     log    Trying to fetch the complete contents of an individual VNF Snapshot Package artifact with not permitted authorization scope
     Set Headers    {"Accept":"${ACCEPT_OCTET}"}  
+    Set Headers    {"Version": "${API_VERSION}"}
     ${scopeValue}=    Create Dictionary    scopeValue=${VNF_ARTIFACTS_READONLY_NOT_PERMITTED_SCOPE}
     ${authorizationToken}=    JWT Encode    payload=${scopeValue}    key=${OAUTH_KEY}    algorithm=${OAUTH_ENCRYPTION_ALGORITHM}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${authorizationToken}"}
@@ -468,6 +516,7 @@ PUT Individual VNF Snapshot Package Artifact
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT_OCTET}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE_OCTET}"}
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages/${vnfSnapshotPkgId}/artifacts/${artifactPath} 		
     ${outputResponse}=    Output    response
@@ -477,6 +526,7 @@ PATCH Individual VNF Snapshot Package Artifact
     log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT_OCTET}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE_OCTET}"}
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages/${vnfSnapshotPkgId}/artifacts/${artifactPath} 		
     ${outputResponse}=    Output    response
@@ -485,6 +535,7 @@ PATCH Individual VNF Snapshot Package Artifact
 DELETE Individual VNF Snapshot Package Artifact
     log    Trying to perform a DELETE. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT_OCTET}"}  
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages/${vnfSnapshotPkgId}/artifacts/${artifactPath} 		
     ${outputResponse}=    Output    response
diff --git a/SOL003/VNFSnapshotPackageManagement-API/environment/variables.txt b/SOL003/VNFSnapshotPackageManagement-API/environment/variables.txt
index f4fabd7e393a8b67635434cec3348716d7b980a9..339109c95db442ed39cf219ab84528ba4f961193 100644
--- a/SOL003/VNFSnapshotPackageManagement-API/environment/variables.txt
+++ b/SOL003/VNFSnapshotPackageManagement-API/environment/variables.txt
@@ -25,6 +25,7 @@ ${CONTENT_TYPE_JSON}    application/json
 ${apiRoot}        /
 ${apiMajorVersion}     v1
 ${apiName}        vnfsnapshotpkgm
+${API_VERSION}    1.12.0
 
 
 ${PAGING_SUPPORTED}    1