diff --git a/internal_variables.txt b/internal_variables.txt
new file mode 100644
index 0000000000000000000000000000000000000000..51cafb784cd5e125b2ff19e77f6547bcea0800c5
--- /dev/null
+++ b/internal_variables.txt
@@ -0,0 +1,541 @@
+################################################################
+####################### v3.3.1-fix-plu #########################
+################################################################
+
+
+######################### SOL002 ###############################
+
+
+### SOL002 VNFConfiguration-API ###
+
+${response}=    httpresponse
+${ACCEPT}         application/json
+${CONTENT_TYPE}    application/json
+
+### SOL002 VNFFaultManagement-API ###
+
+${ACCEPT}         application/json
+${ACCEPT_JSON}         application/json
+${CONTENT_TYPE}    application/json
+${origResponse}=    httpresponse
+${CONTENT_TYPE_PATCH}    application/merge-patch+json
+${notification_request}    []
+${notification_response}    []
+${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
+${AlarmNotification}    {}
+${AlarmClearedNotification}    {}
+${AlarmListRebuiltNotification}    {}
+#${response}=    httpresponse
+
+### SOL002 VNFIndicator-API ###
+
+${CONTENT_TYPE_JSON}    application/json
+#${ACCEPT_JSON}    application/json
+#${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
+#${response}       some_response_object
+#${origResponse}=    httpresponse
+${vnfIndicators}  =   
+
+### SOL002 VNFIndicatorNotification-API ###
+
+#${notification_request}    []
+#${notification_response}    []
+#${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
+
+### SOL002 VNFLifecycleManagement-API ###
+
+#${CONTENT_TYPE}    application/json
+#${CONTENT_TYPE_PATCH}    application/merge-patch+json
+#${ACCEPT}         application/json
+#${ACCEPT_JSON}         application/json
+${ACCEPT_PLAIN}    text/plain
+${ACCEPT_ZIP}     application/zip
+${ARTIFACT_TYPE}    application/octet-stream
+${WRONG_ACCEPT}    application/json
+${VnfLcmOperationOccurrenceNotification}    {}
+${VnfIdentifierCreationNotification}    {}
+${VnfIdentifierDeletionNotification}    {}
+#${notification_request}    []
+#${notification_response}    []
+#${response}=    httpresponse
+#${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
+
+${tosca_type_VDU_compute}    tosca.nodes.nfv.Vdu.Compute
+${tosca_type_VNF}    tosca.nodes.nfv.VNF
+${tosca_type_virtual_link}    tosca.nodes.nfv.VnfVirtualLink
+${tosca_type_VDU_cp}    tosca.nodes.nfv.VduCp
+${tosca_type_storage}    tosca.nodes.nfv.Vdu.VirtualBlockStorage
+ 
+@{VDU_IDs}
+@{VNF_IDs}
+@{virtualLink_IDs}
+@{CP_IDs}
+@{Storage_IDs}
+@{internalCP_IDs}
+@{externalCP_IDs}
+@{InstantiationLevel_IDs}
+
+${Descriptor_ID}
+${Provider}
+${Product_Name}
+${Software_Version}
+${Descriptor_Version}
+
+${scaleVnfRequesttype}    SCALE_OUT
+${scaleVnfRequestAspect}    Aspect
+
+
+### SOL002 VNFPerformanceManagement-API ###
+
+#${CONTENT_TYPE_JSON}    application/json
+#${CONTENT_TYPE_PATCH}    application/merge-patch+json
+#${ACCEPT_JSON}    application/json
+#${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
+#${response}        http-response
+${subscribe}    /subscribe
+${OrigResponse}=    httpresponse
+
+### SOL002 VNFPerformanceManagementNotification-API ###
+
+#${notification_request}    []
+#${notification_response}    []
+#${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
+
+
+######################### SOL003 ###############################
+
+
+### SOL003 VirtualizedQuotaAvailableNotification-API ###
+
+#${CONTENT_TYPE}    application/json
+#${ACCEPT}         application/json
+#${notification_request}    []
+#${notification_response}    []
+${VrQuotaAvailNotification}    {}
+#${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
+#${response}    {}
+
+
+### SOL003 VNFFaultManagement-API ###
+
+#${CONTENT_TYPE}    application/json
+#${ACCEPT}         application/json
+#${ACCEPT_JSON}         application/json
+#${CONTENT_TYPE_PATCH}    application/merge-patch+json
+#${AlarmNotification}    {}
+#${AlarmClearedNotification}    {}
+#${AlarmListRebuiltNotification}    {}
+#${response}    {}
+${req_mock}    {}
+${resp_mock}    {}
+#${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
+
+
+### SOL003 VNFFaultManagementNotification-API ###
+
+#${notification_request}    []
+#${notification_response}    []
+#${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
+
+
+### SOL003 VNFIndicator-API ###
+
+#${ACCEPT_JSON}    application/json
+#${CONTENT_TYPE_JSON}    application/json
+#${response}
+#${notification_request}    []
+#${notification_response}    []
+#${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
+#${origResponse}    httpresponse
+
+
+### SOL003 VNFLifecycleManagement-API ###
+
+#${ACCEPT}         application/json
+#${ACCEPT_JSON}         application/json
+#${CONTENT_TYPE}    application/json
+#${CONTENT_TYPE_PATCH}    application/merge-patch+json
+#${ACCEPT_PLAIN}    text/plain
+#${ACCEPT_ZIP}     application/zip
+#${ARTIFACT_TYPE}    application/octet-stream
+#${WRONG_ACCEPT}    application/json
+${ACCEPT_OCTET}    application/octet-stream 
+
+${CONTENT_TYPE_OCTET}    application/octet-stream
+${VnfLcmOperationOccurrenceNotification}    {}
+${VnfIdentifierCreationNotification}    {}
+${VnfIdentifierDeletionNotification}    {}
+#${response}    {}
+${json}    {}
+
+${changeVnfFlavourRequest}    {}
+${changeVnfOperateRequest}    {}
+${requestedState}   test
+${changeVnfExtConnectivityRequest}    {}
+${patchBodyRequest}   {}
+
+#${notification_request}    []
+#${notification_response}    []
+#${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
+
+${LccnSubscriptions}    
+${scaleInfo}
+${element}
+${scaleOutResponse}
+
+#${tosca_type_VDU_compute}    tosca.nodes.nfv.Vdu.Compute
+#${tosca_type_virtual_link}    tosca.nodes.nfv.VnfVirtualLink
+#${tosca_type_VDU_cp}    tosca.nodes.nfv.VduCp
+ 
+#@{VDU_IDs}
+#@{virtualLink_IDs}
+#@{CP_IDs}
+#@{externalCP_IDs}
+
+#${Descriptor_ID}
+#${Provider}
+#${Product_Name}
+#${Software_Version}
+#${Descriptor_Version}
+
+
+### SOL003 VNFLifecycleOperationGranting-API ###
+
+#${CONTENT_TYPE}    application/json
+#${ACCEPT}         application/json
+#${response}    {}
+#${CONTENT_TYPE_PATCH}    application/merge-patch+json
+#${ACCEPT_PLAIN}    text/plain
+#${ACCEPT_ZIP}     application/zip
+#${ARTIFACT_TYPE}    application/octet-stream
+#${WRONG_ACCEPT}    application/json
+#${VrQuotaAvailNotification}    {}
+
+#${tosca_type_VDU_compute}    tosca.nodes.nfv.Vdu.Compute
+#${tosca_type_virtual_link}    tosca.nodes.nfv.VnfVirtualLink
+#${tosca_type_VDU_cp}    tosca.nodes.nfv.VduCp
+ 
+#@{VDU_IDs}
+#@{virtualLink_IDs}
+#@{CP_IDs}
+#@{externalCP_IDs}
+
+#${Descriptor_ID}
+#${Provider}
+#${Product_Name}
+#${Software_Version}
+#${Descriptor_Version}
+
+
+### SOL003 VNFPackageManagement-API ###
+
+#${ACCEPT_JSON}    application/json
+#${CONTENT_TYPE_JSON}    application/json
+#${response}    httpresponse
+#${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
+#${notification_request}    []
+#${notification_response}    []
+#${origResponse}    httpresponse
+#${ACCEPT_PLAIN}    text/plain
+${CONTENT_TYPE_PLAIN}    text/plain
+#${ACCEPT_ZIP}     application/zip
+${CONTENT_TYPE_ZIP}    application/zip
+#${artifactPath}    artifactPath
+#${CONTENT_TYPE_OCTET}    application/octet-stream
+
+#${Descriptor_ID}
+#${Provider}
+#${Product_Name}
+#${Software_Version}
+#${Descriptor_Version}
+
+### SOL003 VNFPerformanceManagement-API ###
+
+
+#${CONTENT_TYPE_JSON}    application/json
+#${CONTENT_TYPE_PATCH}    application/merge-patch+json
+#${ACCEPT_JSON}    application/json
+#${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
+#${response}=    httpresponse
+#${OrigResponse}=    httpresponse
+#${notification_request}    []
+#${notification_response}    []
+
+
+### SOL003 VNFSnapshotPackages-API ###
+
+#${ACCEPT_JSON}    application/json
+#${AUTH_USAGE}     1
+#${CONTENT_TYPE_JSON}    application/json
+#${response}    httpresponse
+#${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
+#${notification_request}    []
+#${notification_response}    []
+#${origResponse}    httpresponse
+#${ACCEPT_PLAIN}    text/plain
+#${CONTENT_TYPE_PLAIN}    text/plain
+#${ACCEPT_ZIP}     application/zip
+#${ACCEPT_OCTET}    application/octet-stream
+#${CONTENT_TYPE_ZIP}    application/zip
+#${CONTENT_TYPE_OCTET}    application/octet-stream
+
+
+######################### SOL005 ###############################
+
+
+### SOL005 NFVICapacityInformation-API ###
+
+#${ACCEPT_JSON}    application/json
+#${CONTENT_TYPE_JSON}    application/json
+#${CONTENT_TYPE_PATCH}    application/merge-patch+json
+#${response}    httpresponse
+#${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
+#${notification_request}    []
+#${notification_response}    []
+#${origResponse}    httpresponse
+#${ACCEPT_PLAIN}    text/plain
+#${CONTENT_TYPE_PLAIN}    text/plain
+#${ACCEPT_ZIP}     application/zip
+#${ACCEPT_OCTET}    application/octet-stream
+#${CONTENT_TYPE_ZIP}    application/zip
+#${CONTENT_TYPE_OCTET}    application/octet-stream
+
+
+### SOL005 NSDManagement-API ###
+
+#${CONTENT_TYPE_JSON}    application/json
+#${ACCEPT_JSON}    application/json
+#${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
+#${notification_request}    []
+#${notification_response}    []
+#${response}    httpresponse
+#${origResponse}    httpresponse
+#${ACCEPT_ZIP}    application/zip
+#${ACCEPT_PLAIN}    text/plain
+#${CONTENT_TYPE_ZIP}    application/zip
+#${CONTENT_TYPE_PLAIN}    text/plain
+#${CONTENT_TYPE_OCTET}    application/octet-stream
+
+
+### SOL005 NSFaultManagement-API ###
+
+#${ACCEPT}         application/json
+#${ACCEPT_JSON}         application/json
+#${CONTENT_TYPE}    application/json
+#${CONTENT_TYPE_PATCH}    application/merge-patch+json
+#${AlarmNotification}    {}
+#${AlarmClearedNotification}    {}
+#${AlarmListRebuiltNotification}    {}
+#${response}    {}
+#${req_mock}    {}
+#${resp_mock}    {}
+#${notification_request}    []
+#${notification_response}    []
+
+
+### SOL005 NSLifecycleManagement-API ###
+
+#${CONTENT_TYPE}    application/json
+#${CONTENT_TYPE_PATCH}    application/merge-patch+json
+#${ACCEPT_JSON}         application/json
+#${ACCEPT}         application/json
+#${ACCEPT_PLAIN}    text/plain
+#${ACCEPT_ZIP}     application/zip
+#${ARTIFACT_TYPE}    application/octet-stream
+#${WRONG_ACCEPT}    application/json
+#${VnfLcmOperationOccurrenceNotification}    {}
+#${VnfIdentifierCreationNotification}    {}
+#${VnfIdentifierDeletionNotification}    {}
+#${notification_request}    {}
+#${notification_response}    {}
+#${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
+#${response}    {}
+#${json}    {"notificationStatus": ""}
+
+#${tosca_type_VDU_compute}    tosca.nodes.nfv.Vdu.Compute
+#${tosca_type_VNF}    tst010.vnf.simple    # custom tosca type defined in the descriptor vnfd_SOL001.yaml in descriptors folder
+#${tosca_type_virtual_link}    tosca.nodes.nfv.VnfVirtualLink
+#${tosca_type_VDU_cp}    tosca.nodes.nfv.VduCp
+#${tosca_type_storage}    tosca.nodes.nfv.Vdu.VirtualBlockStorage
+
+#@{VDU_IDs}
+#@{VNF_IDs}
+#@{virtualLink_IDs}
+#@{CP_IDs}
+#@{Storage_IDs}
+#@{internalCP_IDs}
+#@{externalCP_IDs}
+#@{InstantiationLevel_IDs}
+
+#${Descriptor_ID}
+#${Provider}
+#${Product_Name}
+#${Software_Version}
+#${Descriptor_Version}
+
+
+### SOL005 NSPerformanceManagement-API ###
+
+#${CONTENT_TYPE_JSON}    application/json
+#${ACCEPT_JSON}    application/json
+#${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
+
+#${response}    {}
+#${CONTENT_TYPE_PATCH}    application/merge-patch+json
+#${origResponse}=    httpresponse
+#${notification_request}    []
+#${notification_response}    []
+
+
+### SOL005 VNFPackageManagement-API ###
+
+#${CONTENT_TYPE_JSON}    application/json
+#${ACCEPT_JSON}    application/json
+#${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
+#${response}    
+#${notification_request}    []
+#${notification_response}    []
+#${origResponse}    httpresponse
+#${ACCEPT_PLAIN}    text/plain
+#${ACCEPT_ZIP}     application/zip
+#${CONTENT_TYPE_PLAIN}    text/plain
+#${CONTENT_TYPE_ZIP}    application/zip
+#${CONTENT_TYPE_OCTET}    application/octet-stream
+
+#${tosca_type_VDU_compute}    tosca.nodes.nfv.Vdu.Compute
+#${tosca_type_VNF}    tosca.nodes.nfv.VNF
+#${tosca_type_virtual_link}    tosca.nodes.nfv.VnfVirtualLink
+#${tosca_type_VDU_cp}    tosca.nodes.nfv.VduCp
+#${tosca_type_storage}    tosca.nodes.nfv.Vdu.VirtualBlockStorage
+  
+#@{VDU_IDs}
+#@{VNF_IDs}
+#@{virtualLink_IDs}
+#@{CP_IDs}
+#@{Storage_IDs}
+#@{internalCP_IDs}
+#@{externalCP_IDs}
+#@{InstantiationLevel_IDs}
+
+#${Descriptor_ID}
+#${Provider}
+#${Product_Name}
+#${Software_Version}
+#${Descriptor_Version}
+
+### SOL005 VNFSnapshotPackageManagement-API ###
+
+#${ACCEPT_JSON}    application/json
+#${CONTENT_TYPE_JSON}    application/json
+#${response}    httpresponse
+#${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
+#${notification_request}    []
+#${notification_response}    []
+#${origResponse}    httpresponse
+#${ACCEPT_PLAIN}    text/plain
+#${CONTENT_TYPE_PLAIN}    text/plain
+#${ACCEPT_ZIP}     application/zip
+#${ACCEPT_OCTET}    application/octet-stream
+#${CONTENT_TYPE_ZIP}    application/zip
+#${CONTENT_TYPE_OCTET}    application/octet-stream
+
+
+######################### SOL009 ###############################
+
+### SOL009 NFVManoConfigurationAndInformationManagement-API ###
+
+#${CONTENT_TYPE_JSON}    application/json
+#${ACCEPT_JSON}    application/json
+#${CONTENT_TYPE_PATCH}    application/merge-patch+json
+#${response}   
+#${notification_request}    []
+#${notification_response}    []
+#${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
+#${origResponse}    {}
+
+
+### SOL009 NFVMANOFaultManagement-API ###
+
+#${CONTENT_TYPE}    application/json
+#${ACCEPT}         application/json
+#${ACCEPT_JSON}         application/json
+#${response}    {}
+#${CONTENT_TYPE_PATCH}    application/merge-patch+json
+#${notification_request}    []
+#${notification_response}    []
+#${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
+
+
+### SOL009 NFVMANOLogManagement-API ###
+
+#${CONTENT_TYPE}    application/json
+#${CONTENT_TYPE_JSON}    application/json
+#${ACCEPT_JSON}    application/json
+#${ACCEPT}         application/json
+#${response}    {}
+#${origResponse}    {}
+#${notification_request}    []
+#${notification_response}    []
+#${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
+
+
+### SOL009 NFVMANOPerformanceManagement-API ###
+
+#${response}=    httpresponse
+#${OrigResponse}=    httpresponse
+#${notification_request}    []
+#${notification_response}    []
+#${CONTENT_TYPE_JSON}    application/json
+#${ACCEPT_JSON}    application/json
+#${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
+#${response} 
+
+
+######################### SOL011 ###############################
+
+
+### SOL011 NSInstanceUsageNotification-API ###
+
+#${CONTENT_TYPE}    application/json
+#${CONTENT_TYPE_JSON}    application/json
+#${ACCEPT}         application/json
+#${ACCEPT_JSON}         application/json
+#${response}    {}
+#${CONTENT_TYPE_PATCH}    application/merge-patch+json
+#${ACCEPT_PLAIN}    text/plain
+#${ACCEPT_ZIP}     application/zip
+#${ARTIFACT_TYPE}    application/octet-stream
+#${WRONG_ACCEPT}    application/json
+#${VrQuotaAvailNotification}    {}
+#${notification_request}    []
+#${notification_response}    []
+#${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
+
+### SOL011 NSLifecycleOperationGranting-API ###
+
+#${CONTENT_TYPE}    application/json
+#${ACCEPT}         application/json
+#${response}
+#${CONTENT_TYPE_PATCH}    application/merge-patch+json
+#${ACCEPT_PLAIN}    text/plain
+#${ACCEPT_ZIP}     application/zip
+#${ARTIFACT_TYPE}    application/octet-stream
+#${WRONG_ACCEPT}    application/json
+#${VrQuotaAvailNotification}    {}
+
+
+######################### SOL012 ###############################
+
+
+### SOL012 PolicyManagement-API ###
+
+#${CONTENT_TYPE}    application/json
+#${CONTENT_TYPE_JSON}    application/json
+#${ACCEPT}         application/json
+#${ACCEPT_JSON}         application/json
+${POLICY_CONTENT_TYPE}    application/json
+#${response}    {}
+#${VrQuotaAvailNotification}    {}
+#${notification_request}    []
+#${notification_response}    []
+#${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
\ No newline at end of file