diff --git a/SOL003/VNFLifecycleManagement-API/CancelOperationWorkflow.robot b/SOL003/VNFLifecycleManagement-API/CancelOperationWorkflow.robot
index 76543397fb2237822044f85a8b6370b07064e5ac..9e2c4fb67501d01c022bebd185c823d52704c107 100644
--- a/SOL003/VNFLifecycleManagement-API/CancelOperationWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/CancelOperationWorkflow.robot
@@ -16,11 +16,11 @@ Suite Teardown    Terminate All Processes    kill=true
 
 *** Test Cases ***
 Cancel a VNF LCM Operation - STARTING
-    [Documentation]    Test ID: 7.3.1.2.1
+    [Documentation]    Test ID: 7.3.1.25
     ...    Test title: Cancel a VNF LCM Operation
     ...    Test objective: The objective is to test the workflow for Cancelling a VNF LCM Operation
     ...    Pre-conditions: The VNF lifecycle management operation occurrence is in STARTING state. NFVO is subscribed to VNF LCM Operation Occurrence notifications (Test ID: 5.4.20.1)
-    ...    Reference: section 5.3.10 - SOL003 v2.4.1
+    ...    Reference: section 5.4.17 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: NFVO is able to receive notifications from VNFM
     ...    Post-Conditions: The VNF lifecycle management operation occurrence is in ROLLED_BACK state
diff --git a/SOL003/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityWorkflow.robot b/SOL003/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityWorkflow.robot
index 6df7f0848bc25999bc27ad05c328eb2a98cdfc92..8cf3a3e4e6d7ebb306b89f0263d0382989752f7a 100644
--- a/SOL003/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityWorkflow.robot
@@ -16,11 +16,11 @@ Suite Teardown    Terminate All Processes    kill=true
 
 *** Test Cases ***
 Operate a VNF Instance
-    [Documentation]    Test ID: 7.3.5.4.1
+    [Documentation]    Test ID: 7.3.1.24
     ...    Test title: Change the external connectivity of a VNF instance
     ...    Test objective: The objective is to change the external connectivity of a VNF instance.
     ...    Pre-conditions: VNF instance in INSTANTIATED state (Test ID: 5.a.b.c)
-    ...    Reference: section 5.3.3 - SOL003 v2.4.1
+    ...    Reference: section 5.4.11 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: NFVO is able to receive notifications from VNFM. Change the external connectivity of a VNF instance is supported for the VNF (as capability in the VNFD)
     ...    Post-Conditions: VNF instance still in INSTANTIATED state and external connectivity of the VNF is changed
diff --git a/SOL003/VNFLifecycleManagement-API/CreateVNFWorkflow.robot b/SOL003/VNFLifecycleManagement-API/CreateVNFWorkflow.robot
index e9f0ebddc4c3de0a2cabb8f343fbdb2bdf3d59ca..a57cf83c7fefd254e2221b885198ea906b2e9660 100644
--- a/SOL003/VNFLifecycleManagement-API/CreateVNFWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/CreateVNFWorkflow.robot
@@ -16,11 +16,11 @@ Suite Teardown    Terminate All Processes    kill=true
 
 *** Test Cases ***
 Create VNF Instance Resource
-    [Documentation]    Test ID: 5.3.1.1
+    [Documentation]    Test ID: 7.3.1.20
     ...    Test title: Create VNF Instance workflow
     ...    Test objective: The objective is to test the workflow for the creation of a new VNF instance resource.
     ...    Pre-conditions: NFVO is subscribed to VNF Identifier Creation notifications (Test ID: 5.4.20.2)
-    ...    Reference: section 5.4.2 - SOL003 v2.4.1
+    ...    Reference: section 5.3.1 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: NFVO is able to receive notifications from VNFM
     ...    Post-Conditions: The VNF instance resource has been created in "NOT_INSTANTIATED" state.
@@ -28,14 +28,14 @@ Create VNF Instance Resource
     Check HTTP Response Status Code Is    201
     Check HTTP Response Header Contains    Location 
     Check Operation Notification For VNF Instance Creation
-    Check Postcondition VNF Instance Created  NOT_INSTANTIATED
+    Check Postcondition VNF Instance Created status is  NOT_INSTANTIATED
 
 *** Keywords ***
 
 Initialize System
     Create Sessions
 
-Check Postcondition VNF Instance Created
+Check Postcondition VNF Instance Created status is
     [Arguments]    ${status}
     Check VNF Instance    ${vnfInstanceId}
     Check HTTP Response Status Code Is    200
