diff --git a/SOL002/VNFLifecycleManagement-API/IndividualVNFInstance.robot b/SOL002/VNFLifecycleManagement-API/IndividualVNFInstance.robot
index 2f85514b5b27ba48cdafc066091940f682b35dbc..c2db6cbb3d0e5f36750faa972fd0de25fffa3ec8 100644
--- a/SOL002/VNFLifecycleManagement-API/IndividualVNFInstance.robot
+++ b/SOL002/VNFLifecycleManagement-API/IndividualVNFInstance.robot
@@ -67,7 +67,7 @@ PATCH Individual VNFInstance Precondition failed
     [Documentation]    Test ID: 6.3.5.2.5
     ...    Test title: PATCH Individual VNFInstance Precondition failed
     ...    Test objective: The objective is to create a new VNF instance resource
-    ...    Pre-conditions:  A precondition given in an HTTP request header is not fulfilled. Typically, this is due to an ETag mismatch, indicating that the resource was modified by another entity
+    ...    Pre-conditions: VNF Instance is Created
     ...    Reference: clause 5.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v2.4.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: 
diff --git a/SOL002/VNFLifecycleManagement-API/Subscriptions.robot b/SOL002/VNFLifecycleManagement-API/Subscriptions.robot
index d36fd9da2d6b909a20a40084da751b478614fc2d..05fbdda02196c734e16c936b53abc4db99d592c1 100644
--- a/SOL002/VNFLifecycleManagement-API/Subscriptions.robot
+++ b/SOL002/VNFLifecycleManagement-API/Subscriptions.robot
@@ -27,7 +27,7 @@ POST Create a new Subscription - DUPLICATION
     ...    Pre-conditions: none
     ...    Reference: clause 5.4.18.3.1 - ETSI GS NFV-SOL 002 [2] v2.4.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: none
+    ...    Applicability: SUT should support duplication of subscription creation
     ...    Post-Conditions: in response header Location shall not be null
     ...    POST Cancel operation task
     Post Create subscription - DUPLICATION
@@ -41,7 +41,7 @@ POST Create a new Subscription - NO-DUPLICATION
     ...    Pre-conditions: none
     ...    Reference: clause 5.4.18.3.1 - ETSI GS NFV-SOL 002 [2] v2.4.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: none
+    ...    Applicability: SUT should not support duplication of subscription creation
     ...    Post-Conditions: in response header Location shall not be null
     ...    POST Cancel operation task
     Post Create subscription - NO-DUPLICATION
@@ -170,7 +170,7 @@ DELETE subscriptions - Method not implemented
     ...    Reference: clause 5.4.18.3.5 - ETSI GS NFV-SOL 002 [2] v2.4.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
-    ...    Post-Conditions: none 
+    ...    Post-Conditions: check that resources are not deleted
     DELETE subscriptions
 	Check HTTP Response Status Code Is    405
     
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot b/SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot
index a0de19877fb41fceee4e0ecc587b43cf3a53305e..f60fef9e7344603db13c4f155c13979d67b10099 100644
--- a/SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot
+++ b/SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot
@@ -37,7 +37,6 @@ Get Information about an individual VNF Instance
     GET individual vnfInstance
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    vnfInstance
-    SET etag
     
 PUT Individual VNFInstance - Method not implemented 
     [Documentation]    Test ID: 7.3.1.2.3
@@ -68,7 +67,7 @@ PATCH Individual VNFInstance Precondition failed
      [Documentation]    Test ID: 7.3.1.2.5
     ...    Test title: PATCH Individual VNFInstance Precondition failed
     ...    Test objective: The objective is to create a new VNF instance resource
-    ...    Pre-conditions:  ETag mismatch
+    ...    Pre-conditions:  VNF Instance created (Test ID 7.3.1.2.2)
     ...    Reference: clause 5.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
@@ -110,10 +109,11 @@ DELETE Individual VNFInstance Conflict
     ...    Reference: clause 5.4.3.3.5 - ETSI GS NFV-SOL 003 [1] v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Post-Conditions: Resources are not deleted
     DELETE individual vnfInstance
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails
+    Check resource existence
     
 *** Keywords ***
 Check resource existence
diff --git a/SOL003/VNFLifecycleManagement-API/ScaleVNFTask.robot b/SOL003/VNFLifecycleManagement-API/ScaleVNFTask.robot
index 6d5d5e302588cd0f9a2cba797664685f81944b97..2ec765914d3c786a1494a498678b3902eb0e26a7 100644
--- a/SOL003/VNFLifecycleManagement-API/ScaleVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/ScaleVNFTask.robot
@@ -13,7 +13,7 @@ POST Scale a vnfInstance
     [Documentation]    Test ID: 7.3.1.4.1
     ...    Test title: POST Scale a vnfInstance
     ...    Test objective: The objective is to scale a VNF instance
