diff --git a/SOL002/VNFLifecycleManagement-API/HealVNFTask.robot b/SOL002/VNFLifecycleManagement-API/HealVNFTask.robot
index cddaa37bad3bbcaad85e7c64e4999784ad0d3640..c62f11df16456c5fc24a0a11d720b4d49f73ee2f 100644
--- a/SOL002/VNFLifecycleManagement-API/HealVNFTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/HealVNFTask.robot
@@ -16,7 +16,7 @@ POST Heal a vnfInstance
     ...    Reference: Clause 5.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     POST Heal VNF
     Check HTTP Response Status Code Is    202
     Check Operation Occurrence Id
@@ -30,7 +30,7 @@ POST Heal a vnfInstance Conflict (Not-Instantiated)
     ...    Reference: Clause 5.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     POST Heal VNF
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails 
@@ -44,7 +44,7 @@ POST Heal a vnfInstance Not Found
     ...    Reference: Clause 5.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     POST Heal VNF
     Check HTTP Response Status Code Is    404
     Check HTTP Response Body Json Schema Is    ProblemDetails 
@@ -57,7 +57,7 @@ GET Heal VNFInstance - Method not implemented
     ...    Reference: Clause 5.4.9.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     GET Heal VNF  
     Check HTTP Response Status Code Is    405
 
@@ -69,7 +69,7 @@ PUT Heal VNFInstance - Method not implemented
     ...    Reference: Clause 5.4.9.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions:
+    ...    Post-Conditions: none
     PUT Heal VNF  
     Check HTTP Response Status Code Is    405
 
@@ -81,7 +81,7 @@ PATCH Heal VNFInstance - Method not implemented
     ...    Reference: Clause 5.4.9.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions:
+    ...    Post-Conditions: none
     PATCH Heal VNF  
     Check HTTP Response Status Code Is    405
     
@@ -93,7 +93,7 @@ DELETE Heal VNFInstance - Method not implemented
     ...    Reference: Clause 5.4.9.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions:
+    ...    Post-Conditions: none
     DELETE Heal VNF  
     Check HTTP Response Status Code Is    405
 
diff --git a/SOL002/VNFLifecycleManagement-API/IndividualVNFInstance.robot b/SOL002/VNFLifecycleManagement-API/IndividualVNFInstance.robot
index bb34332ff2925cb219051b1440b592cbf7ea75f6..84f826b94e467990d29cc8a22fc12d2f09afcec4 100644
--- a/SOL002/VNFLifecycleManagement-API/IndividualVNFInstance.robot
+++ b/SOL002/VNFLifecycleManagement-API/IndividualVNFInstance.robot
@@ -20,8 +20,8 @@ POST Individual VNFInstance - Method not implemented
     ...    Pre-conditions: none
     ...    Reference: Clause 5.4.3.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     POST individual vnfInstance
     Check HTTP Response Status Code Is    405
     
@@ -32,8 +32,8 @@ GET Information about an individual VNF Instance
     ...    Pre-conditions: none
     ...    Reference: Clause 5.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     GET individual vnfInstance
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    vnfInstance
@@ -45,7 +45,7 @@ PUT Individual VNFInstance - Method not implemented
     ...    Pre-conditions: none
     ...    Reference: Clause 5.4.3.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
+    ...    Applicability: none
     ...    Post-Conditions: VNF instance not modified
     PUT individual vnfInstance
     Check HTTP Response Status Code Is    405
@@ -57,7 +57,7 @@ PATCH Individual VNFInstance
     ...    Pre-conditions: none
     ...    Reference: Clause 5.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
+    ...    Applicability: none
     ...    Post-Conditions: VNF instance modified
     PATCH individual vnfInstance
     Check HTTP Response Status Code Is    202
@@ -70,7 +70,7 @@ PATCH Individual VNFInstance Precondition failed
     ...    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
     ...    Reference: Clause 5.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
+    ...    Applicability: none
     ...    Post-Conditions: VNF instance not modified
     PATCH individual vnfInstance
     Check HTTP Response Status Code Is    412
@@ -83,7 +83,7 @@ PATCH Individual VNFInstance Conflict
     ...    Pre-conditions: none
     ...    Reference: Clause 5.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
+    ...    Applicability: none
     ...    Post-Conditions: VNF instance not modified
      PATCH individual vnfInstance
     Check HTTP Response Status Code Is    409
@@ -96,7 +96,7 @@ DELETE Individual VNFInstance
     ...    Pre-conditions: none
     ...    Reference: Clause 5.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
+    ...    Applicability: none
     ...    Post-Conditions: VNF instance deleted
     DELETE individual vnfInstance
     Check HTTP Response Status Code Is    204
