diff --git a/SOL002/VNFLifecycleManagement-API/CancelOperationTask.robot b/SOL002/VNFLifecycleManagement-API/CancelOperationTask.robot
index 2ca0d781f02e94a261e2d2e37a8c7949b6e24830..326819aa0be9e7ad048353e2624910de1e9903ba 100644
--- a/SOL002/VNFLifecycleManagement-API/CancelOperationTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/CancelOperationTask.robot
@@ -17,7 +17,7 @@ Post Cancel operation task
     ...    Reference: Clause 5.4.17.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
-    ...    Post-Conditions: none    
+    ...    Post-Conditions: the resource is in FAILED_TEMP state    
     POST Cancel operation task
     Check HTTP Response Status Code Is    202
     Check operation resource state is FAILED_TEMP
@@ -47,6 +47,7 @@ Post Cancel operation task Not Found
     ...    Post-Conditions: none  
     POST Cancel operation task
     Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is    ProblemDetails
     
 GET Cancel operation task - Method not implemented
     [Documentation]    Test ID: 6.3.5.16.4
@@ -101,20 +102,4 @@ Check resource existence
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
-    Integer    response status    200
-
-Launch another error handling action
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/retry
-    Integer    response status    202
-    
-Check Fail not supported
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
-    # how to check if Fail is not supported?
-    
-
-Check resource FAILED_TEMP
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 
-    String    response body operationState    FAILED_TEMP
\ No newline at end of file
+    Integer    response status    200
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot b/SOL002/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot
index d8ad9fb089b0c12a342846e9a78fbe5a75c52c71..48589116c0974e4ba7861f1a55ca133586795a16 100644
--- a/SOL002/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot
@@ -11,7 +11,7 @@ Suite Setup    Check resource existence
 POST Change external VNF connectivity 
     [Documentation]    Test ID: 6.3.5.10.1
     ...    Test title: POST Change external VNF connectivity
-    ...    Test objective: The objective is to test that POST method trigger a change in VNF external connectivity
+    ...    Test objective: The objective is to test that POST method triggers a change in VNF external connectivity
     ...    Pre-conditions: none
     ...    Reference: Clause 5.4.11.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
@@ -69,16 +69,16 @@ DELETE Change external VNF connectivity - Method not implemented
     DELETE Change External VNF Connectivity
     Check HTTP Response Status Code Is    405
     
-POST Operate a vnfInstance Conflict (Not-Instantiated)
+POST Change external VNF connectivity Conflict
     [Documentation]    Test ID: 6.3.5.10.6
-    ...    Test title: POST Operate a vnfInstance Conflict (Not-Instantiated)
+    ...    Test title: POST Change external VNF connectivity Conflict
     ...    Test objective: The objective is to test that the operation cannot be executed currently, due to a conflict with the state of the VNF instance resource or that a required child attribute of the "extensions" attribue has not been set. 
     ...    Pre-conditions: none
     ...    Reference: Clause 5.4.11.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
-    ...    Post-Conditions:
-    POST Operate VNF
+    ...    Post-Conditions: none
+    POST Change External VNF Connectivity
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails 
 
@@ -88,12 +88,4 @@ Check resource existence
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} 
-    Integer    response status    200
-
-Launch another LCM operation
-    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/${vnfInstanceId}/scale    ${body}
-    Integer    response status    202
\ No newline at end of file
+    Integer    response status    200
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot b/SOL002/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
index 3d662724ca58e184cc8dfaaeb338ac4ec5b48b08..d1a7d8634aa64fbfe76e93a2c0f8c47cafc304c9 100644
--- a/SOL002/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
@@ -34,7 +34,6 @@ POST Change deployment flavour of a vnfInstance Conflict (Not-Instantiated)
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails
 
-    
 POST Change deployment flavour of a vnfInstance Not Found
     [Documentation]    Test ID: 6.3.5.6.3
     ...    Test title: POST Change deployment flavour of a vnfInstance Not Found
@@ -47,8 +46,7 @@ POST Change deployment flavour of a vnfInstance Not Found
     POST Change VNF deployment flavour  
     Check HTTP Response Status Code Is    404
     Check HTTP Response Body Json Schema Is    ProblemDetails
-   
-    
+       
 GET Change deployment flavour VNFInstance - Method not implemented
     [Documentation]    Test ID: 6.3.5.6.4
     ...    Test title: GET Change deployment flavour VNFInstance - Method not implemented
@@ -103,27 +101,4 @@ Check resource existence
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} 
-    Integer    response status    200
-
-Check resource not instantiated
-    [Arguments]    ${instanceId}
-    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/${instanceId} 
-    String    response body instantiationState    NOT_INSTANTIATED
-
-Check change flavour not supported
-    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/${vnfInstanceId} 
-    # how to check if change floavour is not supported? "flavourId" doesn't exist?
-
-Launch another LCM operation
-    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/${vnfInstanceId}/scale    ${body}
-    Integer    response status    202
\ No newline at end of file
+    Integer    response status    200
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/FailOperationTask.robot b/SOL002/VNFLifecycleManagement-API/FailOperationTask.robot
index f1ebf86ce0fa0f431c768005b4a1a8488b53dfce..071e57c712bfb92454e50cdfbb08373310656fcb 100644
--- a/SOL002/VNFLifecycleManagement-API/FailOperationTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/FailOperationTask.robot
@@ -10,7 +10,7 @@ Library    JSONSchemaLibrary    schemas/
 POST Fail operation task  
     [Documentation]    Test ID: 6.3.5.15.1
     ...    Test title: POST Fail operation task
