diff --git a/SOL005/VNFPackageManagement-API/ApiVersion.robot b/SOL005/VNFPackageManagement-API/ApiVersion.robot
index 787f4ccf549e453b2f04a782c9f3619a3d74bb65..609a71d1a3197c939fc9d4ff6ca6c99425c4eb4e 100644
--- a/SOL005/VNFPackageManagement-API/ApiVersion.robot
+++ b/SOL005/VNFPackageManagement-API/ApiVersion.robot
@@ -1,7 +1,6 @@
 *** Settings ***
 
 Resource    environment/variables.txt
-
 Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}     ssl_verify=false
 Library    DependencyLibrary
 Library    JSONLibrary
diff --git a/SOL005/VNFPackageManagement-API/IndividualSubscription.robot b/SOL005/VNFPackageManagement-API/IndividualSubscription.robot
index 06b4a44c55f8b75fc1a48fe61613c91c8170d2a1..c72164f90033cd65d722a508054b8dc4d6d82261 100644
--- a/SOL005/VNFPackageManagement-API/IndividualSubscription.robot
+++ b/SOL005/VNFPackageManagement-API/IndividualSubscription.robot
@@ -1,7 +1,6 @@
 *** Settings ***
 Library           JSONSchemaLibrary    schemas/
-Resource          environment/variables.txt    # Generic Parameters
-Resource          environment/individualSubscription.txt
+Resource          environment/variables.txt 
 Resource          VNFPackageManagementKeywords.robot
 Library           OperatingSystem
 Library           JSONLibrary
diff --git a/SOL005/VNFPackageManagement-API/IndividualVNFPackage.robot b/SOL005/VNFPackageManagement-API/IndividualVNFPackage.robot
index 8e8d887c0f0d03c7fa720b8405b805e7606c8515..f47c41c4d9f053b9b1007d09c0297a8fd6f218ac 100644
--- a/SOL005/VNFPackageManagement-API/IndividualVNFPackage.robot
+++ b/SOL005/VNFPackageManagement-API/IndividualVNFPackage.robot
@@ -1,7 +1,6 @@
 *** Settings ***
 Library           JSONSchemaLibrary    schemas/
-Resource          environment/variables.txt    # Generic Parameters
-Resource          environment/individualVnfPackage.txt
+Resource          environment/variables.txt
 Resource          VNFPackageManagementKeywords.robot    
 Library           JSONLibrary
 Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
diff --git a/SOL005/VNFPackageManagement-API/Subscriptions.robot b/SOL005/VNFPackageManagement-API/Subscriptions.robot
index 00d943bf7feb566a94e67cb35f4349546b74dd4f..8ca89778abe576e97b3277db3908d55ba33a4b60 100644
--- a/SOL005/VNFPackageManagement-API/Subscriptions.robot
+++ b/SOL005/VNFPackageManagement-API/Subscriptions.robot
@@ -1,7 +1,6 @@
 *** Settings ***
 Library           JSONSchemaLibrary    schemas/
-Resource          environment/variables.txt    # Generic Parameters
-Resource          environment/subscriptions.txt
+Resource          environment/variables.txt
 Resource          VNFPackageManagementKeywords.robot
 Library           OperatingSystem
 Library           JSONLibrary
diff --git a/SOL005/VNFPackageManagement-API/VNFDInIndividualVNFPackage.robot b/SOL005/VNFPackageManagement-API/VNFDInIndividualVNFPackage.robot
index 9ea927e2940c2f37a97e61edbc1d200ffcfca386..05586203fabcf31c7618b3d7c2f523d4a83b6c2e 100644
--- a/SOL005/VNFPackageManagement-API/VNFDInIndividualVNFPackage.robot
+++ b/SOL005/VNFPackageManagement-API/VNFDInIndividualVNFPackage.robot
@@ -1,7 +1,6 @@
 *** Settings ***
 Library           JSONSchemaLibrary    schemas/
-Resource          environment/variables.txt    # Generic Parameters
-Resource          environment/vnfdInIndividualVnfPackage.txt
+Resource          environment/variables.txt
 Resource          VNFPackageManagementKeywords.robot    
 Library           JSONLibrary
 Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
