diff --git a/SOL002/VNFFaultManagement-API/Alarms.robot b/SOL002/VNFFaultManagement-API/Alarms.robot
index 2f5d428fa6f4bc15f5d1e511ec8831369687f528..22c32579fe0fd1139615f94056b3eabe0cb5559e 100644
--- a/SOL002/VNFFaultManagement-API/Alarms.robot
+++ b/SOL002/VNFFaultManagement-API/Alarms.robot
@@ -232,3 +232,16 @@ Check HTTP Response Status Code Is
     [Arguments]    ${expected_status}    
     Should Be Equal    ${response.status_code}    ${expected_status}
     Log    Status code validated 
+    
+Check HTTP Response Header Contains
+    [Arguments]    ${CONTENT_TYPE}
+    Log    ${response['headers']}
+    Should Contain    ${response['headers']}    ${CONTENT_TYPE}
+    Log    Header is present
+    
+Check HTTP Response Body Json Schema Is
+    [Arguments]    ${input}
+    Should Contain    ${response['headers']['Content-Type']}    application/json
+    ${schema} =    Catenate    SEPARATOR=    ${input}	.schema.json
+    Validate Json    ${schema}    ${response['body']}
+    Log    Json Schema Validation OK
diff --git a/SOL002/VNFFaultManagement-API/EscalatePerceivedSeverityTask.robot b/SOL002/VNFFaultManagement-API/EscalatePerceivedSeverityTask.robot
index 094540c3908ad069209b6b37880c8aa81312f5ef..b8937c22794f7a39242af22b4b3dda72ed5a6c84 100644
--- a/SOL002/VNFFaultManagement-API/EscalatePerceivedSeverityTask.robot
+++ b/SOL002/VNFFaultManagement-API/EscalatePerceivedSeverityTask.robot
@@ -1,6 +1,7 @@
 *** Settings ***
 Resource    environment/variables.txt 
-Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT} 
+Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}
+Library    JSONSchemaLibrary
 Suite Setup    Check resource existance
 
 *** Test Cases ***
@@ -103,4 +104,16 @@ DELETE escalate severity
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Delete    ${apiRoot}/${apiName}/${apiVersion}/alarms/${alarmId}/escalate  
      ${outputResponse}=    Output    response
-	Set Global Variable    @{response}    ${outputResponse} 
\ No newline at end of file
+	Set Global Variable    @{response}    ${outputResponse} 
+	
+Check HTTP Response Status Code Is
+    [Arguments]    ${expected_status}    
+    Should Be Equal    ${response.status_code}    ${expected_status}
+    Log    Status code validated 
+    
+Check HTTP Response Body Json Schema Is
+    [Arguments]    ${input}
+    Should Contain    ${response['headers']['Content-Type']}    application/json
+    ${schema} =    Catenate    SEPARATOR=    ${input}	.schema.json
+    Validate Json    ${schema}    ${response['body']}
+    Log    Json Schema Validation OK
\ No newline at end of file
diff --git a/SOL002/VNFFaultManagement-API/IndividualAlarm.robot b/SOL002/VNFFaultManagement-API/IndividualAlarm.robot
index 55656d59fd1262c704a973beac76860374ef21a5..b38c2fc7b486288f9ebee9ee66959e6ecb9f36dc 100644
--- a/SOL002/VNFFaultManagement-API/IndividualAlarm.robot
+++ b/SOL002/VNFFaultManagement-API/IndividualAlarm.robot
@@ -118,6 +118,7 @@ PUT Alarm Task
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${body}=    Get File    jsons/alarmModifications.json
     Put    ${apiRoot}/${apiName}/${apiVersion}/alarms/${alarmId}     ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    @{response}    ${outputResponse}
@@ -172,4 +173,15 @@ GET Alarm Task with invalid filter
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiVersion}/alarms?${invalid_alarm_filter}=${managedObjectId} 
     ${outputResponse}=    Output    response
-	Set Global Variable    @{response}    ${outputResponse}	
\ No newline at end of file
+	Set Global Variable    @{response}    ${outputResponse}	
+Check HTTP Response Status Code Is
+    [Arguments]    ${expected_status}    
+    Should Be Equal    ${response.status_code}    ${expected_status}
+    Log    Status code validated 
+    
+Check HTTP Response Body Json Schema Is
+    [Arguments]    ${input}
+    Should Contain    ${response['headers']['Content-Type']}    application/json
+    ${schema} =    Catenate    SEPARATOR=    ${input}	.schema.json
+    Validate Json    ${schema}    ${response['body']}
+    Log    Json Schema Validation OK
\ No newline at end of file
diff --git a/SOL002/VNFFaultManagement-API/IndividualSubscription.robot b/SOL002/VNFFaultManagement-API/IndividualSubscription.robot
index 8c65ab3cea29a6879706c2051e9de99680fc0696..98cdff772d53c06d33a315a3d8f3ea67b940bc96 100644
--- a/SOL002/VNFFaultManagement-API/IndividualSubscription.robot
+++ b/SOL002/VNFFaultManagement-API/IndividualSubscription.robot
@@ -127,4 +127,16 @@ DELETE individual subscription
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Delete    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}    	   
     ${outputResponse}=    Output    response