-    ...    Test objective: The objective is to test that POST method mark as "finally failed" a VNF lifecycle operation if that operation has experienced a temporary failure
+    ...    Test objective: The objective is to test that POST method mark as "finally failed" a VNF lifecycle operation if that operation has experienced a failure
     ...    Pre-conditions: the "VNF LCM operation occurrence" resource is in "FAILED_TEMP" state.
     ...    Reference: Clause 5.4.16.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
@@ -22,10 +22,9 @@ POST Fail operation task
     Check operation resource state is FINALLY_FAILED
 
 POST Fail operation task Conflict (Not-FAILED_TEMP)
-    # TODO: Need to set the pre-condition of the test. VNF instance shall be in INSTANTIATED state
     [Documentation]    Test ID: 6.3.5.15.2
     ...    Test title: POST Fail operation task Conflict (Not-FAILED_TEMP)
-    ...    Test objective: The objective is to test that POST method cannot mark as "finally failed" a VNF lifecycle operation if that operation has experienced a temporary failure
+    ...    Test objective: The objective is to test that POST method cannot mark as "finally failed" due to confilct with the state of LCM Operation Occurrence
     ...    Pre-conditions: the "VNF LCM operation occurrence" resource is not in "FAILED_TEMP" state.
     ...    Reference: Clause 5.4.16.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
@@ -36,17 +35,17 @@ POST Fail operation task Conflict (Not-FAILED_TEMP)
     Check HTTP Response Body Json Schema Is    ProblemDetails
 
 POST Fail operation task Not Found
-    # TODO: Need to create a vnfInstance which's instantiatedVnfInfo.scaleStatus is absent
     [Documentation]    Test ID: 6.3.5.15.3
     ...    Test title: POST Fail operation task Not Found
     ...    Test objective: The objective is to test that POST method cannot mark as "finally failed" a VNF lifecycle operation because the operation is not supported
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 5.4.16.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none  
     Post Fail operation
     Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is    ProblemDetails
 
 GET Fail operation task - Method not implemented
      [Documentation]    Test ID: 6.3.5.15.4
@@ -56,7 +55,7 @@ GET Fail operation task - Method not implemented
     ...    Reference: Clause 5.4.16.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     Get Fail operation
     Check HTTP Response Status Code Is    405
 
@@ -68,7 +67,7 @@ PUT Fail operation task - Method not implemented
     ...    Reference: Clause 5.4.16.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none 
     Put Fail operation
     Check HTTP Response Status Code Is    405
 
@@ -80,7 +79,7 @@ PATCH Fail operation task - Method not implemented
     ...    Reference: Clause 5.4.16.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none 
     Patch Fail operation
     Check HTTP Response Status Code Is    405
     
@@ -92,28 +91,6 @@ DELETE Fail operation task - Method not implemented
     ...    Reference: Clause 5.4.16.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
-    ...    Post-Conditions: VNF instance not deleted
+    ...    Post-Conditions: none
     Delete Fail operation
-    Check HTTP Response Status Code Is    405
-
-*** Keywords ***
-Check resource existence
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
-    Integer    response status    200
-
-Launch another error handling action
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/retry
-    Integer    response status    202
-    
-Check Fail not supported
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
-    # how to check if Fail is not supported?
-
-Check resource FAILED_TEMP
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 
-    String    response body operationState    FAILED_TEMP
\ No newline at end of file
+    Check HTTP Response Status Code Is    405
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/HealVNFTask.robot b/SOL002/VNFLifecycleManagement-API/HealVNFTask.robot
index c62f11df16456c5fc24a0a11d720b4d49f73ee2f..68b5014f67464ff7f7b5a8f2a88fd929b4c1a451 100644
--- a/SOL002/VNFLifecycleManagement-API/HealVNFTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/HealVNFTask.robot
@@ -22,7 +22,6 @@ POST Heal a vnfInstance
     Check Operation Occurrence Id
     
 POST Heal a vnfInstance Conflict (Not-Instantiated)
-    # TODO: Need to set the pre-condition of the test. VNF instance shall be in INSTANTIATED state
    [Documentation]    Test ID: 6.3.5.8.2
     ...    Test title: POST Heal a vnfInstance (Not-Instantiated)
     ...    Test objective: The objective is to test that the operation cannot be executed currently, due to a conflict with the state of the VNF instance resource or that a required child attribute of the "extensions" attribue has not been set. 
