diff --git a/SOL002/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot b/SOL002/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
index 4e610a073fa7e23d15da738b39478421adeb7b65..42127046b0c86a01f819af067951d09cf0bf8397 100644
--- a/SOL002/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
@@ -8,7 +8,7 @@ Library    JSONSchemaLibrary    schemas/
 Suite Setup    Check resource existance
 
 *** Test Cases ***
-Change deployment flavour of a vnfInstance
+POST Change deployment flavour of a vnfInstance
     [Documentation]    Test ID: 6.3.5.6.1
     ...    Test title: POST Change deployment flavour of a vnfInstance
     ...    Test objective: The objective is to test that POST method trigger a change in VNF deployment flavour
@@ -21,9 +21,9 @@ Change deployment flavour of a vnfInstance
     Check HTTP Response Status Code Is    202
     Check Operation Occurrence Id
 
-Change deployment flavour of a vnfInstance Conflict (Not-Instantiated)
+POST Change deployment flavour of a vnfInstance Conflict (Not-Instantiated)
     [Documentation]    Test ID: 6.3.5.6.2
-    ...    Test title: POST Change deployment flavour of a vnfInstance
+    ...    Test title: POST Change deployment flavour of a vnfInstance Conflict (Not-Instantiated)
     ...    Test objective: The objective is to test that POST method can't trigger a change in VNF deployment flavour because of a conflict with the state of the VNF instance resource. 
     ...    Pre-conditions: VNF instance resource is not in NOT-INSTANTIATED state
     ...    Reference:  section 5.4.7.3.1 - SOL002 v2.4.1
@@ -35,9 +35,9 @@ Change deployment flavour of a vnfInstance Conflict (Not-Instantiated)
     Check HTTP Response Body Json Schema Is    ProblemDetails
 
     
-Change deployment flavour of a vnfInstance Not Found
+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
+    ...    Test title: POST Change deployment flavour of a vnfInstance Not Found
     ...    Test objective: The objective is to test that POST method can't trigger a change in VNF deployment flavour because the VNF instance resource is not found. 
     ...    Pre-conditions: VNF instance resource is not in NOT-INSTANTIATED state
     ...    Reference:  section 5.4.7.3.1 - SOL002 v2.4.1
@@ -50,8 +50,8 @@ Change deployment flavour of a vnfInstance Not Found
    
     
 GET Change deployment flavour VNFInstance - Method not implemented
-    [Documentation]    Test ID: 6.3.5.16.4
-    ...    Test title: GET Cancel operation task - Method not implemented
+    [Documentation]    Test ID: 6.3.5.6.4
+    ...    Test title: GET Change deployment flavour VNFInstance - Method not implemented
     ...    Test objective: The objective is to test that GET method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 5.4.7.3.2 - SOL002 v2.4.1
@@ -62,8 +62,8 @@ GET Change deployment flavour VNFInstance - Method not implemented
     Check HTTP Response Status Code Is    405
 
 PUT Change deployment flavour VNFInstance - Method not implemented
-    [Documentation]    Test ID: 6.3.5.16.5
-    ...    Test title: PUT Cancel operation task - Method not implemented
+    [Documentation]    Test ID: 6.3.5.6.5
+    ...    Test title: PUT Change deployment flavour VNFInstance - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 5.4.7.3.3 - SOL002 v2.4.1
@@ -74,7 +74,7 @@ PUT Change deployment flavour VNFInstance - Method not implemented
     Check HTTP Response Status Code Is    405
 
 PATCH Change deployment flavour VNFInstance - Method not implemented
-    [Documentation]    Test ID: 6.3.5.16.6
+    [Documentation]    Test ID: 6.3.5.6.6
     ...    Test title: PATCH Cancel operation task - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
@@ -86,8 +86,8 @@ PATCH Change deployment flavour VNFInstance - Method not implemented
     Check HTTP Response Status Code Is    405
     
 DELETE Change deployment flavour VNFInstance - Method not implemented
-    [Documentation]    Test ID: 6.3.5.16.7
-    ...    Test title: DELETE Cancel operation task - Method not implemented
+    [Documentation]    Test ID: 6.3.5.6.7
+    ...    Test title: DELETE Change deployment flavour VNFInstance - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 5.4.7.3.5 - SOL002 v2.4.1
diff --git a/SOL002/VNFLifecycleManagement-API/FailOperationTask.robot b/SOL002/VNFLifecycleManagement-API/FailOperationTask.robot
index 5c871b0122482eefd25d59123b36f85eb90fb83b..26ba78cdd0ad30499b9c619fdb25b27ebff32295 100644
--- a/SOL002/VNFLifecycleManagement-API/FailOperationTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/FailOperationTask.robot
@@ -7,9 +7,9 @@ Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
 
 *** Test Cases ***
-Post Fail operation task  
+POST Fail operation task  
     [Documentation]    Test ID: 6.3.5.15.1
-    ...    Test title: Post Fail operation task
+    ...    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
     ...    Pre-conditions: the "VNF LCM operation occurrence" resource is in "FAILED_TEMP" state.
     ...    Reference:  section 5.4.16.3.1 - SOL002 v2.4.1
@@ -21,10 +21,10 @@ Post Fail operation task
     Check Operation Occurrence Id
     Check operation resource state is FINALLY_FAILED
 
-Post Fail operation task Conflict (Not-FAILED_TEMP)
+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
+    ...    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
     ...    Pre-conditions: the "VNF LCM operation occurrence" resource is not in "FAILED_TEMP" state.
     ...    Reference:  section 5.4.16.3.1 - SOL002 v2.4.1
@@ -35,10 +35,10 @@ Post Fail operation task Conflict (Not-FAILED_TEMP)
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails
 
-Post Fail operation task Not Found
+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
+    ...    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: 
     ...    Reference:  section 5.4.16.3.1 - SOL002 v2.4.1
@@ -74,7 +74,7 @@ PUT Fail operation task - Method not implemented
 
 PATCH Fail operation task - Method not implemented
      [Documentation]    Test ID: 6.3.5.15.6
-    ...    Test title: GET Fail operation task- Method not implemented
+    ...    Test title: PATCH Fail operation task - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
     ...    Reference:  section 5.4.16.3.4 - SOL002 v2.4.1
@@ -92,7 +92,7 @@ DELETE Fail operation task - Method not implemented
     ...    Reference:  section 5.4.16.3.5 - SOL002 v2.4.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: vnf instance not deleted
     Delete Fail operation
     Check HTTP Response Status Code Is    405
 
diff --git a/SOL002/VNFLifecycleManagement-API/HealVNFTask.robot b/SOL002/VNFLifecycleManagement-API/HealVNFTask.robot
index 62a8f48f672263d041b162ef1bd60f97f98f6835..43fa763ffa29ef565f30b2a6f294528a5d367d20 100644
--- a/SOL002/VNFLifecycleManagement-API/HealVNFTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/HealVNFTask.robot
@@ -8,7 +8,7 @@ Library    JSONSchemaLibrary    schemas/
 Suite Setup    Check resource existance
 
 *** Test Cases ***
-Heal a vnfInstance
+POST Heal a vnfInstance
      [Documentation]    Test ID: 6.3.5.8.1
     ...    Test title: POST Heal a vnfInstance
     ...    Test objective: The objective is to test that POST method heal a VNF instance
@@ -21,7 +21,7 @@ Heal a vnfInstance
     Check HTTP Response Status Code Is    202
     Check Operation Occurrence Id
     
-Heal a vnfInstance Conflict (Not-Instantiated)
+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)
@@ -36,9 +36,9 @@ Heal a vnfInstance Conflict (Not-Instantiated)
     Check HTTP Response Body Json Schema Is    ProblemDetails 
 
     
-Heal a vnfInstance Not Found
+POST Heal a vnfInstance Not Found
    [Documentation]    Test ID: 6.3.5.8.3
-    ...    Test title: POST Heal a vnfInstance (Not-Instantiated)
+    ...    Test title: POST Heal a vnfInstance Not Found
     ...    Test objective: The objective is to test that the operation cannot be executed because the VNF instance resource is not found. 
     ...    Pre-conditions: the VNF instance resource is not existing
     ...    Reference:  section 5.4.9.3.1 - SOL002 v2.4.1
@@ -62,7 +62,7 @@ GET Heal VNFInstance - Method not implemented
     Check HTTP Response Status Code Is    405
 
 PUT Heal VNFInstance - Method not implemented
-    [Documentation]    Test ID: 6.3.5.8.4
+    [Documentation]    Test ID: 6.3.5.8.5
     ...    Test title: PUT Heal a vnfInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
@@ -74,7 +74,7 @@ PUT Heal VNFInstance - Method not implemented
     Check HTTP Response Status Code Is    405
 
 PATCH Heal VNFInstance - Method not implemented
-    [Documentation]    Test ID: 6.3.5.8.5
+    [Documentation]    Test ID: 6.3.5.8.6
     ...    Test title: PATCH Heal a vnfInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
@@ -86,7 +86,7 @@ PATCH Heal VNFInstance - Method not implemented
     Check HTTP Response Status Code Is    405
     
 DELETE Heal VNFInstance - Method not implemented
-    [Documentation]    Test ID: 6.3.5.8.6
+    [Documentation]    Test ID: 6.3.5.8.7
     ...    Test title: DELETE Heal a vnfInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
diff --git a/SOL002/VNFLifecycleManagement-API/IndividualSubscription.robot b/SOL002/VNFLifecycleManagement-API/IndividualSubscription.robot
index f2f183e212be05b1d4111fb17c810ad6691a7289..90ffd738d5e20bcd226af1afab1e9d7269362923 100644
--- a/SOL002/VNFLifecycleManagement-API/IndividualSubscription.robot
+++ b/SOL002/VNFLifecycleManagement-API/IndividualSubscription.robot
@@ -6,9 +6,9 @@ Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
 
 *** Test Cases ***
-Post Individual Subscription - Method not implemented
+POST Individual Subscription - Method not implemented
     [Documentation]    Test ID: 6.3.5.18.1
-    ...    Test title: Post Individual Subscription - Method not implemented
+    ...    Test title: POST Individual Subscription - Method not implemented
     ...    Test objective: The objective is to test that the method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 5.4.19.3.1 - SOL002 v2.4.1
diff --git a/SOL002/VNFLifecycleManagement-API/IndividualVNFInstance.robot b/SOL002/VNFLifecycleManagement-API/IndividualVNFInstance.robot
index 9778c0036106511d974235704d175cf6acf811b4..d810b3efe4c1c295e956d37af492edc2944c8fca 100644
--- a/SOL002/VNFLifecycleManagement-API/IndividualVNFInstance.robot
+++ b/SOL002/VNFLifecycleManagement-API/IndividualVNFInstance.robot
@@ -13,9 +13,9 @@ Library    JSONSchemaLibrary    schemas/
 ${original_etag}    1234
 
 *** Test Cases ***
-Post Individual VNFInstance - Method not implemented
+POST Individual VNFInstance - Method not implemented
     [Documentation]    Test ID: 6.3.5.2.1
-    ...    Test title: Post Individual VNFInstance - Method not implemented
+    ...    Test title: POST Individual VNFInstance - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
     ...    Reference: section 5.4.3.3.1 - SOL002 v2.4.1
@@ -25,9 +25,9 @@ Post Individual VNFInstance - Method not implemented
     POST individual vnfInstance
     Check HTTP Response Status Code Is    405
     
-Get Information about an individual VNF Instance
+GET Information about an individual VNF Instance
     [Documentation]    Test ID: 6.3.5.2.2
-    ...    Test title: Get Information about an individual VNF Instance
+    ...    Test title: GET Information about an individual VNF Instance
     ...    Test objective: The objective is to create a new VNF instance resource
     ...    Pre-conditions: none
     ...    Reference: section 5.4.3.3.2 - SOL002 v2.4.1
@@ -47,7 +47,7 @@ PUT Individual VNFInstance - Method not implemented
     ...    Reference: section 5.4.3.3.3 - SOL002 v2.4.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Post-Conditions: vnf instance not modified
     PUT individual vnfInstance
     Check HTTP Response Status Code Is    405
 
@@ -59,7 +59,7 @@ PATCH Individual VNFInstance
     ...    Reference: section 5.4.3.3.4 - SOL002 v2.4.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Post-Conditions: vnf instance modified
     PATCH individual vnfInstance
     Check HTTP Response Status Code Is    202
     Check Operation Occurrence Id
@@ -72,20 +72,20 @@ PATCH Individual VNFInstance Precondition failed
     ...    Reference: section 5.4.3.3.4 - SOL002 v2.4.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Post-Conditions: vnf instance not modified
     PATCH individual vnfInstance
     Check HTTP Response Status Code Is    412
     Check HTTP Response Body Json Schema Is    ProblemDetails
 
 PATCH Individual VNFInstance Conflict
     [Documentation]    Test ID: 6.3.5.2.6
-    ...    Test title: PATCH Individual VNFInstance Precondition failed
+    ...    Test title: PATCH Individual VNFInstance Conflict
     ...    Test objective: The objective is to create a new VNF instance resource
     ...    Pre-conditions: none
     ...    Reference: section 5.4.3.3.4 - SOL002 v2.4.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Post-Conditions: vnf instance not modified
      PATCH individual vnfInstance
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails
@@ -98,7 +98,7 @@ DELETE Individual VNFInstance
     ...    Reference: section 5.4.3.3.5 - SOL002 v2.4.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Post-Conditions: vnf instance deleted
     DELETE individual vnfInstance
     Check HTTP Response Status Code Is    204
 
diff --git a/SOL002/VNFLifecycleManagement-API/InstantiateVNFTask.robot b/SOL002/VNFLifecycleManagement-API/InstantiateVNFTask.robot
index 1997f247be933d851eeb1f9e07e63529611d0840..95bde70fc6557258f4889c49f3e3d7e8af08762e 100644
--- a/SOL002/VNFLifecycleManagement-API/InstantiateVNFTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/InstantiateVNFTask.robot
@@ -10,9 +10,9 @@ Suite Setup    Check resource existance
 
 
 *** Test Cases ***
-Instantiate a vnfInstance
+POST Instantiate a vnfInstance
     [Documentation]    Test ID: 6.3.5.3.1
-    ...    Test title: Post Instantiate Individual VNFInstance 
+    ...    Test title: POST Instantiate a vnfInstance
     ...    Test objective: The objective is to instantiate a VNF instance
     ...    Pre-conditions: none
     ...    Reference: section 5.4.4.3.1 - SOL002 v2.4.1
@@ -23,9 +23,9 @@ Instantiate a vnfInstance
     Check HTTP Response Status Code Is    202
     Check Operation Occurrence Id
 
-Instantiate a vnfInstance Conflict
+POST Instantiate a vnfInstance Conflict
     [Documentation]    Test ID: 6.3.5.3.2
-    ...    Test title: Post Instantiate Individual VNFInstance 
+    ...    Test title: POST Instantiate a vnfInstance Conflict
     ...    Test objective: The objective is to verify that the instantiation of the vnf cannot be executed currently, due to a conflict with the state of the VNF instance resource. 
     ...    Pre-conditions: VNF instance resource is in INSTANTIATED state
     ...    Reference: section 5.4.4.3.1 - SOL002 v2.4.1
@@ -38,7 +38,7 @@ Instantiate a vnfInstance Conflict
     
 GET Instantiate VNFInstance - Method not implemented
     [Documentation]    Test ID: 6.3.5.3.3
