diff --git a/SOL003/VNFLifecycleManagement-API/CancelOperationTask.robot b/SOL003/VNFLifecycleManagement-API/CancelOperationTask.robot
index f35468e68228868ee349bfeac9c9d48b7ab75924..2cea9e8703f84fcb502f00e17c5aa99d5b7dfbe8 100644
--- a/SOL003/VNFLifecycleManagement-API/CancelOperationTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/CancelOperationTask.robot
@@ -6,21 +6,20 @@ Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}
 Library    DependencyLibrary
 Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
-Documentation    This task resource represents the "Cancel operation" operation. The client can use this resource to cancel an ongoing VNF lifecycle operation.
-Suite Setup    Check resource existance
 
 *** Test Cases ***
 Post Cancel operation task
     [Documentation]    Test ID: 7.3.1.16.1
     ...    Test title: POST Cancel operation task
     ...    Test objective: The POST method initiates cancelling an ongoing VNF lifecycle operation while it is being executed or rolled back, i.e. the related "VNF LCM operation occurrence" is either in "PROCESSING" or "ROLLING_BACK" state.
-    ...    Pre-conditions: none
+    ...    Pre-conditions: the related "VNF LCM operation occurrence" is either in "PROCESSING" or "ROLLING_BACK" state.
     ...    Reference:  section 5.4.17.3.1 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: in response header Location should not be null    
     POST Cancel operation task
     Check HTTP Response Status Code Is    202
+    Check resource FAILED_TEMP
     
 Post Cancel operation task Conflict
     [Documentation]    Test ID: 7.3.1.16.2
@@ -31,7 +30,6 @@ Post Cancel operation task Conflict
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: in response header Location should not be null  
-    Depends on test  Check resource FAILED_TEMP
     POST Cancel operation task
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails
@@ -40,15 +38,15 @@ Post Cancel operation task Not Found
     # TODO: Need to create a vnfInstance which's instantiatedVnfInfo.scaleStatus is absent
      [Documentation]    Test ID: 7.3.1.16.2
     ...    Test title: POST Cancel operation task
-    ...    Test objective: The objective is to test that POST method cannot cancel a VNF lifecycle operation because the operation is not supported
+    ...    Test objective: The objective is to test that POST method cannot cancel a VNF lifecycle operation because the resource is not found
     ...    Pre-conditions: 
     ...    Reference:  section 5.4.17.3.1 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: in response header Location should not be null  
-    [Setup]    Check Fail not supported
     POST Cancel operation task
     Check HTTP Response Status Code Is    404
+    
 GET Cancel operation task - Method not implemented
     [Documentation]    Test ID: 7.3.1.16.3
     ...    Test title: GET Cancel operation task - Method not implemented
diff --git a/SOL003/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot b/SOL003/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot
index 1bd859eaa16327a0094c9ce2f4bd21184a5f544e..d57054da5acfe657a2435c574ea842ee58bb67a8 100644
--- a/SOL003/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot
@@ -6,7 +6,6 @@ Resource    VnfLcmMntOperationKeywords.robot
 Library    OperatingSystem
 Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
-Suite Setup    Check resource existance
 
 *** Test Cases ***
 POST Change external VNF connectivity 
diff --git a/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot b/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
index 5d4605c6a4cb14427f041fd0c68cf6b8b9ff129a..6cedd724dd4ff3551af673216ddaa00a84b76a45 100644
--- a/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
@@ -6,7 +6,6 @@ Resource    VnfLcmMntOperationKeywords.robot
 Library     OperatingSystem
 Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
-Suite Setup    Check resource existance
 
 *** Test Cases ***
 POST Change deployment flavour of a vnfInstance
@@ -18,7 +17,7 @@ POST Change deployment flavour of a vnfInstance
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: in response header Location should not be null  
-    POST Change VNF deployment flavour   ${vnfInstanceId}
+    POST Change VNF deployment flavour   
     Check HTTP Response Status Code Is    202
     Check Operation Occurrence Id
 
@@ -31,8 +30,7 @@ Change deployment flavour of a vnfInstance Conflict (Not-Instantiated)
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none  
-    [Setup]    Check resource not instantiated   
-    POST Change VNF deployment flavour   ${instantiatedVnfInstanceId}
+    POST Change VNF deployment flavour   
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails
 
@@ -47,8 +45,7 @@ Change deployment flavour of a vnfInstance Not Found
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none  
-    [Setup]    Check change flavour not supported
-    POST Change VNF deployment flavour   ${notFoundVnfInstanceId}
+    POST Change VNF deployment flavour  
     Check HTTP Response Status Code Is    404
     Check HTTP Response Body Json Schema Is    ProblemDetails
    