@@ -108,8 +108,8 @@ DELETE Individual VNFInstance Conflict
     ...    Pre-conditions: VNF instance resource is in INSTANTIATED state
     ...    Reference: Clause 5.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     DELETE individual vnfInstance
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails
diff --git a/SOL002/VNFLifecycleManagement-API/InstantiateVNFTask.robot b/SOL002/VNFLifecycleManagement-API/InstantiateVNFTask.robot
index 01dd6a03edfd8e0a04c6c9e37a0b7d78cc264146..93855de0a2400ec06ef3bc01db2c5660021c9fc7 100644
--- a/SOL002/VNFLifecycleManagement-API/InstantiateVNFTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/InstantiateVNFTask.robot
@@ -17,8 +17,8 @@ POST Instantiate a vnfInstance
     ...    Pre-conditions: none
     ...    Reference: Clause 5.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     POST instantiate individual vnfInstance
     Check HTTP Response Status Code Is    202
     Check Operation Occurrence Id
@@ -30,8 +30,8 @@ POST Instantiate a vnfInstance Conflict
     ...    Pre-conditions: VNF instance resource is in INSTANTIATED state
     ...    Reference: Clause 5.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     POST instantiate individual vnfInstance
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails 
@@ -40,11 +40,11 @@ GET Instantiate VNFInstance - Method not implemented
     [Documentation]    Test ID: 6.3.5.3.3
     ...    Test title: GET Instantiate VNFInstance - Method not implemented
     ...    Test objective: The objective is to test that GET method is not implemented
-    ...    Pre-conditions:  
+    ...    Pre-conditions:  none
     ...    Reference: Clause 5.4.4.3.2  - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     GET instantiate individual vnfInstance   
     Check HTTP Response Status Code Is    405
     
@@ -52,10 +52,10 @@ PUT Instantiate VNFInstance - Method not implemented
     [Documentation]    Test ID: 6.3.5.3.4
     ...    Test title: PUT Instantiate VNFInstance  - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
-    ...    Pre-conditions:  
+    ...    Pre-conditions:  none
     ...    Reference: Clause 5.4.4.3.3  - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
+    ...    Applicability: none
     ...    Post-Conditions: VNF instance not modified
     PUT instantiate individual vnfInstance   
     Check HTTP Response Status Code Is    405
@@ -64,10 +64,10 @@ PATCH Instantiate VNFInstance - Method not implemented
     [Documentation]    Test ID: 6.3.5.3.5
     ...    Test title: PATCH Instantiate VNFInstance  - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
-    ...    Pre-conditions:  
+    ...    Pre-conditions:  none
     ...    Reference: Clause 5.4.4.3.4  - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
+    ...    Applicability: none
     ...    Post-Conditions: VNF instance not modified
     PATCH instantiate individual vnfInstance   
     Check HTTP Response Status Code Is    405
@@ -76,10 +76,10 @@ DELETE Instantiate VNFInstance - Method not implemented
      [Documentation]    Test ID: 6.3.5.3.6
     ...    Test title: DELETE Instantiate VNFInstance  - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
-    ...    Pre-conditions:  
+    ...    Pre-conditions:  none
     ...    Reference: Clause 5.4.4.3.5  - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
+    ...    Applicability: none
     ...    Post-Conditions: VNF instance not deleted
     DELETE instantiate individual vnfInstance   
     Check HTTP Response Status Code Is    405
diff --git a/SOL002/VNFLifecycleManagement-API/OperateVNFTask.robot b/SOL002/VNFLifecycleManagement-API/OperateVNFTask.robot
index 88aa9592063ada102275653206c6e4121b7691d0..c450c897e5af6b69f89d9c27c4e8229dece5e4a6 100644
--- a/SOL002/VNFLifecycleManagement-API/OperateVNFTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/OperateVNFTask.robot
@@ -16,7 +16,7 @@ POST Operate a vnfInstance
     ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     POST Operate VNF
     Check HTTP Response Status Code Is    202
     Check Operation Occurrence Id
@@ -29,7 +29,7 @@ POST Operate a vnfInstance Conflict (Not-Instantiated)
     ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
-    ...    Post-Conditions:
+    ...    Post-Conditions: none
     POST Operate VNF
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails 
@@ -43,7 +43,7 @@ POST Operate a vnfInstance Not Found
     ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
-    ...    Post-Conditions:
+    ...    Post-Conditions: none
     POST Operate VNF
     Check HTTP Response Status Code Is    404
     Check HTTP Response Body Json Schema Is    ProblemDetails
@@ -56,7 +56,7 @@ GET Operate VNFInstance - Method not implemented
     ...    Reference: Clause 5.4.10.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
-    ...    Post-Conditions:
+    ...    Post-Conditions: none
     GET Operate VNF
     Check HTTP Response Status Code Is    405
 