-    ...    Test title: GET Instantiate Individual VNFInstance - Method not implemented
+    ...    Test title: GET Instantiate VNFInstance - Method not implemented
     ...    Test objective: The objective is to test that GET method is not implemented
     ...    Pre-conditions:  
     ...    Reference: section 5.4.4.3.2  - SOL002 v2.4.1
@@ -50,37 +50,37 @@ GET Instantiate VNFInstance - Method not implemented
     
 PUT Instantiate VNFInstance - Method not implemented
     [Documentation]    Test ID: 6.3.5.3.4
-    ...    Test title: PUT Instantiate Individual VNFInstance  - Method not implemented
+    ...    Test title: PUT Instantiate VNFInstance  - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions:  
     ...    Reference: section 5.4.4.3.3  - SOL002 v2.4.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Post-Conditions: vnf instance not modified
     PUT instantiate individual vnfInstance   
     Check HTTP Response Status Code Is    405
 
 PATCH Instantiate VNFInstance - Method not implemented
     [Documentation]    Test ID: 6.3.5.3.5
-    ...    Test title: PATCH Instantiate Individual VNFInstance  - Method not implemented
+    ...    Test title: PATCH Instantiate VNFInstance  - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions:  
     ...    Reference: section 5.4.4.3.4  - SOL002 v2.4.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Post-Conditions: vnf instance not modified
     PATCH instantiate individual vnfInstance   
     Check HTTP Response Status Code Is    405
     
 DELETE Instantiate VNFInstance - Method not implemented
      [Documentation]    Test ID: 6.3.5.3.6
-    ...    Test title: DELETE Instantiate Individual VNFInstance  - Method not implemented
+    ...    Test title: DELETE Instantiate VNFInstance  - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions:  
     ...    Reference: section 5.4.4.3.5  - SOL002 v2.4.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Post-Conditions: vnf instance not deleted
     DELETE instantiate individual vnfInstance   
     Check HTTP Response Status Code Is    405
 
diff --git a/SOL002/VNFLifecycleManagement-API/OperateVNFTask.robot b/SOL002/VNFLifecycleManagement-API/OperateVNFTask.robot
index c61f793a967b78b8e768811ce6f058ed54ae5f16..647aff9d9e4da9c2af6baeddae894689cb55a784 100644
--- a/SOL002/VNFLifecycleManagement-API/OperateVNFTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/OperateVNFTask.robot
@@ -8,7 +8,7 @@ Library    JSONSchemaLibrary    schemas/
 Suite Setup    Check resource existance
 
 *** Test Cases ***
-Operate a vnfInstance
+POST Operate a vnfInstance
     [Documentation]    Test ID: 6.3.5.9.1
     ...    Test title: POST Operate a vnfInstance
     ...    Test objective: The objective is to test that POST method operate a VNF instance
@@ -23,7 +23,7 @@ Operate a vnfInstance
 
 POST Operate a vnfInstance Conflict (Not-Instantiated)
     [Documentation]    Test ID: 6.3.5.9.2
-    ...    Test title: POST Operate a vnfInstance
+    ...    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. 
     ...    Pre-conditions: the VNF instance resource is in NOT-INSTANTIATED state
     ...    Reference:  section 5.4.10.3.1 - SOL002 v2.4.1
@@ -37,7 +37,7 @@ POST Operate a vnfInstance Conflict (Not-Instantiated)
     
 POST Operate a vnfInstance Not Found
     [Documentation]    Test ID: 6.3.5.9.3
-    ...    Test title: POST Operate a vnfInstance
+    ...    Test title: POST Operate a vnfInstance Not Found
     ...    Test objective: The objective is to test that the operation cannot be executed currently, because the resource is not existing
     ...    Pre-conditions: the VNF instance resource is in  not existing
     ...    Reference:  section 5.4.10.3.1 - SOL002 v2.4.1
@@ -50,7 +50,7 @@ POST Operate a vnfInstance Not Found
    
 GET Operate VNFInstance - Method not implemented
     [Documentation]    Test ID: 6.3.5.9.4
-    ...    Test title: GET Operate a vnfInstance - Method not implemented
+    ...    Test title: GET Operate VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
     ...    Reference:  section 5.4.10.3.2 - SOL002 v2.4.1
@@ -62,7 +62,7 @@ GET Operate VNFInstance - Method not implemented
 
 PUT Operate VNFInstance - Method not implemented
     [Documentation]    Test ID: 6.3.5.9.5
-    ...    Test title: PUT Operate a vnfInstance - Method not implemented
+    ...    Test title: PUT Operate VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
     ...    Reference:  section 5.4.10.3.3 - SOL002 v2.4.1
@@ -74,7 +74,7 @@ PUT Operate VNFInstance - Method not implemented
 
 PATCH Operate VNFInstance - Method not implemented
     [Documentation]    Test ID: 6.3.5.9.6
-    ...    Test title: PATCH Operate a vnfInstance - Method not implemented
+    ...    Test title: PATCH Operate VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
     ...    Reference:  section 5.4.10.3.4 - SOL002 v2.4.1
@@ -86,7 +86,7 @@ PATCH Operate VNFInstance - Method not implemented
     
 DELETE Operate VNFInstance - Method not implemented
     [Documentation]    Test ID: 6.3.5.9.7
-    ...    Test title: DELETE Operate a vnfInstance - Method not implemented
+    ...    Test title: DELETE Operate VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
     ...    Reference:  section 5.4.10.3.5 - SOL002 v2.4.1
diff --git a/SOL002/VNFLifecycleManagement-API/RetryOperationTask.robot b/SOL002/VNFLifecycleManagement-API/RetryOperationTask.robot
index 2f1ad366456fc2e34e95f0c152e12fda7906169b..a5f0bc6b7e1d44ee6298dfe78137e0cda46e5385 100644
--- a/SOL002/VNFLifecycleManagement-API/RetryOperationTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/RetryOperationTask.robot
@@ -9,9 +9,9 @@ Documentation    This task resource represents the "Retry operation" operation.
 Suite Setup    Check resource existance
 
 *** Test Cases ***
-Post Retry operation task  
+POST Retry operation task  
     [Documentation]    Test ID: 6.3.5.13.1
-    ...    Test title: Post Retry operation task
+    ...    Test title: POST Retry operation task
     ...    Test objective: The objective is to test that POST method The POST method initiates retrying 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:  section 5.4.14.3.1 - SOL002 v2.4.1
@@ -22,10 +22,10 @@ Post Retry operation task
     Check HTTP Response Status Code Is    202
     Check Operation Occurrence Id
 
-Post Retry operation task Conflict (Not-FAILED_TEMP)
+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
+    ...    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)
     ...    Pre-conditions: the "VNF LCM operation occurrence" resource is not in "FAILED_TEMP" state.
     ...    Reference:  section 5.4.14.3.1 - SOL002 v2.4.1
@@ -37,10 +37,10 @@ Post Retry operation task Conflict (Not-FAILED_TEMP)
     Check HTTP Response Body Json Schema Is    ProblemDetails
 
 
-Post Retry operation task Not Found
+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
+    ...    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
     ...    Pre-conditions: 
     ...    Reference:  section 5.4.14.3.1 - SOL002 v2.4.1
diff --git a/SOL002/VNFLifecycleManagement-API/RollbackOperationTask.robot b/SOL002/VNFLifecycleManagement-API/RollbackOperationTask.robot
index f0a3ba78fa353db3bc36b313b965f41ef19a2483..5c0d9f3c7c4f5e5def818fef3c3cbd9e14f0f0c9 100644
--- a/SOL002/VNFLifecycleManagement-API/RollbackOperationTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/RollbackOperationTask.robot
@@ -9,9 +9,9 @@ Documentation    This task resource represents the "Rollback operation" operatio
 Suite Setup    Check resource existance
 
 *** Test Cases ***
-Post Rollback operation task  
+POST Rollback operation task  
     [Documentation]    Test ID: 6.3.5.14.1
-    ...    Test title: Post Rollback operation task
+    ...    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
     ...    Pre-conditions: the "VNF LCM operation occurrence" resource is in "FAILED_TEMP" state.
     ...    Reference:  section 5.4.15.3.1 - SOL002 v2.4.1
@@ -22,10 +22,10 @@ Post Rollback operation task
     Check HTTP Response Status Code Is    202
     Check Operation Occurrence Id
 
-Post Rollback operation task Conflict (Not-FAILED_TEMP)
+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
+    ...    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
     ...    Pre-conditions: the "VNF LCM operation occurrence" resource is not in "FAILED_TEMP" state.
     ...    Reference:  section 5.4.15.3.1 - SOL002 v2.4.1
@@ -37,10 +37,10 @@ Post Rollback operation task Conflict (Not-FAILED_TEMP)
     Check HTTP Response Body Json Schema Is    ProblemDetails
 
 
-Post Rollback operation task Not Found
+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
+    ...    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: 
     ...    Reference:  section 5.4.15.3.1 - SOL002 v2.4.1
@@ -52,7 +52,7 @@ Post Rollback operation task Not Found
 
 GET Rollback operation task - Method not implemented
     [Documentation]    Test ID: 6.3.5.14.4
-    ...    Test title: GET Retry operation task- Method not implemented
+    ...    Test title: GET Rollback operation task - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
     ...    Reference:  section 5.4.15.3.2 - SOL002 v2.4.1
@@ -64,7 +64,7 @@ GET Rollback operation task - Method not implemented
     
 PUT Rollback operation task - Method not implemented
     [Documentation]    Test ID: 6.3.5.14.5
-    ...    Test title: PUT Retry operation task- Method not implemented
+    ...    Test title: PUT Rollback operation task - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
     ...    Reference:  section 5.4.15.3.3 - SOL002 v2.4.1
@@ -76,7 +76,7 @@ PUT Rollback operation task - Method not implemented
 
 PATCH Rollback operation task - Method not implemented
     [Documentation]    Test ID: 6.3.5.14.6
-    ...    Test title: PATCH Retry operation task- Method not implemented
+    ...    Test title: PATCH Rollback operation task - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
     ...    Reference:  section 5.4.15.3.4 - SOL002 v2.4.1
@@ -88,7 +88,7 @@ PATCH Rollback operation task - Method not implemented
     
 DELETE Rollback operation task - Method not implemented
     [Documentation]    Test ID: 6.3.5.14.7
-    ...    Test title: DELETE Retry operation task- Method not implemented
+    ...    Test title: DELETE Rollback operation task - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
     ...    Reference:  section 5.4.15.3.5 - SOL002 v2.4.1
diff --git a/SOL002/VNFLifecycleManagement-API/ScaleVNFTask.robot b/SOL002/VNFLifecycleManagement-API/ScaleVNFTask.robot
index a8de52ee1874a80feb822baaa066e899476f325b..4db17b70952fc2b272788bf7a91483c28370c3fe 100644
--- a/SOL002/VNFLifecycleManagement-API/ScaleVNFTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/ScaleVNFTask.robot
@@ -8,7 +8,7 @@ Library    JSONSchemaLibrary    schemas/
 Suite Setup    Check resource existance
 
 *** Test Cases ***
-Scale a vnfInstance
+POST Scale a vnfInstance
     [Documentation]    Test ID: 6.3.5.4.1
     ...    Test title: POST Scale a vnfInstance
     ...    Test objective: The objective is to scale a VNF instance
@@ -21,7 +21,7 @@ Scale a vnfInstance
     Check HTTP Response Status Code Is    202
     Check Operation Occurrence Id
 
-Scale a vnfInstance Conflict (Not-Instantiated)
+POST Scale a vnfInstance Conflict (Not-Instantiated)
     [Documentation]    Test ID: 6.3.5.4.2
     ...    Test title: POST Scale a vnfInstance Conflict (Not-Instantiated)
     ...    Test objective: The objective is to verify that the operation cannot be executed currently, due to a conflict with the state of the VNF instance resource. 
@@ -35,7 +35,7 @@ Scale a vnfInstance Conflict (Not-Instantiated)
     Check HTTP Response Body Json Schema Is    ProblemDetails 
 
     
-Scale a vnfInstance Not Found
+POST Scale a vnfInstance Not Found
     [Documentation]    Test ID: 6.3.5.4.3
     ...    Test title: POST Scale a vnfInstance Not Found
     ...    Test objective: The objective is to verify that the operation cannot be executed currently, due to a conflict with the state of the VNF instance resource. 
diff --git a/SOL002/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot b/SOL002/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
index 07cbad5b8cb3a357b338cdc09c9ecf3d098cdd87..41251f383e989c460ea20d16d2f7ee37efbae4c0 100644
--- a/SOL002/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
@@ -7,7 +7,7 @@ Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
 
 *** Test Cases ***
-Scale a vnfInstance to level
+POST Scale a vnfInstance to level
     [Documentation]    Test ID: 6.3.5.5.1
     ...    Test title: POST Scale a vnfInstance to level
     ...    Test objective: The objective is to scale a VNF instance to a target level.
@@ -20,10 +20,10 @@ Scale a vnfInstance to level
     Check HTTP Response Status Code Is    202
     Check Operation Occurrence Id
 
-Scale a vnfInstance to level Conflict (Not-Instantiated)
+POST Scale a vnfInstance to level 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.5.2
-    ...    Test title: POST Scale a vnfInstance to level
+    ...    Test title: POST Scale a vnfInstance to level Conflict (Not-Instantiated)
     ...    Test objective: The objective is to verify that the operation cannot be executed currently, due to a conflict with the state of the VNF instance resource. 
     ...    Pre-conditions: VNF instance resource is in NOT-INSTANTIATED state
     ...    Reference: section 5.4.6.3.1 - SOL002 v2.4.1
@@ -35,9 +35,9 @@ Scale a vnfInstance to level Conflict (Not-Instantiated)
     Check HTTP Response Body Json Schema Is    ProblemDetails 
 
     
-Scale a vnfInstance Not Found
+POST Scale a vnfInstance Not Found
     [Documentation]    Test ID: 6.3.5.5.3
-    ...    Test title: Scale a vnfInstance Not Found
+    ...    Test title: POST Scale a vnfInstance Not Found
     ...    Test objective: The objective is to verify that the operation cannot be executed , because the VNF instance resource can't be found.
     ...    Pre-conditions: VNF instance resource is in NOT-INSTANTIATED state
     ...    Reference: section 5.4.6.3.1 - SOL002 v2.4.1
@@ -63,7 +63,7 @@ GET Scale to level VNFInstance - Method not implemented
 
 PUT Scale to level VNFInstance - Method not implemented
     [Documentation]    Test ID: 6.3.5.5.5
-    ...    Test title: GET Scale to level VNFInstance - Method not implemented
+    ...    Test title: PUT Scale to level VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
     ...    Pre-conditions:  
     ...    Reference: section 5.4.6.3.3 - SOL002 v2.4.1
@@ -75,7 +75,7 @@ PUT Scale to level VNFInstance - Method not implemented
 
 PATCH Scale to level VNFInstance - Method not implemented
     [Documentation]    Test ID: 6.3.5.5.6
-    ...    Test title: GET Scale to level VNFInstance - Method not implemented
+    ...    Test title: PATCH Scale to level VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
     ...    Pre-conditions:  
     ...    Reference: section 5.4.6.3.4 - SOL002 v2.4.1
