diff --git a/SOL002/VNFFaultManagement-API/IndividualAlarm.robot b/SOL002/VNFFaultManagement-API/IndividualAlarm.robot
index 06d25b5cd627e5ac20b5f0b5985fd7a62733a017..68cda09827d5b042cc49974267724ac8f62b3137 100644
--- a/SOL002/VNFFaultManagement-API/IndividualAlarm.robot
+++ b/SOL002/VNFFaultManagement-API/IndividualAlarm.robot
@@ -70,7 +70,7 @@ PATCH Alarm
 PATCH Alarm - Precondition failed
     [Documentation]    Test ID: 6.3.4.2.5
     ...    Test title: PATCH Alarm - Precondition failed
-    ...    Test objective: The objective is to Modify an individual alarm resource
+    ...    Test objective: The objective is to attempt to Modify an individual alarm resource, where the precondition was not met
     ...    Pre-conditions: The related alarm exists
     ...    Reference: clause 7.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v2.4.1
     ...    Config ID: Config_prod_VNFM
diff --git a/SOL002/VNFFaultManagement-API/Subscriptions.robot b/SOL002/VNFFaultManagement-API/Subscriptions.robot
index 6da4fc3319a8ec3277dbeed4bc7605bee7c54825..ea28925cc88783a5ba95b8d9301ece1ff5038713 100644
--- a/SOL002/VNFFaultManagement-API/Subscriptions.robot
+++ b/SOL002/VNFFaultManagement-API/Subscriptions.robot
@@ -14,10 +14,11 @@ Create a new subscription
     ...    Reference: clause 7.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
-    ...    Post-Conditions: subscription is created
+    ...    Post-Conditions: Resource created successfully
     Post Create subscription
     Check HTTP Response Status Code Is    201
     Check HTTP Response Body Json Schema Is    FmSubscription
+    Check resource existance
 
 Create a new Subscription - DUPLICATION
      [Documentation]    Test ID: 6.3.4.4.2
@@ -286,4 +287,11 @@ Check HTTP Response Body Json Schema Is
     Should Contain    ${response['headers']['Content-Type']}    application/json
     ${schema} =    Catenate    SEPARATOR=    ${input}	.schema.json
     Validate Json    ${schema}    ${response['body']}