@@ -68,7 +68,7 @@ PUT Operate VNFInstance - Method not implemented
     ...    Reference: Clause 5.4.10.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
-    ...    Post-Conditions:
+    ...    Post-Conditions: none
     PUT Operate VNF
     Check HTTP Response Status Code Is    405
 
@@ -80,7 +80,7 @@ PATCH Operate VNFInstance - Method not implemented
     ...    Reference: Clause 5.4.10.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
-    ...    Post-Conditions:
+    ...    Post-Conditions: none
     PATCH Operate VNF
     Check HTTP Response Status Code Is    405
     
@@ -92,7 +92,7 @@ DELETE Operate VNFInstance - Method not implemented
     ...    Reference: Clause 5.4.10.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
-    ...    Post-Conditions:
+    ...    Post-Conditions: none
     DELETE Operate VNF
     Check HTTP Response Status Code Is    405
 
diff --git a/SOL002/VNFLifecycleManagement-API/ScaleVNFTask.robot b/SOL002/VNFLifecycleManagement-API/ScaleVNFTask.robot
index b9d984193cad547d9963f0e011d98b25636270b0..6a5e732a1227c5802237fbb463c32c552fd58f14 100644
--- a/SOL002/VNFLifecycleManagement-API/ScaleVNFTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/ScaleVNFTask.robot
@@ -15,8 +15,8 @@ POST Scale a vnfInstance
     ...    Pre-conditions: none
     ...    Reference: Clause 5.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     POST Scale vnfInstance  
     Check HTTP Response Status Code Is    202
     Check Operation Occurrence Id
@@ -28,8 +28,8 @@ POST Scale a vnfInstance Conflict (Not-Instantiated)
     ...    Pre-conditions:  VNF instance resource is in NOT-INSTANTIATED state
     ...    Reference: Clause 5.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     POST Scale vnfInstance  
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails 
@@ -39,12 +39,12 @@ POST Scale a vnfInstance Not Found
     [Documentation]    Test ID: 6.3.5.4.3
     ...    Test title: POST Scale a vnfInstance Not Found
     ...    Test objective: The objective is to verify that the operation cannot be executed currently, due to a conflict with the state of the VNF instance resource. 
-    ...    Pre-conditions:  
+    ...    Pre-conditions: none 
     ...    Reference: Clause 5.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
-    ...    Post-Conditions: 
-    POST Scale vnfInstance  
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    POST Scale vnfInstance
     Check HTTP Response Status Code Is    404
     Check HTTP Response Body Json Schema Is    ProblemDetails 
    
@@ -52,11 +52,11 @@ GET Scale VNFInstance - Method not implemented
     [Documentation]    Test ID: 6.3.5.4.4
     ...    Test title: GET Scale VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
-    ...    Pre-conditions:  
+    ...    Pre-conditions: none  
     ...    Reference: Clause 5.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     GET Scale vnfInstance
     Check HTTP Response Status Code Is    405
 
@@ -64,11 +64,11 @@ PUT Scale VNFInstance - Method not implemented
     [Documentation]    Test ID: 6.3.5.4.5
     ...    Test title: PUT Scale VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
-    ...    Pre-conditions:  
+    ...    Pre-conditions:  none
     ...    Reference: Clause 5.4.5.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     PUT Scale vnfInstance
     Check HTTP Response Status Code Is    405
 
@@ -76,11 +76,11 @@ PATCH Scale VNFInstance - Method not implemented
      [Documentation]    Test ID: 6.3.5.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:  
+    ...    Pre-conditions:  none
     ...    Reference: Clause 5.4.5.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     PATCH Scale vnfInstance
     Check HTTP Response Status Code Is    405
     
@@ -88,11 +88,11 @@ DELETE Scale VNFInstance - Method not implemented
     [Documentation]    Test ID: 6.3.5.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:  
+    ...    Pre-conditions:  none
     ...    Reference: Clause 5.4.5.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     DELETE Scale vnfInstance
     Check HTTP Response Status Code Is    405
 
diff --git a/SOL002/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot b/SOL002/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
index be72af2682d59aad7ce0496dc138615490862891..7648c37568cce7d7a135e1718632b557ca7e1eec 100644
--- a/SOL002/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
@@ -14,8 +14,8 @@ POST Scale a vnfInstance to level
     ...    Pre-conditions: none
     ...    Reference: Clause 5.4.6.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
-    ...    Post-Conditions:
+    ...    Applicability: none
+    ...    Post-Conditions: none
     POST Scale vnfInstance to level     
     Check HTTP Response Status Code Is    202
     Check Operation Occurrence Id
@@ -27,8 +27,8 @@ POST Scale a vnfInstance to level Conflict (Not-Instantiated)
     ...    Pre-conditions: VNF instance resource is in NOT-INSTANTIATED state
     ...    Reference: Clause 5.4.6.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