-	Set Global Variable    @{response}    ${outputResponse}	      
\ No newline at end of file
+	Set Global Variable    @{response}    ${outputResponse}	      
+	
+Check HTTP Response Status Code Is
+    [Arguments]    ${expected_status}    
+    Should Be Equal    ${response.status_code}    ${expected_status}
+    Log    Status code validated 
+    
+Check HTTP Response Body Json Schema Is
+    [Arguments]    ${input}
+    Should Contain    ${response['headers']['Content-Type']}    application/json
+    ${schema} =    Catenate    SEPARATOR=    ${input}	.schema.json
+    Validate Json    ${schema}    ${response['body']}
+    Log    Json Schema Validation OK
\ No newline at end of file
diff --git a/SOL002/VNFFaultManagement-API/Subscriptions.robot b/SOL002/VNFFaultManagement-API/Subscriptions.robot
index 7cc9463349ed5de5f4eecf29a57d28839998be39..8fe6d42caea8e0ccd3bec814c18ce69f709a067e 100644
--- a/SOL002/VNFFaultManagement-API/Subscriptions.robot
+++ b/SOL002/VNFFaultManagement-API/Subscriptions.robot
@@ -274,4 +274,16 @@ DELETE subscriptions
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Delete    ${apiRoot}/${apiName}/${apiVersion}/subscriptions 	   
     ${outputResponse}=    Output    response
-	Set Global Variable    @{response}    ${outputResponse}	    
\ No newline at end of file
+	Set Global Variable    @{response}    ${outputResponse}	  
+
+Check HTTP Response Status Code Is
+    [Arguments]    ${expected_status}    
+    Should Be Equal    ${response.status_code}    ${expected_status}
+    Log    Status code validated 
+    
+Check HTTP Response Body Json Schema Is
+    [Arguments]    ${input}
+    Should Contain    ${response['headers']['Content-Type']}    application/json
+    ${schema} =    Catenate    SEPARATOR=    ${input}	.schema.json
+    Validate Json    ${schema}    ${response['body']}
+    Log    Json Schema Validation OK  
\ No newline at end of file
diff --git a/SOL002/VNFFaultManagement-API/environment/variables.txt b/SOL002/VNFFaultManagement-API/environment/variables.txt
index 32d545076d3fd850c1c418e96f82095cc9f1a8ee..4a93fafa99bbc19c33af0eee20e25f1ba79d3984 100644
--- a/SOL002/VNFFaultManagement-API/environment/variables.txt
+++ b/SOL002/VNFFaultManagement-API/environment/variables.txt
@@ -4,6 +4,7 @@ ${VNFM_PORT}      8080    # Listening port of the VNFM
 ${VNFM_SCHEMA}    https
 ${AUTHORIZATION}    Bearer    QWxhZGRpbjpvcGVuIHNlc2FtZQ==
 ${ACCEPT}         application/json
+${ACCEPT_JSON}         application/json
 ${AUTH_USAGE}     1
 ${alarm_filter}       managedObjectId
 ${managedObjectId}    007c111c-38a1-42c0-a666-7475ecb1567c
@@ -45,4 +46,6 @@ ${AlarmNotification}    {}
 ${AlarmClearedNotification}    {}
 ${AlarmListRebuiltNotification}    {}
 
-${fields}         softwareImages,additionalArtifacts
\ No newline at end of file
+${fields}         softwareImages,additionalArtifacts
+
+${response}=    httpresponse
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/HealVNFTask.robot b/SOL002/VNFLifecycleManagement-API/HealVNFTask.robot
index 43fa763ffa29ef565f30b2a6f294528a5d367d20..391f2e1ce31a6ca67e08bc2dd5ddc96c2f193b8c 100644
--- a/SOL002/VNFLifecycleManagement-API/HealVNFTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/HealVNFTask.robot
@@ -17,7 +17,7 @@ POST Heal a vnfInstance
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: 
-    POST Terminate VNF
+    POST Heal VNF
     Check HTTP Response Status Code Is    202
     Check Operation Occurrence Id
     
