diff --git a/SOL002/VNFConfiguration-API/Configuration.robot b/SOL002/VNFConfiguration-API/Configuration.robot
index ab7b4a62a50a52743d260c87bf4119c951e21d1f..3120ea30d65c71e2e09da4afc2940914b60cdfb5 100644
--- a/SOL002/VNFConfiguration-API/Configuration.robot
+++ b/SOL002/VNFConfiguration-API/Configuration.robot
@@ -8,14 +8,14 @@ Library    DependencyLibrary
 
 *** Test Cases ***
 Set new VNF Configuration
-    [Documentation]    Test ID: 6.3.1
+    [Documentation]    Test ID: 6.3.1.1.1
     ...    Test title: Set a new VNF Configuration
-    ...    Test objective: The objective is to test the creation of a new VNF configuration
-    ...    Pre-conditions: A VNF instance is up and running
-    ...    Reference: section 9.4.2 - SOL002 v2.4.1
+    ...    Test objective: The objective is to test the creation of a new VNF configuration and perform a JSON schema validation of the returned configuration data structure
+    ...    Pre-conditions: A VNF instance is instantiated
+    ...    Reference:  section 9.4.2.3.4 - SOL002 v2.4.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation of HTTP Etag opaque identifiers
-    ...    Post-Conditions: The VNF configuration is set
+    ...    Post-Conditions: The configuration is successfully set in the VNF and it matches the issued configuration
     Send VNF configuration
     Check HTTP Response Status Code Is    200
     Check HTTP Response Header Contains    Etag
@@ -24,88 +24,84 @@ Set new VNF Configuration
 
 Get information about a VNF configuration
     [Tags]    no-etag
-    [Documentation]    Test ID: 6.3.2
+    [Documentation]    Test ID: 6.3.1.1.2
     ...    Test title: Get information about a VNF configuration
-    ...    Test objective: The objective is to test the retrieval of an existing VNF instance configuration
-    ...    Pre-conditions: A VNF instance is up and running. The VNF instance is already configured (Test ID 6.3.1)
-    ...    Reference: section 9.4.2 - SOL002 v2.4.1
+    ...    Test objective: The objective is to test the retrieval of an existing VNF instance configuration and perform a JSON schema validation of the collected configuration data structure
+    ...    Pre-conditions: A VNF instance is instantiated. The VNF instance is already configured.
+    ...    Reference: section 9.4.2.3.2 - SOL002 v2.4.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
-    ...    Post-Conditions: The VNF configuration is not modified by the operation
+    ...    Post-Conditions: none
     Get VNF configuration
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is   vnfConfiguration.schema.json
-    Check Postcondition VNF Configuration Untouched (Implicit)
 
-Get information about a VNF configuration - with HTTP Etag
+Get information about a VNF configuration with HTTP Etag
     [Tags]    etag
-    [Documentation]    Test ID: 6.3.3
+    [Documentation]    Test ID: 6.3.1.1.3
     ...    Test title: Get information about a VNF configuration with HTTP Etag
-    ...    Test objective: The objective is to test the retrieval of an existing VNF instance configuration with usage of HTTP Etag
-    ...    Pre-conditions: A VNF instance is up and running. The VNF instance is already configured (Test ID 6.3.1)
-    ...    Reference: section 9.4.2 - SOL002 v2.4.1
+    ...    Test objective: The objective is to test the retrieval of an existing VNF instance configuration, check the generation by the VNF of an HTTP Etag opaque identifier, and perform a JSON schema validation of the collected configuration data structure
+    ...    Pre-conditions:  A VNF instance is instantiated. The VNF instance is already configured
+    ...    Reference:  section 9.4.2.3.2 - SOL002 v2.4.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation of HTTP Etag opaque identifiers
-    ...    Post-Conditions: The VNF configuration is not modified by the operation
+    ...    Post-Conditions: none
     Get VNF configuration
     Check HTTP Response Status Code Is    200
     Check HTTP Response Header Contains    Etag
     Check HTTP Response Body Json Schema Is   vnfConfiguration.schema.json
-    Check Postcondition VNF Configuration Untouched (Implicit)
 
-Set new VNF Configuration - HTTP Etag precondition failed
+Set new VNF Configuration - HTTP Etag precondition unsuccessful
     [Tags]    etag