diff --git a/SOL003/VNFLifecycleManagement-API/FailOperationTask.robot b/SOL003/VNFLifecycleManagement-API/FailOperationTask.robot
index 3c32ba2bae59ccdf0095d42aa3a0ed395fadd2c1..a46944dfeda640fa9b05b1e994641b561f4d37fa 100644
--- a/SOL003/VNFLifecycleManagement-API/FailOperationTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/FailOperationTask.robot
@@ -6,11 +6,6 @@ Library    DependencyLibrary
 Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
 Resource    VnfLcmMntOperationKeywords.robot
-Documentation    This task resource represents the "Fail operation" operation. 
-...    The client can use this resource to mark a VNF lifecycle management operation occurrence as "finally failed", 
-...    i.e. change the state of the related VNF LCM operation occurrence resource to "FAILED", if it is not assumed that a subsequent retry or rollback will succeed. 
-...    Once the operation is marked as "finally failed", it cannot be retried or rolled back anymore.
-Suite Setup    Check resource existance
 
 *** Test Cases ***
 Post Fail operation task  
@@ -22,7 +17,6 @@ Post Fail operation task
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
-    Depends on test    Check resource FAILED_TEMP
     Post Fail operation
     Check HTTP Response Status Code Is    202
     Check Operation Occurrence Id
@@ -37,7 +31,6 @@ Post Fail operation task Conflict (Not-FAILED_TEMP)
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none     
-    Depends on test failure  Check resource FAILED_TEMP
     Post Fail operation
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails
@@ -52,7 +45,6 @@ Post Fail operation task Not Found
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none  
-    [Setup]    Check Fail not supported
     Post Fail operation
     Check HTTP Response Status Code Is    404
 
diff --git a/SOL003/VNFLifecycleManagement-API/HealVNFTask.robot b/SOL003/VNFLifecycleManagement-API/HealVNFTask.robot
index 9e3a82dbb8b0bdd784ffa81073255a8f2feba1d6..3ac5c806b2544d734d6a1328ccfceaba72104f3a 100644
--- a/SOL003/VNFLifecycleManagement-API/HealVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/HealVNFTask.robot
@@ -6,7 +6,6 @@ Library     OperatingSystem
 Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
 Resource    VnfLcmMntOperationKeywords.robot
-Suite Setup    Check resource existance
 
 *** Test Cases ***
 POST Heal a vnfInstance
@@ -32,7 +31,6 @@ Heal a vnfInstance Conflict (Not-Instantiated)
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: 
-    [Setup]    Check resource not instantiated
     POST Terminate VNF
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails 
@@ -49,7 +47,6 @@ Heal a vnfInstance Not Found
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: 
-    [Setup]    Check heal not supported
     POST Terminate VNF
     Check HTTP Response Status Code Is    404
     Check HTTP Response Body Json Schema Is    ProblemDetails 
diff --git a/SOL003/VNFLifecycleManagement-API/IndividualSubscription.robot b/SOL003/VNFLifecycleManagement-API/IndividualSubscription.robot
index d38ba6d77b7cfd9bdc4f391fafebee5fdb040f57..2bb605abd4eec2c638ec844136c9709b1b24923d 100644
--- a/SOL003/VNFLifecycleManagement-API/IndividualSubscription.robot
+++ b/SOL003/VNFLifecycleManagement-API/IndividualSubscription.robot
@@ -5,9 +5,6 @@ Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}
 Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
 Resource    VnfLcmMntOperationKeywords.robot
-Documentation    This resource represents an individual subscription. The client can use this resource to read and to terminate a
-...    subscription to notifications related to VNF lifecycle management
-Suite Setup    Check resource existance
 
 *** Test Cases ***
 Post Individual Subscription - Method not implemented
diff --git a/SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot b/SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot
index 888c086ba7e7156006265162d30f4b78a4995e97..12961688657b0279c4df57efda48ebed1f7b6a66 100644
--- a/SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot
+++ b/SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot
@@ -8,9 +8,6 @@ Library    OperatingSystem
 Library    DependencyLibrary
 Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
-Documentation    This resource represents an individual VNF instance. The client can use this resource to modify and delete the 
-...    underlying VNF instance, and to read information about the VNF instance.
-Suite Setup    Check resource existance
 
 *** Variables ***
 ${original_etag}    1234
@@ -76,7 +73,6 @@ PATCH Individual VNFInstance Precondition failed
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: 
-    Depends On Test    PATCH Individual VNFInstance    # If the previous test scceeded, it means that Etag has been modified
     PATCH individual vnfInstance
     Check HTTP Response Status Code Is    412
     Check HTTP Response Body Json Schema Is    ProblemDetails
