diff --git a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
index 7cfc0187904196438837d704a47bf74117b785bc..82d820f54975d711ebcc0d280d16c73033ab08cf 100644
--- a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
+++ b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
@@ -2071,8 +2071,9 @@ GET VNF State Snapshot - Range Request
     Set Headers    {"Range":"${range}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshots/${vnfSnapshotInfoId}/vnf_state_snapshot 		
+    Unset Headers  ["Range"]
     ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse}  
+    Set Global Variable    ${response}    ${outputResponse}  
 
 GET VNF State Snapshot - Invalid Range
     Pass Execution If    ${VNFM_RANGE_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
@@ -2081,8 +2082,9 @@ GET VNF State Snapshot - Invalid Range
     Set Headers    {"Range":"${erroneousRange}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshots/${vnfSnapshotInfoId}/vnf_state_snapshot 		
+    Unset Headers  ["Range"]
     ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse}  
+    Set Global Variable    ${response}    ${outputResponse}  
 	
 GET VNF State Snapshot - Conflict in State
     Log    Trying to get information about a VNF State Snapshot whose creation process is not completed
@@ -2134,4 +2136,4 @@ Check HTTP Content-Length Header Is Set
     Log    Check Content-Range HTTP Header
     Should Contain    ${response['headers']}    Content-Length
     Should Be Equal As Strings    ${response['headers']['Content-Length']}    ${full_length}
-    Log    Header Content-Length is present
\ No newline at end of file
+    Log    Header Content-Length is present
diff --git a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index e7a7b117a90e9bf373cde561ea04c5ba7f213af5..0e268af7bb6551a441e95d3b8be27fe2b580d172 100644
--- a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -279,6 +279,7 @@ GET Individual VNF Package Content with Range Request
     Set Headers    {"Range": "${range}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
+    Unset Headers  ["Range"]
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -288,6 +289,7 @@ GET Individual VNF Package Content with explicit Range Request
     Set Headers    {"Range": "${range}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
+    Unset Headers  ["Range"]
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -311,6 +313,7 @@ GET Individual VNF Package Content with invalid Range Request
     Set Headers    {"Range": "${erroneousRange}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
+    Unset Headers  ["Range"]
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -581,6 +584,7 @@ GET Individual VNF Package Artifact with Range Request
     Set Headers    {"Range": "${range}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
+    Unset Headers  ["Range"]
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -591,6 +595,7 @@ GET Individual VNF Package Artifact with invalid Range Request
     Set Headers    {"Range": "${erroneousRange}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
+    Unset Headers  ["Range"]
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
  
@@ -1054,6 +1059,7 @@ GET Individual OnBoarded VNF Package Content with Range Request
     Set Headers    {"Range": "${range}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}/package_content
+    Unset Headers  ["Range"]
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1064,6 +1070,7 @@ GET Individual OnBoarded VNF Package Content with invalid Range Request
     Set Headers    {"Range": "${erroneousRange}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}/package_content
+    Unset Headers  ["Range"]
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1103,6 +1110,7 @@ GET Individual OnBoarded VNF Package Artifact with Range Request
     Set Headers    {"Range": "${range}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}/artifacts/${artifactPath}
+    Unset Headers  ["Range"]
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1113,6 +1121,7 @@ GET Individual OnBoarded VNF Package Artifact with invalid Range Request
     Set Headers    {"Range": "${erroneousRange}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}/artifacts/${artifactPath}
+    Unset Headers  ["Range"]
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
  
@@ -1397,6 +1406,7 @@ Get Artifact in VNF Package with Range Request
     Set Headers    {"Range": "${range}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts
+    Unset Headers  ["Range"]
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1430,6 +1440,7 @@ GET VNF Package Artifact with invalid Range Request
     Set Headers    {"Range": "${erroneousRange}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts
+    Unset Headers  ["Range"]
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1520,6 +1531,7 @@ Get Artifact in OnBoarded VNF Package with Range Request
     Set Headers    {"Range": "${range}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vnfPackageId}/artifacts
+    Unset Headers  ["Range"]
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1553,6 +1565,7 @@ GET OnBoarded VNF Package Artifact with invalid Range Request
     Set Headers    {"Range": "${erroneousRange}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vnfPackageId}/artifacts
+    Unset Headers  ["Range"]
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1661,4 +1674,4 @@ Match the VNF subscription Response Attributes with Descriptors
     Should Be Equal As Strings    ${response['body']['filter']['vnfProductsFromProviders'][0]['vnfProducts'][0]['vnfProductName']}    ${Product_Name}
     Should Be Equal As Strings    ${response['body']['filter']['vnfProductsFromProviders'][0]['vnfProducts']['versions'][0]['vnfSoftwareVersion']}    ${Software_Version}
     Should Be Equal As Strings    ${response['body']['filter']['vnfProductsFromProviders'][0]['vnfProducts']['versions'][0]['vnfdVersion']}    ${Descriptor_Version}
-    
\ No newline at end of file
+    
diff --git a/SOL003/VNFSnapshotPackageManagement-API/VnfSnapshotPackageManagementKeywords.robot b/SOL003/VNFSnapshotPackageManagement-API/VnfSnapshotPackageManagementKeywords.robot
index b45a9f84caffcc4a21a6aec3f0785b1aa53f7293..cc739c3af381d61d6f81e2aa2d69ccbce5ccb74b 100644
--- a/SOL003/VNFSnapshotPackageManagement-API/VnfSnapshotPackageManagementKeywords.robot
+++ b/SOL003/VNFSnapshotPackageManagement-API/VnfSnapshotPackageManagementKeywords.robot
@@ -285,6 +285,7 @@ GET VNF Snapshot Package Content - Range Request
     Set Headers    {"Range":"${range}"}  
     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"]
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}  
 
@@ -295,6 +296,7 @@ GET VNF Snapshot Package Content - Invalid Range
     Set Headers    {"Range":"${erroneousRange}"}  
     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"]
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}  
 	
@@ -374,6 +376,7 @@ GET Individual VNF Snapshot Package Artifact - Range Request
     Set Headers    {"Range":"${range}"}  
     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"]
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}  
 
@@ -384,6 +387,7 @@ GET Individual VNF Snapshot Package Artifact - Invalid Range
     Set Headers    {"Range":"${erroneousRange}"}  
     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"]
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}  
 	
diff --git a/SOL005/NSDManagement-API/NSDManagementKeywords.robot b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
index 1f7d141efc603f5c3d4a7011c0101cfd4504d823..3e3fd76b3e07c5b3d2ef384975a327dca904cf58 100644
--- a/SOL005/NSDManagement-API/NSDManagementKeywords.robot
+++ b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
@@ -346,6 +346,7 @@ GET NSD Content with Range Request
     Set Headers    {"Range": "${range}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content
+    Unset Headers  ["Range"]
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -356,6 +357,7 @@ GET NSD Content with invalid Range Request
     Set Headers    {"Range": "${erroneousRange}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content
+    Unset Headers  ["Range"]
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -658,6 +660,7 @@ Get PNFD Content with Range Request
     Set Headers    {"Range": "${range}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}/pnfd_content
+    Unset Headers  ["Range"]
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -667,6 +670,7 @@ Get PNFD Content with invalid Range Request
     Set Headers    {"Range": "${erroneousRange}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}/pnfd_content
+    Unset Headers  ["Range"]
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -1379,6 +1383,7 @@ GET Individual PNFD Archive Artifact with Range Request
     Set Headers    {"Range": "${range}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}/artifacts/${pnfd_artifactPath}
+    Unset Headers  ["Range"]
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1411,6 +1416,7 @@ GET Individual PNFD Archive Artifact with invalid Range Request
     Set Headers    {"Range": "${erroneousRange}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}/artifacts/${pnfd_artifactPath}
+    Unset Headers  ["Range"]
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1450,6 +1456,7 @@ GET Individual NSD Archive Artifact with Range Request
     Set Headers    {"Range": "${range}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoId}/artifacts/${artifactPath}
+    Unset Headers  ["Range"]
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1494,6 +1501,7 @@ GET Individual NSD Archive Artifact with invalid Range Request
     Set Headers    {"Range": "${erroneousRange}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoId}/artifacts/${artifactPath}
+    Unset Headers  ["Range"]
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
diff --git a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index 5a858d07421c2ef53277f83996822e500e535fec..e4661c1009c2947399160d8628073e153eaaf23c 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -457,6 +457,7 @@ GET Individual VNF Package Content with Range Request
     Set Headers    {"Range": "${range}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
+    Unset Headers  ["Range"]
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -466,6 +467,7 @@ GET Individual VNF Package Content with explicit Range Request
     Set Headers    {"Range": "${range}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
+    Unset Headers  ["Range"]
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -489,6 +491,7 @@ GET Individual VNF Package Content with invalid Range Request
     Set Headers    {"Range": "${erroneousRange}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
+    Unset Headers  ["Range"]
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -586,6 +589,7 @@ GET Individual VNF Package Artifact with Range Request
     Set Headers    {"Range": "${range}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
+    Unset Headers  ["Range"]
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -596,6 +600,7 @@ GET Individual VNF Package Artifact with invalid Range Request
     Set Headers    {"Range": "${erroneousRange}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
+    Unset Headers  ["Range"]
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
  
@@ -1133,6 +1138,7 @@ Get Artifact in VNF Package with Range Request
     Set Headers    {"Range": "${range}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts
+    Unset Headers  ["Range"]
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1166,6 +1172,7 @@ GET VNF Package Artifact with invalid Range Request
     Set Headers    {"Range": "${erroneousRange}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts
+    Unset Headers  ["Range"]
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
diff --git a/SOL005/VNFSnapshotPackageManagement-API/VnfSnapshotPackageManagementKeywords.robot b/SOL005/VNFSnapshotPackageManagement-API/VnfSnapshotPackageManagementKeywords.robot
index 90349731f582163472a6b70e731a977b7a502b70..e5c9cf02e87a6b9417af6fae57572e8425499eec 100644
--- a/SOL005/VNFSnapshotPackageManagement-API/VnfSnapshotPackageManagementKeywords.robot
+++ b/SOL005/VNFSnapshotPackageManagement-API/VnfSnapshotPackageManagementKeywords.robot
@@ -324,6 +324,7 @@ GET VNF Snapshot Package Content - Range Request
     Set Headers    {"Range":"${range}"}  
     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"]
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}  
 
@@ -334,6 +335,7 @@ GET VNF Snapshot Package Content - Invalid Range
     Set Headers    {"Range":"${erroneousRange}"}  
     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"]
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}  
 	
@@ -438,6 +440,7 @@ GET Individual VNF Snapshot Package Artifact - Range Request
     Set Headers    {"Range":"${range}"}  
     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"]
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}  
 
@@ -448,6 +451,7 @@ GET Individual VNF Snapshot Package Artifact - Invalid Range
     Set Headers    {"Range":"${erroneousRange}"}  
     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"]
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}  
 	
@@ -825,4 +829,4 @@ DELETE Access Configuration for External Artifacts
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshot_packages/${vnfSnapshotPkgId}/ext_artifacts_access 		
     ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
\ No newline at end of file
+	Set Global Variable    ${response}    ${outputResponse} 
diff --git a/requirements.txt b/requirements.txt
index bafc102d3843316cb6cca0a589fffb5deb65e8f5..4f00299b7ec3c17280e3269345fe687d2d7815e7 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,9 +1,9 @@
 ## To install the libraries, use:
 # pip -r requirements.txt
 
-
+git+https://github.com/etsi-cti-admin/RESTinstance
 robotframework==3.1
-RESTinstance==1.0.0rc4
+#RESTinstance==1.0.0rc4
 robotframework-dependencylibrary==1.0.0.post1
 robotframework-jsonlibrary==0.3
 robotframework-jsonschemalibrary==1.0
diff --git a/scripts/docker/Dockerfile b/scripts/docker/Dockerfile
index bf5f18016e4e9c9175fbc6ee663c262a3e3009fd..9f082157bc7b1e5c57c486bc7d932e86f7177057 100644
--- a/scripts/docker/Dockerfile
+++ b/scripts/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 
 MAINTAINER ETSI STF 583