diff --git a/SOL003/VNFLifecycleManagement-API/DeleteVNFWorkflow.robot b/SOL003/VNFLifecycleManagement-API/DeleteVNFWorkflow.robot
index cd750fecc67029f12ea82e831f36ec283b1ba5a8..9eb68cd4cadc1258ddbd80500f43cf920f67f643 100644
--- a/SOL003/VNFLifecycleManagement-API/DeleteVNFWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/DeleteVNFWorkflow.robot
@@ -16,7 +16,7 @@ Suite Teardown    Terminate All Processes    kill=true
 
 *** Test Cases ***
 Delete VNF Instance Resource
-    [Documentation]    Test ID: 5.3.2.1
+    [Documentation]    Test ID: 7.3.1.21
     ...    Test title: Delete VNF Instance workflow
     ...    Test objective: The objective is to test the workflow for the deleteion of an existing VNF instance resource
     ...    Pre-conditions: The VNF Instance resource is in NOT_INSTANTIATED state. NFVO is subscribed to VNF Identifier Creation notifications (Test ID: 5.4.20.2)
diff --git a/SOL003/VNFLifecycleManagement-API/FailOperationWorkflow.robot b/SOL003/VNFLifecycleManagement-API/FailOperationWorkflow.robot
index 3134564f6f544c5d3f53e608d926051fbd52619f..dc3473e9b489a3dbcaaf2e1969808e7dd8c089cb 100644
--- a/SOL003/VNFLifecycleManagement-API/FailOperationWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/FailOperationWorkflow.robot
@@ -16,11 +16,11 @@ Suite Teardown    Terminate All Processes    kill=true
 
 *** Test Cases ***
 Fail VNF LCM Operation
-    [Documentation]    Test ID: 5.x.x.x
+    [Documentation]    Test ID: 7.3.1.22
     ...    Test title: Fail a VNF LCM Operation
     ...    Test objective: The objective is to test the workflow for a Fail VNF LCM Operation
     ...    Pre-conditions: The VNF lifecycle management operation occurrence is in FAILED_TEMP state. NFVO is subscribed to VNF LCM Operation Occurrence notifications (Test ID: 5.4.20.1)
-    ...    Reference: section 5.3.10 - SOL003 v2.4.1
+    ...    Reference: section 5.4.16 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: NFVO is able to receive notifications from VNFM
     ...    Post-Conditions: The VNF lifecycle management operation occurrence is in FAILED state
diff --git a/SOL003/VNFLifecycleManagement-API/HealVNFWorkflow.robot b/SOL003/VNFLifecycleManagement-API/HealVNFWorkflow.robot
index cfdf607d64ee60ea91a8cf1f4129d7921fbc7858..cbeefebabe93e9f3e3ef7b2dc05c156526b9d704 100644
--- a/SOL003/VNFLifecycleManagement-API/HealVNFWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/HealVNFWorkflow.robot
@@ -16,11 +16,11 @@ Suite Teardown    Terminate All Processes    kill=true
 
 *** Test Cases ***
 Heal a VNF Instance
-    [Documentation]    Test ID: 5.x.y.x
+    [Documentation]    Test ID: 7.3.1.22
     ...    Test title: Heal a VNF Instance
     ...    Test objective: The objective is to heal a VNF instance.
     ...    Pre-conditions: VNF instance in INSTANTIATED state (Test ID: 5.a.b.c)
-    ...    Reference: section 5.3.3 - SOL003 v2.4.1
+    ...    Reference: section 5.4.9 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: NFVO is able to receive notifications from VNFM. Heal a VNF instance is supported for the VNF (as capability in the VNFD)
     ...    Post-Conditions: VNF instance still in INSTANTIATED state 
diff --git a/SOL003/VNFLifecycleManagement-API/InstantiateVNFTaskWorkflow.robot b/SOL003/VNFLifecycleManagement-API/InstantiateVNFTaskWorkflow.robot
index 978bdcc9109746491d427e92ad9c6d76a617dbbb..b5b91206fc4affb65ece4e3ceb1c1f92b43172b0 100644
--- a/SOL003/VNFLifecycleManagement-API/InstantiateVNFTaskWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/InstantiateVNFTaskWorkflow.robot
@@ -18,7 +18,7 @@ Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}
 
 *** Test Cases ***
 VNF Instantiation
-    [Documentation]    Test ID: 5.4.4.1
+    [Documentation]    Test ID: 7.3.1.23
     ...    Test title: VNF Instantiation worflow
     ...    Test objective: The objective is to test the workflow for the instantiation of a VNF instance
     ...    Pre-conditions: VNF instance resources is already created (Test ID: 5.4.2.1). NFVO is subscribed to VNF LCM Operation Occurrence notifications (Test ID: 5.4.20.1)