@@ -103,27 +102,4 @@ Check resource existence
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} 
-    Integer    response status    200
-
-Check resource not instantiated
-    [Arguments]    ${instanceId}
-    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/${instanceId} 
-    String    response body instantiationState    NOT_INSTANTIATED
-
-Check heal not supported
-    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/${vnfInstanceId} 
-    # how to check if heal is not supported? "flavourId" doesn't exist?
-
-Launch another LCM operation
-    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/${vnfInstanceId}/scale    ${body}
-    Integer    response status    202
\ No newline at end of file
+    Integer    response status    200
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/IndividualSubscription.robot b/SOL002/VNFLifecycleManagement-API/IndividualSubscription.robot
index f5a3692d630ce0e49b6cf73c9b0399f56320fbe6..03e5e173b7b4fbe96d9bec003eb3505742b7dfd0 100644
--- a/SOL002/VNFLifecycleManagement-API/IndividualSubscription.robot
+++ b/SOL002/VNFLifecycleManagement-API/IndividualSubscription.robot
@@ -57,20 +57,12 @@ PATCH an individual subscription - Method not implemented
     
 DELETE an individual subscription
      [Documentation]    Test ID: 6.3.5.18.5
-    ...    Test title: DELETE Individual Subscription - Method not implemented
-    ...    Test objective: The objective is to test that the method is not implemented
+    ...    Test title: DELETE Individual Subscription
+    ...    Test objective: The objective is to test that the DELETE method removes an individual subscription
     ...    Pre-conditions: none
     ...    Reference: Clause 5.4.19.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
     Delete Individual subscription
-	Check HTTP Response Status Code Is    405
-
-*** Keywords ***
-Check resource existence
-    Set Headers    {"Accept":"${ACCEPT}"}  
-    Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId} 
-    Integer    response status    200
\ No newline at end of file
+	Check HTTP Response Status Code Is    204
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/IndividualVNFInstance.robot b/SOL002/VNFLifecycleManagement-API/IndividualVNFInstance.robot
index 84f826b94e467990d29cc8a22fc12d2f09afcec4..826228e151611a8264449da92317d1d5df7d4f57 100644
--- a/SOL002/VNFLifecycleManagement-API/IndividualVNFInstance.robot
+++ b/SOL002/VNFLifecycleManagement-API/IndividualVNFInstance.robot
@@ -66,12 +66,12 @@ PATCH Individual VNFInstance
 PATCH Individual VNFInstance Precondition failed
     [Documentation]    Test ID: 6.3.5.2.5
     ...    Test title: PATCH Individual VNFInstance Precondition failed
-    ...    Test objective: The objective is to create a new VNF instance resource
-    ...    Pre-conditions:  A precondition given in an HTTP request header is not fulfilled. Typically, this is due to an ETag mismatch, indicating that the resource was modified by another entity
+    ...    Test objective: The objective is to that the modification of individual VNFInstance fails because precondition given in an HTTP request header is not fulfilled. Typically, this is due to an ETag mismatch, indicating that the resource was modified by another entity.
+    ...    Pre-conditions:  none
     ...    Reference: Clause 5.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
-    ...    Post-Conditions: VNF instance not modified
+    ...    Post-Conditions: none
     PATCH individual vnfInstance
     Check HTTP Response Status Code Is    412
     Check HTTP Response Body Json Schema Is    ProblemDetails
@@ -84,7 +84,7 @@ PATCH Individual VNFInstance Conflict
     ...    Reference: Clause 5.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
-    ...    Post-Conditions: VNF instance not modified
+    ...    Post-Conditions: none
      PATCH individual vnfInstance
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails
@@ -112,27 +112,4 @@ DELETE Individual VNFInstance Conflict
     ...    Post-Conditions: none
     DELETE individual vnfInstance
     Check HTTP Response Status Code Is    409
