diff --git a/SOL009/NFVManoConfigurationAndInformationManagement-API/ChangeInterfaceStateTask.robot b/SOL009/NFVManoConfigurationAndInformationManagement-API/ChangeInterfaceStateTask.robot
index 62b6383552e0e55e22b3c6c285b124eb3e57762e..76278ffc64558919c759ab652343ace881ea0f43 100644
--- a/SOL009/NFVManoConfigurationAndInformationManagement-API/ChangeInterfaceStateTask.robot
+++ b/SOL009/NFVManoConfigurationAndInformationManagement-API/ChangeInterfaceStateTask.robot
@@ -12,11 +12,11 @@ POST Change interface state task
     [Documentation]    Test ID: 8.3.1.7.1
     ...    Test title: POST Change interface state task
     ...    Test objective: The objective is send put request to change the state of the NFV-MANO service interface produced by the NFV-MANO functional entity
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: clause 5.5.12.3.1 - ETSI GS NFV-SOL 009 [5] V3.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     Send Post request for Change interface state task
     Check HTTP Response Status Code Is    202
     Check Operation Occurrence Id
@@ -25,24 +25,24 @@ POST Change interface state task - Conflict
     [Documentation]    Test ID: 8.3.1.7.2
     ...    Test title: POST Change interface state task - Conflict
     ...    Test objective: The objective is to test that request to cchange the state of the NFV-MANO service interface produced by the NFV-MANO functional entity failed due to a conflict with the state of the NFV-MANO entity resource and perform the JSON schema validation of the failed operation HTTP response.
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: clause 5.5.12.3.1 - ETSI GS NFV-SOL 009 [5] V3.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     Send Post request for Change interface state task
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is   ProblemDetails
     
-GET Change interface state task - Conflict - Method not implemented
+GET Change interface state task - Method not implemented
     [Documentation]    Test ID: 8.3.1.7.3
-    ...    Test title: GET Change interface state task - Conflict - Method not implemented
+    ...    Test title: GET Change interface state task - Method not implemented
     ...    Test objective: The objective is to test that GET method is not allowed to retrieve the changed state of the NFV-MANO functional entity application.
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: clause 5.5.12.3.2 - ETSI GS NFV-SOL 009 [5] V3.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     Send Get request for Change interface state task
     Check HTTP Response Status Code Is    405
     
@@ -50,11 +50,11 @@ PUT Change interface state task - Conflict - Method not implemented
     [Documentation]    Test ID: 8.3.1.7.4
     ...    Test title: PUT Change interface state task - Conflict - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to update the changed state of the NFV-MANO functional entity application.
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: clause 5.5.12.3.3 - ETSI GS NFV-SOL 009 [5] V3.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     Send Put request for Change interface state task
     Check HTTP Response Status Code Is    405
     
@@ -62,11 +62,11 @@ PATCH Change interface state task - Conflict - Method not implemented
     [Documentation]    Test ID: 8.3.1.7.5
     ...    Test title: PATCH Change interface state task - Conflict - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update the changed state of the NFV-MANO functional entity application.
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: clause 5.5.12.3.4 - ETSI GS NFV-SOL 009 [5] V3.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     Send Patch request for Change interface state task
     Check HTTP Response Status Code Is    405
     
@@ -74,10 +74,10 @@ DELETE Change interface state task - Conflict - Method not implemented
     [Documentation]    Test ID: 8.3.1.7.6
     ...    Test title: DELETE Change interface state task - Conflict - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete the changed state of the NFV-MANO functional entity application.
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: clause 5.5.12.3.5 - ETSI GS NFV-SOL 009 [5] V3.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     Send Delete request for Change interface state task
     Check HTTP Response Status Code Is    405