diff --git a/SOL003/VNFLifecycleManagement-API/OperateVNFWorkflow.robot b/SOL003/VNFLifecycleManagement-API/OperateVNFWorkflow.robot
index ca838cb2a8d242f62473716c350e0c4a2b21224a..ce64b4f3ed6d6d37dc391f8dbccec0e69065f46f 100644
--- a/SOL003/VNFLifecycleManagement-API/OperateVNFWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/OperateVNFWorkflow.robot
@@ -16,7 +16,7 @@ Suite Teardown    Terminate All Processes    kill=true
 
 *** Test Cases ***
 Operate a VNF Instance
-    [Documentation]    Test ID: 7.3.2.3.1
+    [Documentation]    Test ID: 7.3.1.27
     ...    Test title: Operate a VNF Instance
     ...    Test objective: The objective is to change the operational state of a VNF instance.
     ...    Pre-conditions: VNF instance in INSTANTIATED state (Test ID: 5.a.b.c)
diff --git a/SOL003/VNFLifecycleManagement-API/RetryOperationWorkflow.robot b/SOL003/VNFLifecycleManagement-API/RetryOperationWorkflow.robot
index ddcda353382016c52e49758c0e826f192a4925f0..e2dabd1fd829e5a948cd4f170a8fe5ddcd947cc9 100644
--- a/SOL003/VNFLifecycleManagement-API/RetryOperationWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/RetryOperationWorkflow.robot
@@ -14,7 +14,7 @@ Library    Process
 
 *** Test Cases ***
 Retry VNF LCM Operation - Successful
-    [Documentation]    Test ID: 5.x.x.x
+    [Documentation]    Test ID: 7.3.1.28
     ...    Test title: Retry VNF LCM Operation - Successful
     ...    Test objective: The objective is to test the workflow for a Retry VNF LCM Operation and the operation is successful
     ...    Pre-conditions: The VNF lifecycle management operation occurrence is in FAILED_TEMP state. NFVO is subscribed to VNF LCM Operation Occurrence notifications (Test ID: 5.4.20.1)
diff --git a/SOL003/VNFLifecycleManagement-API/RollBackOperationWorkflow.robot b/SOL003/VNFLifecycleManagement-API/RollBackOperationWorkflow.robot
index d665217377fe97d3fdebe9a46aced7d952316a81..d1ba66d3b5db020e0cc77fd360935e34d297f64a 100644
--- a/SOL003/VNFLifecycleManagement-API/RollBackOperationWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/RollBackOperationWorkflow.robot
@@ -16,7 +16,7 @@ Suite Teardown    Terminate All Processes    kill=true
 
 *** Test Cases ***
 Roll back a VNF LCM Operation - Successful
-    [Documentation]    Test ID: 5.x.x.x
+    [Documentation]    Test ID: 7.3.1.29
     ...    Test title: Roll back VNF LCM Operation - Successful
     ...    Test objective: The objective is to test the workflow for a Rolling Back a VNF LCM Operation and the operation is successful
     ...    Pre-conditions: The VNF lifecycle management operation occurrence is in FAILED_TEMP state. NFVO is subscribed to VNF LCM Operation Occurrence notifications (Test ID: 5.4.20.1)
@@ -33,7 +33,7 @@ Roll back a VNF LCM Operation - Successful
     Check Postcondition VNF Roll Back Successful
 
 Retry VNF LCM Operation - Unsuccessful
-    [Documentation]    Test ID: 5.x.x.x
+    [Documentation]    Test ID: 7.3.1.30
     ...    Test title: Retry VNF LCM Operation - Unsuccessful
     ...    Test objective: The objective is to test the workflow for a Retry VNF LCM Operation and the operation is not successful
     ...    Pre-conditions: The VNF lifecycle management operation occurrence is in FAILED_TEMP state. NFVO is subscribed to VNF LCM Operation Occurrence notifications (Test ID: 5.4.20.1)
diff --git a/SOL003/VNFLifecycleManagement-API/ScaleVNFTask.robot b/SOL003/VNFLifecycleManagement-API/ScaleVNFTask.robot
index 0d57c9fc92f81511ed2c270dc36e447022782727..e8e23884c47f2f1b93abf444816ac6b5a1d892b8 100644
--- a/SOL003/VNFLifecycleManagement-API/ScaleVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/ScaleVNFTask.robot
@@ -75,11 +75,11 @@ PUT Scale VNFInstance - Method not implemented
     Check HTTP Response Status Code Is    405
 
 PATCH Scale VNFInstance - Method not implemented