@@ -90,8 +86,6 @@ PATCH Individual VNFInstance Conflict
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: 
-    # TODO: Need to set the pre-condition of the test
-    [Setup]    Launch another LCM operation
     PATCH individual vnfInstance
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails
@@ -118,8 +112,6 @@ DELETE Individual VNFInstance Conflict
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: 
-    # TODO: Need to set the pre-condition of the test. The VnfInstance shall in INSTANTIATED state
-    [Setup]    Check resource instantiated
     DELETE individual vnfInstance
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails
diff --git a/SOL003/VNFLifecycleManagement-API/InstantiateVNFTask.robot b/SOL003/VNFLifecycleManagement-API/InstantiateVNFTask.robot
index 37a570c5e8091a9b440f979c69512ab4d41f9274..d1f7d1afaf472b59b006004cf42d2c29ee9131cf 100644
--- a/SOL003/VNFLifecycleManagement-API/InstantiateVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/InstantiateVNFTask.robot
@@ -34,7 +34,6 @@ Instantiate a vnfInstance Conflict
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: 
-    [Setup]    Check resource instantiated
     POST instantiate individual vnfInstance
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails 
diff --git a/SOL003/VNFLifecycleManagement-API/NotificationEndpoint.robot b/SOL003/VNFLifecycleManagement-API/NotificationEndpoint.robot
index 94a9f7532f8c858260e3185cc6103341418fc074..06c8c486d51a9d46e932c4ba03eaf00b87fea7a8 100644
--- a/SOL003/VNFLifecycleManagement-API/NotificationEndpoint.robot
+++ b/SOL003/VNFLifecycleManagement-API/NotificationEndpoint.robot
@@ -16,8 +16,7 @@ ${sleep_interval}    20s
 Deliver a notification - Operation Occurence
     [Documentation]    Test ID: 7.3.1.19.1
     ...    Test title: POST Deliver a notification - Operation Occurence
-    ...    Test objective: The objective is to test that POST method trigger a notification about lifecycle changes triggered by a VNF LCM
-operation occurrence
+    ...    Test objective: The objective is to test that POST method trigger a notification about lifecycle changes triggered by a VNF LCM operation occurrence
     ...    Pre-conditions: none
     ...    Reference:  section 5.4.20.3.1 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
diff --git a/SOL003/VNFLifecycleManagement-API/OperateVNFTask.robot b/SOL003/VNFLifecycleManagement-API/OperateVNFTask.robot
index c457baba2de6072c79468667fda7fc6b619f95c2..88cda66d959b373440af588d87ffa1d7f7a1e70f 100644
--- a/SOL003/VNFLifecycleManagement-API/OperateVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/OperateVNFTask.robot
@@ -33,7 +33,6 @@ POST Operate a vnfInstance Conflict (Not-Instantiated)
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions:
-    [Setup]    Check resource not instantiated
     POST Operate VNF
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails 
@@ -49,7 +48,6 @@ POST Operate a vnfInstance Not Found
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions:
-    [Setup]    Check operate not supported
     POST Operate VNF
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails
diff --git a/SOL003/VNFLifecycleManagement-API/RetryOperationTask.robot b/SOL003/VNFLifecycleManagement-API/RetryOperationTask.robot
index 78db6617e593ccc9e48ba5f357d0521927c6ff09..a4aa7a8d0460575727b6800775791c0abd00a0c9 100644
--- a/SOL003/VNFLifecycleManagement-API/RetryOperationTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/RetryOperationTask.robot
@@ -20,7 +20,6 @@ Post Retry operation task
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
-    Depends on test    Check resource FAILED_TEMP
     Post Retry operation
     Check HTTP Response Status Code Is    202
     Check Operation Occurrence Id
@@ -35,7 +34,6 @@ Post Retry operation task Conflict (Not-FAILED_TEMP)
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
-    Depends on test failure  Check resource FAILED_TEMP
     Post Retry operation
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails
@@ -51,7 +49,6 @@ Post Retry operation task Not Found
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
-    [Setup]    Check retry not supported
     Post Retry operation
     Check HTTP Response Status Code Is    404
 
diff --git a/SOL003/VNFLifecycleManagement-API/RetryOperationWorkflow.robot b/SOL003/VNFLifecycleManagement-API/RetryOperationWorkflow.robot
index 4905e19230f3bdc07e7ace46ce354bf9c7dba695..ddcda353382016c52e49758c0e826f192a4925f0 100644
--- a/SOL003/VNFLifecycleManagement-API/RetryOperationWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/RetryOperationWorkflow.robot
@@ -10,8 +10,6 @@ Library    BuiltIn
 Library    Collections
 Library    JSONLibrary
 Library    Process