-    Check HTTP Response Body Json Schema Is    ProblemDetails
-    
-*** Keywords ***
-Check resource existence
-    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/${vnfInstanceId} 
-    Integer    response status    200
-
-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/${vnfInstanceId} 
-    String    response body instantiationState    INSTANTIATED
-
-Launch another LCM operation
-    Set Headers  {"Accept":"${ACCEPT}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/scaleVnfToLevelRequest.json
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale_to_level    ${body}
-    Integer    response status    202 
+    Check HTTP Response Body Json Schema Is    ProblemDetails
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot b/SOL002/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot
index a083f949b602d1e995d6db488c7dc7bc935767ec..82ecf4c769cad9467047a46a34974562af02a2bc 100644
--- a/SOL002/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot
+++ b/SOL002/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot
@@ -26,7 +26,7 @@ Get status information about multiple VNF instances
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
-    Get multiple VNF instances
+    Get Individual VNF LCM OP occurrences
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    VnfLcmOpOcc 
 
@@ -39,7 +39,7 @@ PUT status information about multiple VNF instances - Method not implemented
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none  
-    PUT multiple vnfInstances
+    PUT Individual VNF LCM OP occurrences
     Check HTTP Response Status Code Is    405
 
 PATCH status information about multiple VNF instances - Method not implemented 
@@ -51,7 +51,7 @@ PATCH status information about multiple VNF instances - Method not implemented
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none      
-    PATCH multiple vnfInstances
+    PATCH Individual VNF LCM OP occurrences
     Check HTTP Response Status Code Is    405
     
 DELETE status information about multiple VNF instances - Method not implemented 
@@ -63,5 +63,5 @@ DELETE status information about multiple VNF instances - Method not implemented
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none  
-    DELETE multiple vnfInstances
+    DELETE Individual VNF LCM OP occurrences
     Check HTTP Response Status Code Is    405
diff --git a/SOL002/VNFLifecycleManagement-API/InstantiateVNFTask.robot b/SOL002/VNFLifecycleManagement-API/InstantiateVNFTask.robot
index 93855de0a2400ec06ef3bc01db2c5660021c9fc7..200f0c387ab63ee4497bd222885188f89c8cb3aa 100644
--- a/SOL002/VNFLifecycleManagement-API/InstantiateVNFTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/InstantiateVNFTask.robot
@@ -56,7 +56,7 @@ PUT Instantiate VNFInstance - Method not implemented
     ...    Reference: Clause 5.4.4.3.3  - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
-    ...    Post-Conditions: VNF instance not modified
+    ...    Post-Conditions: none
     PUT instantiate individual vnfInstance   
     Check HTTP Response Status Code Is    405
 
@@ -68,7 +68,7 @@ PATCH Instantiate VNFInstance - Method not implemented
     ...    Reference: Clause 5.4.4.3.4  - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
-    ...    Post-Conditions: VNF instance not modified
+    ...    Post-Conditions: none
     PATCH instantiate individual vnfInstance   
     Check HTTP Response Status Code Is    405
     
@@ -80,7 +80,7 @@ DELETE Instantiate VNFInstance - Method not implemented
     ...    Reference: Clause 5.4.4.3.5  - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
-    ...    Post-Conditions: VNF instance not deleted
+    ...    Post-Conditions: none
     DELETE instantiate individual vnfInstance   
     Check HTTP Response Status Code Is    405
 
@@ -90,11 +90,4 @@ Check resource existence
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} 
-    Integer    response status    200
-
-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/${vnfInstanceId} 
-    String    response body instantiationState    INSTANTIATED
\ No newline at end of file
+    Integer    response status    200
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/OperateVNFTask.robot b/SOL002/VNFLifecycleManagement-API/OperateVNFTask.robot
index c450c897e5af6b69f89d9c27c4e8229dece5e4a6..a27748bc19547db86df90a9b7af1edf483328e96 100644
--- a/SOL002/VNFLifecycleManagement-API/OperateVNFTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/OperateVNFTask.robot
@@ -25,7 +25,7 @@ POST Operate a vnfInstance Conflict (Not-Instantiated)
     [Documentation]    Test ID: 6.3.5.9.2
     ...    Test title: POST Operate a vnfInstance Conflict (Not-Instantiated)
     ...    Test objective: The objective is to test that the operation cannot be executed currently, due to a conflict with the state of the VNF instance resource or that a required child attribute of the "extensions" attribue has not been set. 
-    ...    Pre-conditions: the VNF instance resource is in NOT-INSTANTIATED state
+    ...    Pre-conditions: the VNF instance resource is in NOT_INSTANTIATED state
     ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
@@ -34,7 +34,6 @@ POST Operate a vnfInstance Conflict (Not-Instantiated)
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails 
 
-    
 POST Operate a vnfInstance Not Found
     [Documentation]    Test ID: 6.3.5.9.3
     ...    Test title: POST Operate a vnfInstance Not Found
@@ -102,27 +101,4 @@ Check resource existence
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} 
-    Integer    response status    200
-
-Check resource not instantiated
-    [Arguments]    ${instanceId}
-    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/${instanceId} 
-    String    response body instantiationState    NOT_INSTANTIATED
-
-Check operate not supported
-    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/${vnfInstanceId} 
-    # how to check if operate is not supported? "flavourId" doesn't exist?
-
-Launch another LCM operation
-    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/${vnfInstanceId}/scale    ${body}
-    Integer    response status    202
\ No newline at end of file
+    Integer    response status    200
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/RetryOperationTask.robot b/SOL002/VNFLifecycleManagement-API/RetryOperationTask.robot
index d1e1aca15abbc448a5785c8d4fd072e2ccef46e1..fff8c481691b50f43d3de128f0cd736001aae4bb 100644
--- a/SOL002/VNFLifecycleManagement-API/RetryOperationTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/RetryOperationTask.robot
@@ -23,7 +23,6 @@ POST Retry operation task
     Check Operation Occurrence Id
 
 POST Retry operation task Conflict (Not-FAILED_TEMP)
-    # TODO: Need to set the pre-condition of the test. VNF instance shall be in INSTANTIATED state
     [Documentation]    Test ID: 6.3.5.13.2
     ...    Test title: POST Retry operation task Conflict (Not-FAILED_TEMP)
     ...    Test objective: The objective is to test that the retry operation cannot be executed currently, due to a conflict with the state of the VNF instance resource. (i.e. the VNF instance resource is not in FAILED_TEMP state)
@@ -36,9 +35,7 @@ POST Retry operation task Conflict (Not-FAILED_TEMP)
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails
 
-
 POST Retry operation task Not Found