-    [Documentation]    Test ID: 7.3.1.4.4
+    [Documentation]    Test ID: 7.3.1.4.6
     ...    Test title: PATCH Scale VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
     ...    Pre-conditions:  
-    ...    Reference: section 5.4.5.3.2 - SOL003 v2.4.1
+    ...    Reference: section 5.4.5.3.4 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: 
@@ -87,11 +87,11 @@ PATCH Scale VNFInstance - Method not implemented
     Check HTTP Response Status Code Is    405
     
 DELETE Scale VNFInstance - Method not implemented
-    [Documentation]    Test ID: 7.3.1.4.4
+    [Documentation]    Test ID: 7.3.1.4.7
     ...    Test title: DELETE Scale VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
     ...    Pre-conditions:  
-    ...    Reference: section 5.4.5.3.2 - SOL003 v2.4.1
+    ...    Reference: section 5.4.5.3.5 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: 
diff --git a/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelWorkflow.robot b/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelWorkflow.robot
index 6c168d347732deb5f8feb088a93954003e40e675..40a712656a839a3440998ce026a62b320ad3b12e 100644
--- a/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelWorkflow.robot
@@ -10,13 +10,11 @@ Library    BuiltIn
 Library    Collections
 Library    JSONLibrary
 Library    Process
-Suite Setup    Initialize System
-Suite Teardown    Terminate All Processes    kill=true
 
 
 *** Test Cases ***
 VNF Instance Scale To Level
-   [Documentation]    Test ID: 5.4.6.1
+   [Documentation]    Test ID: 7.3.1.31
     ...    Test title: VNF Instance Scale To Level worflow
     ...    Test objective: The objective is to test the workflow for the scale to level of a VNF instance
     ...    Pre-conditions: VNF instance in INSTANTIATED state (Test ID: 5.4.4.1). NFVO is subscribed to VNF LCM Operation Occurrence notifications (Test ID: 5.4.20.1)
diff --git a/SOL003/VNFLifecycleManagement-API/ScaleVNFWorkflow.robot b/SOL003/VNFLifecycleManagement-API/ScaleVNFWorkflow.robot
index 0198e5aac0f66e655621979230a279053be2ff1f..bc24732a6ec6c9cf78e6688c33a64f4ab2f3f719 100644
--- a/SOL003/VNFLifecycleManagement-API/ScaleVNFWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/ScaleVNFWorkflow.robot
@@ -14,7 +14,7 @@ Library    Process
 
 *** Test Cases ***
 VNF Instance Scale Out
-   [Documentation]    Test ID: 5.4.5.1
+   [Documentation]    Test ID: 7.3.1.32
     ...    Test title: VNF Instance Scale Out worflow
     ...    Test objective: The objective is to test the workflow for the scaling out a VNF instance
     ...    Pre-conditions: VNF instance in INSTANTIATED state (Test ID: 5.4.4.1). NFVO is subscribed to VNF LCM Operation Occurrence notifications (Test ID: 5.4.20.1)
diff --git a/SOL003/VNFLifecycleManagement-API/TerminatelVNFWorkflow.robot b/SOL003/VNFLifecycleManagement-API/TerminatelVNFWorkflow.robot
index 02b8ce42118f44370f5e0ed41773361d8b34632b..65c811cb5cf017128bbd5e262ce41d63f4608030 100644
--- a/SOL003/VNFLifecycleManagement-API/TerminatelVNFWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/TerminatelVNFWorkflow.robot
@@ -10,13 +10,11 @@ Library    BuiltIn
 Library    Collections
 Library    JSONLibrary
 Library    Process
-Suite Setup    Initialize System
-Suite Teardown    Terminate All Processes    kill=true
 
 
 *** Test Cases ***
 Terminate a VNF Instance
-    [Documentation]    Test ID: 5.x.y.x
+    [Documentation]    Test ID: 7.3.1.33
     ...    Test title: Terminate a VNF Instance
     ...    Test objective: The objective is to terminate a VNF instance.
     ...    Pre-conditions: VNF instance in INSTANTIATED state (Test ID: 5.a.b.c)
diff --git a/SOL005/NSLifecycleManagement-API/CancelOperationTask.robot b/SOL005/NSLifecycleManagement-API/CancelOperationTask.robot
index 53ef3f9bca23b367a9c9b2d79b22493f59cafb50..6ae9e02fcd23f816215c1b1f51b8a913ba08e3a0 100644
--- a/SOL005/NSLifecycleManagement-API/CancelOperationTask.robot
+++ b/SOL005/NSLifecycleManagement-API/CancelOperationTask.robot
@@ -19,7 +19,7 @@ Post Cancel operation task
     ...    Post-Conditions: NS instance status equal to FAILED_TEMP     
 	POST Cancel operation task
 	Check HTTP Response Status Code Is    202