-    ...    Pre-conditions: none
+    ...    Pre-conditions: VNF instance resource is in INSTANTIATED state
     ...    Reference: clause 5.4.5.3.1 - ETSI GS NFV-SOL 003 [1] v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
@@ -94,9 +94,10 @@ DELETE Scale VNFInstance - Method not implemented
     ...    Reference: clause 5.4.5.3.5 - ETSI GS NFV-SOL 003 [1] v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Post-Conditions: Resource are not deleted
     DELETE Scale vnfInstance
     Check HTTP Response Status Code Is    405
+    Check resource existence
 
 *** Keywords ***
 Check resource existence
@@ -126,4 +127,4 @@ Launch another LCM operation
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${body}=    Get File    jsons/scaleVnfToLevelRequest.json
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale_to_level    ${body}
-    Integer    response status    202
\ No newline at end of file
+    Integer    response status    202
diff --git a/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot b/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
index 6fa08f91f2a2842fe8f7ea8a55468077f1f8eb34..17db5612f951f221e8966dd8e14cd8d79ee0ecf0 100644
--- a/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
@@ -12,7 +12,7 @@ POST Scale a vnfInstance to level
     [Documentation]    Test ID: 7.3.1.5.1
     ...    Test title: POST Scale a vnfInstance to level
     ...    Test objective: The objective is to scale a VNF instance to a target level.
-    ...    Pre-conditions: none
+    ...    Pre-conditions: VNF is Instantiated
     ...    Reference: clause 5.4.6.3.1 - ETSI GS NFV-SOL 003 [1] v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
@@ -95,9 +95,10 @@ DELETE Scale to level VNFInstance - Method not implemented
     ...    Reference: clause 5.4.6.3.5 - ETSI GS NFV-SOL 003 [1] v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Post-Conditions: Resources are not deleted
     DELETE Scale vnfInstance to level
     Check HTTP Response Status Code Is    405
+    Check resource existence
 
 *** Keywords ***
 Check resource existence
@@ -127,4 +128,4 @@ Launch another LCM operation
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${body}=    Get File    jsons/scaleVnfRequest.json
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale    ${body}
-    Integer    response status    202
\ No newline at end of file
+    Integer    response status    202
diff --git a/SOL003/VNFLifecycleManagement-API/TerminateVNFTask.robot b/SOL003/VNFLifecycleManagement-API/TerminateVNFTask.robot
index a4f2fe2cdc41626d7be0b0e9d1724aafb8fc5cc0..fee7462766331a2041a2ed81b44b6c69e2237b07 100644
--- a/SOL003/VNFLifecycleManagement-API/TerminateVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/TerminateVNFTask.robot
@@ -13,7 +13,7 @@ POST Terminate a vnfInstance
     [Documentation]    Test ID: 7.3.1.7.1
     ...    Test title: POST Terminate a vnfInstance
     ...    Test objective: The objective is to test that POST method terminate a VNF instance
-    ...    Pre-conditions: none
+    ...    Pre-conditions: Resource state is INSTANTIATED
     ...    Reference: clause 5.4.8.3.1 - ETSI GS NFV-SOL 003 [1] v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
@@ -112,4 +112,4 @@ Launch another LCM operation
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${body}=    Get File    jsons/scaleVnfRequest.json
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale    ${body}
-    Integer    response status    202
\ No newline at end of file
+    Integer    response status    202
diff --git a/SOL003/VNFLifecycleManagement-API/VNFInstances.robot b/SOL003/VNFLifecycleManagement-API/VNFInstances.robot
index e0b5a40b547550658ceb9800a722369d06bd5e52..b0729e238be4ca8a274699a663404ca4067c5786 100644
--- a/SOL003/VNFLifecycleManagement-API/VNFInstances.robot
+++ b/SOL003/VNFLifecycleManagement-API/VNFInstances.robot
@@ -102,7 +102,7 @@ GET information about multiple VNF instances with "fields" attribute selector
     Check HTTP Response Body Json Schema Is    vnfInstances
 
 GET information about multiple VNF instances with "exclude_fields" attribute selector
-    [Documentation]    Test ID: 7.3.1.1.7
+    [Documentation]    Test ID: 7.3.1.1.8
     ...    Test title: GET information about multiple VNF instances with "exclude_fields" attribute selector
     ...    Test objective: The objective is to query information about multiple VNF instances
     ...    Pre-conditions:  
@@ -115,7 +115,7 @@ GET information about multiple VNF instances with "exclude_fields" attribute sel
     Check HTTP Response Body Json Schema Is    vnfInstances  
   
 PUT multiples VNFInstances - Method not implemented
-    [Documentation]    Test ID: 7.3.1.1.5
+    [Documentation]    Test ID: 7.3.1.1.9
     ...    Test title: PUT multiples VNFInstances - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions:  
