diff --git a/SOL002/VNFIndicator-API/IndividualVNFindicator.robot b/SOL002/VNFIndicator-API/IndividualVNFindicator.robot
index 19b7fb4698a33047153a39eaa7ec5066882be963..437cb6f3a1dbb8301d3a22e3409900703148c807 100644
--- a/SOL002/VNFIndicator-API/IndividualVNFindicator.robot
+++ b/SOL002/VNFIndicator-API/IndividualVNFindicator.robot
@@ -1,7 +1,6 @@
*** Settings ***
Library JSONSchemaLibrary schemas/
Resource environment/variables.txt # Generic Parameters
-Resource environment/individualVnfIndicator.txt
Library REST ${EM-VNF_SCHEMA}://${EM-VNF_HOST}:${EM-VNF_PORT} ssl_verify=false
*** Test Cases ***
diff --git a/SOL002/VNFIndicator-API/Subscriptions.robot b/SOL002/VNFIndicator-API/Subscriptions.robot
index 0e208cd33d3c7008f3a2736fa8a305cf270cb17f..d0f7f89dd0874ca8687174d21bcf723619fc39ba 100644
--- a/SOL002/VNFIndicator-API/Subscriptions.robot
+++ b/SOL002/VNFIndicator-API/Subscriptions.robot
@@ -1,7 +1,6 @@
*** Settings ***
Library JSONSchemaLibrary schemas/
Resource environment/variables.txt # Generic Parameters
-Resource environment/subscriptions.txt
Library OperatingSystem
Library JSONLibrary
Library Process
@@ -220,7 +219,7 @@ Send Post Request for VNF Indicator Subscription
Set Headers {"Accept": "${ACCEPT_JSON}"}
Set Headers {"Content-Type": "${CONTENT_TYPE_JSON}"}
${template}= Get File jsons/subscriptions.json
- ${body}= Format String ${template} callback_uri=${callback_uri} callback_endpoint=${callback_endpoint}
+ ${body}= Format String ${template} callback_uri=${callback_uri} callback_endpoint=${callback_endpoint}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
POST ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions ${body}
${output}= Output response
diff --git a/SOL002/VNFIndicator-API/VNFIndicators.robot b/SOL002/VNFIndicator-API/VNFIndicators.robot
index f3f8f20f88073f4c2f08793ed71783614ce4d663..0addde85823850b4b4fddd01cc9fca1034a244fc 100644
--- a/SOL002/VNFIndicator-API/VNFIndicators.robot
+++ b/SOL002/VNFIndicator-API/VNFIndicators.robot
@@ -4,7 +4,6 @@ Library JSONSchemaLibrary schemas/
Resource environment/variables.txt # Generic Parameters
Library JSONLibrary
Library String
-Resource environment/vnfIndicators.txt
Library REST ${EM-VNF_SCHEMA}://${EM-VNF_HOST}:${EM-VNF_PORT} ssl_verify=false
*** Test Cases ***
diff --git a/SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot b/SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot
index 14cb889721e9b3b8ecfc6ea30f7e5882408de890..b25da0214a2dea2b0c1537a74bc6fa9854f08ea0 100644
--- a/SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot
+++ b/SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot
@@ -2,7 +2,6 @@
Documentation This resource represents VNF indicators related to a VNF instance. The client can use this resource to query multiple VNF indicators that are related to a particular VNF instance.
Library JSONSchemaLibrary schemas/
Resource environment/variables.txt # Generic Parameters
-Resource environment/vnfIndicatorinVnfInstance.txt
Library JSONLibrary
Library String
Library REST ${EM-VNF_SCHEMA}://${EM-VNF_HOST}:${EM-VNF_PORT} ssl_verify=false
diff --git a/SOL002/VNFIndicator-API/environment/individualSubscription.txt b/SOL002/VNFIndicator-API/environment/individualSubscription.txt
deleted file mode 100644
index 1ae7592905ba5abf23204085eab6c19e0a894210..0000000000000000000000000000000000000000
--- a/SOL002/VNFIndicator-API/environment/individualSubscription.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-*** Variables ***
-${subscriptionId} f3ae6df7-07e1-47c9-8924-9ebe10343586
-${erroneousSubscriptionId} 442e3ee5-0499-4849-9b31-eb91ce1638f1 # Not existing ID on the subscriptions
-${response}= httpresponse
-${origResponse}= httpresponse
\ No newline at end of file
diff --git a/SOL002/VNFIndicator-API/environment/individualVnfIndicator.txt b/SOL002/VNFIndicator-API/environment/individualVnfIndicator.txt
deleted file mode 100644
index 5e90a5d7060ef53b76b6310d23bf633c3397024d..0000000000000000000000000000000000000000
--- a/SOL002/VNFIndicator-API/environment/individualVnfIndicator.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-*** Variables ***
-${vnfInstanceId} 80b0deba-c398-445b-bef0-ac0fe733e3d0
-${indicatorId} 34e70855-a9d3-4fef-aece-76a3cd266ec8
-${notAllowedIndicatorId} notAllowedId
-${erroneousIndicatorId} erroneousIndicatorId
-${response}= httpresponse
diff --git a/SOL002/VNFIndicator-API/environment/subscriptions.txt b/SOL002/VNFIndicator-API/environment/subscriptions.txt
deleted file mode 100644
index ec4b63ac0b029a4352bd6e32d35b625436fed83b..0000000000000000000000000000000000000000
--- a/SOL002/VNFIndicator-API/environment/subscriptions.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-*** Variables ***
-${vnfInstanceId} 80b0deba-c398-445b-bef0-ac0fe733e3d0
-${indicatorId} 34e70855-a9d3-4fef-aece-76a3cd266ec8
-${erroneousIndicatorId} erroneousIndicatorId
-${POS_FILTER} callbackUri=http://127.0.0.1/subscribe
-${NEG_FILTER} callback=http://127.0.0.1/subscribe
-${response}= httpresponse
-${total_polling_time} 2 min
-${polling_interval} 10 sec
-${SEPERATOR} =
\ No newline at end of file
diff --git a/SOL002/VNFIndicator-API/environment/variables.txt b/SOL002/VNFIndicator-API/environment/variables.txt
index 22f32a1fbe4b357b20e4682dc5cc0825e5a7c26e..b0843366065c9f4f406769d28642245985cd3215 100644
--- a/SOL002/VNFIndicator-API/environment/variables.txt
+++ b/SOL002/VNFIndicator-API/environment/variables.txt
@@ -24,4 +24,28 @@ ${callback_port} 9091
${callback_endpoint} /endpoint
${callback_endpoint_error} /endpoint_404
-${response} some_response_object
\ No newline at end of file
+${response} some_response_object
+
+
+${subscriptionId} f3ae6df7-07e1-47c9-8924-9ebe10343586
+${erroneousSubscriptionId} 442e3ee5-0499-4849-9b31-eb91ce1638f1 # Not existing ID on the subscriptions
+${origResponse}= httpresponse
+
+${vnfInstanceId} 80b0deba-c398-445b-bef0-ac0fe733e3d0
+${indicatorId} 34e70855-a9d3-4fef-aece-76a3cd266ec8
+${notAllowedIndicatorId} notAllowedId
+${erroneousIndicatorId} erroneousIndicatorId
+
+${POS_FILTER} callbackUri=http://127.0.0.1/subscribe
+${NEG_FILTER} callback=http://127.0.0.1/subscribe
+${total_polling_time} 2 min
+${polling_interval} 10 sec
+${SEPERATOR} =
+
+${erroneousVnfInstanceId} erroneousVnfInstanceId
+${POS_FIELDS} name=vnfIndicator
+${NEG_FIELDS} wrongName=any_value
+
+
+${vnfIndicators} =
+${VAR_SEPERATOR} &
\ No newline at end of file
diff --git a/SOL002/VNFIndicator-API/environment/vnfIndicatorinVnfInstance.txt b/SOL002/VNFIndicator-API/environment/vnfIndicatorinVnfInstance.txt
deleted file mode 100644
index 8651dee3da6c2b3a4eabfa69879dee2659db881e..0000000000000000000000000000000000000000
--- a/SOL002/VNFIndicator-API/environment/vnfIndicatorinVnfInstance.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-*** Variables ***
-${vnfInstanceId} 80b0deba-c398-445b-bef0-ac0fe733e3d0
-${erroneousVnfInstanceId} erroneousVnfInstanceId
-${POS_FIELDS} name=vnfIndicator
-${NEG_FIELDS} wrongName=any_value
-${response}= httpresponse
-${SEPERATOR} =
\ No newline at end of file
diff --git a/SOL002/VNFIndicator-API/environment/vnfIndicators.txt b/SOL002/VNFIndicator-API/environment/vnfIndicators.txt
deleted file mode 100644
index 8476590796160e3da8b0d6c7e3548b5d74381854..0000000000000000000000000000000000000000
--- a/SOL002/VNFIndicator-API/environment/vnfIndicators.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-*** Variables ***
-${POS_FIELDS} name=vnfIndicator&vnfInstanceId=80b0deba-c398-445b-bef0-ac0fe733e3d0
-${NEG_FIELDS} wrongName=wrongValue
-${response} some_response_object
-${vnfIndicators} =
-${SEPERATOR} =
-${VAR_SEPERATOR} &
-${POS_FILTER} =
\ No newline at end of file