-    ...    Post-Conditions:
+    ...    Applicability: none
+    ...    Post-Conditions: none
     POST Scale vnfInstance to level   
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails 
@@ -41,8 +41,8 @@ POST Scale a vnfInstance Not Found
     ...    Pre-conditions: VNF instance resource is in NOT-INSTANTIATED state
     ...    Reference: Clause 5.4.6.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
-    ...    Post-Conditions:
+    ...    Applicability: none 
+    ...    Post-Conditions: none
     POST Scale vnfInstance to level    
     Check HTTP Response Status Code Is    404
     Check HTTP Response Body Json Schema Is    ProblemDetails 
@@ -52,11 +52,11 @@ GET Scale to level VNFInstance - Method not implemented
     [Documentation]    Test ID: 6.3.5.5.4
     ...    Test title: GET Scale to level VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
-    ...    Pre-conditions:  
+    ...    Pre-conditions:  none
     ...    Reference: Clause 5.4.6.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     GET Scale vnfInstance to level
     Check HTTP Response Status Code Is    405
 
@@ -64,11 +64,11 @@ PUT Scale to level VNFInstance - Method not implemented
     [Documentation]    Test ID: 6.3.5.5.5
     ...    Test title: PUT Scale to level VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
-    ...    Pre-conditions:  
+    ...    Pre-conditions:  none
     ...    Reference: Clause 5.4.6.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     PUT Scale vnfInstance to level
     Check HTTP Response Status Code Is    405
 
@@ -76,11 +76,11 @@ PATCH Scale to level VNFInstance - Method not implemented
     [Documentation]    Test ID: 6.3.5.5.6
     ...    Test title: PATCH Scale to level VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
-    ...    Pre-conditions:  
+    ...    Pre-conditions: none
     ...    Reference: Clause 5.4.6.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     PATCH Scale vnfInstance to level
     Check HTTP Response Status Code Is    405
     
@@ -88,11 +88,11 @@ DELETE Scale to level VNFInstance - Method not implemented
     [Documentation]    Test ID: 6.3.5.5.7
     ...    Test title: DELETE Scale to level VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
-    ...    Pre-conditions:  
+    ...    Pre-conditions:  none
     ...    Reference: Clause 5.4.6.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     DELETE Scale vnfInstance to level
     Check HTTP Response Status Code Is    405
 
diff --git a/SOL002/VNFLifecycleManagement-API/Subscriptions.robot b/SOL002/VNFLifecycleManagement-API/Subscriptions.robot
index 3f14d231b0847a616320443d355df57ac9614535..ad77de44378c8324deb42ba48d59881cd1ebd842 100644
--- a/SOL002/VNFLifecycleManagement-API/Subscriptions.robot
+++ b/SOL002/VNFLifecycleManagement-API/Subscriptions.robot
@@ -84,6 +84,7 @@ GET subscriptions - Bad Request Invalid attribute-based filtering parameters
     Get subscriptions - invalid filter
     Check HTTP Response Status Code Is    400
     Check HTTP Response Body Json Schema Is    ProblemDetails
+    
  GET subscriptions with all_fields attribute selector
      [Documentation]    Test ID: 6.3.5.17.7
     ...    Test title: GET subscriptions with all_fields attribute selector
diff --git a/SOL002/VNFLifecycleManagement-API/TerminateVNFTask.robot b/SOL002/VNFLifecycleManagement-API/TerminateVNFTask.robot
index 643737789b3fab0d42cfb54cac285379f4d4fc5e..914af78117eded0929408a26a4630ca667e39d1b 100644
--- a/SOL002/VNFLifecycleManagement-API/TerminateVNFTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/TerminateVNFTask.robot
@@ -16,7 +16,7 @@ POST Terminate a vnfInstance
     ...    Reference: Clause 5.4.8.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     POST Terminate VNF  
     Check HTTP Response Status Code Is    202
     Check Operation Occurrence Id
@@ -29,7 +29,7 @@ POST Terminate a vnfInstance Conflict (Not-Instantiated)
     ...    Reference: Clause 5.4.8.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     POST Terminate VNF  
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails
diff --git a/SOL002/VNFLifecycleManagement-API/VNFInstances.robot b/SOL002/VNFLifecycleManagement-API/VNFInstances.robot
index 23b5dbea720bfd932923539987927c22560a721f..9f2f09c01d524536d5346b7151920125166f0858 100644
--- a/SOL002/VNFLifecycleManagement-API/VNFInstances.robot
+++ b/SOL002/VNFLifecycleManagement-API/VNFInstances.robot
@@ -11,10 +11,10 @@ POST Create a new vnfInstance
     [Documentation]    Test ID: 6.3.5.1.1
     ...    Test title: POST Create a new vnfInstance
     ...    Test objective: The objective is to create a new VNF instance resource
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 5.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
+    ...    Applicability: none
     ...    Post-Conditions: VNF instance created
     POST Create a new vnfInstance
     Check HTTP Response Status Code Is    201