-Suite Setup    Initialize System
-Suite Teardown    Terminate All Processes    kill=true
 
 
 *** Test Cases ***
diff --git a/SOL003/VNFLifecycleManagement-API/RollbackOperationTask.robot b/SOL003/VNFLifecycleManagement-API/RollbackOperationTask.robot
index 1340d482667275d79238273378a1ead5876e3905..86605dc875217b0e77dce5b13232c79aa5e4b0f8 100644
--- a/SOL003/VNFLifecycleManagement-API/RollbackOperationTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/RollbackOperationTask.robot
@@ -19,7 +19,6 @@ Post Rollback operation task
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
-    Depends on test    Check resource FAILED_TEMP
     Post Rollback operation
     Check HTTP Response Status Code Is    202
     Check Operation Occurrence Id
@@ -34,7 +33,6 @@ Post Rollback operation task Conflict (Not-FAILED_TEMP)
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
-    Depends on test failure  Check resource FAILED_TEMP
     Post Rollback operation
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails
@@ -50,7 +48,6 @@ Post Rollback operation task Not Found
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
-    [Setup]    Check Rollback not supported
     Post Rollback operation
     Check HTTP Response Status Code Is    404
 
diff --git a/SOL003/VNFLifecycleManagement-API/ScaleVNFTask.robot b/SOL003/VNFLifecycleManagement-API/ScaleVNFTask.robot
index 85c93ddb46eb0567093f3c494d99aedcc40a17bf..0d57c9fc92f81511ed2c270dc36e447022782727 100644
--- a/SOL003/VNFLifecycleManagement-API/ScaleVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/ScaleVNFTask.robot
@@ -18,7 +18,7 @@ POST Scale a vnfInstance
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: 
-    POST Scale vnfInstance   ${instantiatedVnfInstanceId}
+    POST Scale vnfInstance  
     Check HTTP Response Status Code Is    202
     Check Operation Occurrence Id
 
@@ -32,8 +32,7 @@ POST Scale a vnfInstance Conflict (Not-Instantiated)
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: 
-    [Setup]    Check resource not instantiated
-    POST Scale vnfInstance   ${notInstantiatedVnfInstanceId}
+    POST Scale vnfInstance  
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails 
     
@@ -47,8 +46,7 @@ POST Scale a vnfInstance Not Found
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: 
-    [Setup]    Check scale not supported
-    POST Scale vnfInstance    ${notFoundVnfInstanceId}
+    POST Scale vnfInstance  
     Check HTTP Response Status Code Is    404
     Check HTTP Response Body Json Schema Is    ProblemDetails 
    
diff --git a/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot b/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
index b31f58f4faa9ee0931534a881f361a4d2341d577..fd63e70858fab045371e4516bee3cab409bc6acf 100644
--- a/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
@@ -6,7 +6,6 @@ Library    OperatingSystem
 Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
 Resource    VnfLcmMntOperationKeywords.robot
-Suite Setup    Check resource existance
 
 *** Test Cases ***
 POST Scale a vnfInstance to level
@@ -18,7 +17,7 @@ POST Scale a vnfInstance to level
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions:
-    POST Scale vnfInstance to level       ${instantiatedVnfInstanceId}     
+    POST Scale vnfInstance to level     
     Check HTTP Response Status Code Is    202
     Check Operation Occurrence Id
 
@@ -32,8 +31,7 @@ POST Scale a vnfInstance to level Conflict (Not-Instantiated)
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions:
-    [Setup]    Check resource not instantiated
-    POST Scale vnfInstance to level     ${notInstantiatedInstanceId}
+    POST Scale vnfInstance to level   
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails 
 
@@ -48,8 +46,7 @@ Scale a vnfInstance Not Found
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions:
-    [Setup]    Check scale to level not supported
-    POST Scale vnfInstance to level     ${notFoundInstanceId}
+    POST Scale vnfInstance to level    
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails 
    
diff --git a/SOL003/VNFLifecycleManagement-API/ScaleVNFWorkflow.robot b/SOL003/VNFLifecycleManagement-API/ScaleVNFWorkflow.robot
index 7344f7f81fac6ebc8f9b25ff47a74a85d42dbc79..0198e5aac0f66e655621979230a279053be2ff1f 100644
--- a/SOL003/VNFLifecycleManagement-API/ScaleVNFWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/ScaleVNFWorkflow.robot
@@ -10,8 +10,6 @@ Library    BuiltIn
 Library    Collections
 Library    JSONLibrary
 Library    Process