-    Log    Json Schema Validation OK  
\ No newline at end of file
+    Log    Json Schema Validation OK  
+    
+Check resource existance
+    Set Headers    {"Accept":"${ACCEPT}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Get    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId} 
+    Integer    response status    200
+
diff --git a/SOL002/VNFLifecycleManagement-API/IndividualVNFInstance.robot b/SOL002/VNFLifecycleManagement-API/IndividualVNFInstance.robot
index 9faeab3c13ddb1016e113693401a32afe52b150c..2f85514b5b27ba48cdafc066091940f682b35dbc 100644
--- a/SOL002/VNFLifecycleManagement-API/IndividualVNFInstance.robot
+++ b/SOL002/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: 6.3.5.2.3
@@ -136,7 +135,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
-SET etag
-    ${etag}    Output    response headers ETag
-    Set Suite Variable    ${original_etag}    ${etag}   
+    Integer    response status    202 
diff --git a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
index c9af09e7925b3de2ed13b16fbf7a88a9c9b92948..fe980a5e9cd683552160921094a7ce039faa0721 100644
--- a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
+++ b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
@@ -112,7 +112,7 @@ GET status information about multiple VNF LCM Operation OCC with "exclude_fields
     Check HTTP Response Body Json Schema Is    VnfLcmOpOccs    
     
 PUT status information about multiple VNF LCM operation occurrences - Method not implemented
-     [Documentation]    Test ID: 6.3.5.11.5
+     [Documentation]    Test ID: 6.3.5.11.9
     ...    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
@@ -124,7 +124,7 @@ PUT status information about multiple VNF LCM operation occurrences - Method not
     Check HTTP Response Status Code Is    405
 
 PATCH status information about multiple VNF LCM operation occurrences - Method not implemented
-    [Documentation]    Test ID: 6.3.5.11.6
+    [Documentation]    Test ID: 6.3.5.11.10
     ...    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
@@ -136,7 +136,7 @@ PATCH status information about multiple VNF LCM operation occurrences - Method n
     Check HTTP Response Status Code Is    405
 
 DELETE status information about multiple VNF LCM operation occurrences - Method not implemented
-    [Documentation]    Test ID: 6.3.5.11.7
+    [Documentation]    Test ID: 6.3.5.11.11
     ...    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
@@ -145,4 +145,4 @@ DELETE status information about multiple VNF LCM operation occurrences - Method
     ...    Applicability: none
     ...    Post-Conditions: none
     DELETE VNF LCM OP occurrences
-    Check HTTP Response Status Code Is    405
\ No newline at end of file
+    Check HTTP Response Status Code Is    405
diff --git a/SOL005/NSDManagement-API/PNFDContent.robot b/SOL005/NSDManagement-API/PNFDContent.robot
index ae0ac97068ba67b5db4e3badfd48f90b15332203..a3b3458bfd8d090fbcb1d519aa215370aef950e1 100644
--- a/SOL005/NSDManagement-API/PNFDContent.robot
+++ b/SOL005/NSDManagement-API/PNFDContent.robot
@@ -53,7 +53,7 @@ Upload PNFD Content as plain text file
     ...    Test title: Upload PNFD Content as plain text file
     ...    Test objective: The objective is to test the upload of a PNFD Content in plain text format.
     ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
-    ...    Reference: clause 5.4.7.3.4 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.7.3.3 - ETSI GS NFV-SOL 005 [3] v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The uploaded PNFD content is available in the NFVO
@@ -67,7 +67,7 @@ Upload PNFD Content with conflict due to onboarding state
     ...    Test title: Upload PNFD Content with conflict due to onboarding state
     ...    Test objective: The objective is to test that the upload of the PNFD Content fails due to a conflict when the PNFD is not in onboarding state CREATED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: The onboarding state of the PNFD for which the PNFD Content is requested is different from CREATED.
-    ...    Reference: clause 5.4.7.3.4 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 5.4.7.3.3 - ETSI GS NFV-SOL 005 [3] v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL005/NSLifecycleManagement-API/ContinueOperationTask.robot b/SOL005/NSLifecycleManagement-API/ContinueOperationTask.robot
index 2d9f11583ae7c7439b5c7eba2da8f9aeea0bf34f..034b3649795bc5bb5584ef35aa2c7454959a1b2e 100644
--- a/SOL005/NSLifecycleManagement-API/ContinueOperationTask.robot
+++ b/SOL005/NSLifecycleManagement-API/ContinueOperationTask.robot
@@ -60,7 +60,7 @@ GET Continue operation task - Method not implemented
 	Check HTTP Response Status Code Is    405	
 	
 PUT Continue operation task - Method not implemented
-    [Documentation]    Test ID: 5.3.2.13.5
+    [Documentation]    Test ID: 5.3.2.12.5
     ...    Test title: PUT Continue operation task - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
@@ -72,11 +72,11 @@ PUT Continue operation task - Method not implemented
     Check HTTP Response Status Code Is    405
 
 PATCH Continue operation task - Method not implemented
-    [Documentation]    Test ID: 5.3.2.13.5
+    [Documentation]    Test ID: 5.3.2.12.6
     ...    Test title: PATCH Continue operation task - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: clause 6.4.14.3.4 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 6.4.13.3.4 - ETSI GS NFV-SOL 005 [3] v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -84,11 +84,11 @@ PATCH Continue operation task - Method not implemented
     Check HTTP Response Status Code Is    405
 
 DELETE Continue operation task - Method not implemented
-        [Documentation]    Test ID: 5.3.2.13.5
+        [Documentation]    Test ID: 5.3.2.12.7
     ...    Test title: DELETE Continue operation task - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: clause 6.4.14.3.5 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 6.4.13.3.5 - ETSI GS NFV-SOL 005 [3] v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -96,4 +96,4 @@ DELETE Continue operation task - Method not implemented
     Check HTTP Response Status Code Is    405
     
 
-	
\ No newline at end of file
+	
diff --git a/SOL005/NSLifecycleManagement-API/Subscriptions.robot b/SOL005/NSLifecycleManagement-API/Subscriptions.robot
index a7235f29ffdae62c2e6bb660776313f59e21bd9b..c6343a16972e9d01bc10ea4ca0813d81550265c7 100644
--- a/SOL005/NSLifecycleManagement-API/Subscriptions.robot
+++ b/SOL005/NSLifecycleManagement-API/Subscriptions.robot
@@ -141,7 +141,7 @@ GET subscriptions with "exclude_fields" attribute selector
     Check HTTP Response Body Json Schema Is   FmSubscriptions  
         
 PUT subscriptions - Method not implemented
-     [Documentation]    Test ID: 5.3.2.15.7
+     [Documentation]    Test ID: 5.3.2.15.11
     ...    Test title: PUT subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PUT method cannot modify a NS lifecycle management subscription
     ...    Pre-conditions: none
@@ -153,7 +153,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.8
+    [Documentation]    Test ID: 5.3.2.15.12
     ...    Test title: PATCH subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PUT method cannot modify a NS lifecycle management subscription
     ...    Pre-conditions: none
@@ -165,7 +165,7 @@ PATCH subscriptions - Method not implemented
     Check HTTP Response Status Code Is    405
 
 DELETE subscriptions - Method not implemented
-    [Documentation]    Test ID: 5.3.2.15.9
+    [Documentation]    Test ID: 5.3.2.15.13
     ...    Test title: DELETE subscriptions - Method not implemented
     ...    Test objective: The objective is to test that DELETE method cannot modify a NS lifecycle management subscription
     ...    Pre-conditions: none