@@ -24,11 +24,11 @@ GET information about multiple VNF instances
     [Documentation]    Test ID: 6.3.5.1.2
     ...    Test title: GET information about multiple VNF instances
     ...    Test objective: The objective is to get information about multiples VNF instances
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     GET multiple vnfInstances
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    vnfInstances
@@ -38,11 +38,11 @@ GET information about multiple VNF instances Bad Request Invalid attribute-based
     [Documentation]    Test ID: 6.3.5.1.3
     ...    Test title: GET information about multiple VNF instances Bad Request Invalid attribute-based filtering parameters
     ...    Test objective: The objective is to get information about multiples VNF instances with Invalid attribute-based filtering parameters
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     GET multiple vnfInstances with bad attribute
     Check HTTP Response Status Code Is    400
     Check HTTP Response Body Json Schema Is   ProblemDetails
@@ -51,11 +51,11 @@ GET information about multiple VNF instances Bad Request Invalid attribute selec
     [Documentation]    Test ID: 6.3.5.1.4
     ...    Test title: GET information about multiple VNF instances Bad Request Invalid attribute selector
     ...    Test objective: The objective is to get information about multiples VNF instances with Invalid attribute-based filtering parameters
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     GET multiple vnfInstances with bad filter
     Check HTTP Response Status Code Is    400
     Check HTTP Response Body Json Schema Is   ProblemDetails
@@ -64,11 +64,11 @@ GET information about multiple VNF instances with "all_fields" attribute selecto
     [Documentation]    Test ID: 6.3.5.1.5
     ...    Test title: GET information about multiple VNF instances with "all_fields" attribute selector
     ...    Test objective: The objective is to query information about multiple VNF instances
-    ...    Pre-conditions:  
+    ...    Pre-conditions:  none
     ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     GET multiple vnfInstances with all_fields attribute selector
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    vnfInstances
@@ -77,11 +77,11 @@ GET information about multiple VNF instances with "exclude_default" attribute se
     [Documentation]    Test ID: 6.3.5.1.6
     ...    Test title: GET information about multiple VNF instances with "exclude_default" attribute selector
     ...    Test objective: The objective is to query information about multiple VNF instances
-    ...    Pre-conditions:  
+    ...    Pre-conditions:  none
     ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     GET multiple vnfInstances with exclude_default attribute selector
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    vnfInstances
@@ -90,11 +90,11 @@ GET information about multiple VNF instances with "fields" attribute selector
     [Documentation]    Test ID: 6.3.5.1.7
     ...    Test title: GET information about multiple VNF instances with "fields" attribute selector
     ...    Test objective: The objective is to query information about multiple VNF instances
-    ...    Pre-conditions:  
+    ...    Pre-conditions:  none
     ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     GET multiple vnfInstances with fields attribute selector
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    vnfInstances
@@ -103,11 +103,11 @@ GET information about multiple VNF instances with "exclude_fields" attribute sel
     [Documentation]    Test ID: 6.3.5.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:  
+    ...    Pre-conditions:  none
     ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     GET multiple vnfInstances with exclude_fields attribute selector
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    vnfInstances  
@@ -116,11 +116,11 @@ PUT VNFInstances - Method not implemented
     [Documentation]    Test ID: 6.3.5.1.9
     ...    Test title: PUT VNFInstances - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
-    ...    Pre-conditions:  
+    ...    Pre-conditions:  none
     ...    Reference: Clause 5.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     PUT multiple vnfInstances
     Check HTTP Response Status Code Is    405
 
@@ -128,11 +128,11 @@ PATCH VNFInstances - Method not implemented
     [Documentation]    Test ID: 6.3.5.1.10
     ...    Test title: PATCH VNFInstances - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
-    ...    Pre-conditions:  
+    ...    Pre-conditions: none 
     ...    Reference: Clause 5.4.2.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     PATCH multiple vnfInstances
     Check HTTP Response Status Code Is    405
 
@@ -140,10 +140,23 @@ DELETE VNFInstances - Method not implemented
     [Documentation]    Test ID: 6.3.5.1.11
     ...    Test title: DELETE VNFInstances - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
-    ...    Pre-conditions:  
+    ...    Pre-conditions: none 
     ...    Reference: Clause 5.4.2.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
+    ...    Applicability: none
     ...    Post-Conditions: VNF instance not deleted
     DELETE multiple vnfInstances