-Suite Setup    Initialize System
-Suite Teardown    Terminate All Processes    kill=true
 
 
 *** Test Cases ***
diff --git a/SOL003/VNFLifecycleManagement-API/TerminateVNFTask.robot b/SOL003/VNFLifecycleManagement-API/TerminateVNFTask.robot
index 5573682b5153d34fd0e9d39c3762e56dc836da20..3b69891558f5694172dfab608298ca69d66d5550 100644
--- a/SOL003/VNFLifecycleManagement-API/TerminateVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/TerminateVNFTask.robot
@@ -32,7 +32,6 @@ Terminate a vnfInstance Conflict (Not-Instantiated)
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: 
-    [Setup]    Check resource not instantiated
     POST Terminate VNF  
     Check HTTP Response Status Code Is    202
     Check HTTP Response Body Json Schema Is    ProblemDetails
diff --git a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
index 290bf517b3784f07194fb962d3279180dbcca339..5c39cc48f86bda2947606f5e9bce9172751de8b6 100644
--- a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
+++ b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
@@ -306,40 +306,39 @@ DELETE Change External VNF Connectivity
 	Set Global Variable    @{response}    ${outputResponse}  
 	
 POST Change VNF deployment flavour
-    [Arguments]    ${instanceId}
     Log    Trying to change the deployment flavour of 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/changeVnfFlavourRequest.json
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${instanceId}/change_flavour    ${body} 
+    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/change_flavour    ${body} 
     ${outputResponse}=    Output    response
 	Set Global Variable    @{response}    ${outputResponse}  	 
 GET Change External VNF Connectivity
     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/${instanceId}/change_flavour 	
+    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/change_flavour 	
     ${outputResponse}=    Output    response
 	Set Global Variable    @{response}    ${outputResponse}
 	
 PUT Change External VNF Connectivity
     log    Trying to perform a PUT. This method should not be implemented 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${instanceId}/change_flavour 	
+    Put    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/change_flavour 	
     ${outputResponse}=    Output    response
 	Set Global Variable    @{response}    ${outputResponse}
 	
 PATCH Change External VNF Connectivity
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${instanceId}/change_flavour   	 	
+    Patch    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/change_flavour   	 	
     ${outputResponse}=    Output    response
 	Set Global Variable    @{response}    ${outputResponse}
 	
 DELETE Change External VNF Connectivity
     Log    Trying to perform a DELETE. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${instanceId}/change_flavour   	 	
+    Delete    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/change_flavour   	 	
     ${outputResponse}=    Output    response
 	Set Global Variable    @{response}    ${outputResponse} 
 	 	
@@ -538,13 +537,12 @@ DELETE Scale vnfInstance
     ${outputResponse}=    Output    response
 	Set Global Variable    @{response}    ${outputResponse} 	
 POST Scale vnfInstance to level
-    [Arguments]    ${instanceId}
     Log    Trying to scale a vnf Instance to level
     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/${instanceId}/scale_to_level    ${body}
+    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale_to_level    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    @{response}    ${outputResponse} 
 GET Scale vnfInstance to level
diff --git a/SOL003/VNFLifecycleManagement-API/environment/variables.txt b/SOL003/VNFLifecycleManagement-API/environment/variables.txt
index fe5c9214e77a8906b50e93b72099179658256180..82e8f8ad6b342a23100c6510e3f6575548b8dfdd 100644
--- a/SOL003/VNFLifecycleManagement-API/environment/variables.txt
+++ b/SOL003/VNFLifecycleManagement-API/environment/variables.txt
@@ -1,8 +1,5 @@
 *** Variables ***
 ${vnfInstanceId}       6fc3539c-e602-4afa-8e13-962fb5a7d81f
-${instantiatedVnfInstanceId}    6fc3539c-e602-4afa-8e13-962fb5a7d81f    #Change with an instantiated vnfInstanceID
-${notInstantiatedVnfInstanceId}    6fc3539c-e602-4afa-8e13-962fb5a7d81f    #Change with an instantiated vnfInstanceID
-${notFoundVnfInstanceId}    xxxxxxx-yyyyyyy-tttt-az98-uuuuuu    #Change with an instantiated vnfInstanceID
 ${subscriptionId}    6fc3539c-e602-4afa-8e13-962fb5a7d81f
 ${vnfLcmOpOccId}    6fc3539c-e602-4afa-8e13-962fb5a7d81d
 ${callback_endpoint}    /notification