-	Check resource FAILED_TEMP
+	Check resource has a temporary failure
 	
 Post Cancel operation task Not Found
     [Documentation]    Test ID: 5.3.2.14.2
diff --git a/SOL005/NSLifecycleManagement-API/ContinueOperationTask.robot b/SOL005/NSLifecycleManagement-API/ContinueOperationTask.robot
index 80e0c93f7bdeb37906b0f33903c8739f9e113d76..c4bccbd0178ee60f78fbdec34d0c0cb6fdd4cf01 100644
--- a/SOL005/NSLifecycleManagement-API/ContinueOperationTask.robot
+++ b/SOL005/NSLifecycleManagement-API/ContinueOperationTask.robot
@@ -19,7 +19,7 @@ Post Continue operation task
     ...    Post-Conditions: NS instance status not equal to FAILED_TEMP 
 	POST Continue operation task
 	Check HTTP Response Status Code Is    202
-	Check resource not   FAILED_TEMP
+	Check resource has not a temporary failure
 	
 Post Continue operation task Not Found
     [Documentation]    Test ID: 5.3.2.12.2
diff --git a/SOL005/NSLifecycleManagement-API/CreateNSInstanceWorkflow.robot b/SOL005/NSLifecycleManagement-API/CreateNSInstanceWorkflow.robot
index 2f05ae3c59c47ff666b38bc5f5a5462f3e54947b..c2d82ff3bf6952f57bbe3d1235f605d066c6e3c8 100644
--- a/SOL005/NSLifecycleManagement-API/CreateNSInstanceWorkflow.robot
+++ b/SOL005/NSLifecycleManagement-API/CreateNSInstanceWorkflow.robot
@@ -10,6 +10,14 @@ Library    JSONSchemaLibrary    schemas/
 *** Test Cases ***
 
 NS Instance Creation
+    [Documentation]    Test ID: 5.3.2.18
+    ...    Test title: NS Instance Creation
+    ...    Test objective: The objective is to test the workflow for Creating a NS instance
+    ...    Pre-conditions: none
+    ...    Reference: section 6.4.2 - SOL003 v2.4.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: The NS lifecycle management operation occurrence is in NOT_ISTANTIATED state
     POST New nsInstance
     Check HTTP Response Status Code Is    201
     Check HTTP Response Header Contains    Location
diff --git a/SOL005/NSLifecycleManagement-API/DeleteNSInstanceWorkflow.robot b/SOL005/NSLifecycleManagement-API/DeleteNSInstanceWorkflow.robot
index dc855c0cf7fc6d7d175a3dbf63982b288b5eb0df..c813e737ff6699db20f2a5ff8445148b1daac6fb 100644
--- a/SOL005/NSLifecycleManagement-API/DeleteNSInstanceWorkflow.robot
+++ b/SOL005/NSLifecycleManagement-API/DeleteNSInstanceWorkflow.robot
@@ -5,10 +5,17 @@ Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}
 Library    OperatingSystem
 Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
-Suite Setup    Check resource existance
 
 *** Test Cases ***
 NS Instance Deletion
+    [Documentation]    Test ID: 5.3.2.19
+    ...    Test title: NS Instance Deletion
+    ...    Test objective: The objective is to test the workflow for Deleting a NS instance
+    ...    Pre-conditions: the resource is in NOT_INSTANTIATED state
+    ...    Reference: section 6.4.2 - SOL003 v2.4.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
     Check resource not_instantiated
     DELETE IndividualNSInstance
     Check HTTP Response Status Code Is    204
diff --git a/SOL005/NSLifecycleManagement-API/FailOperationTask.robot b/SOL005/NSLifecycleManagement-API/FailOperationTask.robot
index 1f8a95d182b85e43c6c5405cace059feb2ef5d5a..305f1c6f050dbd5a805d70ddbd74b3d857e840db 100644
--- a/SOL005/NSLifecycleManagement-API/FailOperationTask.robot
+++ b/SOL005/NSLifecycleManagement-API/FailOperationTask.robot
@@ -19,7 +19,7 @@ Post Fail operation task
     ...    Post-Conditions: none 
 	POST Fail operation task
 	Check HTTP Response Status Code Is    202
-	Check resource not   FAILED_TEMP
+	Check resource is finally failed
 	
 	
 Post Fail operation task Not Found