@@ -31,7 +31,7 @@ POST Heal a vnfInstance Conflict (Not-Instantiated)
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: 
-    POST Terminate VNF
+    POST Heal VNF
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails 
 
@@ -45,7 +45,7 @@ POST Heal a vnfInstance Not Found
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: 
-    POST Terminate VNF
+    POST Heal VNF
     Check HTTP Response Status Code Is    404
     Check HTTP Response Body Json Schema Is    ProblemDetails 
    
diff --git a/SOL002/VNFLifecycleManagement-API/TerminateVNFTask.robot b/SOL002/VNFLifecycleManagement-API/TerminateVNFTask.robot
index ad3acf1dec47413ddd5d6befa51c98a48cf42531..3c5ee260da484d8c9c30da695447c47c6f6bf93a 100644
--- a/SOL002/VNFLifecycleManagement-API/TerminateVNFTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/TerminateVNFTask.robot
@@ -44,7 +44,7 @@ GET Terminate VNFInstance - Method not implemented
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
-    GET Scale vnfInstance to level
+    GET Terminate VNF
     Check HTTP Response Status Code Is    405
 
 PUT Terminate VNFInstance - Method not implemented
@@ -56,7 +56,7 @@ PUT Terminate VNFInstance - Method not implemented
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
-    PUT Scale vnfInstance to level
+    PUT Terminate VNF
     Check HTTP Response Status Code Is    405
 
 PATCH Terminate VNFInstance - Method not implemented
@@ -68,7 +68,7 @@ PATCH Terminate VNFInstance - Method not implemented
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
-    PATCH Scale vnfInstance to level
+    PATCH Terminate VNF
     Check HTTP Response Status Code Is    405
     
 DELETE Terminate VNFInstance - Method not implemented
@@ -80,7 +80,7 @@ DELETE Terminate VNFInstance - Method not implemented
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
-    DELETE Scale vnfInstance to level
+    DELETE Terminate VNF
     Check HTTP Response Status Code Is    405
 
 *** Keywords ***
diff --git a/SOL002/VnfLcmMntOperationKeywords.robot b/SOL002/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
similarity index 99%
rename from SOL002/VnfLcmMntOperationKeywords.robot
rename to SOL002/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
index ed194366e1221ecb792a934a56617aa62ff41ad1..1a86471ba9430f65bdd8e06085f7b06bd0737e4b 100644
--- a/SOL002/VnfLcmMntOperationKeywords.robot
+++ b/SOL002/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
@@ -1,7 +1,7 @@
 *** Settings ***
-Resource    environment/configuration.txt
+#Resource    environment/configuration.txt
 Resource    environment/variables.txt
-Resource    environment/scaleVariables.txt
+#Resource    environment/scaleVariables.txt
 Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}
 Library    OperatingSystem
 Library    BuiltIn
@@ -319,7 +319,7 @@ POST Change VNF deployment flavour
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/change_flavour    ${body} 
     ${outputResponse}=    Output    response
 	Set Global Variable    @{response}    ${outputResponse}  	 
-GET Change External VNF Connectivity
+GET Change External VNF Flavour
     log    Trying to perform a GET. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/change_flavour 	
diff --git a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
index 1e8af39fa27f97c383b0bf501fd8fbab015f95c1..b02e4968dd80bc38a6deaa9ce8ca0dd0c60503e1 100644
--- a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
+++ b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
@@ -1,7 +1,7 @@
 *** Settings ***
-Resource    environment/configuration.txt
+#Resource    environment/configuration.txt
 Resource    environment/variables.txt
-Resource    environment/scaleVariables.txt
+#Resource    environment/scaleVariables.txt
 Library    MockServerLibrary
 Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}
 Library    OperatingSystem
diff --git a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
index 2d09980f9203505ed7c4c46f8e6a8315e5edea56..77010e97b73294794bab3b2f681707262529f506 100644
--- a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
+++ b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
@@ -132,7 +132,7 @@ PATCH status information about multiple VNF LCM operation occurrences - Method n
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
-    PUT VNF LCM OP occurences
+    PATCH VNF LCM OP occurences
     Check HTTP Response Status Code Is    405
 
 DELETE status information about multiple VNF LCM operation occurrences - Method not implemented