-    # TODO: Need to create a vnfInstance which's instantiatedVnfInfo.scaleStatus is absent
     [Documentation]    Test ID: 6.3.5.13.3
     ...    Test title: POST Retry operation task Not Found
     ...    Test objective: The objective is to test that the retry operation cannot be executed because the operation is not supported
@@ -49,6 +46,7 @@ POST Retry operation task Not Found
     ...    Post-Conditions: none 
     Post Retry operation
     Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is    ProblemDetails
 
 GET Retry operation task - Method not implemented
     [Documentation]    Test ID: 6.3.5.13.4
@@ -58,7 +56,7 @@ GET Retry operation task - Method not implemented
     ...    Reference: Clause 5.4.14.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     Get Retry operation
     Check HTTP Response Status Code Is    405
 
@@ -70,7 +68,7 @@ PUT Retry operation task - Method not implemented
     ...    Reference: Clause 5.4.14.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     Put Retry operation
     Check HTTP Response Status Code Is    405
 
@@ -82,7 +80,7 @@ PATCH Retry operation task - Method not implemented
     ...    Reference: Clause 5.4.14.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     Patch Retry operation
     Check HTTP Response Status Code Is    405
     
@@ -94,7 +92,7 @@ DELETE Retry operation task - Method not implemented
     ...    Reference: Clause 5.4.14.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     Delete Retry operation
     Check HTTP Response Status Code Is    405
 *** Keywords ***
@@ -102,19 +100,4 @@ Check resource existence
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
-    Integer    response status    200
-
-Launch another error handling action
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/rollback
-    Integer    response status    202
-    
-Check retry not supported
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
-    # how to check if retry is not supported?
-
-Check resource FAILED_TEMP
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 
-    String    response body operationState    FAILED_TEMP
\ No newline at end of file
+    Integer    response status    200
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/RollbackOperationTask.robot b/SOL002/VNFLifecycleManagement-API/RollbackOperationTask.robot
index d9513b7ff4b422c20d7199dbc6b3689c07cdfb18..c92083878fe46d5abc3e83e6bf7ce1f29758f56a 100644
--- a/SOL002/VNFLifecycleManagement-API/RollbackOperationTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/RollbackOperationTask.robot
@@ -12,7 +12,7 @@ Suite Setup    Check resource existence
 POST Rollback operation task  
     [Documentation]    Test ID: 6.3.5.14.1
     ...    Test title: POST Rollback operation task
-    ...    Test objective: The objective is to test that POST method The POST method initiates rollback a VNF lifecycle operation if that operation has experienced a temporary failure
+    ...    Test objective: The objective is to test that POST method initiates rollback a VNF lifecycle operation if that operation has experienced a temporary failure
     ...    Pre-conditions: the "VNF LCM operation occurrence" resource is in "FAILED_TEMP" state.
     ...    Reference: Clause 5.4.15.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
@@ -23,7 +23,6 @@ POST Rollback operation task
     Check Operation Occurrence Id
 
 POST Rollback operation task Conflict (Not-FAILED_TEMP)
-    # TODO: Need to set the pre-condition of the test. VNF instance shall be in INSTANTIATED state
     [Documentation]    Test ID: 6.3.5.14.2
     ...    Test title: POST Rollback operation task Conflict (Not-FAILED_TEMP)
     ...    Test objective: The objective is to test that POST method The POST method initiates rollback a VNF lifecycle operation if that operation has experienced a temporary failure
@@ -36,19 +35,18 @@ POST Rollback operation task Conflict (Not-FAILED_TEMP)
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails
 
-
 POST Rollback operation task Not Found
-    # TODO: Need to create a vnfInstance which's instantiatedVnfInfo.scaleStatus is absent
     [Documentation]    Test ID: 6.3.5.14.3
     ...    Test title: POST Rollback operation task Not Found
     ...    Test objective: The objective is to test that the retry operation cannot be executed because the operation is not supported
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 5.4.15.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
     Post Rollback operation
     Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is    ProblemDetails
 
 GET Rollback operation task - Method not implemented
     [Documentation]    Test ID: 6.3.5.14.4
@@ -58,7 +56,7 @@ GET Rollback operation task - Method not implemented
     ...    Reference: Clause 5.4.15.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none 
     Get Rollback operation
     Check HTTP Response Status Code Is    405
     
@@ -70,7 +68,7 @@ PUT Rollback operation task - Method not implemented
     ...    Reference: Clause 5.4.15.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none 
     Put Rollback operation
     Check HTTP Response Status Code Is    405
 
@@ -82,7 +80,7 @@ PATCH Rollback operation task - Method not implemented
     ...    Reference: Clause 5.4.15.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     Patch Rollback operation
     Check HTTP Response Status Code Is    405
     
@@ -94,7 +92,7 @@ DELETE Rollback operation task - Method not implemented
     ...    Reference: Clause 5.4.15.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     Delete Rollback operation
     Check HTTP Response Status Code Is    405
 
