diff --git a/SOL002/VNFIndicator-API/IndividualSubscription.robot b/SOL002/VNFIndicator-API/IndividualSubscription.robot
index dc83acc731dc88576f81c7cba96270fda7f1fafd..4e75f80c7bcb9bfdcd11ce5601e0c9fa14013053 100644
--- a/SOL002/VNFIndicator-API/IndividualSubscription.robot
+++ b/SOL002/VNFIndicator-API/IndividualSubscription.robot
@@ -62,40 +62,37 @@ PUT Individual VNF Indicator Subscription - Method not implemented
     [Documentation]    Test ID: 6.3.2.5.5
     ...    Test title: PUT individual VNF indicator subscription - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify an individual VNF performance indicator subscription
-    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNF.
+    ...    Pre-conditions: none
     ...    Reference: Clause 8.4.6.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
-    ...    Post-Conditions: The individual VNF indicator subscription is not modified by the operation
+    ...    Post-Conditions: none
     Send Put Request for Individual VNF Indicator Subscription
     Check HTTP Response Status Code Is    405
-    Check Postcondition VNF individual subscription Unmodified (Implicit)
 
 PATCH Individual VNF Indicator Subscription - Method not implemented
     [Documentation]    Test ID: 6.3.2.5.6
     ...    Test title: PUT individual VNF indicator subscription - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update an individual VNF performance indicator subscription
-    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNF.
+    ...    Pre-conditions: none
     ...    Reference: Clause 8.4.6.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
-    ...    Post-Conditions: The individual VNF indicator subscription is not modified by the operation
+    ...    Post-Conditions: none
     Send Patch Request for Individual VNF Indicator Subscription
     Check HTTP Response Status Code Is    405
-    Check Postcondition VNF individual subscription Unmodified (Implicit) 
 
 POST Individual VNF Indicator Subscription - Method not implemented
     [Documentation]    Test ID: 6.3.2.5.7
     ...    Test title: PUT individual VNF indicator subscription - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify an individual VNF performance indicator subscription
-    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNF.
+    ...    Pre-conditions: none
     ...    Reference: Clause 8.4.6.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
-    ...    Post-Conditions: The individual VNF indicator subscription is not created by the operation
+    ...    Post-Conditions: none
     Send Post Request for Individual VNF Indicator Subscription
     Check HTTP Response Status Code Is    405
-    Check Postcondition VNF individual subscription is not created  
 
 *** Keywords ***
 Get Individual VNF Indicator Subscription
@@ -181,14 +178,3 @@ Check Postcondition Individual VNF Indicator Subscription is Deleted
     Log    Check Postcondition subscription is deleted
     GET Individual VNF Indicator Subscription
     Check HTTP Response Status Code Is    404
-
-Check Postcondition VNF individual subscription Unmodified (Implicit)
-    Log    Check Postcondition subscription is not modified
-    GET Individual VNF Indicator Subscription
-    Log    Check Response matches original subscription
-    Should Be Equal As Strings    ${origResponse['body']['callbackUri']}    ${response['body']['callbackUri']}
-    
-Check Postcondition VNF individual subscription is not created
-    Log    Check Postcondition subscription is not created
-    GET Individual VNF Indicator Subscription with invalid resource identifier
-    Check HTTP Response Status Code Is    404
diff --git a/SOL002/VNFIndicator-API/IndividualVNFindicator.robot b/SOL002/VNFIndicator-API/IndividualVNFindicator.robot
index 5e5cdf32d06c87adbaeba2b5c636dca645ec9ba9..19b7fb4698a33047153a39eaa7ec5066882be963 100644
--- a/SOL002/VNFIndicator-API/IndividualVNFindicator.robot
+++ b/SOL002/VNFIndicator-API/IndividualVNFindicator.robot
@@ -37,7 +37,7 @@ POST Individual VNF Indicator - Method not implemented
     [Documentation]    Test ID: 6.3.2.3.3
     ...    Test title: POST individual performance indicator for VNF instance - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new performance indicator for a VNF instance
-    ...    Pre-conditions: A VNF instance is instantiated.
+    ...    Pre-conditions: none
     ...    Reference: Clause 8.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