diff --git a/SOL002/VNFLifecycleManagement-API/environment/variables.txt b/SOL002/VNFLifecycleManagement-API/environment/variables.txt
index 21bb5d38dd71f4ea0f87cac52307a086b07a608b..9e28c8cfcfbd7d1a091347dfeba169726ad5b702 100644
--- a/SOL002/VNFLifecycleManagement-API/environment/variables.txt
+++ b/SOL002/VNFLifecycleManagement-API/environment/variables.txt
@@ -9,6 +9,7 @@ ${AUTHORIZATION}    Bearer    QWxhZGRpbjpvcGVuIHNlc2FtZQ==
 ${CONTENT_TYPE}    application/json
 ${CONTENT_TYPE_PATCH}    application/merge-patch+json
 ${ACCEPT}         application/json
+${ACCEPT_JSON}         application/json
 ${apiRoot}        /
 ${apiName}        vnflcm
 ${apiVersion}     v1
@@ -38,6 +39,8 @@ ${VnfLcmOperationOccurrenceNotification}    {}
 ${VnfIdentifierCreationNotification}    {}
 ${VnfIdentifierDeletionNotification}    {}
 
+${SYNC_MODE}    0
+
 ${callback_uri}    http://localhost
 ${callback_port}    9091
 ${callback_endpoint}    /endpoint
@@ -50,4 +53,7 @@ ${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
+${response}=    httpresponse
+
+${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
+
diff --git a/SOL003/VNFFaultManagement-API/environment/variables.txt b/SOL003/VNFFaultManagement-API/environment/variables.txt
index e7c43e4415d272338056e55e227092a3c70e54dd..28a9c673739dc9c1b0ad77141372705d5fc80489 100644
--- a/SOL003/VNFFaultManagement-API/environment/variables.txt
+++ b/SOL003/VNFFaultManagement-API/environment/variables.txt
@@ -5,6 +5,7 @@ ${VNFM_SCHEMA}    https
 ${AUTHORIZATION}    Bearer    QWxhZGRpbjpvcGVuIHNlc2FtZQ==
 ${CONTENT_TYPE}    application/json
 ${ACCEPT}         application/json
+${ACCEPT_JSON}         application/json
 ${AUTH_USAGE}     1
 
 ${alarm_filter}       managedObjectId
@@ -21,6 +22,8 @@ ${VNFM_DUPLICATION}    1
 ${sub_filter}    filter
 ${sub_filter_invalid}    filter_invalid
 
+${NFVO_FIELDS}    1
+
 ${apiRoot}        /
 ${apiName}        vnffm
 ${apiVersion}     v1
@@ -40,4 +43,6 @@ ${resp_mock}    {}
 ${alarm_filter}       nsInstanceId
 ${nsInstanceId}    007c111c-38a1-42c0-a666-7475ecb1567c
 ${invalid_alarm_filter}    badFilter 
-${invalidAlarmId}    invalidIdAlarm
\ No newline at end of file
+${invalidAlarmId}    invalidIdAlarm
+
+${fields}         criteria,objectInstanceIds
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot b/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
index 18c0e00c51767b4b84a118d521f10200b3d833b0..ae9f5e4c13de955da3e51258c89bef130d3a929e 100644
--- a/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
@@ -117,7 +117,7 @@ Check resource instantiated
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${instantiatedVnfInstanceId} 
+    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} 
     String    response body instantiationState    INSTANTIATED    
 
 Check change flavour not supported
diff --git a/SOL003/VNFLifecycleManagement-API/HealVNFTask.robot b/SOL003/VNFLifecycleManagement-API/HealVNFTask.robot
index 4abebdf431d41df91cf3f2ee9439fbd6b2e64935..a8e5a399a1770159d7575a0fff87383ccd3df29d 100644
--- a/SOL003/VNFLifecycleManagement-API/HealVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/HealVNFTask.robot
@@ -17,7 +17,7 @@ POST Heal a vnfInstance
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: 
-    POST Terminate VNF
+    POST Heal VNF
     Check HTTP Response Status Code Is    202
     Check Operation Occurrence Id existence
 
@@ -31,7 +31,7 @@ POST Heal a vnfInstance Conflict (Not-Instantiated)
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: 
-    POST Terminate VNF
+    POST Heal VNF
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails 
 
@@ -46,7 +46,7 @@ POST Heal a vnfInstance Not Found
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: 
-    POST Terminate VNF
+    POST Heal VNF
     Check HTTP Response Status Code Is    404
     Check HTTP Response Body Json Schema Is    ProblemDetails 
     
diff --git a/SOL003/VNFLifecycleManagement-API/TerminateVNFTask.robot b/SOL003/VNFLifecycleManagement-API/TerminateVNFTask.robot
index e04ace2f51f6b2700ab97bbe66c45e7b52bd53e7..017d2220fcc44dd76b7894e2288d0ac9bd6896cf 100644
--- a/SOL003/VNFLifecycleManagement-API/TerminateVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/TerminateVNFTask.robot
@@ -45,7 +45,7 @@ GET Terminate VNFInstance - Method not implemented
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
-    GET Scale vnfInstance to level
+    GET Terminate VNF
     Check HTTP Response Status Code Is    405
 
 PUT Terminate VNFInstance - Method not implemented
@@ -57,7 +57,7 @@ PUT Terminate VNFInstance - Method not implemented
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
-    PUT Scale vnfInstance to level
+    PUT Terminate VNF
     Check HTTP Response Status Code Is    405
 
 PATCH Terminate VNFInstance - Method not implemented
@@ -69,7 +69,7 @@ PATCH Terminate VNFInstance - Method not implemented
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
-    PATCH Scale vnfInstance to level
+    PATCH Terminate VNF
     Check HTTP Response Status Code Is    405
     
 DELETE Terminate VNFInstance - Method not implemented
@@ -81,7 +81,7 @@ DELETE Terminate VNFInstance - Method not implemented
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
-    DELETE Scale vnfInstance to level
+    DELETE Terminate VNF
     Check HTTP Response Status Code Is    405
 
 *** Keywords ***
diff --git a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
index 6b2bbab13700afcc04281926a43afd31d406a49b..7a37ef9bd51c70f9d27e1ed0201c62aef28a87ea 100644
--- a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
+++ b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
@@ -366,6 +366,15 @@ POST Create a new vnfInstance
     ${outputResponse}=    Output    response
 	Set Global Variable    @{response}    ${outputResponse} 	
 
+Get multiple VNF instances	
+    Log    Query status information about multiple VNF lifecycle management operation occurrences.
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Log    Execute Query and validate response
+    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
+    ${outputResponse}=    Output    response
+	Set Global Variable    @{response}    ${outputResponse}	
+
 GET multiple vnfInstances	
     Log    Query VNF The GET method queries information about multiple VNF instances.
     Set Headers  {"Accept":"${ACCEPT}"}  
@@ -534,13 +543,12 @@ DELETE instantiate individual vnfInstance
     ${outputResponse}=    Output    response
 	Set Global Variable    @{response}    ${outputResponse} 	
 POST Scale vnfInstance	
-    [Arguments]    ${instanceId}
     Log    Trying to Instantiate a vnf Instance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${body}=    Get File    jsons/scaleVnfRequest.json
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${instanceId}/scale    ${body}
+    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    @{response}    ${outputResponse} 
 GET Scale vnfInstance				
@@ -815,14 +823,7 @@ Post Individual VNF LCM Operation occurrences
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}	
     ${outputResponse}=    Output    response
 	Set Global Variable    @{response}    ${outputResponse}	