\ No newline at end of file
diff --git a/SOL009/NFVManoConfigurationAndInformationManagement-API/ChangeNFVMANOEntityStateTask.robot b/SOL009/NFVManoConfigurationAndInformationManagement-API/ChangeNFVMANOEntityStateTask.robot
index c1914e7c8f3e7a68d132a738c296c43106c51ba6..a4a4b9935c3aebf4ff79f25e83db3ba5d3bc46fc 100644
--- a/SOL009/NFVManoConfigurationAndInformationManagement-API/ChangeNFVMANOEntityStateTask.robot
+++ b/SOL009/NFVManoConfigurationAndInformationManagement-API/ChangeNFVMANOEntityStateTask.robot
@@ -11,11 +11,11 @@ POST NFV-MANO functional entity application state change
     [Documentation]    Test ID: 8.3.1.2.1
     ...    Test title: POST NFV-MANO functional entity application state change
     ...    Test objective: The objective is to request state change of the NFV-MANO functional entity application.
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: clause 5.5.7.3.1 - ETSI GS NFV-SOL 009 [5] V3.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     Send Post request for NFV-MANO functional entity application state change
     Check HTTP Response Status Code Is    202
     Check Operation Occurrence Id
@@ -24,11 +24,11 @@ POST NFV-MANO functional entity application state change - Conflict
     [Documentation]    Test ID: 8.3.1.2.2
     ...    Test title: POST NFV-MANO functional entity application state change - Conflict
     ...    Test objective: The objective is to test that request to change the state of the NFV-MANO functional entity application failed due to a conflict with the state of the NFV-MANO entity resource and perform the JSON schema validation of the failed operation HTTP response.
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: clause 5.5.7.3.1 - ETSI GS NFV-SOL 009 [5] V3.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     Send Post request for NFV-MANO functional entity application state change
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is   ProblemDetails
@@ -37,11 +37,11 @@ GET NFV-MANO functional entity application state change - Method not implemented
     [Documentation]    Test ID: 8.3.1.2.3
     ...    Test title: GET NFV-MANO functional entity application state change - Method not implemented
     ...    Test objective: The objective is to test that GET method is not allowed to retrieve the changed state of the NFV-MANO functional entity application.
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: clause 5.5.7.3.2 - ETSI GS NFV-SOL 009 [5] V3.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     Send Get request for NFV-MANO functional entity application state change
     Check HTTP Response Status Code Is    405
     
@@ -49,11 +49,11 @@ PUT NFV-MANO functional entity application state change - Method not implemented
     [Documentation]    Test ID: 8.3.1.2.4
     ...    Test title: PUT NFV-MANO functional entity application state change - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to update the changed state of the NFV-MANO functional entity application.
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: clause 5.5.7.3.3 - ETSI GS NFV-SOL 009 [5] V3.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     Send Put request for NFV-MANO functional entity application state change
     Check HTTP Response Status Code Is    405
     
@@ -61,11 +61,11 @@ PATCH NFV-MANO functional entity application state change - Method not implement
     [Documentation]    Test ID: 8.3.1.2.5
     ...    Test title: PATCH NFV-MANO functional entity application state change - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update the changed state of the NFV-MANO functional entity application.
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: clause 5.5.7.3.4 - ETSI GS NFV-SOL 009 [5] V3.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     Send Patch request for NFV-MANO functional entity application state change
     Check HTTP Response Status Code Is    405
     
@@ -73,10 +73,10 @@ DELETE NFV-MANO functional entity application state change - Method not implemen
     [Documentation]    Test ID: 8.3.1.2.6
     ...    Test title: DELETE NFV-MANO functional entity application state change - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete the changed state of the NFV-MANO functional entity application.
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: clause 5.5.7.3.5 - ETSI GS NFV-SOL 009 [5] V3.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     Send Delete request for NFV-MANO functional entity application state change
     Check HTTP Response Status Code Is    405