@@ -103,19 +101,4 @@ Check resource existence
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
-    Integer    response status    200
-
-Launch another error handling action
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/retry
-    Integer    response status    202
-    
-Check Rollback not supported
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
-    # how to check if Rollback is not supported?
-    
-Check resource FAILED_TEMP
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 
-    String    response body operationState    FAILED_TEMP
\ No newline at end of file
+    Integer    response status    200
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/ScaleVNFTask.robot b/SOL002/VNFLifecycleManagement-API/ScaleVNFTask.robot
index 6a5e732a1227c5802237fbb463c32c552fd58f14..4b9ebed989896b99bca1ec482083dd52767c8134 100644
--- a/SOL002/VNFLifecycleManagement-API/ScaleVNFTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/ScaleVNFTask.robot
@@ -34,7 +34,6 @@ POST Scale a vnfInstance Conflict (Not-Instantiated)
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails 
 
-    
 POST Scale a vnfInstance Not Found
     [Documentation]    Test ID: 6.3.5.4.3
     ...    Test title: POST Scale a vnfInstance Not Found
@@ -102,27 +101,4 @@ Check resource existence
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} 
-    Integer    response status    200
-
-Check resource not instantiated
-    [Arguments]    ${instanceId}
-    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/${instanceId} 
-    String    response body instantiationState    NOT_INSTANTIATED
-
-Check scale not supported
-    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/${vnfInstanceId} 
-    Missing    response body instantiatedVnfInfo scaleStatus
-
-Launch another LCM operation
-    Set Headers  {"Accept":"${ACCEPT}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/scaleVnfToLevelRequest.json
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale_to_level    ${body}
-    Integer    response status    202
\ No newline at end of file
+    Integer    response status    200
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot b/SOL002/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
index 7648c37568cce7d7a135e1718632b557ca7e1eec..75efe34bf20e509ceafc424c2c21c78c536e0797 100644
--- a/SOL002/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
@@ -33,7 +33,6 @@ POST Scale a vnfInstance to level Conflict (Not-Instantiated)
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails 
 
-    
 POST Scale a vnfInstance Not Found
     [Documentation]    Test ID: 6.3.5.5.3
     ...    Test title: POST Scale a vnfInstance Not Found
@@ -46,8 +45,7 @@ POST Scale a vnfInstance Not Found
     POST Scale vnfInstance to level    
     Check HTTP Response Status Code Is    404
     Check HTTP Response Body Json Schema Is    ProblemDetails 
-   
-    
+       
 GET Scale to level VNFInstance - Method not implemented
     [Documentation]    Test ID: 6.3.5.5.4
     ...    Test title: GET Scale to level VNFInstance - Method not implemented
@@ -102,27 +100,4 @@ Check resource existence
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} 
-    Integer    response status    200
-
-Check resource not instantiated
-    [Arguments]    ${instanceId}
-    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/${instanceId} 
-    String    response body instantiationState    NOT_INSTANTIATED
-
- Check scale to level not supported
-    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/${vnfInstanceId} 
-    Missing    response body instantiatedVnfInfo scaleStatus
-
-Launch another LCM operation
-    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/${vnfInstanceId}/scale    ${body}
-    Integer    response status    202
+    Integer    response status    200
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/Subscriptions.robot b/SOL002/VNFLifecycleManagement-API/Subscriptions.robot
index ad77de44378c8324deb42ba48d59881cd1ebd842..6f8cbd6ed25299347d12c2b96c985893dc9eb673 100644
--- a/SOL002/VNFLifecycleManagement-API/Subscriptions.robot
+++ b/SOL002/VNFLifecycleManagement-API/Subscriptions.robot
@@ -18,7 +18,7 @@ POST Create a new subscription
     ...    Post-Conditions: in response header Location shall not be null
     Post Create subscription
     Check HTTP Response Status Code Is    201
-    Check HTTP Response Body Json Schema Is    Subscription
+    Check HTTP Response Body Json Schema Is    subscription
     
 POST Create a new Subscription - DUPLICATION
     [Documentation]    Test ID: 6.3.5.17.2
@@ -31,7 +31,7 @@ POST Create a new Subscription - DUPLICATION
     ...    Post-Conditions: in response header Location shall not be null
     Post Create subscription - DUPLICATION
     Check HTTP Response Status Code Is    201
-    Check HTTP Response Body Json Schema Is    Subscription
+    Check HTTP Response Body Json Schema Is    subscription
 
 POST Create a new Subscription - NO-DUPLICATION
     [Documentation]    Test ID: 6.3.5.17.3
@@ -198,7 +198,7 @@ GET information about multiple subscriptions to get Paged Response
     ...    Post-Conditions:  
     Get subscriptions
     Check HTTP Response Status Code Is    200
-    Check LINK in Header 
+    Check HTTP Response Header Contain Link
     
 GET information about multiple subscriptions for Bad Request Response too big
     [Documentation]    Test ID: 6.3.5.17.16
@@ -211,5 +211,4 @@ GET information about multiple subscriptions for Bad Request Response too big
     ...    Post-Conditions: 
     Get subscriptions
     Check HTTP Response Status Code Is    400