@@ -127,7 +127,7 @@ PUT multiples VNFInstances - Method not implemented
 	Check HTTP Response Status Code Is    405
 	
 PATCH multiples VNFInstances - Method not implemented
-    [Documentation]    Test ID: 7.3.1.1.6
+    [Documentation]    Test ID: 7.3.1.1.10
     ...    Test title: PATCH multiples VNFInstances - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions:  
@@ -139,13 +139,16 @@ PATCH multiples VNFInstances - Method not implemented
 	Check HTTP Response Status Code Is    405
 
 DELETE VNFInstances - Method not implemented
-    [Documentation]    Test ID: 7.3.1.1.7
+    [Documentation]    Test ID: 7.3.1.1.11
     ...    Test title: DELETE multiples VNFInstances - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions:  
     ...    Reference: clause 5.4.2.3.5 - ETSI GS NFV-SOL 003 [1] v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Post-Conditions: resources are not deleted
     DELETE multiple vnfInstances
 	Check HTTP Response Status Code Is    405
+	Verify Resources not Deleted
+	
+	
diff --git a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
index f94a5510c83efaa5592d954b527bf5ec6aa55779..c3f4267a8b95a413900c3bc0e904e34bbc94ea06 100644
--- a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
+++ b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
@@ -1147,4 +1147,8 @@ GET test endpoint
     Create Mock Expectation  ${req}  ${rsp}
     Sleep  ${sleep_interval}
     Verify Mock Expectation  ${req}
-    Clear Requests  ${callback_endpoint}    	    	
\ No newline at end of file
+    Clear Requests  ${callback_endpoint}    	 
+Verify Resources not Deleted  
+    GET multiple vnfInstances
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is    vnfInstances 	
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleOperationGranting-API/Grants.robot b/SOL003/VNFLifecycleOperationGranting-API/Grants.robot
index c9abf0d887c0121e5b3e31dd443c00362ccc61ea..c3e0124312227448dbfeb42190ffecce14c8393d 100644
--- a/SOL003/VNFLifecycleOperationGranting-API/Grants.robot
+++ b/SOL003/VNFLifecycleOperationGranting-API/Grants.robot
@@ -47,7 +47,7 @@ Requests a grant for a particular VNF lifecycle operation - Forbidden
     [Documentation]    Test ID: 7.3.2.1.3
     ...    Test title: Requests a grant for a particular VNF lifecycle operation - Forbidden 
     ...    Test objective: The objective is to request a grant for a particular VNF lifecycle operation and check the content of the problem details data structure returned
-    ...    Pre-conditions: The grant should not be accorded
+    ...    Pre-conditions: none
     ...    Reference: clause 9.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
@@ -100,9 +100,10 @@ DELETE Grants - Method not implemented
     ...    Reference: clause 9.4.2.3.5 - ETSI GS NFV-SOL 003 [1] v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: none
+    ...    Post-Conditions:  resources are not deleted
     Delete Grants
     Check HTTP Response Status Code Is    405
+    Get an individual grant - Successful
     
 *** Keywords ***
 Wait for individual grant successful notification
@@ -214,4 +215,4 @@ Delete Grants
     ${body}=    Output    response
     Set Suite Variable    &{response}    ${body}
     
-    
\ No newline at end of file
+    
diff --git a/SOL005/NSLifecycleManagement-API/CreateNSInstanceWorkflow.robot b/SOL005/NSLifecycleManagement-API/CreateNSInstanceWorkflow.robot
index db919f10f424613dd2394dff5d8d97a520526c07..348e7e873e4c07005c0b51d08553b8a420bc7ff8 100644
--- a/SOL005/NSLifecycleManagement-API/CreateNSInstanceWorkflow.robot
+++ b/SOL005/NSLifecycleManagement-API/CreateNSInstanceWorkflow.robot
@@ -10,7 +10,7 @@ Library    JSONSchemaLibrary    schemas/
 *** Test Cases ***
 
 NS Instance Creation
-    [Documentation]    Test ID: 5.3.2.17
+    [Documentation]    Test ID: 5.3.2.18.1
     ...    Test title: NS Instance Creation
     ...    Test objective: The objective is to test the workflow for Creating a NS instance
     ...    Pre-conditions: none
diff --git a/SOL005/NSLifecycleManagement-API/DeleteNSInstanceWorkflow.robot b/SOL005/NSLifecycleManagement-API/DeleteNSInstanceWorkflow.robot
index 38ca80c7f4900674b792245d3e861afb8c19ea28..157fd663972f72c1a0b1084100f9dedb8d29890f 100644
--- a/SOL005/NSLifecycleManagement-API/DeleteNSInstanceWorkflow.robot
+++ b/SOL005/NSLifecycleManagement-API/DeleteNSInstanceWorkflow.robot
@@ -8,14 +8,14 @@ Library    JSONSchemaLibrary    schemas/
 
 *** Test Cases ***
 NS Instance Deletion
