diff --git a/SOL002/VNFIndicator-API/IndividualVNFindicator.robot b/SOL002/VNFIndicator-API/IndividualVNFindicator.robot
index 114909043bf8d13c3e24f615e29ce55dd709fc16..7945638df74249cf8921b81e0d25093ed9e4cc73 100644
--- a/SOL002/VNFIndicator-API/IndividualVNFindicator.robot
+++ b/SOL002/VNFIndicator-API/IndividualVNFindicator.robot
@@ -17,8 +17,8 @@ Get Individual Indicator for VNF Instance
     Get Individual Indicator for a VNF instance
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is   vnfIndicator
-    Check HTTP Response Body Matches VNF Instance ID
-    Check HTTP Response Body Matches Indicator ID
+    Check HTTP Response Body Includes Requested VNF Instance ID
+    Check HTTP Response Body Includes Requested Indicator ID
 
 Get Individual Indicator for VNF Instance with invalid indicator identifier
     [Documentation]    Test ID 6.3.2.3.2
@@ -66,7 +66,7 @@ PATCH Individual VNF Indicator - Method not implemented
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
-    Send PUT Request for individual indicator in VNF instance
+    Send PATCH Request for individual indicator in VNF instance
     Check HTTP Response Status Code Is    405
 
 DELETE Individual VNF Indicator - Method not implemented
@@ -150,11 +150,11 @@ Check HTTP Response Body Json Schema Is
     Validate Json    ${schema}    ${response[0]['body']}
     Log    Json Schema Validation OK
 
-Check HTTP Response Body Matches Indicator ID
+Check HTTP Response Body Includes Requested Indicator ID
     Log    Check Response includes propoer VNF instance and Indicator identifiers
     Should Be Equal    ${response[0]['body']['id']}    ${indicatorId}
 
-Check HTTP Response Body Matches VNF Instance ID
+Check HTTP Response Body Includes Requested VNF Instance ID
     Log    Check Response includes propoer VNF instance and Indicator identifiers
     Should Be Equal    ${response[0]['body']['vnfInstanceId']}    ${vnfInstanceId}
 
diff --git a/SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot b/SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot
index 5c83579937fca3eea36fa6ab25c426fca306b681..290bbdb7623f2620c5888804c456db69b1708231 100644
--- a/SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot
+++ b/SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot
@@ -19,7 +19,7 @@ Get Indicators for VNF Instance
     Get all indicators for a VNF instance
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is   vnfIndicators
-    Check HTTP Response Body Matches VNF Instance ID
+    Check HTTP Response Body Includes Requested VNF Instance ID
 
 GET Indicators for VNF Instance with attribute-based filter
     [Documentation]    Test ID 6.3.2.2.2
@@ -194,7 +194,7 @@ Check HTTP Response Body Json Schema Is
     Validate Json    ${schema}    ${response[0]['body']}
     Log    Json Schema Validation OK
 
-Check HTTP Response Body Matches VNF Instance ID
+Check HTTP Response Body Includes Requested VNF Instance ID
     Log    Check Response includes Indicators according to resource identifier
     #todo
     
@@ -204,4 +204,4 @@ Check HTTP Response Body Matches Attribute-Based Filter
 
 Check Postcondition Indicators for VNF instance Exist
     Log    Check Response includes VNF Indicators according to filter
-    #todo
\ No newline at end of file
+    #todo