diff --git a/SOL005/NSLifecycleManagement-API/HealNSTaskWorkflow.robot b/SOL005/NSLifecycleManagement-API/HealNSTaskWorkflow.robot
index c3aee5c20241883d48b0e707b24e1a5ffb1f907f..8ee8dac11776d5710744ed6fc69b0efd634acf85 100644
--- a/SOL005/NSLifecycleManagement-API/HealNSTaskWorkflow.robot
+++ b/SOL005/NSLifecycleManagement-API/HealNSTaskWorkflow.robot
@@ -10,6 +10,14 @@ Suite Teardown    Terminate All Processes    kill=true
 
 *** Test Cases ***
 Heal Flow of NS lifecycle management operations
+     [Documentation]    Test ID: 5.3.2.20
+    ...    Test title: Heal Flow of NS lifecycle management operations
+    ...    Test objective: The objective is to test the workflow for Healing a NS instance
+    ...    Pre-conditions: the resource is in INSTANTIATED state
+    ...    Reference: section 6.4.7 - SOL003 v2.4.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
     Check resource instantiated
     POST Heal NSInstance
     Check HTTP Response Status Code Is    202
diff --git a/SOL005/NSLifecycleManagement-API/IndividualNSLCMOccurences.robot b/SOL005/NSLifecycleManagement-API/IndividualNSLCMOccurences.robot
index 1321eef1f1dad98473d64571ef05db865668fd3b..33661f458f5e53337bf8766f116e90311e4a98be 100644
--- a/SOL005/NSLifecycleManagement-API/IndividualNSLCMOccurences.robot
+++ b/SOL005/NSLifecycleManagement-API/IndividualNSLCMOccurences.robot
@@ -19,9 +19,9 @@ Post Individual NS LCM occurences - Method not implemented
 	POST Individual NS LCM OP Occurence
 	Check HTTP Response Status Code Is    405
 
-Get stauts information about Individual NS LCM OP OCC   
+Get status information about Individual NS LCM OP OCC   
     [Documentation]    Test ID: 5.3.2.9.2
-    ...    Test title: Get stauts information about Individual NS LCM OP OCC
+    ...    Test title: Get status information about Individual NS LCM OP OCC
     ...    Test objective: The objective is to test that GET method return the LCM occurrence of the NS
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.10.3.2 - SOL005 v2.4.1
@@ -30,12 +30,11 @@ Get stauts information about Individual NS LCM OP OCC
     ...    Post-Conditions: none
 	GET Individual NS LCN OP Occurence
 	Check HTTP Response Status Code Is    200
-	Check HTTP Response Header ContentType is    ${CONTENT_TYPE}
 	Check HTTP Response Body Json Schema Is    NsLcmOpOcc
 	
-PUT stauts information about Individual NS LCM OP OCC - Method not implemented
+PUT status information about Individual NS LCM OP OCC - Method not implemented
      [Documentation]    Test ID: 5.3.2.9.3
-    ...    Test title: PUT stauts information about Individual NS LCM OP OCC - Method not implemented
+    ...    Test title: PUT status information about Individual NS LCM OP OCC - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.10.3.3 - SOL005 v2.4.1
@@ -45,9 +44,9 @@ PUT stauts information about Individual NS LCM OP OCC - Method not implemented
     PUT Individual NS LCM OP Occurence
     Check HTTP Response Status Code Is    405
 
-PATCH stauts information about Individual NS LCM OP OCC - Method not implemented
+PATCH status information about Individual NS LCM OP OCC - Method not implemented
      [Documentation]    Test ID: 5.3.2.9.4
-    ...    Test title: PATCH stauts information about Individual NS LCM OP OCC - Method not implemented
+    ...    Test title: PATCH status information about Individual NS LCM OP OCC - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.10.3.4 - SOL005 v2.4.1
@@ -57,9 +56,9 @@ PATCH stauts information about Individual NS LCM OP OCC - Method not implemented
     PATCH Individual NS LCM OP Occurence
     Check HTTP Response Status Code Is    405
 
-DELETE stauts information about Individual NS LCM OP OCC - Method not implemented
+DELETE status information about Individual NS LCM OP OCC - Method not implemented
          [Documentation]    Test ID: 5.3.2.9.5
-    ...    Test title: DELETE stauts information about Individual NS LCM OP OCC - Method not implemented
+    ...    Test title: DELETE status information about Individual NS LCM OP OCC - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.10.3.5 - SOL005 v2.4.1
diff --git a/SOL005/NSLifecycleManagement-API/InstanciateNSTaskWorkflow.robot b/SOL005/NSLifecycleManagement-API/InstanciateNSTaskWorkflow.robot
index 26c162559a780464b363c34b0e3552ca59b24b4b..f86496c39c73cd9f279d2d16e51dc19438f46b2b 100644
--- a/SOL005/NSLifecycleManagement-API/InstanciateNSTaskWorkflow.robot
+++ b/SOL005/NSLifecycleManagement-API/InstanciateNSTaskWorkflow.robot
@@ -10,6 +10,14 @@ Suite Teardown    Terminate All Processes    kill=true
 
 *** Test Cases ***
 Instantiate Flow of NS lifecycle management operations