-    Check HTTP Response Status Code Is    405
\ No newline at end of file
+    Check HTTP Response Status Code Is    405
+    
+GET information about multiple VNF instances with "exclude_default" and "fields" attribute selector
+    [Documentation]    Test ID: 6.3.5.1.12
+    ...    Test title: GET information about multiple VNF instances with "exclude_default" and "fields" attribute selector
+    ...    Test objective: The objective is to query information about multiple VNF instances
+    ...    Pre-conditions:  none
+    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Config ID: Config_prod_VE
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    GET multiple vnfInstances with exclude_default and fields attribute selector
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is    vnfInstances
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
index 6daa361da77b6ba5a3bda2e5559571a071bf80c3..ceef45a660f2b2cba04f9a582da587da46a7f395 100644
--- a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
+++ b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
@@ -9,6 +9,7 @@ Library    BuiltIn
 Library    JSONLibrary
 Library    Collections
 Library    JSONSchemaLibrary    schemas/
+Library           String
 
 *** Keywords ***
 
@@ -78,7 +79,8 @@ POST Create a new vnfInstance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/createVnfRequest.json
+    ${template} =    Get File    jsons/createVnfRequest.json
+    ${body}=        Format String   ${template}     vnfdId=${vnfdId}
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 	
@@ -129,7 +131,14 @@ GET multiple vnfInstances with fields attribute selector
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances?fields=${fields}
     ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}	
+    Set Suite Variable    ${response}    ${output}	    
+GET multiple vnfInstances with exclude_default and fields attribute selector
+    Log    Query status information about multiple VNF instances, using fields
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances?fields=${fields}&exclude_default
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
 GET multiple vnfInstances with exclude_fields attribute selector
     Log    Query status information about multiple VNF instances, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
@@ -209,7 +218,8 @@ POST instantiate individual vnfInstance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/instantiateVnfRequest.json
+    ${template}=    Get File    jsons/instantiateVnfRequest.json
+    ${body}=        Format String   ${template}     flavourId=${flavourId} 
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/instantiate    ${body}	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 	
@@ -247,7 +257,8 @@ POST Scale vnfInstance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/scaleVnfRequest.json
+    ${template}=    Get File    jsons/scaleVnfRequest.json
+    ${body}=        Format String   ${template}     type=${scaleVnfRequesttype}    aspectId=${scaleVnfRequestAspect} 
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
@@ -293,7 +304,8 @@ POST Scale vnfInstance to level
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/scaleVnfToLevelRequest.json
+    ${template}=    Get File    jsons/scaleVnfToLevelRequest.json
+    ${body}=        Format String   ${template}     newFlavourId=${newFlavourId} 
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale_to_level    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
@@ -330,7 +342,8 @@ POST Change VNF deployment flavour
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/changeVnfFlavourRequest.json
+    ${template}=    Get File    jsons/changeVnfFlavourRequest.json
+    ${body}=        Format String   ${template}     newFlavourId=${newFlavourId} 
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/change_flavour    ${body} 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}  	 
@@ -367,7 +380,8 @@ POST Terminate VNF
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/terminateVnfRequest.json
+    ${template}=    Get File    jsons/terminateVnfRequest.json
+    ${body}=        Format String   ${template}     terminationType=${terminationType} 
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/terminate    ${body}	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
@@ -405,7 +419,8 @@ POST Heal VNF
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/healVnfRequest.json
+    ${template}=    Get File    jsons/healVnfRequest.json
+    ${body}=        Format String   ${template}     cause=${healingCause} 
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/heal    ${body}		
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
@@ -481,7 +496,8 @@ POST Operate VNF
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/operateVnfRequest.json
+    ${template}=    Get File    jsons/operateVnfRequest.json
+    ${body}=        Format String   ${template}     changeStateTo=${changeStateTo} 
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/operate    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
@@ -723,7 +739,8 @@ Post Create subscription
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/lccnSubscriptionRequest.json
+    ${template}=    Get File    jsons/lccnSubscriptionRequest.json
+    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
     Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}				