@@ -49,7 +49,7 @@ PUT Individual VNF Indicator - Method not implemented
     [Documentation]    Test ID: 6.3.2.3.4
     ...    Test title: PUT individual performance indicator for VNF instance - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify an existing performance indicator for a VNF instance
-    ...    Pre-conditions: A VNF instance is instantiated. At least one measure of performance indicator is available for the given VNF instance.
+    ...    Pre-conditions: none
     ...    Reference: Clause 8.4.4.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
@@ -61,7 +61,7 @@ PATCH Individual VNF Indicator - Method not implemented
     [Documentation]    Test ID: 6.3.2.3.5
     ...    Test title: PATCH individual performance indicator for VNF instance - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update an existing performance indicator for a VNF instance
-    ...    Pre-conditions: A VNF instance is instantiated. At least one measure of performance indicator is available for the given VNF instance.
+    ...    Pre-conditions: none
     ...    Reference: Clause 8.4.4.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
@@ -73,14 +73,13 @@ DELETE Individual VNF Indicator - Method not implemented
     [Documentation]    Test ID: 6.3.2.3.6
     ...    Test title: DELETE individual performance indicator indicators for VNF instance - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete an existing performance indicator for a VNF instance
-    ...    Pre-conditions: A VNF instance is instantiated. At least one measure of performance indicator is available for the given VNF instance.
+    ...    Pre-conditions: none
     ...    Reference: Clause 8.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
-    ...    Post-Conditions: The individual performance indicator for the VNF instance is not deleted by the unsuccessful operation
+    ...    Post-Conditions: none
     Send DELETE Request for individual indicator in VNF instance
     Check HTTP Response Status Code Is    405
-    Check Postcondition Indicator for VNF instance Exist
     
 Get Individual Performance Indicator
     [Documentation]    Test ID: 6.3.2.3.7
@@ -113,7 +112,7 @@ POST Individual Performance Indicator - Method not implemented
     [Documentation]    Test ID: 6.3.2.3.9
     ...    Test title: POST Individual Performance Indicator - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new performance indicator.
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 8.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
@@ -125,7 +124,7 @@ PUT Individual Performance Indicator - Method not implemented
     [Documentation]    Test ID: 6.3.2.3.10
     ...    Test title: PUT Individual Performance Indicator - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify an existing performance indicator.
-    ...    Pre-conditions: At least one measure of performance indicator is available.
+    ...    Pre-conditions: none
     ...    Reference: Clause 8.4.4.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
@@ -137,7 +136,7 @@ PATCH Individual Performance Indicator - Method not implemented
     [Documentation]    Test ID: 6.3.2.3.11
     ...    Test title: PATCH Individual Performance Indicator - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update an existing performance indicator.
-    ...    Pre-conditions: At least one measure of performance indicator is available.
+    ...    Pre-conditions: none
     ...    Reference: Clause 8.4.4.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
@@ -149,14 +148,13 @@ DELETE Individual Performance Indicator - Method not implemented
     [Documentation]    Test ID: 6.3.2.3.12
     ...    Test title: DELETE Individual Performance Indicator - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete an existing performance indicator.
-    ...    Pre-conditions: At least one measure of performance indicator is available.
+    ...    Pre-conditions: none
     ...    Reference: Clause 8.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     Send DELETE Request for individual indicator
     Check HTTP Response Status Code Is    405
-    Check PostCondition Individual Indicator exist
     
 *** Keywords ***
 Get Individual Indicator for a VNF instance
@@ -234,12 +232,6 @@ Check HTTP Response Body Includes Requested VNF Instance ID
     Log    Check Response includes propoer VNF instance and Indicator identifiers
     Should Be Equal As Strings   ${response['body']['vnfInstanceId']}    ${vnfInstanceId}
 
-Check Postcondition Indicator for VNF instance Exist
-    Log    Check Response includes VNF Indicator
-    Get Individual Indicator for a VNF instance
-    Should Be Equal As Strings   ${response['body']['vnfInstanceId']}    ${vnfInstanceId}
-    Should Be Equal As Strings   ${response['body']['id']}    ${indicatorId}
-
 Get Individual Indicator
     Log    This resource represents a VNF indicator related to a VNF instance.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
@@ -286,11 +278,4 @@ Send DELETE Request for individual indicator
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${indicatorId}
     ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output} 