+    [Documentation]    Test ID: 5.3.2.21
+    ...    Test title: Instantiate Flow of NS lifecycle management operations
+    ...    Test objective: The objective is to test the workflow for Instantiate a NS instance
+    ...    Pre-conditions: the resource is in NOT_INSTANTIATED state
+    ...    Reference: section 6.4.4 - SOL003 v2.4.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: the resource is in INSTANTIATED state
     Check resource existance
     Check resource not_instantiated
     POST Instatiate nsInstance
diff --git a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
index a22b64496740e65107381a8bab9f2b8f557e548e..fd1b42ed54981fca88335492093056e99b76733e 100644
--- a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
+++ b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
@@ -114,6 +114,27 @@ Check resource not_instantiated
     Get    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nsInstanceId} 
     String    response body instantiationState    NOT_INSTANTIATED
 
+Check resource has a temporary failure
+    Set Headers    {"Accept":"${ACCEPT}"}  
+    Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Get    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nsInstanceId} 
+    String    response body instantiationState    FAILED_TEMP 
+
+Check resource has not a temporary failure
+    Set Headers    {"Accept":"${ACCEPT}"}  
+    Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Get    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nsInstanceId} 
+    String    response body instantiationState  !=  FAILED_TEMP
+
+Check resource is finally failed
+    Set Headers    {"Accept":"${ACCEPT}"}  
+    Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Get    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nsInstanceId} 
+    String    response body instantiationState    FINALLY_FAILED 
+
 Launch another LCM operation
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
diff --git a/SOL005/NSLifecycleManagement-API/RetryOperationTask.robot b/SOL005/NSLifecycleManagement-API/RetryOperationTask.robot
index 7ac47b1f53ddeaeaa58a18c2d0b358496fdf7486..9d0996ee45c658c94cb6c47fb813d6a0fe7a9a01 100644
--- a/SOL005/NSLifecycleManagement-API/RetryOperationTask.robot
+++ b/SOL005/NSLifecycleManagement-API/RetryOperationTask.robot
@@ -20,7 +20,7 @@ Post Retry operation task
 	POST Retry operation task
 	Check HTTP Response Status Code Is    202
 	Check HTTP Response Header Contains    Location
-	Check resource not    FAILED_TEMP
+	Check resource has not a temporary failure
 	
 Post Retry operation task Not Found
     [Documentation]    Test ID: 5.3.2.10.2
diff --git a/SOL005/NSLifecycleManagement-API/RollbackOperationTask.robot b/SOL005/NSLifecycleManagement-API/RollbackOperationTask.robot
index 9f2598eb7b5d912a57752f75dba6a9a86ebb8546..1d2c490d45c9656f0f1111906d9c9b215cc2b356 100644
--- a/SOL005/NSLifecycleManagement-API/RollbackOperationTask.robot
+++ b/SOL005/NSLifecycleManagement-API/RollbackOperationTask.robot
@@ -19,7 +19,7 @@ Post Rollback operation task
     ...    Post-Conditions: NS instance status not equal to FAILED_TEMP    
 	POST Rollback operation task
 	Check HTTP Response Status Code Is    202
-
+    Check resource has not a temporary failure
 	
 Post Rollback operation task Not Found
     [Documentation]    Test ID: 5.3.2.11.2
diff --git a/SOL005/NSLifecycleManagement-API/ScaleNSTask.robot b/SOL005/NSLifecycleManagement-API/ScaleNSTask.robot
index 02f83863a1111632edf84ff7d6a0034e43beb0d4..edb5c64597572fd3a7205aa959b7a6cb896d5566 100644
--- a/SOL005/NSLifecycleManagement-API/ScaleNSTask.robot
+++ b/SOL005/NSLifecycleManagement-API/ScaleNSTask.robot
@@ -20,7 +20,8 @@ POST Scale a nsInstance
     POST scale nsInstance
     Check HTTP Response Status Code Is    202
     Check HTTP Response Header Contains    Location
-
+    Check resource existance
+    
 POST Instantiate a nsInstance Conflict
     [Documentation]    Test ID: 5.3.2.4.2
     ...    Test title: POST Instantiate a nsInstance Conflict