diff --git a/SOL005/VNFPackageManagement-API/VNFPackageArtifacts.robot b/SOL005/VNFPackageManagement-API/VNFPackageArtifacts.robot
index 17fe131cf12c88d248fe202ddb2fe949143c8dbb..72304b9049c1d6a5612195cd4ce94c611b330882 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackageArtifacts.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackageArtifacts.robot
@@ -1,7 +1,6 @@
 *** Settings ***
 Library           JSONSchemaLibrary    schemas/
-Resource          environment/variables.txt    # Generic Parameters
-Resource          environment/vnfPackageArtifacts.txt
+Resource          environment/variables.txt
 Resource          VNFPackageManagementKeywords.robot 
 Library           JSONLibrary
 Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
diff --git a/SOL005/VNFPackageManagement-API/VNFPackageContent.robot b/SOL005/VNFPackageManagement-API/VNFPackageContent.robot
index 8d4248295881a76f9998606340f0bba055fd1c4e..661a04e62da509235ec78e165323f0b9a4fb2ee2 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackageContent.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackageContent.robot
@@ -1,7 +1,6 @@
 *** Settings ***
 Library           JSONSchemaLibrary    schemas/
-Resource          environment/variables.txt    # Generic Parameters
-Resource          environment/vnfPackageContent.txt
+Resource          environment/variables.txt
 Resource          VNFPackageManagementKeywords.robot    
 Library           JSONLibrary
 Library           OperatingSystem    
diff --git a/SOL005/VNFPackageManagement-API/VNFPackageContentViaURI.robot b/SOL005/VNFPackageManagement-API/VNFPackageContentViaURI.robot
index 82ccf7e73b0ca3ce87a9782873df1ea2c8555ee4..6369bdeebec57bda1b0ad28dcbf4e0009f04e0fe 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackageContentViaURI.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackageContentViaURI.robot
@@ -1,7 +1,6 @@
 *** Settings ***
 Library           JSONSchemaLibrary    schemas/
-Resource          environment/variables.txt    # Generic Parameters
-Resource          environment/vnfPackageContentViaUri.txt
+Resource          environment/variables.txt
 Resource          VNFPackageManagementKeywords.robot
 Library           JSONLibrary
 Library           OperatingSystem    
diff --git a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index ff83f44c601054446ece0a46dc88e86295f28a65..28b292b6a7cfde1a1d7ed91fcb593a259fe0f988 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -1,14 +1,6 @@
 *** Settings ***
 Library           JSONSchemaLibrary    schemas/
 Resource          environment/variables.txt    # Generic Parameters
-Resource          environment/subscriptions.txt
-Resource          environment/vnfPackages.txt    # VNF Packages specific parameters
-Resource          environment/individualVnfPackage.txt
-Resource          environment/vnfdInIndividualVnfPackage.txt
-Resource          environment/vnfPackageContent.txt
-Resource          environment/vnfPackageContentViaUri.txt
-Resource          environment/vnfPackageArtifacts.txt
-Resource          environment/individualSubscription.txt
 Library           OperatingSystem
 Library           JSONLibrary
 Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
diff --git a/SOL005/VNFPackageManagement-API/VNFPackages.robot b/SOL005/VNFPackageManagement-API/VNFPackages.robot
index 617e627de366d2c37c90ecb4f1d601d920e064ce..3cfc30de7b41b2c2bb8f2111c31e0c9d25c7f6f3 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackages.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackages.robot
@@ -1,5 +1,4 @@
 *** Settings ***
-Resource          environment/vnfPackages.txt    # VNF Packages specific parameters
 Library           JSONSchemaLibrary    schemas/
 Resource          environment/variables.txt    # Generic Parameters
 Resource          VNFPackageManagementKeywords.robot    
