diff --git a/SOL002/VNFLifecycleManagement-API/environment/variables.txt b/SOL002/VNFLifecycleManagement-API/environment/variables.txt
index 3c0d6ef32deb2f5551b41867382145b67ff46f96..21bb5d38dd71f4ea0f87cac52307a086b07a608b 100644
--- a/SOL002/VNFLifecycleManagement-API/environment/variables.txt
+++ b/SOL002/VNFLifecycleManagement-API/environment/variables.txt
@@ -41,5 +41,13 @@ ${VnfIdentifierDeletionNotification}    {}
 ${callback_uri}    http://localhost
 ${callback_port}    9091
 ${callback_endpoint}    /endpoint
+${callback_endpoint_fwd}    /endpoint/check
 ${callback_endpoint_error}    /endpoint_404
-${sleep_interval}    20s
\ No newline at end of file
+${sleep_interval}    20s
+${total_polling_time}   2 min
+${polling_interval}     10 sec
+
+${notification_request}    []
+${notification_response}    []
+
+${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/schemas/vnfIdentifierDeletionNotification.schema.json b/SOL002/VNFLifecycleManagement-API/schemas/VnfIdentifierDeletionNotification.schema.json
similarity index 100%
rename from SOL002/VNFLifecycleManagement-API/schemas/vnfIdentifierDeletionNotification.schema.json
rename to SOL002/VNFLifecycleManagement-API/schemas/VnfIdentifierDeletionNotification.schema.json
diff --git a/SOL002/VNFLifecycleManagement-API/schemas/vnfLcmOperationOccurrenceNotification.schema.json b/SOL002/VNFLifecycleManagement-API/schemas/VnfLcmOperationOccurrenceNotification.schema.json
similarity index 100%
rename from SOL002/VNFLifecycleManagement-API/schemas/vnfLcmOperationOccurrenceNotification.schema.json
rename to SOL002/VNFLifecycleManagement-API/schemas/VnfLcmOperationOccurrenceNotification.schema.json
diff --git a/SOL003/VNFLifecycleManagement-API/environment/variables.txt b/SOL003/VNFLifecycleManagement-API/environment/variables.txt
index 82e8f8ad6b342a23100c6510e3f6575548b8dfdd..7d2807f15318317f721dc18e54064a383fcea9d6 100644
--- a/SOL003/VNFLifecycleManagement-API/environment/variables.txt
+++ b/SOL003/VNFLifecycleManagement-API/environment/variables.txt
@@ -2,18 +2,12 @@
 ${vnfInstanceId}       6fc3539c-e602-4afa-8e13-962fb5a7d81f
 ${subscriptionId}    6fc3539c-e602-4afa-8e13-962fb5a7d81f
 ${vnfLcmOpOccId}    6fc3539c-e602-4afa-8e13-962fb5a7d81d
-${callback_endpoint}    /notification
-${callback_endpoint_fwd}    /notification/check
-${callback_port}    9091
-${callback_uri}    http://localhost
 ${conflicVnfInstanceId}    6fc3539c-e602-4afa-8e13-962fb5a7d81f
 
 ${VnfLcmOperationOccurrenceNotification}    {}
 ${VnfIdentifierCreationNotification}    {}
 ${VnfIdentifierDeletionNotification}    {}
 ${response}    {}
-${notification_request}    []
-${notification_response}    []
 ${json}    {}
 ${requestedFlavour}    test
 
@@ -30,9 +24,21 @@ ${vnfInstanceDescription_Update}    Updated description vnf
 ${vnfPkgId_processing}    007c111c-38a1-42c0-a666-7475ecb1567c
 
 ${changeVnfFlavourRequest}    {}
-${requestedFlavour}    test
 ${changeVnfOperateRequest}    {}
 ${requestedState}   test
 ${changeVnfExtConnectivityRequest}    {}
 ${patchBodyRequest}   {}
 
+${callback_uri}    http://localhost
+${callback_port}    9091
+${callback_endpoint}    /endpoint
+${callback_endpoint_fwd}    /endpoint/check
+${callback_endpoint_error}    /endpoint_404
+${sleep_interval}    20s
+${total_polling_time}   2 min
+${polling_interval}     10 sec
+
+${notification_request}    []
+${notification_response}    []
+
+${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
diff --git a/SOL005/NSLifecycleManagement-API/environment/variables.txt b/SOL005/NSLifecycleManagement-API/environment/variables.txt
index cd67b8179da2bba0df3416b1718a5a2d56c151e9..47a4c6464d0426c80e1ad16f5a8de55e7bb2fa7f 100644
--- a/SOL005/NSLifecycleManagement-API/environment/variables.txt
+++ b/SOL005/NSLifecycleManagement-API/environment/variables.txt
@@ -39,9 +39,16 @@ ${VnfIdentifierDeletionNotification}    {}
 ${callback_uri}    http://localhost
 ${callback_port}    9091
 ${callback_endpoint}    /endpoint
-${callback_endpoint_fwd}    /notification/check
+${callback_endpoint_fwd}    /endpoint/check
 ${callback_endpoint_error}    /endpoint_404
 ${sleep_interval}    20s
+${total_polling_time}   2 min
+${polling_interval}     10 sec
+
+${notification_request}    []
+${notification_response}    []
+
+${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
 
 ${response}    {}