diff --git a/SOL005/NSLifecycleManagement-API/ScaleNSTaskWorkflow.robot b/SOL005/NSLifecycleManagement-API/ScaleNSTaskWorkflow.robot
index 82d2505535f0eac2712b522beb5b758f0c355d76..1dc390f84b9d498dc038ba28589e1ccb511b58a5 100644
--- a/SOL005/NSLifecycleManagement-API/ScaleNSTaskWorkflow.robot
+++ b/SOL005/NSLifecycleManagement-API/ScaleNSTaskWorkflow.robot
@@ -10,6 +10,14 @@ Suite Teardown    Terminate All Processes    kill=true
 
 *** Test Cases ***
 Scale Flow of NS lifecycle management operations
+    [Documentation]    Test ID: 5.3.2.22
+    ...    Test title: Instantiate Flow of NS lifecycle management operations
+    ...    Test objective: The objective is to test the workflow for Instantiate a NS instance
+    ...    Pre-conditions: the resource is in NOT_INSTANTIATED state
+    ...    Reference: section 6.4.5 - SOL003 v2.4.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: the resource is in INSTANTIATED state    
     Check resource existance
     Check resource instantiated
     POST scale nsInstance
diff --git a/SOL005/NSLifecycleManagement-API/TerminateNSTask.robot b/SOL005/NSLifecycleManagement-API/TerminateNSTask.robot
index 8cd3f4718476e735df7350cb07f7f72c8cb6cc0d..3c86f3460382313bbca3af742129ae21d336574a 100644
--- a/SOL005/NSLifecycleManagement-API/TerminateNSTask.robot
+++ b/SOL005/NSLifecycleManagement-API/TerminateNSTask.robot
@@ -5,7 +5,6 @@ Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}
 Library    OperatingSystem
 Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
-Suite Setup    Check resource existance
 
 *** Test Cases ***
 POST Terminate a NSInstance
@@ -20,7 +19,7 @@ POST Terminate a NSInstance
     POST Terminate NSInstance
     Check HTTP Response Status Code Is    202
     Check HTTP Response Header Contains    Location
-    Check resource     NOT_INSTANTIATED
+    Check resource not_instantiated
     
 POST Terminate a NSInstance Conflict
     [Documentation]    Test ID: 5.3.2.7.2
diff --git a/SOL005/NSLifecycleManagement-API/TerminateNSTaskWorkflow.robot b/SOL005/NSLifecycleManagement-API/TerminateNSTaskWorkflow.robot
index ee1882e6f46f0fc119b0c1cc1024b53fce70e9e5..53c95290126c9edd326241fe7fb5120b4969f3da 100644
--- a/SOL005/NSLifecycleManagement-API/TerminateNSTaskWorkflow.robot
+++ b/SOL005/NSLifecycleManagement-API/TerminateNSTaskWorkflow.robot
@@ -10,6 +10,14 @@ Suite Teardown    Terminate All Processes    kill=true
 
 *** Test Cases ***
 Terminate Flow of NS lifecycle management operations
+    [Documentation]    Test ID: 5.3.2.23
+    ...    Test title: Terminate Flow of NS lifecycle management operations
+    ...    Test objective: The objective is to test the workflow for Terminate a NS instance
+    ...    Pre-conditions: the resource is in INSTANTIATED state
+    ...    Reference: section 6.4.8 - SOL003 v2.4.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: the resource is in NOT_INSTANTIATED state
     Check resource existance
     Check resource instantiated
     POST Terminate NSInstance
diff --git a/SOL005/NSLifecycleManagement-API/UpdateNSTaskWorkflow.robot b/SOL005/NSLifecycleManagement-API/UpdateNSTaskWorkflow.robot
index d4e480edbb6a979afad48ea96f942eba3e64f244..7553a86f8de9ede99991f6e3b79fb6be36ece967 100644
--- a/SOL005/NSLifecycleManagement-API/UpdateNSTaskWorkflow.robot
+++ b/SOL005/NSLifecycleManagement-API/UpdateNSTaskWorkflow.robot
@@ -10,6 +10,14 @@ Suite Teardown    Terminate All Processes    kill=true
 
 *** Test Cases ***
 Update Flow of NS lifecycle management operations
+    [Documentation]    Test ID: 5.3.2.24
+    ...    Test title: Update Flow of NS lifecycle management operations
+    ...    Test objective: The objective is to test the workflow for Update a NS instance
+    ...    Pre-conditions: the resource is in INSTANTIATED state
+    ...    Reference: section 6.4.6 - SOL003 v2.4.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: the resource is in INSTANTIATED state
     Check resource existance
     Check resource instantiated
     POST Update NSInstance