-    Check HTTP Response Body Json Schema Is    ProblemDetails
-
+    Check HTTP Response Body Json Schema Is    ProblemDetails
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/TerminateVNFTask.robot b/SOL002/VNFLifecycleManagement-API/TerminateVNFTask.robot
index 914af78117eded0929408a26a4630ca667e39d1b..72690a90b0a19f07bf4e7d19c0355b68957c9fc1 100644
--- a/SOL002/VNFLifecycleManagement-API/TerminateVNFTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/TerminateVNFTask.robot
@@ -25,7 +25,7 @@ POST Terminate a vnfInstance Conflict (Not-Instantiated)
     [Documentation]    Test ID: 6.3.5.7.2
     ...    Test title: POST Terminate a vnfInstance Conflict (Not-Instantiated)
     ...    Test objective: The objective is to test that the operation cannot be executed currently, due to a conflict with the state of the VNF instance resource or that a required child attribute of the "extensions" attribue has not been set.  
-    ...    Pre-conditions:  VNF instance resource is in NOT-INSTANTIATED state
+    ...    Pre-conditions:  VNF instance resource is in NOT_INSTANTIATED state
     ...    Reference: Clause 5.4.8.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
@@ -33,8 +33,7 @@ POST Terminate a vnfInstance Conflict (Not-Instantiated)
     POST Terminate VNF  
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails
-
-       
+    
 GET Terminate VNFInstance - Method not implemented
     [Documentation]    Test ID: 6.3.5.7.3
     ...    Test title:  GET Terminate VNFInstance - Method not implemented
@@ -89,27 +88,4 @@ Check resource existence
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} 
-    Integer    response status    200
-
-Check resource not instantiated
-    [Arguments]    ${instanceId}
-    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/${instanceId} 
-    String    response body instantiationState    NOT_INSTANTIATED
-
-Check change flavour not supported
-    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/${vnfInstanceId} 
-    # how to check if change floavour is not supported? "flavourId" doesn't exist?
-
-Launch another LCM operation
-    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/${vnfInstanceId}/scale    ${body}
-    Integer    response status    202
\ No newline at end of file
+    Integer    response status    200
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
index d6f9a33d4415fad977ab20fbd580c4928ad66221..8b5b5d7def53d487bc8308a5a942d5019dae6622 100644
--- a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
+++ b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
@@ -587,7 +587,34 @@ Post Individual VNF LCM OP occurrences
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
-
+Get Individual VNF LCM OP occurrences
+    log    Trying to perform a POST. This method should not be implemented
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}	
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}	
+Put Individual VNF LCM OP occurrences
+    log    Trying to perform a POST. This method should not be implemented
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Put    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}	
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
+Patch Individual VNF LCM OP occurrences
+    log    Trying to perform a POST. This method should not be implemented
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Patch   ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}	
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
+Delete Individual VNF LCM OP occurrences
+    log    Trying to perform a POST. This method should not be implemented
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Delete    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}	
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}			
 Post Retry operation
     Log    Retry a VNF lifecycle operation if that operation has experienced a temporary failure
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
@@ -661,7 +688,7 @@ Delete Rollback operation
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 Post Fail operation
-    Log    mark as Failed a VNF lifecycle operation if that operation has experienced a temporary failure
+    Log    mark as Failed a VNF lifecycle operation if that operation has experienced a failure
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Log    Execute Query and validate response
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/fail
@@ -740,7 +767,7 @@ Post Create subscription
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${template}=    Get File    jsons/lccnSubscriptionRequest.json
-    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
+    ${body}=        Format String   ${template}    vnfdIds=${vnfdIds}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
     Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}				
@@ -751,7 +778,7 @@ Post Create subscription - DUPLICATION
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${template}=    Get File    jsons/lccnSubscriptionRequest.json
-    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
+    ${body}=        Format String   ${template}    vnfdIds=${vnfdIds}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
     Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}		
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}			
@@ -762,7 +789,7 @@ Post Create subscription - NO-DUPLICATION
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${template}=    Get File    jsons/lccnSubscriptionRequest.json
-    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
+    ${body}=        Format String   ${template}    vnfdIds=${vnfdIds}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
     Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
@@ -942,10 +969,7 @@ GET test endpoint
     Sleep  ${sleep_interval}
     Verify Mock Expectation  ${req}
     Clear Requests  ${callback_endpoint}   
-Check LINK in Header
-    ${linkURL}=    Get Value From Json    ${response['headers']}    $..Link
-    Should Not Be Empty    ${linkURL}
-
+    
 Check Subscription resource exist
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
@@ -988,4 +1012,8 @@ Get VNF LCM Operation occurrences with exclude_fields attribute selector
     GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs?exclude_fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 	
+    
+Check HTTP Response Header Contain Link
+    ${linkURL}=    Get Value From Json    ${response['headers']}    $..Link
+    Should Not Be Empty    ${linkURL}
     
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
index 1af91b51a7b4f84cc0f68945febb5b4afe3d796b..687c6f711297dc2fcabc2c85fdf4b46ffa9e24ea 100644
--- a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
+++ b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
@@ -59,7 +59,7 @@ GET status information about multiple VNF LCM Operation occurrences Bad Request
     Check HTTP Response Status Code Is    400
     Check HTTP Response Body Json Schema Is    ProblemDetails
 