-    
-Check PostCondition Individual Indicator exist
-    Log    This resource represents a VNF indicator related to a VNF instance.
-    Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${indicatorId}
-    Integer    response status    200	
\ No newline at end of file
+    Set Suite Variable    ${response}    ${output} 
\ No newline at end of file
diff --git a/SOL002/VNFIndicator-API/Subscriptions.robot b/SOL002/VNFIndicator-API/Subscriptions.robot
index a2624badaa3de93a89d6f7624f768569484ee3dd..0e208cd33d3c7008f3a2736fa8a305cf270cb17f 100644
--- a/SOL002/VNFIndicator-API/Subscriptions.robot
+++ b/SOL002/VNFIndicator-API/Subscriptions.robot
@@ -63,6 +63,7 @@ GET VNF Indicators Subscriptions with invalid resource endpoint
     ...    Post-Conditions: none
     Get VNF Indicators Subscriptions with invalid resource endpoint
     Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is   ProblemDetails
 
 Create new VNF indicator subscription
     [Documentation]    Test ID: 6.3.2.4.5
@@ -83,7 +84,7 @@ PUT VNF Indicator Subscriptions - Method not implemented
     [Documentation]    Test ID: 6.3.2.4.6
     ...    Test title: PUT VNF Indicator Subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify VNF indicator subscriptions
-    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNF.
+    ...    Pre-conditions: none
     ...    Reference: Clause 8.4.5.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of indicators.
@@ -95,7 +96,7 @@ PATCH VNF Indicator Subscriptions - Method not implemented
     [Documentation]    Test ID: 6.3.2.4.7
     ...    Test title: PATCH VNF Indicator Subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update VNF indicator subscriptions
-    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNF.
+    ...    Pre-conditions: none
     ...    Reference: Clause 8.4.5.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of indicators.
@@ -107,7 +108,7 @@ DELETE VNF Indicator Subscriptions - Method not implemented
     [Documentation]    Test ID: 6.3.2.4.8
     ...    Test title: DELETE VNF Indicator Subscriptions - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete VNF indicator subscriptions
-    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNF.
+    ...    Pre-conditions: none
     ...    Reference: Clause 8.4.5.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of indicators.
@@ -126,7 +127,7 @@ GET VNF Indicators Subscriptions to get Paged Response
     ...    Post-Conditions: none
     Get VNF Indicators Subscriptions
     Check HTTP Response Status Code Is    200
-    Check LINK in Header
+    Check HTTP Response Header Contain Link
  
 GET VNF Indicators Subscriptions - Bad Request Response too Big
     [Documentation]    Test ID: 6.3.2.4.10
@@ -162,10 +163,11 @@ Create new VNF indicator Subscription - DUPLICATION
     ...    Reference: Clause 8.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: SUT should support duplication of subscription creation
-    ...    Post-Conditions: in response header Location shall not be null
+    ...    Post-Conditions: In response header Location shall not be null
     Post Create subscription - DUPLICATION
     Check HTTP Response Status Code Is    201
     Check HTTP Response Body Json Schema Is    VnfIndicatorSubscription
+    Check Operation Occurrence Id
 
 Create new VNF indicator Subscription - NO-DUPLICATION
     [Documentation]    Test ID: 6.3.2.4.13
@@ -175,7 +177,7 @@ Create new VNF indicator Subscription - NO-DUPLICATION
     ...    Reference: Clause 8.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: SUT should not support duplication of subscription creation
-    ...    Post-Conditions: in response header Location shall not be null
+    ...    Post-Conditions: In response header Location shall not be null
     Post Create subscription - NO-DUPLICATION
     Check HTTP Response Status Code Is    303
     Check Operation Occurrence Id
@@ -303,7 +305,7 @@ Check Notification Endpoint
     Wait Until Keyword Succeeds    ${total_polling_time}   ${polling_interval}   Verify Mock Expectation    ${notification_request}
     Clear Requests  ${callback_endpoint}
     
-Check LINK in Header
+Check HTTP Response Header Contain Link
     ${linkURL}=    Get Value From Json    ${response['headers']}    $..Link
     Should Not Be Empty    ${linkURL}
     