diff --git a/SOL002/VNFLifecycleManagement-API/Subscriptions.robot b/SOL002/VNFLifecycleManagement-API/Subscriptions.robot
index ee93b686b384f06656683398385c6eae33789d57..369d355a0d43165948dc02f02c2ec37f3a17d5e7 100644
--- a/SOL002/VNFLifecycleManagement-API/Subscriptions.robot
+++ b/SOL002/VNFLifecycleManagement-API/Subscriptions.robot
@@ -20,7 +20,7 @@ POST Create a new subscription
     Post Create subscription
     Check HTTP Response Status Code Is    201
     Check HTTP Response Body Json Schema Is    Subscription
-Create a new Subscription - DUPLICATION
+POST Create a new Subscription - DUPLICATION
     [Documentation]    Test ID: 6.3.5.17.2
     ...    Test title: POST Create a new subscription - DUPLICATION
     ...    Test objective: The POST method creates a new subscription even if an existing subscription to same content exist
@@ -34,7 +34,7 @@ Create a new Subscription - DUPLICATION
     Check HTTP Response Status Code Is    201
     Check HTTP Response Body Json Schema Is    Subscription
 
-Create a new Subscription - NO-DUPLICATION
+POST Create a new Subscription - NO-DUPLICATION
     [Documentation]    Test ID: 6.3.5.17.3
     ...    Test title: POST Create a new subscription - NO-DUPLICATION
     ...    Test objective: The POST method creates a new subscription even if an existing subscription to same content exist
@@ -76,7 +76,7 @@ GET Subscription - Filter
     
 GET subscriptions - Bad Request Invalid attribute-based filtering parameters
     [Documentation]    Test ID: 6.3.5.17.6
-    ...    Test title: GET Subscriptions - Filter
+    ...    Test title: GET subscriptions - Bad Request Invalid attribute-based filtering parameters
     ...    Test objective: The objective is Get the list of active subscriptions using a filter
     ...    Pre-conditions: none
     ...    Reference:  section 5.4.18.3.2 - SOL002 v2.4.1
diff --git a/SOL002/VNFLifecycleManagement-API/TerminateVNFTask.robot b/SOL002/VNFLifecycleManagement-API/TerminateVNFTask.robot
index 826f1b246a0bb14f9fe647def92554e4624dfdb7..ad3acf1dec47413ddd5d6befa51c98a48cf42531 100644
--- a/SOL002/VNFLifecycleManagement-API/TerminateVNFTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/TerminateVNFTask.robot
@@ -8,7 +8,7 @@ Library    JSONSchemaLibrary    schemas/
 Suite Setup    Check resource existance
 
 *** Test Cases ***
-Terminate a vnfInstance
+POST Terminate a vnfInstance
     [Documentation]    Test ID: 6.3.5.7.1
     ...    Test title: POST Terminate a vnfInstance
     ...    Test objective: The objective is to test that POST method terminate a VNF instance
@@ -21,9 +21,9 @@ Terminate a vnfInstance
     Check HTTP Response Status Code Is    202
     Check Operation Occurrence Id
 
-Terminate a vnfInstance Conflict (Not-Instantiated)
+POST Terminate a vnfInstance Conflict (Not-Instantiated)
     [Documentation]    Test ID: 6.3.5.7.2
-    ...    Test title: POST Terminate a vnfInstance
+    ...    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. 
     ...    Pre-conditions:  VNF instance resource is in NOT-INSTANTIATED state
     ...    Reference:  section 5.4.8.3.1 - SOL005 v2.4.1
@@ -49,7 +49,7 @@ GET Terminate VNFInstance - Method not implemented
 
 PUT Terminate VNFInstance - Method not implemented
     [Documentation]    Test ID: 6.3.5.7.4
-    ...    Test title:  GET Terminate VNFInstance - Method not implemented
+    ...    Test title:  PUT Terminate VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
     ...    Pre-conditions:  none
     ...    Reference:  section 5.4.8.3.3 - SOL005 v2.4.1
@@ -61,7 +61,7 @@ PUT Terminate VNFInstance - Method not implemented
 
 PATCH Terminate VNFInstance - Method not implemented
     [Documentation]    Test ID: 6.3.5.7.5
-    ...    Test title:  GET Terminate VNFInstance - Method not implemented
+    ...    Test title:  PATCH Terminate VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
     ...    Pre-conditions:  none
     ...    Reference:  section 5.4.8.3.4 - SOL005 v2.4.1
@@ -73,7 +73,7 @@ PATCH Terminate VNFInstance - Method not implemented
     
 DELETE Terminate VNFInstance - Method not implemented
     [Documentation]    Test ID: 6.3.5.7.6
-    ...    Test title:  GET Terminate VNFInstance - Method not implemented
+    ...    Test title:  DELETE Terminate VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
     ...    Pre-conditions:  none
     ...    Reference:  section 5.4.8.3.5 - SOL005 v2.4.1
diff --git a/SOL002/VNFLifecycleManagement-API/VNFInstances.robot b/SOL002/VNFLifecycleManagement-API/VNFInstances.robot
index f44938dc43139d03d0a7e2d0fa3770daadd8846a..c73d69a705dc4dc1b76397afac5e248c94ab35f3 100644
--- a/SOL002/VNFLifecycleManagement-API/VNFInstances.robot
+++ b/SOL002/VNFLifecycleManagement-API/VNFInstances.robot
@@ -7,9 +7,9 @@ Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
 
 *** Test Cases ***
-Create a new vnfInstance
+POST Create a new vnfInstance
     [Documentation]    Test ID: 6.3.5.1.1
-    ...    Test title: Create a new vnfInstance
+    ...    Test title: POST Create a new vnfInstance
     ...    Test objective: The objective is to create a new VNF instance resource
     ...    Pre-conditions: 
     ...    Reference: section 5.4.2.3.1 - SOL002 v2.4.1
@@ -20,9 +20,9 @@ Create a new vnfInstance
     Check HTTP Response Status Code Is    201
     Check HTTP Response Body Json Schema Is    vnfInstance
 
-Get information about multiple VNF instances  
+GET information about multiple VNF instances  
     [Documentation]    Test ID: 6.3.5.1.2
-    ...    Test title: Get information about multiple VNF instances
+    ...    Test title: GET information about multiple VNF instances
     ...    Test objective: The objective is to get informations about multiples VNF instances
     ...    Pre-conditions: 
     ...    Reference: section 5.4.2.3.2 - SOL002 v2.4.1
@@ -34,9 +34,9 @@ Get information about multiple VNF instances
     Check HTTP Response Body Json Schema Is    vnfInstances
     
 
-Get information about multiple VNF instances Bad Request Invalid attribute-based filtering parameters
+GET information about multiple VNF instances Bad Request Invalid attribute-based filtering parameters
     [Documentation]    Test ID: 6.3.5.1.3
-    ...    Test title: Get information about multiple VNF instances Bad Request Invalid attribute-based filtering parameters
+    ...    Test title: GET information about multiple VNF instances Bad Request Invalid attribute-based filtering parameters
     ...    Test objective: The objective is to get informations about multiples VNF instances with Invalid attribute-based filtering parameters
     ...    Pre-conditions: 
     ...    Reference: section 5.4.2.3.2 - SOL002 v2.4.1
@@ -47,9 +47,9 @@ Get information about multiple VNF instances Bad Request Invalid attribute-based
     Check HTTP Response Status Code Is    400
     Check HTTP Response Body Json Schema Is   ProblemDetails
 
-Get information about multiple VNF instances Bad Request Invalid attribute selector
+GET information about multiple VNF instances Bad Request Invalid attribute selector
     [Documentation]    Test ID: 6.3.5.1.4
-    ...    Test title: Get information about multiple VNF instances Bad Request Invalid attribute selector
+    ...    Test title: GET information about multiple VNF instances Bad Request Invalid attribute selector
     ...    Test objective: The objective is to get informations about multiples VNF instances with Invalid attribute-based filtering parameters
     ...    Pre-conditions: 
     ...    Reference: section 5.4.2.3.2 - SOL002 v2.4.1
@@ -62,7 +62,7 @@ Get information about multiple VNF instances Bad Request Invalid attribute selec
     
 PUT VNFInstances - Method not implemented
     [Documentation]    Test ID: 6.3.5.1.5
-    ...    Test title: PUT multiples VNFInstances - Method not implemented
+    ...    Test title: PUT VNFInstances - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions:  
     ...    Reference: section 5.4.2.3.3 - SOL002 v2.4.1
@@ -74,7 +74,7 @@ PUT VNFInstances - Method not implemented
 
 PATCH VNFInstances - Method not implemented
     [Documentation]    Test ID: 6.3.5.1.6
-    ...    Test title: PATCH multiples VNFInstances - Method not implemented
+    ...    Test title: PATCH VNFInstances - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions:  
     ...    Reference: section 5.4.2.3.4 - SOL002 v2.4.1
@@ -86,12 +86,12 @@ PATCH VNFInstances - Method not implemented
 
 DELETE VNFInstances - Method not implemented
     [Documentation]    Test ID: 6.3.5.1.7
-    ...    Test title: PUT multiples VNFInstances - Method not implemented
+    ...    Test title: DELETE VNFInstances - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions:  
     ...    Reference: section 5.4.2.3.5 - SOL002 v2.4.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Post-Conditions: vnf instance not deleted
     DELETE multiple vnfInstances
     Check HTTP Response Status Code Is    405
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
index 8a3b6cb837efa876ab1d48174e907931d35ee02a..901ec3599f42dd3769d4c2f58457d9ad24af7b19 100644
--- a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
+++ b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
@@ -8,9 +8,9 @@ Documentation    This resource represents VNF lifecycle management operation occ
 ...    status information about multiple VNF lifecycle management operation occurrences.
 
 *** Test Cases ***
-Post VNF LCM OP occurences - Method not implemented
+POST VNF LCM operation occurences - Method not implemented
     [Documentation]    Test ID: 6.3.5.11.1
-    ...    Test title: Post VNF LCM OP occurences - Method not implemented
+    ...    Test title: POST VNF LCM operation occurences - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 5.4.12.3.1 - SOL002 v2.4.1
@@ -20,9 +20,9 @@ Post VNF LCM OP occurences - Method not implemented
     Post VNF LCM OP occurences
     Check HTTP Response Status Code Is    405
 
-Get status information about multiple VNF LCM OP OCC 
+GET status information about multiple VNF LCM operation occurrences 
     [Documentation]    Test ID: 6.3.5.11.2
-    ...    Test title: Get status information about multiple VNF LCM OP OCC
+    ...    Test title: GET status information about multiple VNF LCM operation occurrences
     ...    Test objective: The objective is to test that GET method retrieve Query status information about multiple VNF lifecycle management operation occurrences.
     ...    Pre-conditions: none
     ...    Reference:  section 5.4.12.3.2 - SOL002 v2.4.1
@@ -33,9 +33,9 @@ Get status information about multiple VNF LCM OP OCC
     Check HTTP Response Status Code Is    202
     Check HTTP Response Body Json Schema Is    VnfLcmOpOccs 
 
-Get status information about multiple VNF LCM OP OCC Bad Request Invalid attribute-based filtering parameters
+GET status information about multiple VNF LCM operation occurrences Bad Request Invalid attribute-based filtering parameters
     [Documentation]    Test ID: 6.3.5.11.3
-    ...    Test title: Get status information about multiple VNF LCM OP OCC Bad Request Invalid attribute-based filtering parameters
+    ...    Test title: GET status information about multiple VNF LCM operation occurrences Bad Request Invalid attribute-based filtering parameters
     ...    Test objective: The objective is to test that GET method fail retrieving status information about multiple VNF lifecycle management operation occurrences because attribute is invalid.
     ...    Pre-conditions: none
     ...    Reference:  section 5.4.12.3.2 - SOL002 v2.4.1
@@ -46,9 +46,9 @@ Get status information about multiple VNF LCM OP OCC Bad Request Invalid attribu
     Check HTTP Response Status Code Is    400
     Check HTTP Response Body Json Schema Is    ProblemDetails
 
-Get status information about multiple VNF LCM OP OCC Bad Request Invalid attribute selector
+GET status information about multiple VNF LCM Operation occurrences Bad Request Invalid attribute selector
     [Documentation]    Test ID: 6.3.5.11.4
-    ...    Test title: Get status information about multiple VNF LCM OP OCC Bad Request Invalid attribute selector
+    ...    Test title: GET status information about multiple VNF LCM Operation occurrences Bad Request Invalid attribute selector
     ...    Test objective: The objective is to test that GET method fail retrieving status information about multiple VNF lifecycle management operation occurrences because attribute is invalid.
     ...    Pre-conditions: none
     ...    Reference:  section 5.4.12.3.2 - SOL002 v2.4.1
@@ -59,9 +59,9 @@ Get status information about multiple VNF LCM OP OCC Bad Request Invalid attribu
     Check HTTP Response Status Code Is    400
     Check HTTP Response Body Json Schema Is    ProblemDetails
     
-PUT status information about multiple VNF LCM OP OCC - Method not implemented
+PUT status information about multiple VNF LCM operation occurrences - Method not implemented
      [Documentation]    Test ID: 6.3.5.11.5
-    ...    Test title: PUT status information about multiple VNF LCM OP OCC - Method not implemented
+    ...    Test title: PUT status information about multiple VNF LCM operation occurrences - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 5.4.12.3.3 - SOL002 v2.4.1
@@ -71,9 +71,9 @@ PUT status information about multiple VNF LCM OP OCC - Method not implemented
     PUT VNF LCM OP occurences
     Check HTTP Response Status Code Is    405
 
-PATCH status information about multiple VNF LCM OP OCC - Method not implemented
+PATCH status information about multiple VNF LCM operation occurrences - Method not implemented
     [Documentation]    Test ID: 6.3.5.11.6
-    ...    Test title: PATCH status information about multiple VNF LCM OP OCC - Method not implemented
+    ...    Test title: PATCH status information about multiple VNF LCM operation occurrences - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 5.4.12.3.4 - SOL002 v2.4.1
@@ -83,9 +83,9 @@ PATCH status information about multiple VNF LCM OP OCC - Method not implemented
     PUT VNF LCM OP occurences
     Check HTTP Response Status Code Is    405
 
-DELETE status information about multiple VNF LCM OP OCC - Method not implemented
+DELETE status information about multiple VNF LCM operation occurrences - Method not implemented
     [Documentation]    Test ID: 6.3.5.11.7
-    ...    Test title: DELETE status information about multiple VNF LCM OP OCC - Method not implemented
+    ...    Test title: DELETE status information about multiple VNF LCM operation occurrences - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 5.4.12.3.5 - SOL002 v2.4.1
diff --git a/SOL003/VNFLifecycleManagement-API/CancelOperationTask.robot b/SOL003/VNFLifecycleManagement-API/CancelOperationTask.robot
index 59b0574e2ed8d14dd37ced9c349f7d436862e6b7..035159ad3a6aa331c39fc7035485807060565227 100644
--- a/SOL003/VNFLifecycleManagement-API/CancelOperationTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/CancelOperationTask.robot
@@ -8,7 +8,7 @@ Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
 
 *** Test Cases ***
-Post Cancel operation task
+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 "VNF LCM operation occurrence" is either in "PROCESSING" or "ROLLING_BACK" state.
@@ -21,9 +21,9 @@ Post Cancel operation task
     Check HTTP Response Status Code Is    202
     Check operation resource state is FAILED_TEMP
     