\ No newline at end of file
diff --git a/SOL009/NFVManoConfigurationAndInformationManagement-API/ChangeStateOperationOccurance.robot b/SOL009/NFVManoConfigurationAndInformationManagement-API/ChangeStateOperationOccurance.robot
index 323e678d462330ad00dfd3c3fcd4a7fee772264d..f3bbd69d0f7f09a38a58cfe9d45b0845934c31a9 100644
--- a/SOL009/NFVManoConfigurationAndInformationManagement-API/ChangeStateOperationOccurance.robot
+++ b/SOL009/NFVManoConfigurationAndInformationManagement-API/ChangeStateOperationOccurance.robot
@@ -12,11 +12,11 @@ POST Change State Operation Occurance - Method not implemented
     [Documentation]    Test ID: 8.3.1.3.1
     ...    Test title: POST Change State Operation Occurance - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemeted.
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: clause 5.5.8.3.1 - ETSI GS NFV-SOL 009 [5] V3.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     Send Post request for Change State Operation Occurance
     Check HTTP Response Status Code Is    405
     
@@ -24,11 +24,11 @@ GET Change State Operation Occurance
     [Documentation]    Test ID: 8.3.1.3.2
     ...    Test title: GET Change State Operation Occurance
     ...    Test objective: The objective is to query status information about multiple change state operation occurrences.
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: clause 5.5.8.3.2 - ETSI GS NFV-SOL 009 [5] V3.3.1
     ...    Config ID: Config_prod_NFV-MANO
-    ...    Applicability: 
-    ...    Post-Conditions:  
+    ...    Applicability: none
+    ...    Post-Conditions: none 
     Get Change State OpOcc
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    ChangeStateOpOccs
@@ -37,11 +37,11 @@ GET Change State Operation Occurance - invalid attribute-based filter
     [Documentation]    Test ID: 8.3.1.3.3
     ...    Test title: GET Change State Operation Occurance - invalid attribute-based filter
     ...    Test objective:  The objective is to test that the retrieval of Change State Operation Occurance fails when using invalid attribute-based filter, and perform the JSON schema validation of the failed operation HTTP response.
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: clause 5.5.8.3.2 - ETSI GS NFV-SOL 009 [5] V3.3.1
     ...    Config ID: Config_prod_NFV-MANO
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     Get Change State OpOcc with invalid filter
     Check HTTP Response Status Code Is    400
     Check HTTP Response Body Json Schema Is    ProblemDetails   
@@ -50,11 +50,11 @@ GET Change State Operation Occurance - invalid attribute selector
     [Documentation]    Test ID: 8.3.1.3.4
     ...    Test title: GET Change State Operation Occurance - invalid attribute selector
     ...    Test objective: The objective is to test that the retrieval of Change State Operation Occurance fails when using invalid attribute selector, and perform the JSON schema validation of the failed operation HTTP response.
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: clause 5.5.8.3.2 - ETSI GS NFV-SOL 009 [5] V3.3.1
     ...    Config ID: Config_prod_NFV-MANO
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     Get Change State OpOcc with invalid selector
     Check HTTP Response Status Code Is    400
     Check HTTP Response Body Json Schema Is    ProblemDetails  
@@ -63,11 +63,11 @@ GET Change State Operation Occurance - Bad Request Response too Big
     [Documentation]    Test ID: 8.3.1.3.5
     ...    Test title: GET Change State Operation Occurance - Bad Request Response too Big
     ...    Test objective: The objective is to test that the retrieval of Change State Operation Occurance fails when response is too big, and perform the JSON schema validation of the failed operation HTTP response.
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: clause 5.5.8.3.2 - ETSI GS NFV-SOL 009 [5] V3.3.1
     ...    Config ID: Config_prod_NFV-MANO
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     Get Change State OpOcc
     Check HTTP Response Status Code Is    400
     Check HTTP Response Body Json Schema Is    ProblemDetails