diff --git a/SOL002/VNFIndicator-API/VNFIndicators.robot b/SOL002/VNFIndicator-API/VNFIndicators.robot
index 11b8d7b010a5445b686ad689f40c2a631e8a88cb..f3f8f20f88073f4c2f08793ed71783614ce4d663 100644
--- a/SOL002/VNFIndicator-API/VNFIndicators.robot
+++ b/SOL002/VNFIndicator-API/VNFIndicators.robot
@@ -59,6 +59,7 @@ Get all VNF Indicators with malformed authorization token
     ...    Post-Conditions: none
     Get all VNF indicators with malformed authorization token
     Check HTTP Response Status Code Is    400
+    Check HTTP Response Body Json Schema Is   ProblemDetails
 
 Get all VNF Indicators without authorization token
     [Documentation]    Test ID: 6.3.2.1.5
@@ -71,6 +72,7 @@ Get all VNF Indicators without authorization token
     ...    Post-Conditions: none
     Get all VNF indicators without authorization token
     Check HTTP Response Status Code Is    401
+    Check HTTP Response Body Json Schema Is   ProblemDetails
 
 GET all VNF Indicators with expired or revoked authorization token
     [Documentation]    Test ID: 6.3.2.1.6
@@ -83,6 +85,7 @@ GET all VNF Indicators with expired or revoked authorization token
     ...    Post-Conditions: none
     Get all VNF indicators with expired or revoked authorization token
     Check HTTP Response Status Code Is    401
+    Check HTTP Response Body Json Schema Is   ProblemDetails
 
 Get all VNF Indicators with invalid resource endpoint
     [Documentation]    Test ID: 6.3.2.1.7
@@ -95,12 +98,13 @@ Get all VNF Indicators with invalid resource endpoint
     ...    Post-Conditions: none
     Get all VNF indicators with invalid resource endpoint
     Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is   ProblemDetails
 
 POST all VNF Indicators - Method not implemented
     [Documentation]    Test ID: 6.3.2.1.8
     ...    Test title: POST all VNF Indicators - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create new VNF indicators
-    ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF performance indicators are available in the VNF
+    ...    Pre-conditions: none
     ...    Reference: Clause 8.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
@@ -112,7 +116,7 @@ PUT all VNF Indicators - Method not implemented
     [Documentation]    Test ID: 6.3.2.1.9
     ...    Test title: PUT all VNF Indicators - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify VNF indicators
-    ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF performance indicators are available in the VNF
+    ...    Pre-conditions: none
     ...    Reference: Clause 8.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
@@ -124,7 +128,7 @@ PATCH all VNF Indicators - Method not implemented
      [Documentation]    Test ID: 6.3.2.1.10
     ...    Test title: PATCH all VNF Indicators - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update VNF indicators
-    ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF performance indicators are available in the VNF
+    ...    Pre-conditions: none
     ...    Reference: Clause 8.4.2.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
@@ -136,14 +140,13 @@ DELETE all VNF Indicators - Method not implemented
     [Documentation]    Test ID: 6.3.2.1.11
     ...    Test title: DELETE all VNF Indicators - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete VNF indicators
-    ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF performance indicators are available in the VNF
+    ...    Pre-conditions: none
     ...    Reference: Clause 8.4.2.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
     Send DELETE Request for all VNF indicators
     Check HTTP Response Status Code Is    405
-    Check Postcondition VNF Indicators Exist
     
 Get VNF Indicators to get Paged Response
     [Documentation]    Test ID: 6.3.2.1.12
@@ -156,7 +159,7 @@ Get VNF Indicators to get Paged Response
     ...    Post-Conditions: none
     Get all VNF indicators
     Check HTTP Response Status Code Is    200
-    Check LINK in Header
+    Check HTTP Response Header Contain Link
     
 Get VNF Indicators - Bad Request Response too Big
     [Documentation]    Test ID: 6.3.2.1.13
@@ -288,11 +291,6 @@ Check HTTP Response Body Json Schema Is
     ${jsonSchema}=    Catenate    SEPARATOR=    ${schema}    .schema.json
     Validate Json    ${jsonSchema}    ${response['body']}
     Log    Json Schema Validation OK
-
-Check Postcondition VNF Indicators Exist
-    Log    Check Postcondition indicators exist
-    Get all VNF indicators
-    Check HTTP Response Status Code Is    200
     
 Check HTTP Response Body vnfIndicators Matches the requested attribute-based filter
     Log    Check Response includes VNF Indicators according to filter