-Post Cancel operation task Conflict
+POST Cancel operation task Conflict
     [Documentation]    Test ID: 7.3.1.16.2
-    ...    Test title: POST Cancel operation task
+    ...    Test title: POST Cancel operation task Conflict
     ...    Test objective: The POST method is NOT cancelling an ongoing VNF lifecycle operation due to the fact that the VNF instance resource is not in STARTING, PROCESSING or ROLLING_BACK state
     ...    Pre-conditions: operation is not in STARTING, PROCESSING or ROLLING_BACK state
     ...    Reference:  section 5.4.17.3.1 - SOL003 v2.4.1
@@ -34,10 +34,10 @@ Post Cancel operation task Conflict
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails
 
-Post Cancel operation task Not Found
+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
+     [Documentation]    Test ID: 7.3.1.16.3
+    ...    Test title: POST Cancel operation task Not Found
     ...    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
@@ -48,7 +48,7 @@ Post Cancel operation task Not Found
     Check HTTP Response Status Code Is    404
     
 GET Cancel operation task - Method not implemented
-    [Documentation]    Test ID: 7.3.1.16.3
+    [Documentation]    Test ID: 7.3.1.16.4
     ...    Test title: GET Cancel operation task - Method not implemented
     ...    Test objective: The objective is to test that GET method is not implemented
     ...    Pre-conditions: none
@@ -60,7 +60,7 @@ GET Cancel operation task - Method not implemented
 	Check HTTP Response Status Code Is    405
 
 PUT Cancel operation task - Method not implemented
-    [Documentation]    Test ID: 7.3.1.16.3
+    [Documentation]    Test ID: 7.3.1.16.5
     ...    Test title: PUT Cancel operation task - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
@@ -72,7 +72,7 @@ PUT Cancel operation task - Method not implemented
 	Check HTTP Response Status Code Is    405
 
 PATCH Cancel operation task - Method not implemented
-    [Documentation]    Test ID: 7.3.1.16.4
+    [Documentation]    Test ID: 7.3.1.16.6
     ...    Test title: PATCH Cancel operation task - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
@@ -84,7 +84,7 @@ PATCH Cancel operation task - Method not implemented
 	Check HTTP Response Status Code Is    405
     
 DELETE Cancel operation task - Method not implemented
-    [Documentation]    Test ID: 7.3.1.16.5
+    [Documentation]    Test ID: 7.3.1.16.7
     ...    Test title: DELETE Cancel operation task - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
diff --git a/SOL003/VNFLifecycleManagement-API/CancelOperationWorkflow.robot b/SOL003/VNFLifecycleManagement-API/CancelOperationWorkflow.robot
index 1c6da678d3c891cba0259add9ea3a5a9aeb72815..db68d6f6ae80f72988bb684f7f92eea79a56bf57 100644
--- a/SOL003/VNFLifecycleManagement-API/CancelOperationWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/CancelOperationWorkflow.robot
@@ -27,7 +27,7 @@ Cancel a VNF LCM Operation - STARTING
     Send Cancel Operation Request
     Check HTTP Response Status Code Is    202
     Check HTTP Response Header Contains    Location 
-    Check Operation Occurrence Id
+    Check Operation Occurrence Id existence
     Check Operation Notification For Cancel    ROLLED_BACK
     Check Postcondition VNF Cancel - STARTING
 
@@ -43,7 +43,7 @@ Cancel a VNF LCM Operation - PROCESSING - ROLLING_BACK
     Send Cancel Operation Request
     Check HTTP Response Status Code Is    202
     Check HTTP Response Header Contains    Location 
-    Check Operation Occurrence Id
+    Check Operation Occurrence Id existence
     Check Operation Notification For Cancel    FAILED_TEMP
     Check Postcondition VNF Cancel - PROCESSING - ROLLING_BACK
 
diff --git a/SOL003/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityWorkflow.robot b/SOL003/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityWorkflow.robot
index bcea33f7ba2a297019304a07b2d773c1c89c58a7..3fea9fac907fb767170e93d972f870c05cd19012 100644
--- a/SOL003/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityWorkflow.robot
@@ -27,7 +27,7 @@ Change external connectivity of VNF Workflow
     Send Change Ext Connectivity Request
     Check HTTP Response Status Code Is    202
     Check HTTP Response Header Contains    Location 
-    Check Operation Occurrence Id
+    Check Operation Occurrence Id existence
     Check Operation Notification For Change Ext Connectivity    STARTING
     Check Operation Notification For Change Ext Connectivity    PROCESSING
     Check Operation Notification For Change Ext Connectivity    COMPLETED
diff --git a/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot b/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
index ade8c77c2dfbd1e793899896c4dafd42df0cc5b3..18c0e00c51767b4b84a118d521f10200b3d833b0 100644
--- a/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
@@ -19,11 +19,11 @@ POST Change deployment flavour of a vnfInstance
     ...    Post-Conditions: in response header Location shall not be null  
     POST Change VNF deployment flavour   
     Check HTTP Response Status Code Is    202
-    Check Operation Occurrence Id
+    Check Operation Occurrence Id existence
 
-Change deployment flavour of a vnfInstance Conflict (Not-Instantiated)
+POST Change deployment flavour of a vnfInstance Conflict (Not-Instantiated)
     [Documentation]    Test ID: 7.3.1.6.2
-    ...    Test title: POST Change deployment flavour of a vnfInstance
+    ...    Test title: POST Change deployment flavour of a vnfInstance Conflict (Not-Instantiated)
     ...    Test objective: The objective is to test that POST method can't trigger a change in VNF deployment flavour because of a conflict with the state of the VNF instance resource. (VNF instance resource is not in NOT-INSTANTIATED state)
     ...    Pre-conditions: VNF instance resource is in NOT-INSTANTIATED state
     ...    Reference:  section 5.4.7.3.1 - SOL003 v2.4.1
@@ -35,10 +35,10 @@ Change deployment flavour of a vnfInstance Conflict (Not-Instantiated)
     Check HTTP Response Body Json Schema Is    ProblemDetails
 
   
-Change deployment flavour of a vnfInstance Not Found
+POST Change deployment flavour of a vnfInstance Not Found
     # TODO: Need to create a vnfInstance which's instantiatedVnfInfo.scaleStatus is absent
     [Documentation]    Test ID: 7.3.1.6.3
-    ...    Test title: POST Change deployment flavour of a vnfInstance
+    ...    Test title: POST Change deployment flavour of a vnfInstance Not Found
     ...    Test objective: The objective is to test that POST method can't trigger a change in VNF deployment flavour because the VNF instance resource is not found. 
     ...    Pre-conditions: the VNF instance resource is not existing
     ...    Reference:  section 5.4.7.3.1 - SOL003 v2.4.1
@@ -52,7 +52,7 @@ Change deployment flavour of a vnfInstance Not Found
     
 GET Change deployment flavour VNFInstance - Method not implemented
     [Documentation]    Test ID: 7.3.1.16.4
-    ...    Test title: GET Cancel operation task - Method not implemented
+    ...    Test title: GET Change deployment flavour VNFInstance - Method not implemented
     ...    Test objective: The objective is to test that GET method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 5.4.7.3.2 - SOL003 v2.4.1
@@ -64,7 +64,7 @@ GET Change deployment flavour VNFInstance - Method not implemented
 
 PUT Change deployment flavour VNFInstance - Method not implemented
     [Documentation]    Test ID: 7.3.1.16.5
-    ...    Test title: PUT Cancel operation task - Method not implemented
+    ...    Test title: PUT Change deployment flavour VNFInstance - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 5.4.7.3.3 - SOL003 v2.4.1
@@ -76,7 +76,7 @@ PUT Change deployment flavour VNFInstance - Method not implemented
 
 PATCH Change deployment flavour VNFInstance - Method not implemented
     [Documentation]    Test ID: 7.3.1.16.6
-    ...    Test title: PATCH Cancel operation task - Method not implemented
+    ...    Test title: PATCH Change deployment flavour VNFInstance - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 5.4.7.3.4 - SOL003 v2.4.1
@@ -88,7 +88,7 @@ PATCH Change deployment flavour VNFInstance - Method not implemented
     
 DELETE Change deployment flavour VNFInstance - Method not implemented
     [Documentation]    Test ID: 7.3.1.16.7
-    ...    Test title: DELETE Cancel operation task - Method not implemented
+    ...    Test title: DELETE Change deployment flavour VNFInstance - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 5.4.7.3.5 - SOL003 v2.4.1
diff --git a/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourWorkflow.robot b/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourWorkflow.robot
index dfe57c065e8532582f0c0daf13084d35145b1bfb..0d3f01f2e06b8762431791851e7b17c607c356d6 100644
--- a/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourWorkflow.robot
@@ -27,7 +27,7 @@ Change VNF Flavour Workflow
     Send Change VNF Flavour Request
     Check HTTP Response Status Code Is    202
     Check HTTP Response Header Contains    Location 
-    Check Operation Occurrence Id
+    Check Operation Occurrence Id existence
     Check Operation Notification For Change Flavour    STARTING
     Check Operation Notification For Change Flavour    PROCESSING
     Check Operation Notification For Change Flavour    COMPLETED
diff --git a/SOL003/VNFLifecycleManagement-API/FailOperationTask.robot b/SOL003/VNFLifecycleManagement-API/FailOperationTask.robot
index af2287afbaefc55598bf49739e58420e8b38c4b4..96715052b778f76ddf636e2777e708a29909210c 100644
--- a/SOL003/VNFLifecycleManagement-API/FailOperationTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/FailOperationTask.robot
@@ -8,9 +8,9 @@ Library    JSONSchemaLibrary    schemas/
 Resource    VnfLcmMntOperationKeywords.robot
 
 *** Test Cases ***
-Post Fail operation task  
+POST Fail operation task  
     [Documentation]    Test ID: 7.3.1.15.1
-    ...    Test title: Post Fail operation task
+    ...    Test title: POST Fail operation task
     ...    Test objective: The objective is to test that POST method mark as "finally failed" a VNF lifecycle operation 
     ...    Pre-conditions: the "VNF LCM operation occurrence" resource is in "FAILED_TEMP" state.
     ...    Reference:  section 5.4.16.3.1 - SOL003 v2.4.1
@@ -19,7 +19,7 @@ Post Fail operation task
     ...    Post-Conditions: VNF resource state is FINALLY_FAILED
     Post Fail operation
     Check HTTP Response Status Code Is    202
-    Check Operation Occurrence Id
+    Check Operation Occurrence Id existence
     Check operation resource state is FINALLY_FAILED
 
 Post Fail operation task Conflict (Not-FAILED_TEMP)
diff --git a/SOL003/VNFLifecycleManagement-API/HealVNFTask.robot b/SOL003/VNFLifecycleManagement-API/HealVNFTask.robot
index 132e174f11b17279facc70862d667966a8beb719..4abebdf431d41df91cf3f2ee9439fbd6b2e64935 100644
--- a/SOL003/VNFLifecycleManagement-API/HealVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/HealVNFTask.robot
@@ -19,12 +19,12 @@ POST Heal a vnfInstance
     ...    Post-Conditions: 
     POST Terminate VNF
     Check HTTP Response Status Code Is    202
-    Check Operation Occurrence Id
+    Check Operation Occurrence Id existence
 
-Heal a vnfInstance Conflict (Not-Instantiated)
+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: 7.3.1.8.2
-    ...    Test title: POST Heal a vnfInstance (Not-Instantiated)
+    ...    Test title: POST Heal 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. 
     ...    Pre-conditions: the VNF instance resource is in NOT-INSTANTIATED state
     ...    Reference:  section 5.4.9.3.1 - SOL003 v2.4.1
@@ -37,9 +37,9 @@ Heal a vnfInstance Conflict (Not-Instantiated)
 
 
     
-Heal a vnfInstance Not Found
+POST Heal a vnfInstance Not Found
     [Documentation]    Test ID: 7.3.1.8.3
-    ...    Test title: POST Heal a vnfInstance (Not-Instantiated)
+    ...    Test title: POST Heal a vnfInstance Not Found
     ...    Test objective: The objective is to test that the operation cannot be executed because the VNF instance resource is not found. 
     ...    Pre-conditions: the VNF instance resource is not existing
     ...    Reference:  section 5.4.9.3.1 - SOL003 v2.4.1
diff --git a/SOL003/VNFLifecycleManagement-API/HealVNFWorkflow.robot b/SOL003/VNFLifecycleManagement-API/HealVNFWorkflow.robot
index 1602ead2372839398e04214c5106aee3b170dfcb..31c1080c2c3c58d32025413d3add4bc3260a1761 100644
--- a/SOL003/VNFLifecycleManagement-API/HealVNFWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/HealVNFWorkflow.robot
@@ -27,7 +27,7 @@ Heal a VNF Instance
     Send Heal VNF Request
     Check HTTP Response Status Code Is    202
     Check HTTP Response Header Contains    Location 
-    Check Operation Occurrence Id
+    Check Operation Occurrence Id existence
     Check Operation Notification For Heal    STARTING
     Check Operation Notification For Heal    PROCESSING
     Check Operation Notification For Heal    COMPLETED
diff --git a/SOL003/VNFLifecycleManagement-API/IndividualSubscription.robot b/SOL003/VNFLifecycleManagement-API/IndividualSubscription.robot
index 2bb605abd4eec2c638ec844136c9709b1b24923d..50c6a69d28b224a739fd1811c26243fdeda01513 100644
--- a/SOL003/VNFLifecycleManagement-API/IndividualSubscription.robot
+++ b/SOL003/VNFLifecycleManagement-API/IndividualSubscription.robot
@@ -7,9 +7,9 @@ Library    JSONSchemaLibrary    schemas/
 Resource    VnfLcmMntOperationKeywords.robot
 
 *** Test Cases ***
-Post Individual Subscription - Method not implemented
+POST Individual Subscription - Method not implemented
     [Documentation]    Test ID: 7.3.1.18.1
-    ...    Test title: Post Individual Subscription - Method not implemented
+    ...    Test title: POST Individual Subscription - Method not implemented
     ...    Test objective: The objective is to test that the method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 5.4.19.3.1 - SOL003 v2.4.1
@@ -34,7 +34,7 @@ GET Individual Subscription
 
 PUT an individual subscription - Method not implemented
     [Documentation]    Test ID: 7.3.1.18.3
-    ...    Test title: PUT Individual Subscription - Method not implemented
+    ...    Test title: PUT an individual subscription - Method not implemented
     ...    Test objective: The objective is to test that the method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 5.4.19.3.3 - SOL003 v2.4.1
@@ -46,7 +46,7 @@ PUT an individual subscription - Method not implemented
 
 PATCH an individual subscription - Method not implemented
     [Documentation]    Test ID: 7.3.1.18.4
-    ...    Test title: PATCH Individual Subscription - Method not implemented
+    ...    Test title: PATCH an individual subscription - Method not implemented
     ...    Test objective: The objective is to test that the method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 5.4.19.3.4 - SOL003 v2.4.1
@@ -58,13 +58,13 @@ PATCH an individual subscription - Method not implemented
     
 DELETE an individual subscription
      [Documentation]    Test ID: 7.3.1.18.5
-    ...    Test title: DELETE Individual Subscription - Method not implemented
+    ...    Test title: DELETE an individual subscription
     ...    Test objective: The objective is to test that the method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 5.4.19.3.5 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions: none 