@@ -76,11 +76,11 @@ GET Change State Operation Occurance with attribute-based filter
     [Documentation]    Test ID: 8.3.1.3.6
     ...    Test title: GET Change State Operation Occurance with attribute-based filter
     ...    Test objective: The objective is to query status information about multiple change state operation occurrences with attribute filters
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: clause 5.5.8.3.2 - ETSI GS NFV-SOL 009 [5] V3.3.1
     ...    Config ID: Config_prod_NFV-MANO
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     Get Change State OpOcc with filter
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    ChangeStateOpOcc
@@ -89,11 +89,11 @@ GET Change State Operation Occurance with "all_fields" attribute selector
     [Documentation]    Test ID: 8.3.1.3.7
     ...    Test title: GET Change State Operation Occurance with "all_fields" attribute selector
     ...    Test objective: The objective is to retrieve Change State Operation Occurance with "all_fields" attribute selector
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: clause 5.5.8.3.2 - ETSI GS NFV-SOL 009 [5] V3.3.1
     ...    Config ID: Config_prod_NFV-MANO
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     Get Change State OpOcc with all_fields attribute selector
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    ChangeStateOpOcc
diff --git a/SOL009/NFVManoConfigurationAndInformationManagement-API/IndividualStateChangeOpperationOccurance.robot b/SOL009/NFVManoConfigurationAndInformationManagement-API/IndividualStateChangeOpperationOccurance.robot
index 765b7b86632d58af01abdc7629e83f43f07ba3cf..dd5e632463297913b1d2833d37e494c6eb2f8701 100644
--- a/SOL009/NFVManoConfigurationAndInformationManagement-API/IndividualStateChangeOpperationOccurance.robot
+++ b/SOL009/NFVManoConfigurationAndInformationManagement-API/IndividualStateChangeOpperationOccurance.robot
@@ -12,11 +12,11 @@ POST Individual Change State Operation Occurance - Method not implemented
     [Documentation]    Test ID: 8.3.1.4.1
     ...    Test title: POST Individual Change State Operation Occurance - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemeted.
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: clause 5.5.9.3.1 - ETSI GS NFV-SOL 009 [5] V3.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     Send Post request for Individual Change State Operation Occurance
     Check HTTP Response Status Code Is    405
     
@@ -24,11 +24,11 @@ GET Individual Change State Operation Occurance
     [Documentation]    Test ID: 8.3.1.4.2
     ...    Test title: GET Individual Change State Operation Occurance
     ...    Test objective: The objective is to query status information about Individual change state operation occurrences.
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: clause 5.5.9.3.2 - ETSI GS NFV-SOL 009 [5] V3.3.1
     ...    Config ID: Config_prod_NFV-MANO
-    ...    Applicability: 
-    ...    Post-Conditions:  
+    ...    Applicability: none
+    ...    Post-Conditions:  none
     Get Individual Change State OpOcc
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    ChangeStateOpOcc
@@ -37,11 +37,11 @@ PUT Individual Change State Operation Occurance - Method not implemented
     [Documentation]    Test ID: 8.3.1.4.3
     ...    Test title: PUT Individual Change State Operation Occurance - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemeted.
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: clause 5.5.9.3.3 - ETSI GS NFV-SOL 009 [5] V3.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     Send Put request for Individual Change State Operation Occurance
     Check HTTP Response Status Code Is    405
     
@@ -49,11 +49,11 @@ PATCH Individual Change State Operation Occurance - Method not implemented
     [Documentation]    Test ID: 8.3.1.4.4
     ...    Test title: PATCH Individual Change State Operation Occurance - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemeted.
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: clause 5.5.9.3.4 - ETSI GS NFV-SOL 009 [5] V3.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     Send Patch request for Individual Change State Operation Occurance
     Check HTTP Response Status Code Is    405
 
@@ -61,10 +61,10 @@ DELETE Individual Change State Operation Occurance - Method not implemented
     [Documentation]    Test ID: 8.3.1.4.5
     ...    Test title: DELETE Individual Change State Operation Occurance - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemeted.
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: clause 5.5.9.3.5 - ETSI GS NFV-SOL 009 [5] V3.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     Send Delete request for Individual Change State Operation Occurance
     Check HTTP Response Status Code Is    405