diff --git a/SOL005/VNFPackageManagement-API/environment/individualSubscription.txt b/SOL005/VNFPackageManagement-API/environment/individualSubscription.txt
deleted file mode 100644
index 78c7b91b436411ec93240864274e0912381ef171..0000000000000000000000000000000000000000
--- a/SOL005/VNFPackageManagement-API/environment/individualSubscription.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-*** Variables ***
-${subscriptionId}    f3ae6df7-07e1-47c9-8924-9ebe10343586
-${erroneousSubscriptionId}    442e3ee5-0499-4849-9b31-eb91ce1638f1    # Not existing ID on the subscriptions
-${newSubscriptionId}    newSubsciptionId
-${response}    httpresponse
-${origResponse}    httpresponse
-
diff --git a/SOL005/VNFPackageManagement-API/environment/individualVnfPackage.txt b/SOL005/VNFPackageManagement-API/environment/individualVnfPackage.txt
deleted file mode 100644
index 23b0dd07b95fb53b3a1022e25b0b003eb8e46d2a..0000000000000000000000000000000000000000
--- a/SOL005/VNFPackageManagement-API/environment/individualVnfPackage.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-*** Variables ***
-${erroneousVnfPackageId}    erroneousVnfPackageId    # Given ID for vnfPkg not present in database
-${disabledVnfPackageId}    87a2c9d3-00ea-4032-8c67-a5106d001868
-${vnfPackageId}  788106a2-d692-44f3-a86d-384f0ce35e42
-${instantiatedVnfPackageId}  0b79bab50daca910b000d4f1a2b675d604257e42
\ No newline at end of file
diff --git a/SOL005/VNFPackageManagement-API/environment/subscriptions.txt b/SOL005/VNFPackageManagement-API/environment/subscriptions.txt
deleted file mode 100644
index ca34ee831fbdd3dd3727821ab00ee81d82c00fc6..0000000000000000000000000000000000000000
--- a/SOL005/VNFPackageManagement-API/environment/subscriptions.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-*** Variables ***
-${filter_ok}      callbackUri=http://172.22.1.7:9091/vnfpkgm/subscriptions
-${filter_ko}      nfvId=f9f130e4-05eb-4082-a676-4c97d13a883d    # Not existant filter attribute-based
-${callbackUri}    http://172.22.1.7:9091/vnfpkgm/subscriptions
-${total_polling_time}   2 min
-${polling_interval}     10 sec
-${SEPERATOR}      =
\ No newline at end of file
diff --git a/SOL005/VNFPackageManagement-API/environment/variables.txt b/SOL005/VNFPackageManagement-API/environment/variables.txt
index 80469cdfead4dc91b9668e91d26b19968ed0f798..bb3a84bbe6081be64083933f30c96237199a441f 100644
--- a/SOL005/VNFPackageManagement-API/environment/variables.txt
+++ b/SOL005/VNFPackageManagement-API/environment/variables.txt
@@ -14,7 +14,6 @@ ${apiName}        vnfpkgm
 ${FIELD_USAGE}    1
 ${NFVO_PLAIN}     1
 ${NFVO_FIELDS}    1
-${onboardingStateVnfPkgId}    788106a2-d692-44f3-a86d-384f0ce35e42    # The VNF Package is in CREATED onboardingState
 
 ${testOptionalMethods}    0
 
@@ -31,7 +30,53 @@ ${polling_interval}     10 sec
 
 ${NFVO_CHECKS_NOTIF_ENDPOINT}    1
 
-${response}
+${response}    
 
 ${notification_request}    []
 ${notification_response}    []