+    ...    Post-Conditions: subscription deleted from VNFM
     Delete Individual subscription
 	Check HTTP Response Status Code Is    405
 
diff --git a/SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot b/SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot
index 75fd1287e8c2d03149460351166f9c5200a61db6..ad91e976c56264dc3f7d500dfab5b46a10ff5427 100644
--- a/SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot
+++ b/SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot
@@ -59,10 +59,10 @@ PATCH Individual VNFInstance
     ...    Reference: section 5.4.3.3.4 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Post-Conditions: VNFInstance modified
     PATCH individual vnfInstance
     Check HTTP Response Status Code Is    202
-    Check Operation Occurrence Id
+    Check Operation Occurrence Id existence
 
 PATCH Individual VNFInstance Precondition failed
      [Documentation]    Test ID: 7.3.1.2.5
@@ -72,20 +72,20 @@ PATCH Individual VNFInstance Precondition failed
     ...    Reference: section 5.4.3.3.4 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Post-Conditions: VNFInstance not modified
     PATCH individual vnfInstance
     Check HTTP Response Status Code Is    412
     Check HTTP Response Body Json Schema Is    ProblemDetails
 
 PATCH Individual VNFInstance Conflict
      [Documentation]    Test ID: 7.3.1.2.6
-    ...    Test title: PATCH Individual VNFInstance Precondition failed
+    ...    Test title: PATCH Individual VNFInstance Conflict
     ...    Test objective: The objective is to test the conflict while modifying a VNF instance resource
-    ...    Pre-conditions: none
+    ...    Pre-conditions: another LCM operation is ongoing
     ...    Reference: section 5.4.3.3.4 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Post-Conditions: VNFInstance not modified
     PATCH individual vnfInstance
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails
@@ -98,7 +98,7 @@ DELETE Individual VNFInstance
     ...    Reference: section 5.4.3.3.5 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Post-Conditions: VNFInstance deleted
     DELETE individual vnfInstance
     Check HTTP Response Status Code Is    204
 
diff --git a/SOL003/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot b/SOL003/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot
index bfc2844380855d27ddd7b38e53881bbceafe0bc7..8c535e751cf91c98b18379014bde121b96e9bc13 100644
--- a/SOL003/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot
+++ b/SOL003/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot
@@ -7,22 +7,22 @@ Library    JSONSchemaLibrary    schemas/
 Resource    VnfLcmMntOperationKeywords.robot
 
 *** Test Cases ***
-Post Individual VNF LCM Operation occurences - Method not implemented
+Post Individual VNF LCM Operation occurrences - Method not implemented
     [Documentation]    Test ID: 7.3.1.12.1
-    ...    Test title: Post Individual VNF LCM Operation occurences - Method not implemented
+    ...    Test title: Post Individual VNF LCM Operation occurrences - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 5.4.13.3.1 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
-    Post Individual VNF LCM Operation occurences
+    Post Individual VNF LCM Operation occurrences
     Check HTTP Response Status Code Is    405
     
-Get status information about multiple VNF instances 
+Get information about multiple VNF instances 
     [Documentation]    Test ID: 7.3.1.12.2
-    ...    Test title: Get status information about multiple VNF instances
-    ...    Test objective: The objective is to test that this method retrieve status information about a VNF lifecycle management operation occurrence 
+    ...    Test title: Get information about multiple VNF instances
+    ...    Test objective: The objective is to test that this method retrieve information about a VNF lifecycle management operation occurrence 
     ...    Pre-conditions: none
     ...    Reference:  section 5.4.13.3.2 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
@@ -32,9 +32,9 @@ Get status information about multiple VNF instances
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    VnfLcmOpOcc 
 
-PUT status information about multiple VNF instances - Method not implemented
+PUT Individual VNF LCM Operation occurrences - Method not implemented
     [Documentation]    Test ID: 7.3.1.12.3
-    ...    Test title: Put Individual VNF LCM Operation occurences - Method not implemented
+    ...    Test title: PUT Individual VNF LCM Operation occurrences - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 5.4.13.3.3 - SOL003 v2.4.1
@@ -44,9 +44,9 @@ PUT status information about multiple VNF instances - Method not implemented
     Put multiple VNF instances
     Check HTTP Response Status Code Is    405
 
-PATCH status information about VNF instances - Method not implemented 
+PATCH Individual VNF LCM Operation occurrences - Method not implemented 
     [Documentation]    Test ID: 7.3.1.12.4
-    ...    Test title: Patch Individual VNF LCM Operation occurences - Method not implemented
+    ...    Test title: PATCH Individual VNF LCM Operation occurrences - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 5.4.13.3.4 - SOL003 v2.4.1
@@ -56,9 +56,9 @@ PATCH status information about VNF instances - Method not implemented
     Patch multiple VNF instances
     Check HTTP Response Status Code Is    405
     
-DELETE status information about multiple VNF instances - Method not implemented 
+ DELETE Individual VNF LCM Operation occurrences - Method not implemented
     [Documentation]    Test ID: 7.3.1.12.5
-    ...    Test title: Delete Individual VNF LCM Operation occurences - Method not implemented
+    ...    Test title: DELETE Individual VNF LCM Operation occurrences - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 5.4.13.3.5 - SOL003 v2.4.1
diff --git a/SOL003/VNFLifecycleManagement-API/InstantiateVNFTask.robot b/SOL003/VNFLifecycleManagement-API/InstantiateVNFTask.robot
index 779321bd1aeede163edea6f84a9b63acdd225abb..268d1d1f5af8f540a1af8460a0a64b6cc1f7a812 100644
--- a/SOL003/VNFLifecycleManagement-API/InstantiateVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/InstantiateVNFTask.robot
@@ -21,7 +21,7 @@ Instantiate a vnfInstance
     ...    Post-Conditions: 
     POST instantiate individual vnfInstance
     Check HTTP Response Status Code Is    202
-    Check Operation Occurrence Id
+    Check Operation Occurrence Id existence
 
 Instantiate a vnfInstance Conflict
     # TODO: Need to set the pre-condition of the test. VNF instance shall be in INSTANTIATED state
diff --git a/SOL003/VNFLifecycleManagement-API/InstantiateVNFTaskWorkflow.robot b/SOL003/VNFLifecycleManagement-API/InstantiateVNFTaskWorkflow.robot
index 53c17b4385c7938ec9f42fb51fe64e406c891bd6..2006122067c75309d8d54c0271f35d723fee2eca 100644
--- a/SOL003/VNFLifecycleManagement-API/InstantiateVNFTaskWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/InstantiateVNFTaskWorkflow.robot
@@ -29,7 +29,7 @@ VNF Instantiation
     Send VNF Instantiation Request
     Check HTTP Response Status Code Is    202
     Check HTTP Response Header Contains    Location
-    Check Operation Occurrence Id
+    Check Operation Occurrence Id existence
     Check Operation Notification For Instantiation  STARTING
     Check Operation Notification For Instantiation  PROCESSING
     Check Operation Notification For Instantiation  COMPLETED
diff --git a/SOL003/VNFLifecycleManagement-API/ModifyVNFInformationWorkflow.robot b/SOL003/VNFLifecycleManagement-API/ModifyVNFInformationWorkflow.robot
index 1f6da069465d562725ca37994b2724f18853dead..4e3a5c5cdcae5a4e39e6e6bb64c03546b2062761 100644
--- a/SOL003/VNFLifecycleManagement-API/ModifyVNFInformationWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/ModifyVNFInformationWorkflow.robot
@@ -27,7 +27,7 @@ Modify info of a VNF Instance
     Send Info Modification Request
     Check HTTP Response Status Code Is    202
     Check HTTP Response Header Contains    Location 
-    Check Operation Occurrence Id
+    Check Operation Occurrence Id existence
     Check Operation Notification For Modify Info    start   #need more info about the notification content
     Check Operation Notification For Modify Info    result  #need more info about the notification content, how the result is presented
     Check Postcondition VNF Modify Info
diff --git a/SOL003/VNFLifecycleManagement-API/OperateVNFTask.robot b/SOL003/VNFLifecycleManagement-API/OperateVNFTask.robot
index 7c5f77981f5a130899a7f1a7f92426f629943164..b8eeca6232051803910dac67f5ed70de87124485 100644
--- a/SOL003/VNFLifecycleManagement-API/OperateVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/OperateVNFTask.robot
@@ -21,11 +21,11 @@ POST Operate a vnfInstance
     ...    Post-Conditions: 
     POST Operate VNF
     Check HTTP Response Status Code Is    202
-    Check Operation Occurrence Id
+    Check Operation Occurrence Id existence
 
 POST Operate a vnfInstance Conflict (Not-Instantiated)
     [Documentation]    Test ID: 7.3.1.9.2
-    ...    Test title: POST Operate a vnfInstance
+    ...    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. 
     ...    Pre-conditions: the VNF instance resource is in NOT-INSTANTIATED state
     ...    Reference:  section 5.4.10.3.1 - SOL003 v2.4.1
@@ -39,7 +39,7 @@ POST Operate a vnfInstance Conflict (Not-Instantiated)
     
 POST Operate a vnfInstance Not Found
     [Documentation]    Test ID: 7.3.1.9.3
-    ...    Test title: POST Operate a vnfInstance
+    ...    Test title: POST Operate a vnfInstance Not Found
     ...    Test objective: The objective is to test that the operation cannot be executed currently, because the resource is not existing
     ...    Pre-conditions: the VNF instance resource is in  not existing
     ...    Reference:  section 5.4.10.3.1 - SOL003 v2.4.1
diff --git a/SOL003/VNFLifecycleManagement-API/OperateVNFWorkflow.robot b/SOL003/VNFLifecycleManagement-API/OperateVNFWorkflow.robot
index 87394be947b9ceec22eb8a37980eef18ced1ee7c..71f1849af36b8a1b3719045b5b04cfeadf7115e4 100644
--- a/SOL003/VNFLifecycleManagement-API/OperateVNFWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/OperateVNFWorkflow.robot
@@ -27,7 +27,7 @@ Operate a VNF Instance
     Send Change VNF Operational State Request
     Check HTTP Response Status Code Is    202
     Check HTTP Response Header Contains    Location 
-    Check Operation Occurrence Id
+    Check Operation Occurrence Id existence
     Check Operation Notification For Operate    STARTING
     Check Operation Notification For Operate    PROCESSING
     Check Operation Notification For Operate    COMPLETED
diff --git a/SOL003/VNFLifecycleManagement-API/RetryOperationTask.robot b/SOL003/VNFLifecycleManagement-API/RetryOperationTask.robot
index 85bfa4937428454a3bcbaa9aff2d9abbc6659252..14918d6ff8d23888a43b2f3a02198a9accb57d82 100644
--- a/SOL003/VNFLifecycleManagement-API/RetryOperationTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/RetryOperationTask.robot
@@ -22,7 +22,7 @@ Post Retry operation task
     ...    Post-Conditions: none 
     Post Retry operation
     Check HTTP Response Status Code Is    202
-    Check Operation Occurrence Id
+    Check Operation Occurrence Id existence
 
 Post Retry operation task Conflict (Not-FAILED_TEMP)
     [Documentation]    Test ID: 7.3.1.13.2
diff --git a/SOL003/VNFLifecycleManagement-API/RetryOperationWorkflow.robot b/SOL003/VNFLifecycleManagement-API/RetryOperationWorkflow.robot
index 7ee914ea965672f575fd0107e27ea605b1d17fc6..eaa0901f4dc9a6b914ac6e081ba894b2849a5fc1 100644
--- a/SOL003/VNFLifecycleManagement-API/RetryOperationWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/RetryOperationWorkflow.robot
@@ -25,7 +25,7 @@ Retry VNF LCM Operation - Successful
     Send Retry Operation Request
     Check HTTP Response Status Code Is    202
     Check HTTP Response Header Contains    Location 
-    Check Operation Occurrence Id
+    Check Operation Occurrence Id existence
     Check Operation Notification For Retry    PROCESSING
     Check Operation Notification For Retry    COMPLETED
     Check Postcondition VNF Retry Successful
@@ -42,7 +42,7 @@ Retry VNF LCM Operation - Unsuccessful
     Send Retry Operation Request
     Check HTTP Response Status Code Is    202
     Check HTTP Response Header Contains    Location 
-    Check Operation Occurrence Id
+    Check Operation Occurrence Id existence
     Check Operation Notification For Retry    PROCESSING
     Check Operation Notification For Retry    FAILED_TEMP
     Check Postcondition VNF Retry Unsuccessful
diff --git a/SOL003/VNFLifecycleManagement-API/RollBackOperationWorkflow.robot b/SOL003/VNFLifecycleManagement-API/RollBackOperationWorkflow.robot
index b01f60c12de2fbf9aa2f2b76dfcb9245beda0288..25d34d31c37f2137efef5cad8c9c5d0c83c397dd 100644
--- a/SOL003/VNFLifecycleManagement-API/RollBackOperationWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/RollBackOperationWorkflow.robot
@@ -27,7 +27,7 @@ Rollback a VNF LCM Operation - Successful
     Send Roll back Operation Request
     Check HTTP Response Status Code Is    202
     Check HTTP Response Header Contains    Location 
-    Check Operation Occurrence Id
+    Check Operation Occurrence Id existence
     Check Operation Notification For Roll Back    ROLLING_BACK
     Check Operation Notification For Roll Back    ROLLED_BACK
     Check Postcondition VNF Roll Back Successful
@@ -44,7 +44,7 @@ Rollback VNF LCM Operation - Unsuccessful
     Send Roll back Operation Request
     Check HTTP Response Status Code Is    202
     Check HTTP Response Header Contains    Location 
-    Check Operation Occurrence Id
+    Check Operation Occurrence Id existence
     Check Operation Notification For Roll Back    ROLLING_BACK
     Check Operation Notification For Roll Back    FAILED_TEMP
     Check Postcondition VNF Roll Back UnSuccessful
diff --git a/SOL003/VNFLifecycleManagement-API/RollbackOperationTask.robot b/SOL003/VNFLifecycleManagement-API/RollbackOperationTask.robot
index 918b749ff7538921efcd88af2442ced2f6c4e374..cc7e874cf1391e81a1928f0d8723b2ded25916ee 100644
--- a/SOL003/VNFLifecycleManagement-API/RollbackOperationTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/RollbackOperationTask.robot
@@ -21,12 +21,12 @@ Post Rollback operation task
     ...    Post-Conditions: none 
     Post Rollback operation
     Check HTTP Response Status Code Is    202
-    Check Operation Occurrence Id
+    Check Operation Occurrence Id existence
 
-Post Rollback operation task Conflict (Not-FAILED_TEMP)
+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: 7.3.1.14.2
-    ...    Test title: Post Rollback operation task Conflict (Not-FAILED_TEMP)
+    ...    Test title: POST Rollback operation task Conflict (Not-FAILED_TEMP)
     ...    Test objective: The objective is to test that POST method initiates a rollback on a VNF lifecycle operation 
     ...    Pre-conditions: the "VNF LCM operation occurrence" resource is not in "FAILED_TEMP" state.
     ...    Reference:  section 5.4.15.3.1 - SOL003 v2.4.1
@@ -38,9 +38,9 @@ Post Rollback operation task Conflict (Not-FAILED_TEMP)
     Check HTTP Response Body Json Schema Is    ProblemDetails
 
 