\ No newline at end of file
diff --git a/SOL009/NFVManoConfigurationAndInformationManagement-API/NFVMANOEntity.robot b/SOL009/NFVManoConfigurationAndInformationManagement-API/NFVMANOEntity.robot
index 2a4d56277c30a785bccad6ec831f39c8581987e9..edbdfe53fd44872e45ed102540be616e004ff2fd 100644
--- a/SOL009/NFVManoConfigurationAndInformationManagement-API/NFVMANOEntity.robot
+++ b/SOL009/NFVManoConfigurationAndInformationManagement-API/NFVMANOEntity.robot
@@ -12,11 +12,11 @@ POST NFV-MANO entity - Method not implemented
     [Documentation]    Test ID: 8.3.1.1.1
     ...    Test title: POST NFV-MANO entity - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create an NFV-MANO Entity.
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: clause 5.5.3.3.1 - ETSI GS NFV-SOL 009 [5] V3.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     Send Post request for NFV-MANO Entity
     Check HTTP Response Status Code Is    405
 
@@ -24,7 +24,7 @@ GET NFV-MANO entity
     [Documentation]    Test ID: 8.3.1.1.2
     ...    Test title: Get NFV-MANO entity
     ...    Test objective: The objective is to test the retrieval of information about an NFV-MANO functional entity by reading the NFV-MANO entity resource and perform a JSON schema and content validation of the collected job data structure.
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: clause 5.5.3.3.2 - ETSI GS NFV-SOL 009 [5] V3.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
@@ -37,11 +37,11 @@ PUT NFV-MANO entity - Method not implemented
     [Documentation]    Test ID: 8.3.1.1.3
     ...    Test title: PUT NFV-MANO entity - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to update an NFV-MANO Entity.
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: clause 5.5.3.3.3 - ETSI GS NFV-SOL 009 [5] V3.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     Send Put request for NFV-MANO Entity
     Check HTTP Response Status Code Is    405
 
@@ -88,10 +88,10 @@ DELETE NFV-MANO entity - Method not implemented
     [Documentation]    Test ID: 8.3.1.1.7
     ...    Test title: DELETE NFV-MANO entity - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete an NFV-MANO Entity.
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: clause 5.5.3.3.5 - ETSI GS NFV-SOL 009 [5] V3.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     Send Delete request for NFV-MANO Entity
     Check HTTP Response Status Code Is    405
\ No newline at end of file
diff --git a/SOL009/NFVManoConfigurationAndInformationManagement-API/NFVMANOServiceInterface.robot b/SOL009/NFVManoConfigurationAndInformationManagement-API/NFVMANOServiceInterface.robot
index 46fcf9102dfacf73900fe6a27f2e03e9a07dcf2c..3c88c58d8375b7e81948cc03624102979ce25914 100644
--- a/SOL009/NFVManoConfigurationAndInformationManagement-API/NFVMANOServiceInterface.robot
+++ b/SOL009/NFVManoConfigurationAndInformationManagement-API/NFVMANOServiceInterface.robot
@@ -12,11 +12,11 @@ POST NFV-MANO Serive Interface - Method not implemented
     [Documentation]    Test ID: 8.3.1.5.1
     ...    Test title: POST NFV-MANO Serive Interface - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemeted.
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: clause 5.5.10.3.1 - ETSI GS NFV-SOL 009 [5] V3.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     Send Post request for NFV-MANO Serive Interface
     Check HTTP Response Status Code Is    405
     
@@ -24,11 +24,11 @@ GET NFV-MANO Serive Interface
     [Documentation]    Test ID: 8.3.1.5.2
     ...    Test title: GET NFV-MANO Serive Interface
     ...    Test objective: The objective is to query status information about multiple NFV-MANO service interfaces of the NFV-MANO functional entity.
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: clause 5.5.10.3.2 - ETSI GS NFV-SOL 009 [5] V3.3.1
     ...    Config ID: Config_prod_NFV-MANO