@@ -733,7 +750,8 @@ Post Create subscription - DUPLICATION
     Set Headers    {"Accept": "${ACCEPT}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/lccnSubscriptionRequest.json
+    ${template}=    Get File    jsons/lccnSubscriptionRequest.json
+    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
     Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}		
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}			
@@ -743,7 +761,8 @@ Post Create subscription - NO-DUPLICATION
     Set Headers    {"Accept": "${ACCEPT}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/lccnSubscriptionRequest.json
+    ${template}=    Get File    jsons/lccnSubscriptionRequest.json
+    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
     Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
@@ -956,6 +975,13 @@ Get VNF LCM Operation occurrences with fields attribute selector
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
+Get VNF LCM Operation occurrences with exclude_default and fields attribute selector
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs?fields=${fields}&exclude_default
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
 Get VNF LCM Operation occurrences with exclude_fields attribute selector
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
diff --git a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
index cfd78c66d5dadfa5277c3bca57f5a79904abe06c..1af91b51a7b4f84cc0f68945febb5b4afe3d796b 100644
--- a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
+++ b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
@@ -171,4 +171,17 @@ GET status information about multiple VNF LCM Operation occurrences Bad Request
     ...    Post-Conditions: none 
     GET VNF LCM OP occurrences
     Check HTTP Response Status Code Is    400
-    Check HTTP Response Body Json Schema Is    ProblemDetails
\ No newline at end of file
+    Check HTTP Response Body Json Schema Is    ProblemDetails
+    
+GET status information about multiple VNF LCM Operation OCC with "exlude_default" and "fields" 
+    [Documentation]    Test ID: 6.3.5.11.14
+    ...    Test title: GET status information about multiple VNF LCM Operation OCC with "exclude_default" and "fields"
+    ...    Test objective: The objective is to test that GET method retrieve Query status information about multiple VNF lifecycle management operation occurrences.
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Config ID: Config_prod_VE
+    ...    Applicability: none
+    ...    Post-Conditions: none   
+    Get VNF LCM Operation occurrences with exclude_default and fields attribute selector
+    Check HTTP Response Status Code Is    202
+    Check HTTP Response Body Json Schema Is    VnfLcmOpOccs 
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/environment/variables.txt b/SOL002/VNFLifecycleManagement-API/environment/variables.txt
index af716e9c41b6901ab91a74617d4335608c927e7d..ef3d9d5ae3ed10af53671d3a19688dbc3ba6209c 100644
--- a/SOL002/VNFLifecycleManagement-API/environment/variables.txt
+++ b/SOL002/VNFLifecycleManagement-API/environment/variables.txt
@@ -59,4 +59,18 @@ ${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.
 
 ${fields}
 
-${original_etag}    some_etag
\ No newline at end of file
+${original_etag}    some_etag
+
+${vnfdId}    6fc3539c-e602-4afa-8e13-962fb5a7d81f
+${flavourId}    vnf flavour
+
+${scaleVnfRequesttype}    SCALE_OUT
+${scaleVnfRequestAspect}    Aspect
+
+${newFlavourId}    5a7d81f-e602-4afa-8e13-962fb5a7d81f
+
+${terminationType}    GRACEFUL
+
+${healingCause}    healingCause    
+
+${changeStateTo}    STOPPED
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/jsons/changeVnfFlavourRequest.json b/SOL002/VNFLifecycleManagement-API/jsons/changeVnfFlavourRequest.json
index 5b52927e97d1566e4aeec39de314a263ec3a0560..50d5eb5db52d57e0a3cf8184cf315baea933745c 100644
--- a/SOL002/VNFLifecycleManagement-API/jsons/changeVnfFlavourRequest.json
+++ b/SOL002/VNFLifecycleManagement-API/jsons/changeVnfFlavourRequest.json
@@ -1,3 +1,3 @@
-{
-  "newFlavourId": "myFlavour_new"
-}
\ No newline at end of file
+{{
+  "newFlavourId": "{newFlavourId}"
+}}
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/jsons/createVnfRequest.json b/SOL002/VNFLifecycleManagement-API/jsons/createVnfRequest.json
index 290151ae0de5286745c29b9a12df050a9b3ce9f9..5c9c30a259dc1bc272001a61a6eef3645f94822e 100644
--- a/SOL002/VNFLifecycleManagement-API/jsons/createVnfRequest.json
+++ b/SOL002/VNFLifecycleManagement-API/jsons/createVnfRequest.json
@@ -1,6 +1,5 @@
-{
-  "vnfdId": "6fc3539c-e602-4afa-8e13-962fb5a7d81f",
+{{
+  "vnfdId": "${vnfdId}",
   "vnfInstanceName": "string",
-  "vnfInstanceDescription": "string",
-  "metadata":{}
-}
\ No newline at end of file
+  "vnfInstanceDescription": "string"
+}}
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/jsons/healVnfRequest.json b/SOL002/VNFLifecycleManagement-API/jsons/healVnfRequest.json
index 8981fa94238e3e44ee17147f70898a8e9d831a40..8e57871a51c434ade9f39d427eddb45ca2ab2ae7 100644
--- a/SOL002/VNFLifecycleManagement-API/jsons/healVnfRequest.json
+++ b/SOL002/VNFLifecycleManagement-API/jsons/healVnfRequest.json
@@ -1,4 +1,4 @@
-{
-  "cause": "a specific cause",
+{{
+  "cause": "{healingCause}",
   "additionalParams": {}
-}
\ No newline at end of file
+}}
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/jsons/instantiateVnfRequest.json b/SOL002/VNFLifecycleManagement-API/jsons/instantiateVnfRequest.json
index bb96e19ddce87e266b427158183da85a62c43861..c8a0ed85c2509d2e3f266d6eefead5abe181577d 100644
--- a/SOL002/VNFLifecycleManagement-API/jsons/instantiateVnfRequest.json
+++ b/SOL002/VNFLifecycleManagement-API/jsons/instantiateVnfRequest.json
@@ -1,6 +1,5 @@
-{
-  "flavourId": "myFlavour",
-  "instantiationLevelId": "string",
+{{
+  "flavourId": "{flavourId}",
   "extVirtualLinks": [
     {
       "id": "string",
@@ -75,4 +74,4 @@
   "localizationLanguage": "English",
   "extensions": {},
   "additionalParams": {}
-}
\ No newline at end of file
+}}
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/jsons/lccnSubscriptionRequest.json b/SOL002/VNFLifecycleManagement-API/jsons/lccnSubscriptionRequest.json
index e44916f8dd95ffe1fd61888add4ebf78653c43f1..1411fe3b4eae8fc55e9b0b38e34282076a96aea8 100644
--- a/SOL002/VNFLifecycleManagement-API/jsons/lccnSubscriptionRequest.json
+++ b/SOL002/VNFLifecycleManagement-API/jsons/lccnSubscriptionRequest.json
@@ -1,10 +1,10 @@
-{
-  "filter": {
-    "vnfInstanceSubscriptionFilter": {
+{{
+  "filter": {{
+    "vnfInstanceSubscriptionFilter": {{
       "vnfdIds": [
         "6fc3539c-e602-4afa-8e13-962fb5a7d81f"
       ]
-    }
-  },
-  "callbackUri": "http://127.0.0.1/subscribe"
-}
\ No newline at end of file
+    }}
+  }},
+  "callbackUri": "{callback_uri}{callback_endpoint}"
+}}
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/jsons/operateVnfRequest.json b/SOL002/VNFLifecycleManagement-API/jsons/operateVnfRequest.json
index 2ead53e198a7a32420eb866a8b0b732bf3a8ee12..c32dd2c4ec5f4cf0fc2b85fd399b844e14b8dd66 100644
--- a/SOL002/VNFLifecycleManagement-API/jsons/operateVnfRequest.json
+++ b/SOL002/VNFLifecycleManagement-API/jsons/operateVnfRequest.json
@@ -1,5 +1,5 @@
-{
-  "changeStateTo": "STOPPED",
+{{
+  "changeStateTo": "{changeStateTo}",
   "stopType": "FORCEFUL",
   "additionalParams": {}
-}
\ No newline at end of file
+}}
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/jsons/scaleVnfRequest.json b/SOL002/VNFLifecycleManagement-API/jsons/scaleVnfRequest.json
index 09dc7dffb4a74b17a8773924ada8afe4f5dc5104..58964bb5697888d6ab452db04c738dc37d7d11d9 100644
--- a/SOL002/VNFLifecycleManagement-API/jsons/scaleVnfRequest.json
+++ b/SOL002/VNFLifecycleManagement-API/jsons/scaleVnfRequest.json
@@ -1,4 +1,4 @@
-{
-  "type": "SCALE_OUT",
-  "aspectId": "myAspect"
-}
\ No newline at end of file
+{{
+  "type": "{scaleVnfRequesttype}",
+  "aspectId": "{scaleVnfRequestAspect}"
+}}
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/jsons/scaleVnfToLevelRequest.json b/SOL002/VNFLifecycleManagement-API/jsons/scaleVnfToLevelRequest.json
index eeccec1d2174cdcb7648e731f6dd95676a7c7aaa..448dc4c275e80759dc2a3bb6b39821765f3f9a18 100644
--- a/SOL002/VNFLifecycleManagement-API/jsons/scaleVnfToLevelRequest.json
+++ b/SOL002/VNFLifecycleManagement-API/jsons/scaleVnfToLevelRequest.json
@@ -1,3 +1,3 @@
-{
-  "newFlavourId" : ""
-}
\ No newline at end of file
+{{
+  "newFlavourId" : "{newFlavourId}"
+}}
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/jsons/terminateVnfRequest.json b/SOL002/VNFLifecycleManagement-API/jsons/terminateVnfRequest.json
index 0a4f9592d9062dc9c8bf10d81858cddc71cb78aa..b317c4de963ec357ae338259a876e4d730efe6ae 100644
--- a/SOL002/VNFLifecycleManagement-API/jsons/terminateVnfRequest.json
+++ b/SOL002/VNFLifecycleManagement-API/jsons/terminateVnfRequest.json
@@ -1,4 +1,4 @@
-{
-  "terminationType": "GRACEFUL",
+{{
+  "terminationType": "{terminationType}",
   "additionalParams": {}
-}
\ No newline at end of file
+}}
\ No newline at end of file