-Post Rollback operation task Not Found
+POST Rollback operation task Not Found
     [Documentation]    Test ID: 7.3.1.14.3
-    ...    Test title: Post Rollback operation task Not Found
+    ...    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: 
     ...    Reference:  section 5.4.15.3.1 - SOL003 v2.4.1
@@ -52,7 +52,7 @@ Post Rollback operation task Not Found
 
 GET Rollback operation task - Method not implemented
     [Documentation]    Test ID: 7.3.1.14.4
-    ...    Test title: GET Retry operation task- Method not implemented
+    ...    Test title: GET Rollback operation task - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
     ...    Reference:  section 5.4.15.3.2 - SOL003 v2.4.1
@@ -64,7 +64,7 @@ GET Rollback operation task - Method not implemented
     
 PUT Rollback operation task - Method not implemented
     [Documentation]    Test ID: 7.3.1.14.5
-    ...    Test title: PUT Retry operation task- Method not implemented
+    ...    Test title: PUT Rollback operation task - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
     ...    Reference:  section 5.4.15.3.3 - SOL003 v2.4.1
@@ -76,7 +76,7 @@ PUT Rollback operation task - Method not implemented
 
 PATCH Rollback operation task - Method not implemented
     [Documentation]    Test ID: 7.3.1.14.6
-    ...    Test title: PATCH Retry operation task- Method not implemented
+    ...    Test title: PATCH Rollback operation task - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
     ...    Reference:  section 5.4.15.3.4 - SOL003 v2.4.1
@@ -88,7 +88,7 @@ PATCH Rollback operation task - Method not implemented
     
 DELETE Rollback operation task - Method not implemented
     [Documentation]    Test ID: 7.3.1.14.7
-    ...    Test title: DELETE Retry operation task- Method not implemented
+    ...    Test title: DELETE Rollback operation task - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
     ...    Reference:  section 5.4.15.3.5 - SOL003 v2.4.1
diff --git a/SOL003/VNFLifecycleManagement-API/ScaleVNFTask.robot b/SOL003/VNFLifecycleManagement-API/ScaleVNFTask.robot
index 23f5a7be6c0ab1332793891cf811a942f634b8c8..1fa00bc95bf7338b94593c63abadad3618c96ba0 100644
--- a/SOL003/VNFLifecycleManagement-API/ScaleVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/ScaleVNFTask.robot
@@ -20,7 +20,7 @@ POST Scale a vnfInstance
     ...    Post-Conditions: 
     POST Scale vnfInstance  
     Check HTTP Response Status Code Is    202
-    Check Operation Occurrence Id
+    Check Operation Occurrence Id existence
 
 POST Scale a vnfInstance Conflict (Not-Instantiated)
     # TODO: Need to set the pre-condition of the test. VNF instance shall be in INSTANTIATED state
diff --git a/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot b/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
index b473a6524979ad8bb1466a4f7258fb5dcd6b2d04..5689d2d27811c185236619f7a2c532b6407111a7 100644
--- a/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
@@ -19,13 +19,13 @@ POST Scale a vnfInstance to level
     ...    Post-Conditions:
     POST Scale vnfInstance to level     
     Check HTTP Response Status Code Is    202
-    Check Operation Occurrence Id
+    Check Operation Occurrence Id existence
 
 POST Scale a vnfInstance to level Conflict (Not-Instantiated)
     # TODO: Need to set the pre-condition of the test. VNF instance shall be in INSTANTIATED state
     [Documentation]    Test ID: 7.3.1.5.2
     ...    Test title: POST Scale a vnfInstance to level Conflict (Not-Instantiated)
-    ...    Test objective: The objective is to verify that the scale operation cannot be executed 
+    ...    Test objective: The objective is to verify that the scale operation cannot be executed because the resource is not instantiated
     ...    Pre-conditions: VNF instance resource is in NOT-INSTANTIATED state
     ...    Reference: section 5.4.6.3.1 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
diff --git a/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelWorkflow.robot b/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelWorkflow.robot
index 688a163ad70af614be079abb382686360a0025c4..113a9b23c785c2d03fb3cf68fe69c2b8da8f03a4 100644
--- a/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelWorkflow.robot
@@ -25,7 +25,7 @@ VNF Instance Scale To Level
     Send VNF Scale To Level Request
     Check HTTP Response Status Code Is    202
     Check HTTP Response Header Contains    Location 
-    Check Operation Occurrence Id
+    Check Operation Occurrence Id existence
     Check Operation Notification For Scale   STARTING
     Check Operation Notification For Scale    PROCESSING
     Check Operation Notification For Scale    COMPLETED
diff --git a/SOL003/VNFLifecycleManagement-API/ScaleVNFWorkflow.robot b/SOL003/VNFLifecycleManagement-API/ScaleVNFWorkflow.robot
index bc24732a6ec6c9cf78e6688c33a64f4ab2f3f719..6d3f8432bd0ae229b4063b19992f8eb0701c55d8 100644
--- a/SOL003/VNFLifecycleManagement-API/ScaleVNFWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/ScaleVNFWorkflow.robot
@@ -25,7 +25,7 @@ VNF Instance Scale Out
     Send VNF Scale Out Request
     Check HTTP Response Status Code Is    202
     Check HTTP Response Header Contains    Location 
-    Check Operation Occurrence Id
+    Check Operation Occurrence Id existence
     Check Operation Notification For Scale   STARTING
     Check Operation Notification For Scale    PROCESSING
     Check Operation Notification For Scale    COMPLETED
diff --git a/SOL003/VNFLifecycleManagement-API/Subscriptions.robot b/SOL003/VNFLifecycleManagement-API/Subscriptions.robot
index 74e25b3a966887db33512ff867cff2468a85c286..d3d12f358df51bab0538a1dd08173db1a1db8dc8 100644
--- a/SOL003/VNFLifecycleManagement-API/Subscriptions.robot
+++ b/SOL003/VNFLifecycleManagement-API/Subscriptions.robot
@@ -28,7 +28,7 @@ Create a new Subscription - DUPLICATION
     ...    Pre-conditions: none
     ...    Reference:  section 5.4.18.3.1 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
+    ...    Applicability: The VNFM support the creation of duplicated subscriptions
     ...    Post-Conditions: in response header Location shall not be null
     Post Create subscription - DUPLICATION
     Check HTTP Response Status Code Is    201
@@ -41,11 +41,11 @@ Create a new Subscription - NO-DUPLICATION
     ...    Pre-conditions: none
     ...    Reference:  section 5.4.18.3.1 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
+    ...    Applicability: The VNFM does not support the creation of duplicated subscriptions
     ...    Post-Conditions: in response header Location shall not be null
     Post Create subscription - NO-DUPLICATION
     Check HTTP Response Status Code Is    303
-    Check Operation Occurrence Id
+    Check Operation Occurrence Id existence
     
 GET Subscriptions
      [Documentation]    Test ID: 7.3.1.17.4
@@ -72,6 +72,7 @@ GET Subscription - Filter
     Get subscriptions - filter
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    Subscriptions
+
     
 GET subscriptions - Bad Request Invalid attribute-based filtering parameters
     [Documentation]    Test ID: 7.3.1.17.6
diff --git a/SOL003/VNFLifecycleManagement-API/TerminateVNFTask.robot b/SOL003/VNFLifecycleManagement-API/TerminateVNFTask.robot
index 4b6eaec01828b84b60160f1b80002fce6f9b28d9..e04ace2f51f6b2700ab97bbe66c45e7b52bd53e7 100644
--- a/SOL003/VNFLifecycleManagement-API/TerminateVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/TerminateVNFTask.robot
@@ -20,11 +20,11 @@ POST Terminate a vnfInstance
     ...    Post-Conditions: 
     POST Terminate VNF  
     Check HTTP Response Status Code Is    202
-    Check Operation Occurrence Id
+    Check Operation Occurrence Id existence
 
-Terminate a vnfInstance Conflict (Not-Instantiated)
+POST Terminate a vnfInstance Conflict (Not-Instantiated)
     [Documentation]    Test ID: 7.3.1.7.2
-    ...    Test title: POST Terminate a vnfInstance
+    ...    Test title: POST Terminate a vnfInstance Conflict (Not-Instantiated)
     ...    Test objective: The objective is to test that the vnf Instance can't be terminated 
     ...    Pre-conditions:  VNF instance resource is in NOT-INSTANTIATED state
     ...    Reference:  section 5.4.8.3.1 - SOL003 v2.4.1
@@ -50,7 +50,7 @@ GET Terminate VNFInstance - Method not implemented
 
 PUT Terminate VNFInstance - Method not implemented
     [Documentation]    Test ID: 7.3.1.7.4
-    ...    Test title:  GET Terminate VNFInstance - Method not implemented
+    ...    Test title:  PUT Terminate VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
     ...    Pre-conditions:  none
     ...    Reference:  section 5.4.8.3.3 - SOL003 v2.4.1
@@ -62,7 +62,7 @@ PUT Terminate VNFInstance - Method not implemented
 
 PATCH Terminate VNFInstance - Method not implemented
      [Documentation]    Test ID: 7.3.1.7.5
-    ...    Test title:  GET Terminate VNFInstance - Method not implemented
+    ...    Test title:  PATCH Terminate VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
     ...    Pre-conditions:  none
     ...    Reference:  section 5.4.8.3.4 - SOL003 v2.4.1
@@ -74,7 +74,7 @@ PATCH Terminate VNFInstance - Method not implemented
     
 DELETE Terminate VNFInstance - Method not implemented
     [Documentation]    Test ID: 7.3.1.7.6
-    ...    Test title:  GET Terminate VNFInstance - Method not implemented
+    ...    Test title:  DELETE Terminate VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
     ...    Pre-conditions:  none
     ...    Reference:  section 5.4.8.3.5 - SOL003 v2.4.1
diff --git a/SOL003/VNFLifecycleManagement-API/TerminatelVNFWorkflow.robot b/SOL003/VNFLifecycleManagement-API/TerminatelVNFWorkflow.robot
index ae53a34eced4466bd597bc8de0a13204382cbcb5..79e8999a99db17e445ed50db113e9c6cfdc1de78 100644
--- a/SOL003/VNFLifecycleManagement-API/TerminatelVNFWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/TerminatelVNFWorkflow.robot
@@ -25,7 +25,7 @@ Terminate a VNF Instance
     Send Terminate VNF Request
     Check HTTP Response Status Code Is    202
     Check HTTP Response Header Contains    Location 
-    Check Operation Occurrence Id
+    Check Operation Occurrence Id existence
     Check Operation Notification For Terminate    STARTING
     Check Operation Notification For Terminate    PROCESSING
     Check Operation Notification For Terminate    COMPLETED
diff --git a/SOL003/VNFLifecycleManagement-API/VNFInstances.robot b/SOL003/VNFLifecycleManagement-API/VNFInstances.robot
index 7bd0ce2374535a4ed8ccddb4244842edc391428a..bb5bf82cd0f8e90f8e7f0c0afaef4b0cd5dcdabf 100644
--- a/SOL003/VNFLifecycleManagement-API/VNFInstances.robot
+++ b/SOL003/VNFLifecycleManagement-API/VNFInstances.robot
@@ -11,7 +11,7 @@ Library    JSONSchemaLibrary    schemas/
 *** Test Cases ***
 POST Create a new vnfInstance
     [Documentation]    Test ID: 7.3.1.1.1
-    ...    Test title: Create a VNF instance
+    ...    Test title: POST Create a new vnfInstance
     ...    Test objective: The objective is to create a new VNF instance resource
     ...    Pre-conditions: none
     ...    Reference: section 5.4.2.3.1 - SOL003 v2.4.1
@@ -22,9 +22,9 @@ POST Create a new vnfInstance
     Check HTTP Response Status Code Is    201
     Check HTTP Response Body Json Schema Is    vnfInstance
 
-Get information about multiple VNF instances  
+GET information about multiple VNF instances  
     [Documentation]    Test ID: 7.3.1.1.2
-    ...    Test title: Get information about multiple VNF instances
+    ...    Test title: GET information about multiple VNF instances
     ...    Test objective: The objective is to query information about multiple VNF instances
     ...    Pre-conditions:  
     ...    Reference: section 5.4.2.3.2 - SOL003 v2.4.1
@@ -35,11 +35,11 @@ Get information about multiple VNF instances
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    vnfInstances
 
-Get information about multiple VNF instances Bad Request Invalid attribute-based filtering parameters
+GET information about multiple VNF instances Bad Request Invalid attribute-based filtering parameters
     [Documentation]    Test ID: 7.3.1.1.3
-    ...    Test title: Get information about multiple VNF instances - Invalid attribute-based filtering parameters
+    ...    Test title: GET information about multiple VNF instances Bad Request Invalid attribute-based filtering parameters
     ...    Test objective: The objective is to query information about multiple VNF instances with Invalid attribute-based filtering parameters
-    ...    Pre-conditions:  
+    ...    Pre-conditions:  A VNF is instantiated,  a bad filter selector (filter selectors are listed in Table 5.4.2.3.2-1  - SOL003 v2.4.1).
     ...    Reference: section 5.4.2.3.2 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
@@ -49,11 +49,11 @@ Get information about multiple VNF instances Bad Request Invalid attribute-based
     Check HTTP Response Body Json Schema Is    ProblemDetails
     
 
-Get information about multiple VNF instances Bad Request Invalid attribute selector
+GET information about multiple VNF instances Bad Request Invalid attribute selector
     [Documentation]    Test ID: 7.3.1.1.4
-    ...    Test title: Get information about multiple VNF instances - Invalid attribute selector
+    ...    Test title: GET information about multiple VNF instances Bad Request Invalid attribute selector
     ...    Test objective: The objective is to query information about multiple VNF instances with Invalid attribute selector
-    ...    Pre-conditions:  
+    ...    Pre-conditions:  A VNF is instantiated,  a bad attribute selector (attribute selectors are listed in Table 5.4.2.3.2-1  - SOL003 v2.4.1).
     ...    Reference: section 5.4.2.3.2 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
diff --git a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
index 9060cb931f5e15c7aeb40a2c9a0a2e2959942ea1..2ffed7bba412c7d3862e8c602767037ab3f7fe66 100644
--- a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
+++ b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
@@ -26,11 +26,11 @@ Check HTTP Response Status Code Is
     Should Be Equal    ${response.status_code}    ${expected_status}
     Log    Status code validated 
 
-Check Operation Occurrence Id
+Check Operation Occurrence IdS
     ${vnfLcmOpOccId}=    Get Value From Json    ${response.headers}    $..Location
     Should Not Be Empty    ${vnfLcmOpOccId}
 
-Check Operation Occurrence Id existence
+Check Operation Occurrence Id existence 
     ${vnfLcmOpOccId}=    Get Value From Json    ${response.headers}    $..Location
     Should Not Be Empty    ${vnfLcmOpOccId}
     
@@ -730,7 +730,7 @@ GET VNF LCM Operation occurrences invalid filter
     GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs?fields=wrong_field	
     ${outputResponse}=    Output    response
 	Set Global Variable    @{response}    ${outputResponse}	
-PUT VNF LCM Operation occurences	
+PUT VNF LCM Operation occurrences	
     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}"}
diff --git a/SOL003/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot b/SOL003/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
index ab51026bc1e2cb321e4843bf31ad665884a0bfb4..89b4522fcfce9a67fc2407ce42a673f5d2cb8e94 100644
--- a/SOL003/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
+++ b/SOL003/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
@@ -7,54 +7,54 @@ Library    JSONSchemaLibrary    schemas/
 Resource    VnfLcmMntOperationKeywords.robot
 
 *** Test Cases ***