-    [Documentation]    Test ID: 5.3.2.18
+    [Documentation]    Test ID: 5.3.2.18.2
     ...    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: clause 6.3.2 - ETSI GS NFV-SOL 005 [3] v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: none
+    ...    Post-Conditions: Resource should be deleted
     Check resource not_instantiated
     DELETE IndividualNSInstance
     Check HTTP Response Status Code Is    204
diff --git a/SOL005/NSLifecycleManagement-API/HealNSTaskWorkflow.robot b/SOL005/NSLifecycleManagement-API/HealNSTaskWorkflow.robot
index 5f9018bb4a7c3a286f215c08dac2f84d12a097e7..f6fbfad56f5d759af67c66d98be557a54a6a6bb2 100644
--- a/SOL005/NSLifecycleManagement-API/HealNSTaskWorkflow.robot
+++ b/SOL005/NSLifecycleManagement-API/HealNSTaskWorkflow.robot
@@ -10,7 +10,7 @@ Suite Teardown    Terminate All Processes    kill=true
 
 *** Test Cases ***
 Heal Flow of NS lifecycle management operations
-     [Documentation]    Test ID: 5.3.2.19
+     [Documentation]    Test ID: 5.3.2.18.3
     ...    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
diff --git a/SOL005/NSLifecycleManagement-API/InstanciateNSTaskWorkflow.robot b/SOL005/NSLifecycleManagement-API/InstanciateNSTaskWorkflow.robot
index 8535a8a82724bdc31ad7be1dd23596b336cfbe86..2ef539a46a259d5a125cc38f3aa957aa20352345 100644
--- a/SOL005/NSLifecycleManagement-API/InstanciateNSTaskWorkflow.robot
+++ b/SOL005/NSLifecycleManagement-API/InstanciateNSTaskWorkflow.robot
@@ -10,7 +10,7 @@ Suite Teardown    Terminate All Processes    kill=true
 
 *** Test Cases ***
 Instantiate Flow of NS lifecycle management operations
-    [Documentation]    Test ID: 5.3.2.20
+    [Documentation]    Test ID: 5.3.2.18.4
     ...    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
diff --git a/SOL005/NSLifecycleManagement-API/ScaleNSTaskWorkflow.robot b/SOL005/NSLifecycleManagement-API/ScaleNSTaskWorkflow.robot
index eb1445037ec29f0ac1bfa51a7635497132e7acea..2624d99497bec649f3fe56586a942991bbdc3b9e 100644
--- a/SOL005/NSLifecycleManagement-API/ScaleNSTaskWorkflow.robot
+++ b/SOL005/NSLifecycleManagement-API/ScaleNSTaskWorkflow.robot
@@ -10,7 +10,7 @@ Suite Teardown    Terminate All Processes    kill=true
 
 *** Test Cases ***
 Scale Flow of NS lifecycle management operations
-    [Documentation]    Test ID: 5.3.2.21
+    [Documentation]    Test ID: 5.3.2.18.5
     ...    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
diff --git a/SOL005/NSLifecycleManagement-API/TerminateNSTaskWorkflow.robot b/SOL005/NSLifecycleManagement-API/TerminateNSTaskWorkflow.robot
index 05681f5ccc58235e04a7079462f1b59102d5d781..383cec244923f4fbe6a1430bc8bff191872e750c 100644
--- a/SOL005/NSLifecycleManagement-API/TerminateNSTaskWorkflow.robot
+++ b/SOL005/NSLifecycleManagement-API/TerminateNSTaskWorkflow.robot
@@ -10,7 +10,7 @@ Suite Teardown    Terminate All Processes    kill=true
 
 *** Test Cases ***
 Terminate Flow of NS lifecycle management operations
-    [Documentation]    Test ID: 5.3.2.22
+    [Documentation]    Test ID: 5.3.2.18.6
     ...    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
diff --git a/SOL005/NSLifecycleManagement-API/UpdateNSTaskWorkflow.robot b/SOL005/NSLifecycleManagement-API/UpdateNSTaskWorkflow.robot
index 844a85b8db5761cc35d3531f086ad6fb1a51a512..de681d761bd0fbdd46c7cbb28da930e04ec5d0a9 100644
--- a/SOL005/NSLifecycleManagement-API/UpdateNSTaskWorkflow.robot
+++ b/SOL005/NSLifecycleManagement-API/UpdateNSTaskWorkflow.robot
@@ -10,7 +10,7 @@ Suite Teardown    Terminate All Processes    kill=true
 
 *** Test Cases ***
 Update Flow of NS lifecycle management operations
-    [Documentation]    Test ID: 5.3.2.23
+    [Documentation]    Test ID: 5.3.2.18.7
     ...    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