-    ...    Applicability: 
-    ...    Post-Conditions:  
+    ...    Applicability: none
+    ...    Post-Conditions:  none
     Get NFV-MANO Serive Interface
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    ManoServiceInterfaces
@@ -37,11 +37,11 @@ GET NFV-MANO Serive Interface - invalid attribute-based filter
     [Documentation]    Test ID: 8.3.1.5.3
     ...    Test title: GET NFV-MANO Serive Interface - invalid attribute-based filter
     ...    Test objective:  The objective is to test that the retrieval of NFV-MANO Serive Interface fails when using invalid attribute-based filter, and perform the JSON schema validation of the failed operation HTTP response.
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: clause 5.5.10.3.2 - ETSI GS NFV-SOL 009 [5] V3.3.1
     ...    Config ID: Config_prod_NFV-MANO
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     Get NFV-MANO Serive Interface with invalid filter
     Check HTTP Response Status Code Is    400
     Check HTTP Response Body Json Schema Is    ProblemDetails   
@@ -50,11 +50,11 @@ GET NFV-MANO Serive Interface - invalid attribute selector
     [Documentation]    Test ID: 8.3.1.5.4
     ...    Test title: GET NFV-MANO Serive Interface - invalid attribute selector
     ...    Test objective: The objective is to test that the retrieval of NFV-MANO Serive Interface fails when using invalid attribute selector, and perform the JSON schema validation of the failed operation HTTP response.
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: clause 5.5.10.3.2 - ETSI GS NFV-SOL 009 [5] V3.3.1
     ...    Config ID: Config_prod_NFV-MANO
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     Get NFV-MANO Serive Interface with invalid selector
     Check HTTP Response Status Code Is    400
     Check HTTP Response Body Json Schema Is    ProblemDetails  
@@ -63,11 +63,11 @@ GET NFV-MANO Serive Interface - Bad Request Response too Big
     [Documentation]    Test ID: 8.3.1.5.5
     ...    Test title: GET NFV-MANO Serive Interface - Bad Request Response too Big
     ...    Test objective: The objective is to test that the retrieval of NFV-MANO Serive Interface fails when response is too big, and perform the JSON schema validation of the failed operation HTTP response.
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: clause 5.5.10.3.2 - ETSI GS NFV-SOL 009 [5] V3.3.1
     ...    Config ID: Config_prod_NFV-MANO
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     Get NFV-MANO Serive Interface
     Check HTTP Response Status Code Is    400
     Check HTTP Response Body Json Schema Is    ProblemDetails