-GET status information about multiple VNF LCM Operation OCC with "all_fields"   
+GET status information about multiple VNF LCM Operation occurrences with "all_fields"   
     [Documentation]    Test ID: 6.3.5.11.5
     ...    Test title: GET status information about multiple VNF LCM Operation OCC with "all_fields"
     ...    Test objective: The objective is to test that GET method retrieve Query status information about multiple VNF lifecycle management operation occurrences.
@@ -72,7 +72,7 @@ GET status information about multiple VNF LCM Operation OCC with "all_fields"
     Check HTTP Response Status Code Is    202
     Check HTTP Response Body Json Schema Is    VnfLcmOpOccs 
 
-GET status information about multiple VNF LCM Operation OCC with "exlude_default"   
+GET status information about multiple VNF LCM Operation occurrences with "exlude_default"   
     [Documentation]    Test ID: 6.3.5.11.6
     ...    Test title: GET status information about multiple VNF LCM Operation OCC with "exclude_default"
     ...    Test objective: The objective is to test that GET method retrieve Query status information about multiple VNF lifecycle management operation occurrences.
@@ -85,7 +85,7 @@ GET status information about multiple VNF LCM Operation OCC with "exlude_default
     Check HTTP Response Status Code Is    202
     Check HTTP Response Body Json Schema Is    VnfLcmOpOccs 
 
-GET status information about multiple VNF LCM Operation OCC with "fields"   
+GET status information about multiple VNF LCM Operation occurrences with "fields"   
     [Documentation]    Test ID: 6.3.5.11.7
     ...    Test title: GET status information about multiple VNF LCM Operation OCC with "fields"
     ...    Test objective: The objective is to test that GET method retrieve Query status information about multiple VNF lifecycle management operation occurrences.
@@ -98,7 +98,7 @@ GET status information about multiple VNF LCM Operation OCC with "fields"
     Check HTTP Response Status Code Is    202
     Check HTTP Response Body Json Schema Is    VnfLcmOpOccs
 
-GET status information about multiple VNF LCM Operation OCC with "exclude_fields"   
+GET status information about multiple VNF LCM Operation occurrences with "exclude_fields"   
     [Documentation]    Test ID: 6.3.5.11.8
     ...    Test title: GET status information about multiple VNF LCM Operation OCC with "exclude_fields"
     ...    Test objective: The objective is to test that GET method retrieve Query status information about multiple VNF lifecycle management operation occurrences.
@@ -158,7 +158,7 @@ GET status information about multiple VNF LCM operation occurances to get Paged
     ...    Post-Conditions: none   
     GET VNF LCM OP occurrences
     Check HTTP Response Status Code Is    200
-    Check LINK in Header 
+    Check HTTP Response Header Contain Link
     
 GET status information about multiple VNF LCM Operation occurrences Bad Request Response too big
     [Documentation]    Test ID: 6.3.5.11.13
@@ -173,7 +173,7 @@ GET status information about multiple VNF LCM Operation occurrences Bad Request
     Check HTTP Response Status Code Is    400
     Check HTTP Response Body Json Schema Is    ProblemDetails
     
-GET status information about multiple VNF LCM Operation OCC with "exlude_default" and "fields" 
+GET status information about multiple VNF LCM Operation occurrences with "exlude_default" and "fields" 
     [Documentation]    Test ID: 6.3.5.11.14
     ...    Test title: GET status information about multiple VNF LCM Operation OCC with "exclude_default" and "fields"
     ...    Test objective: The objective is to test that GET method retrieve Query status information about multiple VNF lifecycle management operation occurrences.
diff --git a/SOL002/VNFLifecycleManagement-API/environment/variables.txt b/SOL002/VNFLifecycleManagement-API/environment/variables.txt
index ef3d9d5ae3ed10af53671d3a19688dbc3ba6209c..71e5445a3fa628a74867b9cef190ea07f1758d7b 100644
--- a/SOL002/VNFLifecycleManagement-API/environment/variables.txt
+++ b/SOL002/VNFLifecycleManagement-API/environment/variables.txt
@@ -73,4 +73,6 @@ ${terminationType}    GRACEFUL
 
 ${healingCause}    healingCause    
 
-${changeStateTo}    STOPPED
\ No newline at end of file
+${changeStateTo}    STOPPED
+
+${vnfdIds}    6fc3539c-e602-4afa-8e13-962fb5a7d81f
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/jsons/lccnSubscriptionRequest.json b/SOL002/VNFLifecycleManagement-API/jsons/lccnSubscriptionRequest.json
index 1411fe3b4eae8fc55e9b0b38e34282076a96aea8..b28685555bf526fb1b84c4885a78689a3a336895 100644
--- a/SOL002/VNFLifecycleManagement-API/jsons/lccnSubscriptionRequest.json
+++ b/SOL002/VNFLifecycleManagement-API/jsons/lccnSubscriptionRequest.json
@@ -2,7 +2,7 @@
   "filter": {{
     "vnfInstanceSubscriptionFilter": {{
       "vnfdIds": [
-        "6fc3539c-e602-4afa-8e13-962fb5a7d81f"
+        "{vnfdIds}"
       ]
     }}
   }},