@@ -301,6 +299,6 @@ Check HTTP Response Body vnfIndicators Matches the requested attribute-based fil
     @{var_id} =    Split String    @{attr}[1]       ,${SEPERATOR}
     Should Be True     "${response['body'][0]['name']}"=="@{var_name}[1]" and "${response['body'][0]['vnfInstanceId']}"=="@{var_id}[1]"
 
-Check LINK in Header
+Check HTTP Response Header Contain Link
     ${linkURL}=    Get Value From Json    ${response['headers']}    $..Link
     Should Not Be Empty    ${linkURL}
diff --git a/SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot b/SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot
index 06cc15ba817c1f4b9d49a15fca5686b333c64ddc..14cb889721e9b3b8ecfc6ea30f7e5882408de890 100644
--- a/SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot
+++ b/SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot
@@ -66,7 +66,7 @@ POST Indicators for VNF instance - Method not implemented
     [Documentation]    Test ID: 6.3.2.2.5
     ...    Test title: POST performance indicators for VNF instance - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create new performance indicators for a VNF instance
-    ...    Pre-conditions: A VNF instance is instantiated.
+    ...    Pre-conditions: none
     ...    Reference: Clause 8.4.3.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
@@ -78,7 +78,7 @@ PUT Indicators for VNF instance - Method not implemented
     [Documentation]    Test ID: 6.3.2.2.6
     ...    Test title: PUT performance indicators for VNF instance - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify existing performance indicators for a VNF instance
-    ...    Pre-conditions: A VNF instance is instantiated. One or more measures of performance indicators are available for the given VNF instance.
+    ...    Pre-conditions: none
     ...    Reference: Clause 8.4.3.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
@@ -90,7 +90,7 @@ PATCH Indicators for VNF instance - Method not implemented
     [Documentation]    Test ID: 6.3.2.2.7
     ...    Test title: PATCH performance indicators for VNF instance - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update existing performance indicators for a VNF instance
-    ...    Pre-conditions: A VNF instance is instantiated. One or more measures of performance indicators are available for the given VNF instance.
+    ...    Pre-conditions: none
     ...    Reference: Clause 8.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
@@ -102,14 +102,13 @@ DELETE Indicators for VNF instance - Method not implemented
     [Documentation]    Test ID: 6.3.2.2.8
     ...    Test title: DELETE performance indicators for VNF instance - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete performance indicators for a VNF instance
-    ...    Pre-conditions: A VNF instance is instantiated. One or more measures of performance indicators are available for the given VNF instance.
+    ...    Pre-conditions: none
     ...    Reference: Clause 8.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
-    ...    Post-Conditions: The indicators for the VNF instance are not deleted by the unsuccessful operation
+    ...    Post-Conditions: none
     Send DELETE Request for indicators in VNF instance
     Check HTTP Response Status Code Is    405
-    Check Postcondition Indicators for VNF instance Exist
     
 Get Indicators for VNF Instance to get Paged Response
     [Documentation]    Test ID: 6.3.2.2.9
@@ -122,7 +121,7 @@ Get Indicators for VNF Instance to get Paged Response
     ...    Post-Conditions: none
     Get all indicators for a VNF instance
     Check HTTP Response Status Code Is    200
-    Check LINK in Header
+    Check HTTP Response Header Contain Link
     
 Get Indicators for VNF Instance - Bad Request Response too Big
     [Documentation]    Test ID: 6.3.2.2.10
@@ -229,14 +228,7 @@ Check HTTP Response Body Matches Attribute-Based Filter
     Log    Check Response includes VNF Indicators according to filter
     @{words} =  Split String    ${POS_FIELDS}       ,${SEPERATOR} 
     Should Be Equal As Strings    ${response['body'][0]['name']}    @{words}[1]
-
-Check Postcondition Indicators for VNF instance Exist
-    Log    Check Postcondition Indicators for VNF instance Exist
-    Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}
-    Should Be Equal    ${response['status']}    200
     
-Check LINK in Header
+Check HTTP Response Header Contain Link
     ${linkURL}=    Get Value From Json    ${response['headers']}    $..Link
     Should Not Be Empty    ${linkURL}
\ No newline at end of file