-    [Documentation]    Test ID: 6.3.4
-    ...    Test title: Set a new VNF Configuration - HTTP Etag precondition failed
-    ...    Test objective: The objective is to test the failure in setting a duplication of VNF configuration identified by an already used HTTP Etag identifier.
-    ...    Pre-conditions: A VNF instance is up and running. The VNF instance is already configured (Test ID 6.3.1) with a given HTTP Etag identifier.
-    ...    Reference: section 9.4.2 - SOL002 v2.4.1
+    [Documentation]    Test ID: 6.3.1.1.4
+    ...    Test title: Set a new VNF Configuration - HTTP Etag precondition unsuccessful
+    ...    Test objective: The objective is to test the unsuccess in setting a duplication of VNF configuration identified by an already used HTTP Etag identifier. The test also checks the JSON schema of the unsuccessful operation HTTP response.
+    ...    Pre-conditions:  A VNF instance is instantiated. The VNF instance is already configured (Test ID 6.3.1.1.1) with a given HTTP Etag identifier.
+    ...    Reference:  section 9.4.2.3.4 - SOL002 v2.4.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation of HTTP Etag opaque identifiers
-    ...    Post-Conditions:  The VNF configuration is not modified by the operation
+    ...    Post-Conditions:  The VNF configuration is not modified by the unsuccessful operation and it matches the configuration issued in Test ID 6.3.1.1.1
     Send Duplicated VNF configuration
     Check HTTP Response Status Code Is    412
     Check HTTP Response Body Json Schema Is   ProblemDetails
-    Check Postcondition VNF Configuration Untouched (Implicit)
+    Check Postcondition VNF Configuration Unmodified (Implicit)
 
 POST VNF Configuration - Method not implemented
-    [Documentation]    Test ID: 6.3.5
+    [Documentation]    Test ID: 6.3.1.1.5
     ...    Test title: POST VNF Configuration - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new VNF configuration
-    ...    Pre-conditions: A VNF instance is up and running. The VNF instance is already configured (Test ID 6.3.1)
-    ...    Reference: section 9.4.2 - SOL002 v2.4.1
+    ...    Pre-conditions: A VNF instance is instantiated. The VNF instance is alrseady configured
+    ...    Reference: section 9.4.2.3.1 - SOL002 v2.4.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
-    ...    Post-Conditions: The VNF configuration is not modified by the operation
+    ...    Post-Conditions: none
     Send POST Request for VNF Configuration
-    Check HTTP Response Status Code Is    405
-    Check Postcondition VNF Configuration Untouched (Implicit)    
+    Check HTTP Response Status Code Is    405 
 
 PUT VNF Configuration - Method not implemented
-    [Documentation]    Test ID: 6.3.6
+    [Documentation]    Test ID: 6.3.1.1.6
     ...    Test title: PUT VNF Configuration - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify an existing VNF configuration
-    ...    Pre-conditions: A VNF instance is up and running. The VNF instance is already configured (Test ID 6.3.1)
-    ...    Reference: section 9.4.2 - SOL002 v2.4.1
+    ...    Pre-conditions:  A VNF instance is instantiated. The VNF instance is already configured
+    ...    Reference: section 9.4.2.3.3 - SOL002 v2.4.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
-    ...    Post-Conditions: The VNF configuration is not modified by the operation
+    ...    Post-Conditions: none
     Send PUT Request for VNF Configuration
     Check HTTP Response Status Code Is    405
-    Check Postcondition VNF Configuration Untouched (Implicit)   
 
 DELETE VNF Configuration - Method not implemented
-    [Documentation]    Test ID: 6.3.7
+    [Documentation]    Test ID: 6.3.1.1.7
     ...    Test title: Delete VNF Configuration - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete an existing VNF configuration
-    ...    Pre-conditions: A VNF instance is up and running. The VNF instance is already configured (Test ID 6.3.1)
-    ...    Reference: section 9.4.2 - SOL002 v2.4.1
+    ...    Pre-conditions:  A VNF instance is instantiated. The VNF instance is already configured
+    ...    Reference: section 9.4.2.3.5 - SOL002 v2.4.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
-    ...    Post-Conditions: The VNF configuration is not modified by the operation
+    ...    Post-Conditions: The VNF configuration is not deleted by the unsuccessful operation
     Send DELETE Request for VNF Configuration
     Check HTTP Response Status Code Is    405
-    Check Postcondition VNF Configuration Untouched (Implicit)
+    Check Postcondition VNF Configuration Exists
     
 *** Keywords ***    
 Get VNF configuration
@@ -146,9 +142,13 @@ Check HTTP Response Body Json Schema Is
     Validate Json    ${schema}    ${response[0]['body']}
     Log    Json Schema Validation OK
       
-Check Postcondition VNF Configuration Untouched (Implicit)
+Check Postcondition VNF Configuration Unmodified (Implicit)
     Log    Check Implicit Postcondition
     Check Postcondition VNF Is Configured
+
+Check Postcondition VNF Configuration Exists
+    Log    Check Postcondition VNF exists
+    Check Postcondition VNF Is Configured
     
 Check Postcondition VNF Is Configured
     Log    Check Postcondition for VNF Configuration