-Post VNF LCM Operation occurences - Method not implemented
+POST VNF LCM Operation occurrences - Method not implemented
     [Documentation]    Test ID: 7.3.1.11.1
-    ...    Test title: Post VNF LCM Operation occurences - Method not implemented
+    ...    Test title: POST VNF LCM Operation occurrences - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 5.4.12.3.1 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
-    Post VNF LCM Operation occurences
+    Post VNF LCM Operation occurrences
     Check HTTP Response Status Code Is    405
 
-Get status information about multiple VNF LCM Operation OCC 
+GET status information about multiple VNF LCM Operation OCC 
     [Documentation]    Test ID: 7.3.1.11.2
-    ...    Test title: Get status information about multiple VNF LCM Operation OCC
+    ...    Test title: GET status information about multiple VNF LCM Operation OCC
     ...    Test objective: The objective is to test that GET method retrieve Query status information about multiple VNF lifecycle management operation occurrences.
     ...    Pre-conditions: none
     ...    Reference:  section 5.4.12.3.2 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none   
-    GET VNF LCM Operation occurences
+    GET VNF LCM Operation occurrences
     Check HTTP Response Status Code Is    202
     Check HTTP Response Body Json Schema Is    VnfLcmOpOccs 
 
-Get status information about multiple VNF LCM Operation OCC Bad Request Invalid attribute-based filtering parameters
+GET status information about multiple VNF LCM Operation OCC Bad Request Invalid attribute-based filtering parameters
     [Documentation]    Test ID: 7.3.1.11.3
-    ...    Test title: Get status information about multiple VNF LCM Operation OCC Bad Request Invalid attribute-based filtering parameters
+    ...    Test title: GET status information about multiple VNF LCM Operation OCC Bad Request Invalid attribute-based filtering parameters
     ...    Test objective: The objective is to test that GET method fail retrieving status information about multiple VNF lifecycle management operation occurrences because attribute is invalid.
     ...    Pre-conditions: none
     ...    Reference:  section 5.4.12.3.2 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none   
-    GET VNF LCM Operation occurences invalid attribute
+    GET VNF LCM Operation occurrences invalid attribute
     Check HTTP Response Status Code Is    400
     Check HTTP Response Body Json Schema Is    ProblemDetails
 
-Get status information about multiple VNF LCM Operation OCC Bad Request Invalid attribute selector
+GET status information about multiple VNF LCM Operation OCC Bad Request Invalid attribute selector
     [Documentation]    Test ID: 7.3.1.11.4
-    ...    Test title: Get status information about multiple VNF LCM Operation OCC Bad Request Invalid attribute selector
+    ...    Test title: GET status information about multiple VNF LCM Operation OCC Bad Request Invalid attribute selector
     ...    Test objective: The objective is to test that GET method fail retrieving status information about multiple VNF lifecycle management operation occurrences because attribute is invalid.
     ...    Pre-conditions: none
     ...    Reference:  section 5.4.12.3.2 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
-    GET VNF LCM Operation occurences invalid filter
+    GET VNF LCM Operation occurrences invalid filter
     Check HTTP Response Status Code Is    400
     Check HTTP Response Body Json Schema Is    ProblemDetails
     
@@ -67,7 +67,7 @@ PUT status information about multiple VNF LCM Operation OCC - Method not impleme
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
-    PUT VNF LCM Operation occurences
+    PUT VNF LCM Operation occurrences
     Check HTTP Response Status Code Is    405
 
 PATCH status information about multiple VNF LCM Operation OCC - Method not implemented
@@ -79,7 +79,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 occurences
+    PUT 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/SOL005/NSLifecycleManagement-API/CancelOperationTask.robot b/SOL005/NSLifecycleManagement-API/CancelOperationTask.robot
index d23a730b2a1a7467ede2e9c4b8ac4171b00d17f3..06be531d843bcda43939f41dfc21d009bf081aa2 100644
--- a/SOL005/NSLifecycleManagement-API/CancelOperationTask.robot
+++ b/SOL005/NSLifecycleManagement-API/CancelOperationTask.robot
@@ -8,9 +8,9 @@ Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
 
 *** Test Cases ***
-Post Cancel operation task
+POST Cancel operation task
     [Documentation]    Test ID: 5.3.2.14.1
-    ...    Test title: Post Cancel operation task
+    ...    Test title: POST Cancel operation task
     ...    Test objective: The objective is to test that POST method cancel the NS LCM operation
     ...    Pre-conditions: NS instance status equal to STARTING, PROCESSING or ROLLING_BACK
     ...    Reference:  section 6.4.15.3.1 - SOL005 v2.4.1
@@ -21,9 +21,9 @@ Post Cancel operation task
 	Check HTTP Response Status Code Is    202
 	Check operation resource state is FAILED_TEMP
 	
-Post Cancel operation task Not Found
+POST Cancel operation task Not Found
     [Documentation]    Test ID: 5.3.2.14.2
-    ...    Test title: Post Cancel operation task Not Found
+    ...    Test title: POST Cancel operation task Not Found
     ...    Test objective: The objective is to test that POST method fail completing the Cancel NS LCM operation if the resource is not found
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.15.3.1 - SOL005 v2.4.1
@@ -34,9 +34,9 @@ Post Cancel operation task Not Found
 	Check HTTP Response Status Code Is    404
 	Check HTTP Response Body Json Schema Is    ProblemDetails
 		
-Post Cancel operation task Conflict
+POST Cancel operation task Conflict
     [Documentation]    Test ID: 5.3.2.14.3
-    ...    Test title: Post Cancel operation task Conflict
+    ...    Test title: POST Cancel operation task Conflict
     ...    Test objective: The objective is to test that POST method fail if a status conflict exist on the NS LCM operation. (i.e. NS instance status not equal to STARTING, PROCESSING or ROLLING_BACK)
     ...    Pre-conditions: NS instance status not equal to STARTING, PROCESSING or ROLLING_BACK
     ...    Reference:  section 6.4.15.3.1 - SOL005 v2.4.1
diff --git a/SOL005/NSLifecycleManagement-API/ContinueOperationTask.robot b/SOL005/NSLifecycleManagement-API/ContinueOperationTask.robot
index f47800cf93399565ca3fd940ef068a6fb907342e..c754c5a70d56974f7ffc303cd7de73d9df295013 100644
--- a/SOL005/NSLifecycleManagement-API/ContinueOperationTask.robot
+++ b/SOL005/NSLifecycleManagement-API/ContinueOperationTask.robot
@@ -8,9 +8,9 @@ Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
 
 *** Test Cases ***
-Post Continue operation task
+POST Continue operation task
      [Documentation]    Test ID: 5.3.2.12.1
-    ...    Test title: Post Continue operation task
+    ...    Test title: POST Continue operation task
     ...    Test objective: The objective is to test that POST method trigger a continue on the LCM operation
     ...    Pre-conditions: NS instance status equal to FAILED_TEMP
     ...    Reference:  section 6.4.13.3.1 - SOL005 v2.4.1
@@ -21,9 +21,9 @@ Post Continue operation task
 	Check HTTP Response Status Code Is    202
 	Check operation resource state is not FAILED_TEMP
 	
-Post Continue operation task Not Found
+POST Continue operation task Not Found
     [Documentation]    Test ID: 5.3.2.12.2
-    ...    Test title: Post Continue operation task Not Found
+    ...    Test title: POST Continue operation task Not Found
     ...    Test objective: The objective is to test that POST method cannot perform a continue operation task because the resource is not found
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.13.3.1 - SOL005 v2.4.1
@@ -34,9 +34,9 @@ Post Continue operation task Not Found
 	Check HTTP Response Status Code Is    404
 	Check HTTP Response Body Json Schema Is    ProblemDetails
 		
-Post Continue operation task Conflict
+POST Continue operation task Conflict
      [Documentation]    Test ID: 5.3.2.12.3
-    ...    Test title: Post Continue operation task Conflict
+    ...    Test title: POST Continue operation task Conflict
     ...    Test objective: The objective is to test that POST method fail in case of operation status conflict (i.e. NS instance status not equal to FAILED_TEMP )
     ...    Pre-conditions: NS instance status not equal to FAILED_TEMP 
     ...    Reference:  section 6.4.13.3.1 - SOL005 v2.4.1
diff --git a/SOL005/NSLifecycleManagement-API/FailOperationTask.robot b/SOL005/NSLifecycleManagement-API/FailOperationTask.robot
index e08c4eb549cde55753ddb254239b1e8a18607d20..3807ffbf43497038a61be9a4d10a6429b7fc7858 100644
--- a/SOL005/NSLifecycleManagement-API/FailOperationTask.robot
+++ b/SOL005/NSLifecycleManagement-API/FailOperationTask.robot
@@ -8,9 +8,9 @@ Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
 
 *** Test Cases ***
-Post Fail operation task
+POST Fail operation task
     [Documentation]    Test ID: 5.3.2.13.1
-    ...    Test title: Post Fail operation task
+    ...    Test title: POST Fail operation task
     ...    Test objective: The objective is to test that POST method trigger a state change to "finally failed" on the NS LCM operation
     ...    Pre-conditions: NS instance status equal to FAILED_TEMP
     ...    Reference:  section 6.4.14.3.1 - SOL005 v2.4.1
@@ -22,9 +22,9 @@ Post Fail operation task
 	Check resource is finally failed
 	
 	
-Post Fail operation task Not Found
+POST Fail operation task Not Found
     [Documentation]    Test ID: 5.3.2.13.2
-    ...    Test title: Post Fail operation task Not Found
+    ...    Test title: POST Fail operation task Not Found
     ...    Test objective: The objective is to test that POST method fail if the NS LCM resource is not found
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.14.3.1 - SOL005 v2.4.1
@@ -35,9 +35,9 @@ Post Fail operation task Not Found
 	Check HTTP Response Status Code Is    404
 	Check HTTP Response Body Json Schema Is    ProblemDetails
 		
-Post Fail operation task Conflict
+POST Fail operation task Conflict
     [Documentation]    Test ID: 5.3.2.13.3
-    ...    Test title: Post Fail operation task Conflict
+    ...    Test title: POST Fail operation task Conflict
     ...    Test objective: The objective is to test that POST method fail in case of status conflict on the NS LCM operation (i.e NS instance status not equal to FAILED_TEMP)
     ...    Pre-conditions: NS instance status not equal to FAILED_TEMP
     ...    Reference:  section 6.4.14.3.1 - SOL005 v2.4.1
diff --git a/SOL005/NSLifecycleManagement-API/IndividualNSInstance.robot b/SOL005/NSLifecycleManagement-API/IndividualNSInstance.robot
index c426505fa6fbbe0bfea33cbf213ceda21cb093bd..970fcdc49f49bd7e2d5b44c2595ce6a42753515e 100644
--- a/SOL005/NSLifecycleManagement-API/IndividualNSInstance.robot
+++ b/SOL005/NSLifecycleManagement-API/IndividualNSInstance.robot
@@ -8,9 +8,9 @@ Library    JSONSchemaLibrary    schemas/
 Suite Setup    Check resource existance
 
 *** Test Cases ***
-Post Individual NSInstance - Method not implemented
+POST Individual NSInstance - Method not implemented
     [Documentation]    Test ID: 5.3.2.2.1
-    ...    Test title: Post Individual NSInstance - Method not implemented
+    ...    Test title: POST Individual NSInstance - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.3.3.1 - SOL005 v2.4.1
@@ -20,9 +20,9 @@ Post Individual NSInstance - Method not implemented
     POST IndividualNSInstance
     Check HTTP Response Status Code Is    405
 
-Get Information about an individual NS Instance
+GET Information about an individual NS Instance
     [Documentation]    Test ID: 5.3.2.2.2
-    ...    Test title: Get Information about an individual NS Instance
+    ...    Test title: GET Information about an individual NS Instance
     ...    Test objective: The objective is to test that GET method returns an individual NS instance
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.3.3.2 - SOL005 v2.4.1
diff --git a/SOL005/NSLifecycleManagement-API/IndividualSubscription.robot b/SOL005/NSLifecycleManagement-API/IndividualSubscription.robot
index eec57a385d11196ae38243781d9f3de4d5a222c1..fd0929c3ccd77cb4626df6d22a9b1aff72f13fb8 100644
--- a/SOL005/NSLifecycleManagement-API/IndividualSubscription.robot
+++ b/SOL005/NSLifecycleManagement-API/IndividualSubscription.robot
@@ -9,9 +9,9 @@ Library    JSONSchemaLibrary    schemas/
 Suite Setup    Check subscription existance 
 
 *** Test Cases ***
-Post Individual Subscription - Method not implemented
+POST Individual Subscription - Method not implemented
     [Documentation]    Test ID: 5.3.2.16.1
-    ...    Test title: Post Individual Subscription - Method not implemented
+    ...    Test title: POST Individual Subscription - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.17.3.1 - SOL005 v2.4.1
@@ -21,9 +21,9 @@ Post Individual Subscription - Method not implemented
     POST Individual Subscription
     Check HTTP Response Status Code Is    405
 
-Get Information about an individual subscription
+GET Information about an individual subscription
      [Documentation]    Test ID: 5.3.2.16.2
-    ...    Test title: Get Information about an individual subscription
+    ...    Test title: GET Information about an individual subscription
     ...    Test objective: The objective is to test the retrieval of NS lifecycle management subscription and perform a JSON schema validation of the returned subscription data structure
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.17.3.2 - SOL005 v2.4.1
diff --git a/SOL005/NSLifecycleManagement-API/InstantiateNSTask.robot b/SOL005/NSLifecycleManagement-API/InstantiateNSTask.robot
index 72a4804af2ed4633a9c8239ff54453172246a6a9..2c06e0a031857d7c5e8620997827a9bf2f81a676 100644
--- a/SOL005/NSLifecycleManagement-API/InstantiateNSTask.robot
+++ b/SOL005/NSLifecycleManagement-API/InstantiateNSTask.robot
@@ -8,9 +8,9 @@ Library    JSONSchemaLibrary    schemas/
 Suite Setup    Check resource existance
 
 *** Test Cases ***
-Post Instantiate a nsInstance
+POST Instantiate a nsInstance
     [Documentation]    Test ID: 5.3.2.3.1
-    ...    Test title: Post Instantiate a nsInstance
+    ...    Test title: POST Instantiate a nsInstance
     ...    Test objective: The objective is to test that POST method instantiate a new NS instance
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.4.3.1 - SOL005 v2.4.1
@@ -22,9 +22,9 @@ Post Instantiate a nsInstance
     Check HTTP Response Header Contains    Location
     Check resource INSTANTIATED
 
-Post Instantiate a nsInstance Conflict
+POST Instantiate a nsInstance Conflict
     [Documentation]    Test ID: 5.3.2.3.2
-    ...    Test title: Post Instantiate a nsInstance Conflict
+    ...    Test title: POST Instantiate a nsInstance Conflict
     ...    Test objective: The objective is to test that the operation can't be performed due to a conflict with the state of resource (i.e. the resource is in INSTANTIATED state)
     ...    Pre-conditions: resource is in INSTANTIATED state
     ...    Reference:  section 6.4.4.3.1 - SOL005 v2.4.1