-Get multiple VNF instances	
-    Log    Query status information about multiple VNF lifecycle management operation occurrences.
-    Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
-    ${outputResponse}=    Output    response
-	Set Global Variable    @{response}    ${outputResponse}	
+
 Put multiple VNF instances	
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
diff --git a/SOL003/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot b/SOL003/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
index 447d209ef6862a80c1c0916439244d708267a0c8..287ed3fcce0f4ae1f9431303ac6c6438a8587566 100644
--- a/SOL003/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
+++ b/SOL003/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
@@ -131,7 +131,7 @@ PATCH status information about multiple VNF LCM Operation OCC - Method not imple
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
-    PUT VNF LCM Operation occurrences
+    PATCH VNF LCM Operation occurrences
     Check HTTP Response Status Code Is    405
 
 DELETE status information about multiple VNF LCM Operation OCC - Method not implemented
diff --git a/SOL003/VNFLifecycleManagement-API/environment/configuration.txt b/SOL003/VNFLifecycleManagement-API/environment/configuration.txt
index b64dfa2f0b8cf87860494a22bc21454e1c48dd2c..5363f3f0ca19ac8079f864eaf2802c7cdb4205ab 100644
--- a/SOL003/VNFLifecycleManagement-API/environment/configuration.txt
+++ b/SOL003/VNFLifecycleManagement-API/environment/configuration.txt
@@ -3,6 +3,7 @@ ${VNFM_HOST}      localhost    # Hostname of the VNFM
 ${VNFM_PORT}      8080    # Listening port of the VNFM
 ${VNFM_SCHEMA}    https
 ${ACCEPT}         application/json
+${ACCEPT_JSON}         application/json
 ${CONTENT_TYPE}    application/json
 ${AUTHORIZATION}    Bearer    QWxhZGRpbjpvcGVuIHNlc2FtZQ==
 ${AUTH_USAGE}     1