@@ -76,11 +76,11 @@ GET NFV-MANO Serive Interface with attribute-based filter
     [Documentation]    Test ID: 8.3.1.5.6
     ...    Test title: GET NFV-MANO Serive Interface with attribute-based filter
     ...    Test objective: The objective is to query status information about multiple NFV-MANO service interfaces of the NFV-MANO functional entities with attribute filters
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: clause 5.5.10.3.2 - ETSI GS NFV-SOL 009 [5] V3.3.1
     ...    Config ID: Config_prod_NFV-MANO
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     Get NFV-MANO Serive Interface with filter
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    ManoServiceInterfaces
@@ -89,11 +89,11 @@ GET NFV-MANO Serive Interface with "all_fields" attribute selector
     [Documentation]    Test ID: 8.3.1.5.7
     ...    Test title: GET NFV-MANO Serive Interface with "all_fields" attribute selector
     ...    Test objective: The objective is to retrieve NFV-MANO Serive Interface with "all_fields" attribute selector
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: clause 5.5.10.3.2 - ETSI GS NFV-SOL 009 [5] V3.3.1
     ...    Config ID: Config_prod_NFV-MANO
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     Get NFV-MANO Serive Interface with all_fields attribute selector
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    ManoServiceInterfaces
@@ -102,11 +102,11 @@ GET NFV-MANO Serive Interface with "exclude_default" attribute selector
     [Documentation]    Test ID: 8.3.1.5.8
     ...    Test title: GET NFV-MANO Serive Interface with "exclude_default" attribute selector
     ...    Test objective: The objective is to retrieve NFV-MANO Serive Interface with "exclude_default" attribute selector
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: clause 5.5.10.3.2 - ETSI GS NFV-SOL 009 [5] V3.3.1
     ...    Config ID: Config_prod_NFV-MANO
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     Get NFV-MANO Serive Interface with all_fields attribute selector
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    ManoServiceInterfaces
@@ -116,11 +116,11 @@ GET NFV-MANO Serive Interface with "fields" attribute selector
     [Documentation]    Test ID: 8.3.1.5.9
     ...    Test title: GET NFV-MANO Serive Interface with "fields" attribute selector
     ...    Test objective: The objective is to retrieve NFV-MANO Serive Interface with fields attribute selector
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: clause 5.5.10.3.2 - ETSI GS NFV-SOL 009 [5] V3.3.1
     ...    Config ID: Config_prod_NFV-MANO
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     Get NFV-MANO Serive Interface with fields attribute selector
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    ManoServiceInterfaces
@@ -129,10 +129,10 @@ GET NFV-MANO Serive Interface with "exclude_fields" attribute selector
     [Documentation]    Test ID: 8.3.1.5.10
     ...    Test title: GET NFV-MANO Serive Interface with "exclude_fields" attribute selector
     ...    Test objective: The objective is to retrieve NFV-MANO Serive Interface with "exclude_fields" attribute selector
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: clause 5.5.10.3.2 - ETSI GS NFV-SOL 009 [5] V3.3.1
     ...    Config ID: Config_prod_NFV-MANO
-    ...    Applicability: 
+    ...    Applicability: none
     ...    Post-Conditions: none
     Get NFV-MANO Serive Interface with exclude_fields attribute selector
     Check HTTP Response Status Code Is    200
@@ -142,11 +142,11 @@ GET NFV-MANO Serive Interface with Paged Response
     [Documentation]    Test ID: 8.3.1.5.11
     ...    Test title: GET NFV-MANO Serive Interface with Paged Response
     ...    Test objective: The objective is to query NFV-MANO Serive Interface to get Paged Response.
-    ...    Pre-conditions:  
+    ...    Pre-conditions:  none
     ...    Reference: clause 5.5.10.3.2 - ETSI GS NFV-SOL 009 [5] V3.3.1
     ...    Config ID: Config_prod_NFV-MANO
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     Get NFV-MANO Serive Interface
     Check HTTP Response Status Code Is    200
     Check LINK in Header
@@ -155,11 +155,11 @@ PUT NFV-MANO Serive Interface - Method not implemented
     [Documentation]    Test ID: 8.3.1.5.12
     ...    Test title: PUT NFV-MANO Serive Interface - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemeted.
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: clause 5.5.10.3.3 - ETSI GS NFV-SOL 009 [5] V3.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     Send Put request for NFV-MANO Serive Interface
     Check HTTP Response Status Code Is    405
     
@@ -167,11 +167,11 @@ PATCH NFV-MANO Serive Interface - Method not implemented
     [Documentation]    Test ID: 8.3.1.5.13
     ...    Test title: PATCH NFV-MANO Serive Interface - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemeted.
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: clause 5.5.10.3.4 - ETSI GS NFV-SOL 009 [5] V3.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     Send Patch request for NFV-MANO Serive Interface
     Check HTTP Response Status Code Is    405
 
@@ -179,10 +179,10 @@ DELETE NFV-MANO Serive Interface - Method not implemented
     [Documentation]    Test ID: 8.3.1.5.14
     ...    Test title: DELETE NFV-MANO Serive Interface - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemeted.
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: clause 5.5.10.3.5 - ETSI GS NFV-SOL 009 [5] V3.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     Send Delete request for NFV-MANO Serive Interface
     Check HTTP Response Status Code Is    405
\ No newline at end of file