diff --git a/SOL005/NSLifecycleManagement-API/NSInstances.robot b/SOL005/NSLifecycleManagement-API/NSInstances.robot
index 134676183e98e4f675c8f4655bb2627c4395dba2..5c5646a13b1dba83c52955f8c75b7fd16fbc113b 100644
--- a/SOL005/NSLifecycleManagement-API/NSInstances.robot
+++ b/SOL005/NSLifecycleManagement-API/NSInstances.robot
@@ -11,7 +11,7 @@ POST Create a new NsInstance
     [Documentation]    Test ID: 5.3.2.1.1
     ...    Test title: POST Create a new NsInstance
     ...    Test objective: The objective is to test the creation of a new Ns Instances and perform a JSON schema validation of the collected instance data structure
-    ...    Pre-conditions: an NSD onboarded.
+    ...    Pre-conditions: None.
     ...    Reference:  section 6.4.2.3.1 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none.
@@ -21,9 +21,9 @@ POST Create a new NsInstance
     Check HTTP Response Header Contains    Location
     Check HTTP Response Body Json Schema Is    NsInstance
 
-Get information about multiple NS instances  
+GET information about multiple NS instances  
     [Documentation]    Test ID: 5.3.2.1.2
-    ...    Test title: Get information about multiple NS instances
+    ...    Test title: GET information about multiple NS instances
     ...    Test objective: The objective is to test the retrieval of all the available NS Instances and perform a JSON schema and content validation of the collected instance data structure
     ...    Pre-conditions: An existing Ns instance.
     ...    Reference:  section 6.4.2.3.2 - SOL005 v2.4.1
@@ -34,11 +34,11 @@ Get information about multiple NS instances
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    NsInstances  
     
-Get information about multiple NS instances Bad Request Invalid attribute-based filtering parameters
+GET information about multiple NS instances Bad Request Invalid attribute-based filtering parameters
     [Documentation]    Test ID: 5.3.2.1.3
-    ...    Test title: Get information about multiple NS instances Bad Request Invalid attribute-based filtering parameters
+    ...    Test title: GET information about multiple NS instances Bad Request Invalid attribute-based filtering parameters
     ...    Test objective: The objective is to test the retrieval of all the available NS Instances using attribute-based filter and perform a JSON schema and content validation of the collected instance data structure
-    ...    Pre-conditions: A Ns instance is instantiated, a bad filter parameter.
+    ...    Pre-conditions: A Ns instance is instantiated, a bad filter parameter (filter parameters are listed in Table 6.4.2.3.2-1  - SOL005 v2.4.1).
     ...    Reference:  section 6.4.2.3.2 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none.
@@ -47,11 +47,11 @@ Get information about multiple NS instances Bad Request Invalid attribute-based
     Check HTTP Response Status Code Is    400
     Check HTTP Response Body Json Schema Is    ProblemDetails
     
-Get information about multiple NS instances Bad Request Invalid attribute selector
+GET information about multiple NS instances Bad Request Invalid attribute selector
     [Documentation]    Test ID: 5.3.2.1.4
-    ...    Test title: Get information about multiple NS instances Bad Request Invalid attribute selector
+    ...    Test title: GET information about multiple NS instances Bad Request Invalid attribute selector
     ...    Test objective: The objective is to test the retrieval of all the available NS Instances using attribute-based filter and perform a JSON schema and content validation of the collected instance data structure
-    ...    Pre-conditions: A Ns instance is instantiated,  a bad attribute selector.
+    ...    Pre-conditions: A Ns instance is instantiated,  a bad attribute selector (attribute selectors are listed in Table 6.4.2.3.2-1  - SOL005 v2.4.1).
     ...    Reference:  section 6.4.2.3.2 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none.
@@ -74,7 +74,7 @@ PUT NSInstances - Method not implemented
     
 PATCH NSInstances - Method not implemented
      [Documentation]    Test ID: 5.3.2.1.6
-    ...    Test title: PUT NSInstances - Method not implemented
+    ...    Test title: PATCH NSInstances - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.2.3.4 - SOL005 v2.4.1
diff --git a/SOL005/NSLifecycleManagement-API/NSLCMOccurences.robot b/SOL005/NSLifecycleManagement-API/NSLCMOccurences.robot
index 91303e1537517c8965a46b0f74c787e570b11ac5..6223ffd10a3317b608ab47cd8c673aa7b4d0e5ce 100644
--- a/SOL005/NSLifecycleManagement-API/NSLCMOccurences.robot
+++ b/SOL005/NSLifecycleManagement-API/NSLCMOccurences.robot
@@ -7,9 +7,9 @@ Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
 
 *** Test Cases ***
-Post NS LCM occurences - Method not implemented
+POST NS LCM occurrences - Method not implemented
     [Documentation]    Test ID: 5.3.2.8.1
-    ...    Test title: Post NS LCM occurences - Method not implemented
+    ...    Test title: POST NS LCM occurrences - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.9.3.1 - SOL005 v2.4.1
@@ -19,9 +19,9 @@ Post NS LCM occurences - Method not implemented
 	POST NS LCM OP Occurences
 	Check HTTP Response Status Code Is    405
 
-Get status information about multiple NS LCM OCC   
+GET status information about multiple NS LCM OCC   
      [Documentation]    Test ID: 5.3.2.8.2
-    ...    Test title: Get status information about multiple NS LCM OCC
+    ...    Test title: GET status information about multiple NS LCM OCC
     ...    Test objective: The objective is to test that GET method returns a list of LCM occurrences of the NS
     ...    Pre-conditions: At least one LCM OCC available in the NFVO
     ...    Reference:  section 6.4.9.3.2 - SOL005 v2.4.1
@@ -32,10 +32,10 @@ Get status information about multiple NS LCM OCC
 	Check HTTP Response Status Code Is    200
 	Check HTTP Response Body Json Schema Is    NsLcmOpOccs
 
-Get status information about multiple NS LCM OCC Bad Request Invalid attribute-based filtering parameters
+GET status information about multiple NS LCM OCC Bad Request Invalid attribute-based filtering parameters
     [Documentation]    Test ID: 5.3.2.8.3
-    ...    Test title: Get status information about multiple NS LCM OCC Bad Request Invalid attribute-based filtering parameters
-    ...    Test objective: The objective is to test that GET method fail because the query parameter is not existing
+    ...    Test title: GET status information about multiple NS LCM OCC Bad Request Invalid attribute-based filtering parameters
+    ...    Test objective: The objective is to test that GET method fail because of wrong query parameter
     ...    Pre-conditions: At least one LCM OCC available in the NFVO, Invalid filter parameter
     ...    Reference:  section 6.4.9.3.2 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
@@ -45,10 +45,10 @@ Get status information about multiple NS LCM OCC Bad Request Invalid attribute-b
 	Check HTTP Response Status Code Is    400
 	Check HTTP Response Body Json Schema Is    ProblemDetails
 
-Get status information about multiple NS LCM OCC Bad Request Invalid attribute selector
+GET status information about multiple NS LCM OCC Bad Request Invalid attribute selector
     [Documentation]    Test ID: 5.3.2.8.4
-    ...    Test title: Get status information about multiple NS LCM OCC Bad Request Invalid attribute selector
-    ...    Test objective: The objective is to test that GET method fail because the attributes selector is not existing
+    ...    Test title: GET status information about multiple NS LCM OCC Bad Request Invalid attribute selector
+    ...    Test objective: The objective is to test that GET method fail because of wrong attributes selector
     ...    Pre-conditions: At least one LCM OCC available in the NFVO, Invalid attribute selector
     ...    Reference:  section 6.4.9.3.2 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
diff --git a/SOL005/NSLifecycleManagement-API/RollbackOperationTask.robot b/SOL005/NSLifecycleManagement-API/RollbackOperationTask.robot
index 2368c94607c79cbc5209a511575d6996e472f1e9..8d065f2cb49e78485e3d8e01bd26de9db57d01b2 100644
--- a/SOL005/NSLifecycleManagement-API/RollbackOperationTask.robot
+++ b/SOL005/NSLifecycleManagement-API/RollbackOperationTask.robot
@@ -8,9 +8,9 @@ Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
 
 *** Test Cases ***
-Post Rollback operation task
+POST Rollback operation task
      [Documentation]    Test ID: 5.3.2.11.1
-    ...    Test title: Post Rollback operation task
+    ...    Test title: POST Rollback operation task
     ...    Test objective: The objective is to test that POST method triggers a rollback on the NS LCM operation
     ...    Pre-conditions: NS instance status equal to FAILED_TEMP
     ...    Reference:  section 6.4.12.3.1 - SOL005 v2.4.1
@@ -21,9 +21,9 @@ Post Rollback operation task
 	Check HTTP Response Status Code Is    202
 	Check operation resource state is not FAILED_TEMP 
 	
-Post Rollback operation task Not Found
+POST Rollback operation task Not Found
     [Documentation]    Test ID: 5.3.2.11.2
-    ...    Test title: Post Rollback operation task Not Found
+    ...    Test title: POST Rollback operation task Not Found
     ...    Test objective: The objective is to test that POST method fails if  NS LCM operation is not found
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.12.3.1 - SOL005 v2.4.1
@@ -34,9 +34,9 @@ Post Rollback operation task Not Found
 	Check HTTP Response Status Code Is    404
 	Check HTTP Response Body Json Schema Is    ProblemDetails
 		
-Post Rollback operation task Conflict
+POST Rollback operation task Conflict
     [Documentation]    Test ID: 5.3.2.11.3
-    ...    Test title: Post Rollback operation task Conflict
+    ...    Test title: POST Rollback operation task Conflict
     ...    Test objective: The objective is to test that POST method fail in case of NS LCM operation status conflict (i.e. NS instance status not equal to FAILED_TEMP)
     ...    Pre-conditions: NS instance status not equal to FAILED_TEMP
     ...    Reference:  section 6.4.12.3.1 - SOL005 v2.4.1
diff --git a/SOL005/NSLifecycleManagement-API/Subscriptions.robot b/SOL005/NSLifecycleManagement-API/Subscriptions.robot
index bf3594cd3f997e88603f08fa484fd7d39c78d915..4f421ab4ac53da9ba7fc6987a4e462f663c22b0f 100644
--- a/SOL005/NSLifecycleManagement-API/Subscriptions.robot
+++ b/SOL005/NSLifecycleManagement-API/Subscriptions.robot
@@ -29,7 +29,7 @@ POST Create a new Subscription - DUPLICATION
     ...    Pre-conditions: a subscription have already to exist
     ...    Reference:  section 6.4.16.3.1 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
+    ...    Applicability: duplication supported by NFVO
     ...    Post-Conditions: duplicate subscription is created in the NFVO     
     POST subscriptions DUPLICATION
     Check HTTP Response Status Code Is    201
@@ -43,7 +43,7 @@ POST Create a new Subscription - NO-DUPLICATION
     ...    Pre-conditions: a subscription have already to exist
     ...    Reference:  section 6.4.16.3.1 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
+    ...    Applicability: duplication NOT supported by NFVO
     ...    Post-Conditions: duplicate subscription is not created in the NFVO     
     POST subscriptions NO DUPLICATION
     Check HTTP Response Status Code Is    303
@@ -52,7 +52,7 @@ POST Create a new Subscription - NO-DUPLICATION
 GET Subscriptions
     [Documentation]    Test ID: 5.3.2.15.4
     ...    Test title: GET Subscriptions
-    ...    Test objective: The objective is to test that GET method  retrive the list of existing subscriptions
+    ...    Test objective: The objective is to test that GET method  retrieve the list of existing subscriptions
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.16.3.2 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
@@ -65,7 +65,7 @@ GET Subscriptions
 GET Subscription - Filter
     [Documentation]    Test ID: 5.3.2.15.5
     ...    Test title: GET Subscription - Filter
-    ...    Test objective: The objective is to test that GET method  retrive the list of existing subscriptions filtered
+    ...    Test objective: The objective is Get the list of active subscriptions using a filter
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.16.3.2 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
@@ -75,8 +75,21 @@ GET Subscription - Filter
     Check HTTP Response Status Code Is  200
     Check HTTP Response Body Json Schema Is  subscriptions
     
+GET subscriptions - Bad Request Invalid attribute-based filtering parameters
+    [Documentation]    Test ID: 5.3.2.15.6
+    ...    Test title: GET subscriptions - Bad Request Invalid attribute-based filtering parameters
+    ...    Test objective: The objective is Get the list of active subscriptions using an invalid filter
+    ...    Pre-conditions: none
+    ...    Reference:  section 6.4.16.3.2 - SOL005 v2.4.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Get subscriptions - invalid filter
+    Check HTTP Response Status Code Is    400
+    Check HTTP Response Body Json Schema Is    ProblemDetails
+        
 PUT subscriptions - Method not implemented
-     [Documentation]    Test ID: 5.3.2.15.6
+     [Documentation]    Test ID: 5.3.2.15.7
     ...    Test title: PUT subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PUT method can't modify a NS lifecycle management subscription
     ...    Pre-conditions: none
@@ -88,7 +101,7 @@ PUT subscriptions - Method not implemented
     Check HTTP Response Status Code Is    405
 
 PATCH subscriptions - Method not implemented
-    [Documentation]    Test ID: 5.3.2.15.7
+    [Documentation]    Test ID: 5.3.2.15.8
     ...    Test title: PATCH subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PUT method can't modify a NS lifecycle management subscription
     ...    Pre-conditions: none
@@ -100,13 +113,13 @@ PATCH subscriptions - Method not implemented
     Check HTTP Response Status Code Is    405
 
 DELETE subscriptions - Method not implemented
-    [Documentation]    Test ID: 5.3.2.15.8
+    [Documentation]    Test ID: 5.3.2.15.9
     ...    Test title: DELETE subscriptions - Method not implemented
     ...    Test objective: The objective is to test that DELETE method can't modify a NS lifecycle management subscription
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.16.3.5 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: none
+    ...    Post-Conditions: Subscription is not deleted
     DELETE subscriptions
     Check HTTP Response Status Code Is    405
\ No newline at end of file
diff --git a/SOL005/NSLifecycleManagement-API/TerminateNSTask.robot b/SOL005/NSLifecycleManagement-API/TerminateNSTask.robot
index 4a1407b527de79009794648e5b015ed5c7829f9c..e1ee9c3e7a5fe27274500ef11a6e8888123a7714 100644
--- a/SOL005/NSLifecycleManagement-API/TerminateNSTask.robot
+++ b/SOL005/NSLifecycleManagement-API/TerminateNSTask.robot
@@ -55,7 +55,7 @@ PUT Terminate NSInstance - Method not implemented
     ...    Reference:  section 6.4.8.3.3 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: resurce state not modified
+    ...    Post-Conditions: resource state not modified
     PUT Terminate NSInstance
     Check HTTP Response Status Code Is    405
     
@@ -67,7 +67,7 @@ PATCH Terminate NSInstance - Method not implemented
     ...    Reference:  section 6.4.8.3.4 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: resurce state not modified
+    ...    Post-Conditions: resource state not modified
     PATCH Terminate NSInstance
     Check HTTP Response Status Code Is    405
 
@@ -79,7 +79,7 @@ DELETE Terminate NSInstance - Method not implemented
     ...    Reference:  section 6.4.8.3.5 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: resurce state not modified
+    ...    Post-Conditions: resource state not modified
     DELETE Terminate NSInstance
     Check HTTP Response Status Code Is    405