+
+${subscriptionId}    f3ae6df7-07e1-47c9-8924-9ebe10343586
+${erroneousSubscriptionId}    442e3ee5-0499-4849-9b31-eb91ce1638f1    # Not existing ID on the subscriptions
+${newSubscriptionId}    newSubsciptionId
+${origResponse}    httpresponse
+
+${filter_ok}      callbackUri=http://172.22.1.7:9091/vnfpkgm/subscriptions
+${filter_ko}      nfvId=f9f130e4-05eb-4082-a676-4c97d13a883d    # Not existant filter attribute-based
+${SEPERATOR}      =
+
+${erroneousVnfPackageId}    erroneousVnfPackageId    # Given ID for vnfPkg not present in database
+${disabledVnfPackageId}    87a2c9d3-00ea-4032-8c67-a5106d001868
+${vnfPackageId}  788106a2-d692-44f3-a86d-384f0ce35e42
+${instantiatedVnfPackageId}  0b79bab50daca910b000d4f1a2b675d604257e42
+
+${ACCEPT_PLAIN}    text/plain
+${ACCEPT_ZIP}     application/zip
+${CONTENT_TYPE_PLAIN}    text/plain
+${CONTENT_TYPE_ZIP}    application/zip
+${NFVO_VNFD_PLAIN}    1
+${NFVO_VNFD_ZIP}    0
+${vnfPkgPlainVNFD}    c26ad7fb-072b-48c4-a663-7d71646d9e98    # The VNF Pakcage contains a VNFD which is a Single Plain File
+${vnfPkgZipVNFD}    f5b220d4-6177-4ebb-a554-a43311e16075    # The VNF Package contains a VNFD composed by multiple files
+${erroneousVnfPkgId}    erroneousPkgId
+${onboardingStateVnfPkgId}    788106a2-d692-44f3-a86d-384f0ce35e42    # The VNF Package is in CREATED onboardingState
+
+${artifactPath}    artifactPath
+${CONTENT_TYPE_OCTET}    application/octet-stream
+${NFVO_RANGE_OK}    1    # If 1 means that Range is supported by the NFVO
+${range}          bytes=0-1023
+${erroneousRange}    bytes=10000000-1000000000    # Requesting a out of range number of bytes
+${vnfPackageOctetStreamId}    octetStreamPkgId
+${vnfPkgId}       788106a2-d692-44f3-a86d-384f0ce35e42
+${length}          1024
+${creatingVnfPackageId}    d246ccdd-71aa-402f-b256-6a80ee54be3d
+${newVnfPackageId}    d246ccdd-71aa-402f-b256-6a80ee54be3d
+
+${POS_FILTER}     vnfdId=41fdd38a-3d4c-465c-83e0-f80e014425f8&vnfProvider=NXW    # Positive case, suing compiant fields name for filtering get request
+${NEG_FILTER}     nfvId=41fdd38a-3d4c-465c-83e0-f80e014425f8    # Negative case, using wrong name of field
+${CAN_FILTER}     1    # NFVO in able to use filters when retrieving VNF Packages
+${fields}         softwareImages,additionalArtifacts
+${BAD_AUTHORIZATION}    Bear sometoken
+${VAR_SEPERATOR}    &
+
+${vnfPkgViaUriId}       788106a2-d692-44f3-a86d-384f0ce35e42
+${creatingVnfPkgViaUriId}    d246ccdd-71aa-402f-b256-6a80ee54be3d
\ No newline at end of file
diff --git a/SOL005/VNFPackageManagement-API/environment/vnfPackageArtifacts.txt b/SOL005/VNFPackageManagement-API/environment/vnfPackageArtifacts.txt
deleted file mode 100644
index 4acfbd727d6a975eb3da974c81a9cb1f7b7e397f..0000000000000000000000000000000000000000
--- a/SOL005/VNFPackageManagement-API/environment/vnfPackageArtifacts.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-*** Variables ***
-${artifactPath}    artifactPath
-${CONTENT_TYPE_OCTET}    application/octet-stream
-${NFVO_RANGE_OK}    1    # If 1 means that Range is supported by the NFVO
-${range}          bytes=0-1023
-${erroneousRange}    bytes=10000000-1000000000    # Requesting a out of range number of bytes
-${erroneousVnfPkgId}    erroneousPkgId
-${vnfPackageOctetStreamId}    octetStreamPkgId
\ No newline at end of file
diff --git a/SOL005/VNFPackageManagement-API/environment/vnfPackageContent.txt b/SOL005/VNFPackageManagement-API/environment/vnfPackageContent.txt
deleted file mode 100644
index c775a126d8f2e4031134feb00028a2358f32d2ce..0000000000000000000000000000000000000000
--- a/SOL005/VNFPackageManagement-API/environment/vnfPackageContent.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-*** Variables ***
-${ACCEPT_ZIP}     application/zip
-${CONTENT_TYPE_ZIP}    application/zip
-${NFVO_RANGE_OK}    1    # If 1 means that Range is supported by the NFVO
-${erroneousVnfPkgId}    erroneousPkgId
-${vnfPkgId}       788106a2-d692-44f3-a86d-384f0ce35e42
-${erroneousRange}    bytes=100000-1000000    # Requesting a out of range number of bytes
-${range}          bytes=0-1023
-${length}          1024
-${creatingVnfPackageId}    d246ccdd-71aa-402f-b256-6a80ee54be3d
-${newVnfPackageId}    d246ccdd-71aa-402f-b256-6a80ee54be3d
-
diff --git a/SOL005/VNFPackageManagement-API/environment/vnfPackageContentViaUri.txt b/SOL005/VNFPackageManagement-API/environment/vnfPackageContentViaUri.txt
deleted file mode 100644
index 9cb902861d34f0dc7c909832c489dc7a8cea5309..0000000000000000000000000000000000000000
--- a/SOL005/VNFPackageManagement-API/environment/vnfPackageContentViaUri.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-*** Variables ***
-${vnfPkgViaUriId}       788106a2-d692-44f3-a86d-384f0ce35e42
-${creatingVnfPkgViaUriId}    d246ccdd-71aa-402f-b256-6a80ee54be3d
-
diff --git a/SOL005/VNFPackageManagement-API/environment/vnfPackages.txt b/SOL005/VNFPackageManagement-API/environment/vnfPackages.txt
deleted file mode 100644
index 8f599ef60e0a6c0bb1da6116f2e035e686ffae1a..0000000000000000000000000000000000000000
--- a/SOL005/VNFPackageManagement-API/environment/vnfPackages.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-*** Variables ***
-${POS_FILTER}     vnfdId=41fdd38a-3d4c-465c-83e0-f80e014425f8&vnfProvider=NXW    # Positive case, suing compiant fields name for filtering get request
-${NEG_FILTER}     nfvId=41fdd38a-3d4c-465c-83e0-f80e014425f8    # Negative case, using wrong name of field
-${CAN_FILTER}     1    # NFVO in able to use filters when retrieving VNF Packages
-${fields}         softwareImages,additionalArtifacts
-${response}       httpresponse
-${NEG_AUTHORIZATION}    Bearer negativetoken
-${BAD_AUTHORIZATION}    Bear sometoken
-${SEPERATOR}      =
-${VAR_SEPERATOR}    &
diff --git a/SOL005/VNFPackageManagement-API/environment/vnfdInIndividualVnfPackage.txt b/SOL005/VNFPackageManagement-API/environment/vnfdInIndividualVnfPackage.txt
deleted file mode 100644
index 8e228037e47c58578d936e9e1485308add7406d2..0000000000000000000000000000000000000000
--- a/SOL005/VNFPackageManagement-API/environment/vnfdInIndividualVnfPackage.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-*** Variables ***
-${ACCEPT_PLAIN}    text/plain
-${ACCEPT_ZIP}     application/zip
-${CONTENT_TYPE_PLAIN}    text/plain
-${CONTENT_TYPE_ZIP}    application/zip
-${NFVO_VNFD_PLAIN}    1
-${NFVO_VNFD_ZIP}    0
-${vnfPkgPlainVNFD}    c26ad7fb-072b-48c4-a663-7d71646d9e98    # The VNF Pakcage contains a VNFD which is a Single Plain File
-${vnfPkgZipVNFD}    f5b220d4-6177-4ebb-a554-a43311e16075    # The VNF Package contains a VNFD composed by multiple files
-${erroneousVnfPkgId}    erroneousPkgId
-${onboardingStateVnfPkgId}    788106a2-d692-44f3-a86d-384f0ce35e42    # The VNF Package is in CREATED onboardingState
-${vnfPackageId}  788106a2-d692-44f3-a86d-384f0ce35e42