diff --git a/SOL002/VNFPerformanceManagement-API/Subscriptions.robot b/SOL002/VNFPerformanceManagement-API/Subscriptions.robot
index ecf9cd79223ff407617b0ba8ee034cc8478aafc1..c09dd0302c2c2a482f1d769536bea0ca7ca1fb93 100644
--- a/SOL002/VNFPerformanceManagement-API/Subscriptions.robot
+++ b/SOL002/VNFPerformanceManagement-API/Subscriptions.robot
@@ -84,17 +84,17 @@ Create duplicated VNF Performance subscription with VNFM not creating duplicated
     [Tags]    no-duplicated-subs
     [Documentation]    Test ID 6.3.3.6.6
     ...    Test title: Create duplicated VNF Performance subscription with VNFM not creating duplicated subscriptions
-    ...    Test objective: The objective is to test the creation of a duplicated VNF performance subscription and check that no new subscription is created
+    ...    Test objective: The objective is to test the attempt of a creation of a duplicated VNF performance subscription and check that no new subscription is created by the VNFM and a link to the original subscription is returned
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
     ...    Reference: section 6.4.7.3.1 - SOL002 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: The VNFM does not support the creation of duplicated subscriptions
-    ...    Post-Conditions: The existing VNF performance subscription returned is set and it is valid 
+    ...    Post-Conditions: The existing VNF performance subscription returned is available in the VNFM 
     Send Post Request for Duplicated VNF Performance Subscription
     Check HTTP Response Status Code Is    303
     Check HTTP Response Body Is Empty
     Check HTTP Response Header Contains    Location
-    Check Postcondition Subscription Resource URI Returned in Location Header Is Valid
+    Check Postcondition Subscription Resource Returned in Location Header Is Available
 
 Create duplicated VNF Performance subscription with VNFM creating duplicated subscriptions
     [Tags]    duplicated-subs
diff --git a/SOL002/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot b/SOL002/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot
index a7c7ade115d4acafde70339b90df23cfc6a5360c..9a568a93786793ea88bdd25b5ea9c1000b8981f4 100644
--- a/SOL002/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot
+++ b/SOL002/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot
@@ -300,7 +300,7 @@ Check Postcondition VNF Performance Subscription Is Set
     Set Suite Variable    ${response}    ${output}
     Check HTTP Response Status Code Is    200
 
-Check Postcondition Subscription Resource URI Returned in Location Header Is Valid
+Check Postcondition Subscription Resource Returned in Location Header Is Available
     Log    Going to check postcondition
     GET    ${response.headers['Location']}
     Integer    response status    200
diff --git a/SOL003/VNFPerformanceManagement-API/Subscriptions.robot b/SOL003/VNFPerformanceManagement-API/Subscriptions.robot
index be0ea492b09cb5e11dfcca37edc6e26db5ad11e2..e4c9104781542671c61907f864a80543740f66ca 100644
--- a/SOL003/VNFPerformanceManagement-API/Subscriptions.robot
+++ b/SOL003/VNFPerformanceManagement-API/Subscriptions.robot
@@ -84,17 +84,17 @@ Create duplicated VNF Performance subscription with VNFM not creating duplicated
     [Tags]    no-duplicated-subs
     [Documentation]    Test ID 7.3.4.6.6
     ...    Test title: Create duplicated VNF Performance subscription with VNFM not creating duplicated subscriptions
-    ...    Test objective: The objective is to test the creation of a duplicated VNF performance subscription and check that no new subscription is created
+    ...    Test objective: The objective is to test the attempt of a creation of a duplicated VNF performance subscription and check that no new subscription is created by the VNFM and a link to the original subscription is returned
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
     ...    Reference: section 6.4.7.3.1 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: The VNFM does not support the creation of duplicated subscriptions
-    ...    Post-Conditions: The existing VNF performance subscription returned is set and it is valid 
+    ...    Post-Conditions: The existing VNF performance subscription returned is available in the VNFM
     Send Post Request for Duplicated VNF Performance Subscription
     Check HTTP Response Status Code Is    303
     Check HTTP Response Body Is Empty
     Check HTTP Response Header Contains    Location
-    Check Postcondition Subscription Resource URI Returned in Location Header Is Valid
+    Check Postcondition Subscription Resource Returned in Location Header Is Available
 
 Create duplicated VNF Performance subscription with VNFM creating duplicated subscriptions
     [Tags]    duplicated-subs
diff --git a/SOL003/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot b/SOL003/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot
index fc50b93385dde6d9f52639b062a371a3c214b266..4e3f7598c1bf7438950385c0bf7712a2c7aff8cd 100644
--- a/SOL003/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot
+++ b/SOL003/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot
@@ -301,7 +301,7 @@ Check Postcondition VNF Performance Subscription Is Set
     Set Suite Variable    ${response}    ${output}
     Check HTTP Response Status Code Is    200
 
-Check Postcondition Subscription Resource URI Returned in Location Header Is Valid
+Check Postcondition Subscription Resource Returned in Location Header Is Available
     Log    Going to check postcondition
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${response.headers['Location']}