diff --git a/.idea/runConfigurations/Generate_Documentation_Data.xml b/.idea/runConfigurations/Generate_Documentation_Data.xml
index 81f4330c4e2e73e23cd0da343cb48338c0c8dd06..d4e60cbaf0cef416524b791a5bcd77ba543331df 100644
--- a/.idea/runConfigurations/Generate_Documentation_Data.xml
+++ b/.idea/runConfigurations/Generate_Documentation_Data.xml
@@ -1,6 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Generate Documentation Data" type="PythonConfigurationType" factoryName="Python">
     <module name="ngsi-ld-test-suite" />
+    <option name="ENV_FILES" value="" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
     <envs>
diff --git a/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyGETWithoutAccept/045_01.robot b/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyGETWithoutAccept/045_01.robot
index abd654da978b3c0abc1eddee5da009b392e342cb..04e4af9f05f9bd2cfb8c5898c106395d884f81d4 100644
--- a/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyGETWithoutAccept/045_01.robot
+++ b/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyGETWithoutAccept/045_01.robot
@@ -29,7 +29,7 @@ ${content_type}=                application/json
 *** Test Cases ***
 045_01_01 Endpoint /entities/{entityId}
     [Documentation]    Verify that on a GET HTTP request if nothing is specified on the Accept header, "application/json" is assumed (/entities/{entityId})
-    [Tags]    e-query    6_3_4
+    [Tags]    e-query    cb-get    6_3_4
     ${id}=    Generate Random Entity Id    ${building_id_prefix}
     ${response}=    Create Entity Selecting Content Type
     ...    ${building_filename}
@@ -47,7 +47,7 @@ ${content_type}=                application/json
 
 045_01_02 Endpoint /subscriptions/{subscriptionId}
     [Documentation]    Verify that on a GET HTTP request if nothing is specified on the Accept header, "application/json" is assumed (/subscriptions/{subscriptionId})
-    [Tags]    sub-retrieve    6_3_4
+    [Tags]    sub-retrieve    cb-get    6_3_4
     ${id}=    Generate Random Entity Id    ${subscription_id_prefix}
     ${response}=    Create Subscription    ${id}    ${subscription_filename}    ${CONTENT_TYPE_LD_JSON}
     Check Response Status Code    201    ${response.status_code}
@@ -61,7 +61,7 @@ ${content_type}=                application/json
 
 045_01_03 Endpoint /csourceRegistrations/
     [Documentation]    Verify that on a GET HTTP request if nothing is specified on the Accept header, "application/json" is assumed (/csourceRegistrations/)
-    [Tags]    csr-query    6_3_4
+    [Tags]    csr-query    cb-get    6_3_4
     ${registration_id}=    Generate Random Entity Id    ${registration_id_prefix}
     ${payload}=    Load JSON From File    ${EXECDIR}/data/${registration_filename}
     ${updated_payload}=    Update Value To JSON    ${payload}    $..id    ${registration_id}
@@ -79,7 +79,7 @@ ${content_type}=                application/json
 
 045_01_04 Endpoint /temporal/entities
     [Documentation]    Verify that on a GET HTTP request if nothing is specified on the Accept header, "application/json" is assumed (/temporal/entities)
-    [Tags]    te-query    6_3_4
+    [Tags]    te-query    cb-get    6_3_4
     ${temporal_entity_representation_id}=    Generate Random Entity Id    ${tea_id_prefix}
     ${response}=    Create Or Update Temporal Representation Of Entity Selecting Content Type
     ...    temporal_entity_representation_id=${temporal_entity_representation_id}
diff --git a/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyLdContextNotAvailable/043_01.robot b/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyLdContextNotAvailable/043_01.robot
index 14069952cd11493f02bf25f2c4b2c8033894ed55..44a8ff105f12187067e96ea084e89d4309260ca8 100644
--- a/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyLdContextNotAvailable/043_01.robot
+++ b/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyLdContextNotAvailable/043_01.robot
@@ -24,7 +24,7 @@ ${registration_filename}=       csourceRegistrations/context-source-registration
 *** Test Cases ***
 043_01_01 Create entity
     [Documentation]    Verify receiving 503 – LdContextNotAvailable error if remote JSON-LD @context cannot be retrieved (Create entity)
-    [Tags]    e-create    5_2_2
+    [Tags]    e-create    cb-ldcontext    5_2_2
     ${entity_id}=    Generate Random Entity Id    ${building_id_prefix}
     ${response}=    Create Entity Selecting Content Type
     ...    ${building_filename}
@@ -39,7 +39,7 @@ ${registration_filename}=       csourceRegistrations/context-source-registration
 
 043_01_02 Create subscription
     [Documentation]    Verify receiving 503 – LdContextNotAvailable error if remote JSON-LD @context cannot be retrieved (Create subscription)
-    [Tags]    sub-create    5_2_2
+    [Tags]    sub-create    cb-ldcontext    5_2_2
     ${subscription_id}=    Generate Random Entity Id    ${subscription_id_prefix}
     ${response}=    Create Subscription    ${subscription_id}    ${subscription_filename}    ${CONTENT_TYPE_LD_JSON}
     Check Response Status Code    ${expected_status_code}    ${response.status_code}
@@ -51,7 +51,7 @@ ${registration_filename}=       csourceRegistrations/context-source-registration
 
 043_01_03 Create Temporal Representation of Entities
     [Documentation]    Verify receiving 503 – LdContextNotAvailable error if remote JSON-LD @context cannot be retrieved (Create Temporal Representation of Entities)
-    [Tags]    te-create    5_2_2
+    [Tags]    te-create    cb-ldcontext    5_2_2
     ${temporal_entity_representation_id}=    Generate Random Entity Id    ${tea_id_prefix}
     ${response}=    Create Or Update Temporal Representation Of Entity Selecting Content Type
     ...    temporal_entity_representation_id=${temporal_entity_representation_id}
@@ -66,7 +66,7 @@ ${registration_filename}=       csourceRegistrations/context-source-registration
 
 043_01_04 Batch entity create
     [Documentation]    Verify receiving 503 – LdContextNotAvailable error if remote JSON-LD @context cannot be retrieved (Batch entity create)
-    [Tags]    be-create    5_2_2
+    [Tags]    be-create    cb-ldcontext    5_2_2
     ${first_entity_id}=    Generate Random Entity Id    ${building_id_prefix}
     ${second_entity_id}=    Generate Random Entity Id    ${building_id_prefix}
     ${first_entity}=    Load Entity    ${building_filename}    ${first_entity_id}
@@ -83,7 +83,7 @@ ${registration_filename}=       csourceRegistrations/context-source-registration
 
 043_01_05 Create context source registration
     [Documentation]    Verify receiving 503 – LdContextNotAvailable error if remote JSON-LD @context cannot be retrieved (Create context source registration)
-    [Tags]    csr-create    5_2_2
+    [Tags]    csr-create    cb-ldcontext    5_2_2
     ${registration_id}=    Generate Random Entity Id    ${registration_id_prefix}
     ${payload}=    Load JSON From File    ${EXECDIR}/data/${registration_filename}
     ${updated_payload}=    Update Value To JSON    ${payload}    $..id    ${registration_id}
diff --git a/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyMergePatchJson/044_01.robot b/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyMergePatchJson/044_01.robot
index 5ee383661fe209c2447209e4695b486bdee1c544..af2fbf781b7dd9a90dabdd0515a2a2297f77f6ef 100644
--- a/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyMergePatchJson/044_01.robot
+++ b/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyMergePatchJson/044_01.robot
@@ -19,7 +19,7 @@ ${attribute_id}=            brandName
 *** Test Cases ***
 044_01_01 endpoint /entities/{entityId}/attrs/{attrId}
     [Documentation]    Verify that PATCH HTTP requests can be done with "application/merge-patch+json" as Content-Type
-    [Tags]    ea-partial-update    6_3_4
+    [Tags]    ea-partial-update    cb-mergepatch    6_3_4
     ${response}=    Partial Update Entity Attributes
     ...    entityId=${entity_id}
     ...    attributeId=${attribute_id}
diff --git a/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyMergePatchJson/044_02.robot b/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyMergePatchJson/044_02.robot
index 9dbb718367c899c129146d1d2eb4f73dd4b2ae43..a228f94b80facdde3ade8ba78791e611645fc781 100644
--- a/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyMergePatchJson/044_02.robot
+++ b/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyMergePatchJson/044_02.robot
@@ -19,7 +19,7 @@ ${subscription_fragment}=       subscriptions/fragments/subscription-update-samp
 *** Test Cases ***
 044_02_01 Endpoint /subscriptions/{subscriptionId}
     [Documentation]    Verify that PATCH HTTP requests can be done with "application/merge-patch+json" as Content-Type
-    [Tags]    sub-update    6_3_4
+    [Tags]    sub-update    cb-mergepatch    6_3_4
     ${response}=    Update Subscription
     ...    ${subscription_id}
     ...    ${subscription_fragment}
diff --git a/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyNotAcceptableMediaType/049_01.robot b/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyNotAcceptableMediaType/049_01.robot
index 38654ea2f5ab92a86c9d331aa95d75a725820bdd..b835ad1c5209de29d663a3bb376efed9f34d228b 100644
--- a/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyNotAcceptableMediaType/049_01.robot
+++ b/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyNotAcceptableMediaType/049_01.robot
@@ -21,7 +21,7 @@ ${subscription_id_prefix}=      urn:ngsi-ld:Subscription:
 *** Test Cases ***
 049_01_01 Endpoint get /entities/{entityId}
     [Documentation]    Verify throwing 406 HTTP status code (Not Acceptable Media Type) if the "Accept" header does not imply "application/json" nor "application/ld+json" (get /entities/{entityId})
-    [Tags]    e-query    6_3_4
+    [Tags]    e-query    cb-noacceptable-medtype    6_3_4
     ${entity_id}=    Generate Random Entity Id    ${building_id_prefix}
     ${response}=    Query Entity
     ...    id=${entity_id}
@@ -31,7 +31,7 @@ ${subscription_id_prefix}=      urn:ngsi-ld:Subscription:
 
 049_01_02 Endpoint get /subscriptions/{subscriptionId}
     [Documentation]    Verify throwing 406 HTTP status code (Not Acceptable Media Type) if the "Accept" header does not imply "application/json" nor "application/ld+json" (get /subscriptions/{subscriptionId})
-    [Tags]    sub-retrieve    6_3_4
+    [Tags]    sub-retrieve    cb-noacceptable-medtype    6_3_4
     ${id}=    Generate Random Entity Id    ${subscription_id_prefix}
     ${response}=    Retrieve Subscription
     ...    id=${id}
@@ -41,19 +41,19 @@ ${subscription_id_prefix}=      urn:ngsi-ld:Subscription:
 
 049_01_03 Endpoint get /csourceRegistrations/
     [Documentation]    Verify throwing 406 HTTP status code (Not Acceptable Media Type) if the "Accept" header does not imply "application/json" nor "application/ld+json" (get /csourceRegistrations/)
-    [Tags]    csr-query    6_3_4
+    [Tags]    csr-query    cb-noacceptable-medtype    6_3_4
     ${response}=    Query Context Source Registrations With Return    type=Building    accept=${accept}
     Check Response Status Code    ${status_code}    ${response.status_code}
 
 049_01_04 Endpoint get /csourceSubscriptions/
     [Documentation]    Verify throwing 406 HTTP status code (Not Acceptable Media Type) if the "Accept" header does not imply "application/json" nor "application/ld+json" (get /csourceSubscriptions/)
-    [Tags]    csrsub-query    6_3_4
+    [Tags]    csrsub-query    cb-noacceptable-medtype    6_3_4
     ${response}=    Query Context Source Registration Subscriptions    accept=${accept}
     Check Response Status Code    ${status_code}    ${response.status_code}
 
 049_01_05 Endpoint get /temporal/entities
     [Documentation]    Verify throwing 406 HTTP status code (Not Acceptable Media Type) if the "Accept" header does not imply "application/json" nor "application/ld+json" (get /temporal/entities)
-    [Tags]    te-query    6_3_4
+    [Tags]    te-query    cb-noacceptable-medtype    6_3_4
     ${entity_types_to_be_retrieved}=    Catenate    SEPARATOR=,    Vehicle
     ${response}=    Query Temporal Representation Of Entities
     ...    entity_types=${entity_types_to_be_retrieved}
diff --git a/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyNotAcceptableMediaType/049_02.robot b/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyNotAcceptableMediaType/049_02.robot
index a3586c9a8788f996afd2f979d6668fd91124d421..75a726425014499e2e60454d298ab9f02029f2e7 100644
--- a/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyNotAcceptableMediaType/049_02.robot
+++ b/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyNotAcceptableMediaType/049_02.robot
@@ -17,7 +17,7 @@ ${subscription_id_prefix}=      urn:ngsi-ld:Subscription:
 *** Test Cases ***
 049_02_01 Retrieve subscription by id
     [Documentation]    Verify throwing 406 HTTP status code (Not Acceptable Media Type) if the "Accept" header is "application/geo+json" for operations different than "Retrieve Entity" and "Query Entity" (get /subscriptions/{subscriptionId})
-    [Tags]    sub-retrieve    6_3_4
+    [Tags]    sub-retrieve    cb-noacceptable-medtype    6_3_4
     ${id}=    Generate Random Entity Id    ${subscription_id_prefix}
     ${response}=    Retrieve Subscription
     ...    id=${id}
@@ -26,7 +26,7 @@ ${subscription_id_prefix}=      urn:ngsi-ld:Subscription:
 
 049_02_02 Query temporal entities
     [Documentation]    Verify throwing 406 HTTP status code (Not Acceptable Media Type) if the "Accept" header is "application/geo+json" for operations different than "Retrieve Entity" and "Query Entity" (get /temporal/entities)
-    [Tags]    te-query    6_3_4
+    [Tags]    te-query    cb-noacceptable-medtype    6_3_4
     ${entity_types_to_be_retrieved}=    Catenate    SEPARATOR=,    Vehicle
     ${response}=    Query Temporal Representation Of Entities
     ...    entity_types=${entity_types_to_be_retrieved}
@@ -37,6 +37,6 @@ ${subscription_id_prefix}=      urn:ngsi-ld:Subscription:
 
 049_02_03 Query context source registration
     [Documentation]    Verify throwing 406 HTTP status code (Not Acceptable Media Type) if the "Accept" header is "application/geo+json" for operations different than "Retrieve Entity" and "Query Entity" (get /csourceRegistrations)
-    [Tags]    csr-query    6_3_4
+    [Tags]    csr-query    cb-noacceptable-medtype    6_3_4
     ${response}=    Query Context Source Registrations With Return    type=Building    accept=${accept}
     Check Response Status Code    ${status_code}    ${response.status_code}
diff --git a/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyUnsupportedMediaType/048_01.robot b/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyUnsupportedMediaType/048_01.robot
index d49ea02115a7750a804de81e136ca5b741fdb0ad..9b0dd21246fbbd5b0af99d9865334d620befa5e0 100644
--- a/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyUnsupportedMediaType/048_01.robot
+++ b/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyUnsupportedMediaType/048_01.robot
@@ -26,7 +26,7 @@ ${content_type}=                application/xml
 *** Test Cases ***
 048_01_01 Endpoint patch /entities/{entityId}/attrs/{attrId}
     [Documentation]    Verify throwing 415 HTTP status code (Unsupported Media Type) if "Content-Type" header is not "application/json" or "application/ld+json" (patch /entities/{entityId}/attrs/{attrId})
-    [Tags]    ea-partial-update    6_3_4
+    [Tags]    ea-partial-update    cb-unsupport-medtype    6_3_4
     ${entity_id}=    Generate Random Entity Id    ${vehicle_id_prefix}
     ${response}=    Partial Update Entity Attributes
     ...    entityId=${entity_id}
@@ -38,7 +38,7 @@ ${content_type}=                application/xml
 
 048_01_02 Endpoint patch /subscriptions/{subscriptionId}
     [Documentation]    Verify throwing 415 HTTP status code (Unsupported Media Type) if "Content-Type" header is not "application/json" or "application/ld+json" (patch /subscriptions/{subscriptionId})
-    [Tags]    sub-update    6_3_4
+    [Tags]    sub-update    cb-unsupport-medtype    6_3_4
     ${id}=    Generate Random Entity Id    ${subscription_id_prefix}
     ${response}=    Update Subscription    ${id}    ${subscription_fragment}    ${content_type}
     Check Response Status Code    415    ${response.status_code}
@@ -46,7 +46,7 @@ ${content_type}=                application/xml
 
 048_01_03 Endpoint post /entities/
     [Documentation]    Verify throwing 415 HTTP status code (Unsupported Media Type) if "Content-Type" header is not "application/json" or "application/ld+json" (post /entities/)
-    [Tags]    e-create    6_3_4
+    [Tags]    e-create    cb-unsupport-medtype    6_3_4
     ${entity_id}=    Generate Random Entity Id    ${building_id_prefix}
     ${response}=    Create Entity Selecting Content Type
     ...    ${building_filename}
@@ -57,7 +57,7 @@ ${content_type}=                application/xml
 
 048_01_04 Endpoint post /subscriptions/
     [Documentation]    Verify throwing 415 HTTP status code (Unsupported Media Type) if "Content-Type" header is not "application/json" or "application/ld+json" (post /subscriptions/)
-    [Tags]    sub-create    6_3_4
+    [Tags]    sub-create    cb-unsupport-medtype    6_3_4
     ${subscriptions_id}=    Generate Random Entity Id    ${subscription_id_prefix}
     ${response}=    Create Subscription    ${subscriptions_id}    ${subscription_filename}    ${content_type}
     Check Response Status Code    415    ${response.status_code}
@@ -65,7 +65,7 @@ ${content_type}=                application/xml
 
 048_01_05 Endpoint post /entityOperations/create
     [Documentation]    Verify throwing 415 HTTP status code (Unsupported Media Type) if "Content-Type" header is not "application/json" or "application/ld+json" (post /entityOperations/create)
-    [Tags]    be-create    6_3_4
+    [Tags]    be-create    cb-unsupport-medtype    6_3_4
     ${first_entity_id}=    Generate Random Entity Id    ${building_id_prefix}
     ${second_entity_id}=    Generate Random Entity Id    ${building_id_prefix}
     ${first_entity}=    Load Entity    ${building_filename}    ${first_entity_id}
@@ -78,7 +78,7 @@ ${content_type}=                application/xml
 
 048_01_06 Endpoint post /temporal/entities/
     [Documentation]    Verify throwing 415 HTTP status code (Unsupported Media Type) if "Content-Type" header is not "application/json" or "application/ld+json" (post /temporal/entities/)
-    [Tags]    te-create    6_3_4
+    [Tags]    te-create    cb-unsupport-medtype    6_3_4
     ${temporal_entity_representation_id}=    Generate Random Entity Id    ${tea_id_prefix}
     ${response}=    Create Or Update Temporal Representation Of Entity Selecting Content Type
     ...    temporal_entity_representation_id=${temporal_entity_representation_id}
diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_01.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_01.robot
index 60796e30d1cc27772547cd00e71e67e210c472a8..9f671e39e101492908af0a9c01029d9cf95861fd 100644
--- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_01.robot
+++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_01.robot
@@ -26,9 +26,22 @@ ${subscription_payload_file_path}=      csourceSubscriptions/subscription-sample
     ...    subscription_id=${subscription_id}
     ...    context=${ngsild_test_suite_context}
     ...    accept=${CONTENT_TYPE_LD_JSON}
-    ${ignored_attributes}=    Create List    ${status_regex_expr}
+
+    # We need to ignore the Additional Members ('lastFailure', 'lastNotification', 'timesFailed', 'timesSent')
+    ${ignored_attributes}=    Create List
+    ...    ${status_regex_expr}
+    ...    ${lastfailure_regex_expr}
+    ...    ${lastNotification_regex_expr}
+    ...    ${timesFailed_regex_expr}
+    ...    ${timesSent_regex_expr}
+
     Check Created Resource Set To    ${subscription_payload}    ${response1.json()}    ${ignored_attributes}
 
+    Check Dictionary Might Contain Additional Members    ${response1.json()}    lastNotification
+    Check Dictionary Might Contain Additional Members    ${response1.json()}    lastFailure
+    Check Dictionary Might Contain Additional Members    ${response1.json()}    lastSuccess
+    Check Dictionary Might Contain Additional Members    ${response1.json()}    timesSent
+
 
 *** Keywords ***
 Generate Random Ids For Context Source Registration Subscriptions
diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_02.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_02.robot
index be5f0caeb80245ed4252e97de81188b86dea6402..fe198aac608ade0998f1d94ce482abab56957ebe 100644
--- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_02.robot
+++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_02.robot
@@ -4,13 +4,13 @@ Documentation       Check that you can create a context source registration subs
 Resource            ${EXECDIR}/resources/ApiUtils/ContextSourceRegistrationSubscription.resource
 Resource            ${EXECDIR}/resources/AssertionUtils.resource
 Resource            ${EXECDIR}/resources/JsonUtils.resource
-Resource            ${EXECDIR}/resources/HttpUtils.resource
 
 Suite Teardown      Delete Created Context Source Registration Subscriptions
 
 
 *** Variables ***
 ${subscription_payload_file_path}=      csourceSubscriptions/subscription-sample.jsonld
+${subscription_id}=                     ${EMPTY}
 
 
 *** Test Cases ***
@@ -18,11 +18,15 @@ ${subscription_payload_file_path}=      csourceSubscriptions/subscription-sample
     [Documentation]    Check that you can create a context source registration subscription without providing an id and it will be automatically generated
     [Tags]    csrsub-create    5_11_2
     ${subscription_payload}=    Load Test Sample    ${subscription_payload_file_path}
+    Remove From Dictionary    ${subscription_payload}    id
     ${response}=    Create Context Source Registration Subscription    ${subscription_payload}
-    ${subscription_id}=    Fetch Id From Response Location Header    ${response.headers}
-    Check Response Status Code    201    ${response.status_code}
-    Check Response Headers Containing URI set to    ${subscription_id}    ${response.headers}
+
+    Dictionary Should Contain Key    ${response.headers}    Location    msg=HTTP Headers do not contain key 'Location'
+    ${subscription_id}=    Get From Dictionary    ${response.headers}    Location
     Set Suite Variable    ${subscription_id}
+
+    Check Response Status Code    201    ${response.status_code}
+
     ${response1}=    Retrieve Context Source Registration Subscription
     ...    subscription_id=${subscription_id}
     ...    context=${ngsild_test_suite_context}
@@ -33,4 +37,8 @@ ${subscription_payload_file_path}=      csourceSubscriptions/subscription-sample
 
 *** Keywords ***
 Delete Created Context Source Registration Subscriptions
-    Delete Context Source Registration Subscription    ${subscription_id}
+    IF    "${subscription_id}" != "${EMPTY}"
+        Delete Context Source Registration Subscription    ${subscription_id}
+    ELSE
+        Log To Console    \nThere was no Context Source Registration Subscription to delete\n
+    END
diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_04.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_04.robot
index e59b8a923ddbfea227d540ae83eb6596d3b8d133..e2fb5b4ffcca430be7c168dfcce229c57ec37099 100644
--- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_04.robot
+++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_04.robot
@@ -24,6 +24,13 @@ ${subscription_payload_file_path}=      csourceSubscriptions/subscription-inacti
     Check Response Headers Containing URI set to    ${subscription_id}    ${response.headers}
     ${response1}=    Retrieve Context Source Registration Subscription
     ...    subscription_id=${subscription_id}
+
+    # The conversion of a boolean data to json for a python object transform false -> False and true -> True
+    Check Response Body Containing a Boolean Attribute set to
+    ...    expected_attribute_name=isActive
+    ...    response_body=${response1.json()}
+    ...    expected_attribute_value=False
+
     Check Response Body Containing an Attribute set to
     ...    expected_attribute_name=status
     ...    response_body=${response1.json()}
diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_05.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_05.robot
index e377447634149d76de1264a93006ab035d329b54..18ed598f84c9ff588a6a6e637e6295dfa45c26ea 100644
--- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_05.robot
+++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_05.robot
@@ -20,20 +20,26 @@ ${subscription_payload_file_path}=      csourceSubscriptions/subscription-expire
     [Tags]    csrsub-create    5_11_2
     ${subscription_payload_sample}=    Load Test Sample    ${subscription_payload_file_path}    ${subscription_id}
     ${current_date}=    Get Current Date    time_zone=UTC    result_format=${date_format}
-    ${expiresAt}=    Add Time To Date    ${current_date}    10 seconds    date_format=${date_format}
+    ${expiresAt}=    Add Time To Date    ${current_date}    10 seconds    result_format=${date_format}
     ${subscription_payload}=    Update Value To JSON    ${subscription_payload_sample}    $..expiresAt    ${expiresAt}
     ${response}=    Create Context Source Registration Subscription    ${subscription_payload}
     Check Response Status Code    201    ${response.status_code}
     Check Response Headers Containing URI set to    ${subscription_id}    ${response.headers}
     Sleep    15s
+
     ${response1}=    Retrieve Context Source Registration Subscription
     ...    subscription_id=${subscription_id}
+
+    Check Response Body Contains DateTime Value
+    ...    dictionary=${response1.json()}
+    ...    key=expiresAt
+    ...    expected value=${expiresAt}
+
     Check Response Body Containing an Attribute set to
     ...    expected_attribute_name=status
     ...    response_body=${response1.json()}
     ...    expected_attribute_value=expired
 
-
 *** Keywords ***
 Generate Random Ids For Context Source Registration Subscriptions
     ${subscription_id}=    Generate Random Entity Id    ${subscription_id_prefix}
diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_07.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_07.robot
index db8fbe78059b98098447a727547dc6c21ca96a49..e9cb913c2b2aa80e96c31aab9c8f2b6c425c2e0b 100644
--- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_07.robot
+++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_07.robot
@@ -21,10 +21,9 @@ ${subscription_payload_file_path}=      csourceSubscriptions/subscription-sample
     ${subscription_payload}=    Load Test Sample    ${subscription_payload_file_path}    ${subscription_id}
     ${response}=    Create Context Source Registration Subscription    ${subscription_payload}
     Check Response Status Code    409    ${response.status_code}
-    Check Response Body Containing ProblemDetails Element Containing Type Element set to
-    ...    ${response.json()}
-    ...    ${ERROR_TYPE_ALREADY_EXISTS}
-    Check Response Body Containing ProblemDetails Element Containing Title Element    ${response.json()}
+    Check Response Body Containing ProblemDetails Element
+    ...    response_body=${response.json()}
+    ...    problem_type=${ERROR_TYPE_ALREADY_EXISTS}
 
 
 *** Keywords ***
diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_08.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_08.robot
index 8a119eaa98afc374a7c5c1762f2f9a9899a942bf..05e2da3120c9f7e1b5652bfca6efdbdefc224368 100644
--- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_08.robot
+++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_08.robot
@@ -36,7 +36,6 @@ Create Invalid Context Source Registration Subscription
     ${subscription_payload}=    Load Test Sample    ${filepath}    ${subscription_id}
     ${response}=    Create Context Source Registration Subscription    ${subscription_payload}
     Check Response Status Code    400    ${response.status_code}
-    Check Response Body Containing ProblemDetails Element Containing Type Element set to
-    ...    ${response.json()}
-    ...    ${ERROR_TYPE_BAD_REQUEST_DATA}
-    Check Response Body Containing ProblemDetails Element Containing Title Element    ${response.json()}
+    Check Response Body Containing ProblemDetails Element
+    ...    response_body=${response.json()}
+    ...    problem_type=${ERROR_TYPE_BAD_REQUEST_DATA}
diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_09.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_09.robot
index b3da65119f068dcd6b37bc25d99ad5ecdf3d7187..420689f22590a764667981b4c56acb3d5c81b7b4 100644
--- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_09.robot
+++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_09.robot
@@ -19,7 +19,6 @@ ${subscription_payload_file_path}=      csourceSubscriptions/subscription-expire
     ${subscription_payload}=    Load Test Sample    ${subscription_payload_file_path}    ${subscription_id}
     ${response}=    Create Context Source Registration Subscription    ${subscription_payload}
     Check Response Status Code    400    ${response.status_code}
-    Check Response Body Containing ProblemDetails Element Containing Type Element set to
-    ...    ${response.json()}
-    ...    ${ERROR_TYPE_BAD_REQUEST_DATA}
-    Check Response Body Containing ProblemDetails Element Containing Title Element    ${response.json()}
+    Check Response Body Containing ProblemDetails Element
+    ...    response_body=${response.json()}
+    ...    problem_type=${ERROR_TYPE_BAD_REQUEST_DATA}
diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/QueryContextSourceRegistrationSubscriptions/041_01.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/QueryContextSourceRegistrationSubscriptions/041_01.robot
index 67535b429bd60977fdd182c07d92df56f2b914f9..72bfb91d67897c965af29dc141c4cae38b2550e4 100644
--- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/QueryContextSourceRegistrationSubscriptions/041_01.robot
+++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/QueryContextSourceRegistrationSubscriptions/041_01.robot
@@ -6,7 +6,7 @@ Resource            ${EXECDIR}/resources/AssertionUtils.resource
 Resource            ${EXECDIR}/resources/JsonUtils.resource
 
 Test Setup          Setup Initial Context Source Registration Subscriptions
-Test Teardown       Delete Created Context Source Registration Subscription
+Test Teardown       Delete Created Context Source Registration Subscriptions
 
 
 *** Variables ***
diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/QueryContextSourceRegistrationSubscriptions/041_03.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/QueryContextSourceRegistrationSubscriptions/041_03.robot
index bdf0fc8a96a3c2505157bd30df16c3deb3940d3c..dd52a0c7be27c767a8339ec9ee66ac8770d2b7d0 100644
--- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/QueryContextSourceRegistrationSubscriptions/041_03.robot
+++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/QueryContextSourceRegistrationSubscriptions/041_03.robot
@@ -42,7 +42,7 @@ Query Context Source Registration Subscriptions With Limit And Page Parameters
     ...    Subscription
     ...    ${expected_subscription_number}
     ...    ${response.json()}
-    Check Pagination Prev And Next Headers    ${prev_link}    ${next_link}    ${response.json()}
+    Check Pagination Prev And Next Headers    ${prev_link}    ${next_link}    ${response.headers}
 
 Setup Initial Context Source Registration Subscriptions
     ${first_subscription_id}=    Generate Random Entity Id    ${subscription_id_prefix}
diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/RetrieveContextSourceRegistrationSubscription/040_01.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/RetrieveContextSourceRegistrationSubscription/040_01.robot
index 723aea97769393fce9c88acd54f5ba9db56051c2..8af8977180265d5e5d2237a8c619ea9a68157f7b 100644
--- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/RetrieveContextSourceRegistrationSubscription/040_01.robot
+++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/RetrieveContextSourceRegistrationSubscription/040_01.robot
@@ -22,11 +22,39 @@ ${expectation_file_path}=               csourceSubscriptions/expectations/subscr
     ${response}=    Retrieve Context Source Registration Subscription
     ...    subscription_id=${subscription_id}
     ...    context=${ngsild_test_suite_context}
+
+    ${expected_link_header}=    CATENATE
+    ...    SEPARATOR=
+    ...    <
+    ...    ${ngsild_test_suite_context}
+    ...    >; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json"
+
     Check Response Status Code    200    ${response.status_code}
-    Check Response Body Containing Subscription element
-    ...    ${expectation_file_path}
-    ...    ${subscription_id}
-    ...    ${response.json()}
+    Check Response Reason set to    ${response.reason}    OK
+    Check Response Headers Link set to
+    ...    response_headers=${response.headers}
+    ...    expected_link_header=${expected link header}
+
+    ${expectation_payload}=    Load Test Sample    ${expectation_file_path}    ${subscription_id}
+
+    # We need to ignore the Additional Members ('lastFailure', 'lastNotification', 'timesFailed', 'timesSent', 'isActive')
+    ${ignored_attributes}=    Create List
+    ...    ${status_regex_expr}
+    ...    ${lastfailure_regex_expr}
+    ...    ${lastNotification_regex_expr}
+    ...    ${timesFailed_regex_expr}
+    ...    ${timesSent_regex_expr}
+    ...    ${is_active_expr}
+
+    Check Created Resource Set To
+    ...    created_resource=${expectation_payload}
+    ...    response_body=${response.json()}
+    ...    ignored_keys=${ignored_attributes}
+
+    Check Dictionary Might Contain Additional Members    ${response.json()}    lastNotification
+    Check Dictionary Might Contain Additional Members    ${response.json()}    lastFailure
+    Check Dictionary Might Contain Additional Members    ${response.json()}    lastSuccess
+    Check Dictionary Might Contain Additional Members    ${response.json()}    timesSent
 
 
 *** Keywords ***
diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/RetrieveContextSourceRegistrationSubscription/040_02.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/RetrieveContextSourceRegistrationSubscription/040_02.robot
index c86cc31ab76a016492a1fd15649a4aac5b0938ec..38e117d9f0d0ef5bec1d81f35263776cb445417e 100644
--- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/RetrieveContextSourceRegistrationSubscription/040_02.robot
+++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/RetrieveContextSourceRegistrationSubscription/040_02.robot
@@ -12,8 +12,10 @@ Resource            ${EXECDIR}/resources/JsonUtils.resource
     [Tags]    csrsub-retrieve    5_11_4
     ${response}=    Retrieve Context Source Registration Subscription
     ...    subscription_id=invalidUri
+
     Check Response Status Code    400    ${response.status_code}
-    Check Response Body Containing ProblemDetails Element Containing Type Element set to
-    ...    ${response.json()}
-    ...    ${ERROR_TYPE_BAD_REQUEST_DATA}
-    Check Response Body Containing ProblemDetails Element Containing Title Element    ${response.json()}
+    Check Response Reason set to    ${response.reason}    Bad Request
+    Check Response Headers Containing Content-Type set to    ${CONTENT_TYPE_JSON}    ${response.headers}
+    Check Response Body Containing ProblemDetails Element
+    ...    response_body=${response.json()}
+    ...    problem_type=${ERROR_TYPE_BAD_REQUEST_DATA}
diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/RetrieveContextSourceRegistrationSubscription/040_03.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/RetrieveContextSourceRegistrationSubscription/040_03.robot
index fd5dd105cf76b1bbf400561070b155305fbfb682..c615e3fd693a252fd248206f4d2f39faf9665cb6 100644
--- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/RetrieveContextSourceRegistrationSubscription/040_03.robot
+++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/RetrieveContextSourceRegistrationSubscription/040_03.robot
@@ -12,8 +12,10 @@ Resource            ${EXECDIR}/resources/JsonUtils.resource
     [Tags]    csrsub-retrieve    5_11_4
     ${response}=    Retrieve Context Source Registration Subscription
     ...    subscription_id=urn:ngsi-ld:Subscription:unknowSubscription
+
     Check Response Status Code    404    ${response.status_code}
-    Check Response Body Containing ProblemDetails Element Containing Type Element set to
-    ...    ${response.json()}
-    ...    ${ERROR_TYPE_RESOURCE_NOT_FOUND}
-    Check Response Body Containing ProblemDetails Element Containing Title Element    ${response.json()}
+    Check Response Reason set to    ${response.reason}    Not Found
+    Check Response Headers Containing Content-Type set to    ${CONTENT_TYPE_JSON}    ${response.headers}
+    Check Response Body Containing ProblemDetails Element
+    ...    response_body=${response.json()}
+    ...    problem_type=${ERROR_TYPE_RESOURCE_NOT_FOUND}
diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_01.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_01.robot
index 0cf7c44becf736cacac7efa50458522a75a68ffe..7269685b66d7d85f9ddbec7db51e1a5ae07fd457 100644
--- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_01.robot
+++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_01.robot
@@ -24,6 +24,9 @@ ${subscription_update_fragment_file_path}=      csourceSubscriptions/fragments/s
     ...    ${subscription_id}
     ...    ${subscription_update_fragment}
     Check Response Status Code    204    ${response.status_code}
+    Check Response Does Not Contain Body    ${response}
+    Check Response Reason set to    ${response.reason}    No Content
+
     ${subscription}=    Upsert Element In Entity    ${subscription_payload}    ${subscription_update_fragment}
     ${response1}=    Retrieve Context Source Registration Subscription
     ...    subscription_id=${subscription_id}
diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_02.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_02.robot
index 63bcdd789df1437004441d53fa758fe421d0e29c..bee88a1d9376eaf102cef9169af6666f5487c423 100644
--- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_02.robot
+++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_02.robot
@@ -17,7 +17,6 @@ ${subscription_update_fragment_file_path}=      csourceSubscriptions/fragments/s
     ${subscription_update_fragment}=    Load Test Sample    ${subscription_update_fragment_file_path}
     ${response}=    Update Context Source Registration Subscription    invalidUri    ${subscription_update_fragment}
     Check Response Status Code    400    ${response.status_code}
-    Check Response Body Containing ProblemDetails Element Containing Type Element set to
-    ...    ${response.json()}
-    ...    ${ERROR_TYPE_BAD_REQUEST_DATA}
-    Check Response Body Containing ProblemDetails Element Containing Title Element    ${response.json()}
+    Check Response Body Containing ProblemDetails Element
+    ...    response_body=${response.json()}
+    ...    problem_type=${ERROR_TYPE_BAD_REQUEST_DATA}
diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_03.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_03.robot
index c1688c1947abb563c3febe3b29fa6aca9e4076c8..b76d710e65bc8ed776495d39787a8214b4a76aca 100644
--- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_03.robot
+++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_03.robot
@@ -19,7 +19,6 @@ ${subscription_update_fragment_file_path}=      csourceSubscriptions/fragments/s
     ...    urn:ngsi-ld:Subscription:unknowSubscription
     ...    ${subscription_update_fragment}
     Check Response Status Code    404    ${response.status_code}
-    Check Response Body Containing ProblemDetails Element Containing Type Element set to
-    ...    ${response.json()}
-    ...    ${ERROR_TYPE_RESOURCE_NOT_FOUND}
-    Check Response Body Containing ProblemDetails Element Containing Title Element    ${response.json()}
+    Check Response Body Containing ProblemDetails Element
+    ...    response_body=${response.json()}
+    ...    problem_type=${ERROR_TYPE_RESOURCE_NOT_FOUND}
diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_04.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_04.robot
index af44abfbaa41462beac23f5af04a63deefeabac0..b9b6c64092ddf90a761713ada321d4f7ab7970c6 100644
--- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_04.robot
+++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_04.robot
@@ -33,10 +33,9 @@ Update Context Source Registration Subscription With Invalid Fragment
     ...    ${subscription_id}
     ...    ${subscription_update_fragment}
     Check Response Status Code    400    ${response.status_code}
-    Check Response Body Containing ProblemDetails Element Containing Type Element set to
-    ...    ${response.json()}
-    ...    ${ERROR_TYPE_BAD_REQUEST_DATA}
-    Check Response Body Containing ProblemDetails Element Containing Title Element    ${response.json()}
+    Check Response Body Containing ProblemDetails Element
+    ...    response_body=${response.json()}
+    ...    problem_type=${ERROR_TYPE_BAD_REQUEST_DATA}
 
 Setup Initial Context Source Registration Subscriptions
     ${subscription_id}=    Generate Random Entity Id    ${subscription_id_prefix}
diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_05.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_05.robot
index 0115728e3099b40f4662534a2dc0eb669b8563ad..a843710992964183e8bace7204a6fa1dd745a175 100644
--- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_05.robot
+++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_05.robot
@@ -23,10 +23,9 @@ ${subscription_update_fragment_file_path}=      csourceSubscriptions/fragments/s
     ...    ${subscription_id}
     ...    ${subscription_update_fragment_file_path}
     Check Response Status Code    400    ${response.status_code}
-    Check RL Response Body Containing ProblemDetails Element Containing Type Element set to
-    ...    ${response.json()}
-    ...    ${ERROR_TYPE_INVALID_REQUEST}
-    Check RL Response Body Containing ProblemDetails Element Containing Title Element    ${response.json()}
+    Check Response Body Containing ProblemDetails Element
+    ...    response_body=${response.json()}
+    ...    problem_type=${ERROR_TYPE_BAD_REQUEST_DATA}
 
 
 *** Keywords ***
diff --git a/doc/analysis/checks.py b/doc/analysis/checks.py
index 70b7a570479e1b2fffe178139546ae208582081e..50208329ccaf635d65cc78715dff9db91a72bb06 100644
--- a/doc/analysis/checks.py
+++ b/doc/analysis/checks.py
@@ -56,8 +56,14 @@ class Checks:
                 Checks.check_response_body_containing_problemdetails_element_containing_type_element_set_to,
             'Check Response Body Title When Using Session Request':
                 Checks.check_response_body_title_when_using_session_request,
+            'Check Response Body Containing a Boolean Attribute set to':
+                Checks.check_response_body_containing_a_boolean_attribute_set_to,
+            'Check Response Body Contains DateTime Value':
+                Checks.check_response_body_contains_datetime_value,
             'Check Response Body Containing ProblemDetails Element Containing Title Element':
                 Checks.check_response_body_containing_problemdetails_element_containing_title_element,
+            'Check Dictionary Might Contain Additional Members':
+                Checks.check_dictionary_might_contain_additional_members,
             'Check Response Body Containing ProblemDetails Element':
                 Checks.check_response_body_containing_problemdetails_element,
             'Check RL Response Body Containing ProblemDetails Element Containing Type Element set to':
@@ -106,6 +112,10 @@ class Checks:
                 Checks.check_response_reason_set_to,
             'Check Response Does Not Contain Body':
                 Checks.check_response_does_not_contain_body,
+            'Check Response Header is Empty':
+                Checks.check_response_header_is_empty,
+            'Check Response Headers Link set to':
+                Checks.check_response_headers_link_set_to,
             'Check Response Headers Containing NGSILD-Results-Count Equals To' :
                 Checks.check_response_header_contains_ngsild_results_count_equals_to,
         }
@@ -139,6 +149,10 @@ class Checks:
                 'params': ['response_body'],
                 'position': [0]
             },
+            'Check Dictionary Might Contain Additional Members': {
+                'params': ['dictionary', 'key'],
+                'position': [0, 1]
+            },
             'Check Response Headers Containing URI set to': {
                 'params': ['expected_entity_id', 'response_headers'],
                 'position': [0, 1]
@@ -183,6 +197,14 @@ class Checks:
                 'params': ['response_body'],
                 'position': [0]
             },
+            'Check Response Body Containing a Boolean Attribute set to': {
+                'params': ['expected_attribute_name', 'response_body', 'expected_attribute_value'],
+                'position': [0, 1, 2]
+            },
+            'Check Response Body Contains DateTime Value': {
+                'params': ['dictionary', 'key', 'expected value'],
+                'position': [0, 1, 2]
+            },
             'Check Response Body Containing List Containing Subscription elements': {
                 'params': ['file', 'id', 'response'],
                 'position': [0, 1, 2]
@@ -304,6 +326,14 @@ class Checks:
             'Check Response Does Not Contain Body': {
                 'params': ['response'],
                 'position': [0]
+            },
+            'Check Response Header is Empty': {
+                'params': ['response_headers'],
+                'position': [0]
+            },
+            'Check Response Headers Link set to': {
+                'params': ['response_headers', 'expected_link_header'],
+                'position': [0, 1]
             }
             ,
             'Check Response Headers Containing NGSILD-Results-Count Equals To': {
@@ -367,6 +397,14 @@ class Checks:
 
         return response
 
+    @staticmethod
+    def check_response_header_is_empty(kwargs: list) -> str:
+        return "The response header contains an empty dictionary"
+
+    @staticmethod
+    def check_response_headers_link_set_to(kwargs: list) -> str:
+        return f"The response headers Link is set to '{kwargs['expected_link_header']}'"
+
     @staticmethod
     def wait_for_no_notification(kwargs: list) -> str:
         expected_parameters = ['timeout']
@@ -434,6 +472,11 @@ class Checks:
         else:
             raise Exception(f'ERROR, Expected status_code parameter but received: {kwargs}')
 
+    @staticmethod
+    def check_response_body_containing_a_boolean_attribute_set_to(kwargs: list) -> str:
+        return (f"Check that the payload body contains a boolean attribute with name "
+                f"'{kwargs['expected_attribute_name']}' and value '{kwargs['expected_attribute_value']}")
+
     @staticmethod
     def check_response_headers_link_not_empty(kwargs: list) -> str:
         return f'Response Header: Link is not Empty'
@@ -450,6 +493,13 @@ class Checks:
     def check_response_headers_id_not_empty(kwargs: list) -> str:
         return 'Response Header: Location is not Empty'
 
+    @staticmethod
+    def check_dictionary_might_contain_additional_members(kwargs: list) -> str:
+        if 'dictionary' in kwargs and 'key' in kwargs:
+            return f"The dictionary `{kwargs['dictionary']}' might contain the key '{kwargs['key']}'"
+        else:
+            raise Exception(f"ERROR, Expected 'dictionary' and 'key' parameters but received: {kwargs}")
+
     @staticmethod
     def check_response_body_containing_an_attribute_set_to(kwargs: list) -> str:
         expected_parameters = ['checks', 'expected_attribute_name', 'response_body', 'expected_attribute_value']
@@ -577,6 +627,12 @@ class Checks:
         else:
             raise Exception(f"ERROR, expected parameters 'filename' and 'entity_ids', but received '{kwargs}'")
 
+    @staticmethod
+    def check_response_body_contains_datetime_value(kwargs: list) -> str:
+        # ${dictionary}    ${key}    ${expected value}
+        return (f"Check that the dictionary contains the key '{kwargs['key']}' with type DateTime and value set "
+                f"to '{kwargs['expected value']}'")
+
     @staticmethod
     def check_response_body_containing_subscription_element(kwargs: list) -> str:
         if 'filename' in kwargs and 'subscription_id' in kwargs and 'response_body' in kwargs:
@@ -765,7 +821,7 @@ class Checks:
                 case 'response_body':
                     response = f"{response} and\n    Query Parameter: '{key}' set to '{value}'"
                 case 'ignored_keys':
-                    response = f"{response} and\n    Query Parameter: '{key}' set to '{value}'"
+                    response = f"{response} and\n    Query Parameter: '{key}' set to '{value}' list of keys"
                 # If an exact match is not confirmed, this last case will be used if provided
                 case 'checks':
                     pass
diff --git a/doc/analysis/generaterobotdata.py b/doc/analysis/generaterobotdata.py
index 2bd78f1c1a887d327afce42050b8583677b7ce3f..ba74bcb037b6e5679eb5b5fca9139c8b5279a8ed 100644
--- a/doc/analysis/generaterobotdata.py
+++ b/doc/analysis/generaterobotdata.py
@@ -1,9 +1,9 @@
 from os.path import dirname
 from robot.api import TestSuiteBuilder
-from analysis.parserobotfile import ParseRobotFile
-from analysis.parseapiutilsfile import ParseApiUtilsFile
-from analysis.parsevariablesfile import ParseVariablesFile
-from analysis.initial_setup import InitialSetup
+from doc.analysis.parserobotfile import ParseRobotFile
+from doc.analysis.parseapiutilsfile import ParseApiUtilsFile
+from doc.analysis.parsevariablesfile import ParseVariablesFile
+from doc.analysis.initial_setup import InitialSetup
 from re import match, findall, finditer, sub, MULTILINE
 
 
@@ -15,7 +15,6 @@ class GenerateRobotData:
 
         self.config_variables = ParseVariablesFile()
         self.robot = ParseRobotFile(filename=robot_file, execdir=execdir, config_file=self.config_variables)
-        # TODO: the robot file can provide several ApiUtils not only one
         self.apiutils = [ParseApiUtilsFile(filename=file) for file in self.robot.resource_files]
         self.robot.set_apiutils(self.apiutils)
 
@@ -122,7 +121,7 @@ class GenerateRobotData:
         # Generate the initial_condition of the test suite
         self.test_suite['initial_condition'] = self.generate_initial_condition()
 
-    def generate_initial_condition(self) -> str :
+    def generate_initial_condition(self) -> str:
         aux = [x['setup'] for x in self.test_cases]
         if all(element == aux[0] for element in aux[1:]):
             aux = self.initial_setup.get_initial_condition(initial_condition=aux[0])
@@ -131,7 +130,8 @@ class GenerateRobotData:
             print(f'Something went wrong, the test suite {self.suite.resource.source} '
                   f'has different "setup" values for its test cases.')
 
-    def get_permutation_keys(self, data):
+    @staticmethod
+    def get_permutation_keys(data):
         all_keys = set().union(*data)
         excluded_keys = ['doc', 'permutation_tp_id', 'setup', 'teardown', 'name', 'tags']
         all_keys = [x for x in all_keys if x not in excluded_keys]
@@ -154,7 +154,7 @@ class GenerateRobotData:
 
     def get_params(self, test_case: str):
         test_case = self.get_data_template(string=test_case)
-        lines_starting_response = findall(r'^\s*\$\{response\}.*|^\s*\$\{notification\}.*', test_case, MULTILINE)
+        lines_starting_response = findall(r'^\s*\$\{response}.*|^\s*\$\{notification}.*', test_case, MULTILINE)
 
         # If there is more than one line, it means that the test case has several operations, all of them to
         # create the environment content to execute the last one, which is the correct one to test the Test Case
@@ -171,7 +171,7 @@ class GenerateRobotData:
         aux = [x for x in aux if x != '']
 
         params = list()
-        request = str()
+        request = list()
 
         # Get the list of params of the function, they are the keys
         if '    ...    ' in aux[1]:
@@ -181,7 +181,7 @@ class GenerateRobotData:
             # We are in the case that the attributes are in following lines
             for i in range(1, len(aux)):
                 if '    ...    ' in aux[i]:
-                    regex = '(\s{4})*\s{4}\.{3}\s{4}(.*)'
+                    regex = r'(\s{4})*\s{4}\.{3}\s{4}(.*)'
                     param = match(pattern=regex, string=aux[i])
                     if aux:
                         params.append(param.groups()[1])
@@ -215,6 +215,9 @@ class GenerateRobotData:
 
         request, params = self.get_params(test_case=string)
 
+        verb = str()
+        query_param = str()
+        url = str()
         for data in self.apiutils:
             verb, url, query_param = data.get_response(keyword=request)
             if verb != '':
@@ -245,6 +248,7 @@ class GenerateRobotData:
             key = header_key[0]
             value = self.get_header_value(key=key)
         else:
+            aux = list()
             # 2nd case, maybe the params are defined in the way <param>=<value>
             for k in self.headers:
                 aux = [x for x in params if k in x]
@@ -271,9 +275,9 @@ class GenerateRobotData:
         data = [self.get_value_url(key=x, request=request, params=params) for x in keys]
 
         if not query_param:
-            data = '/'.join(data).replace('//', '/').replace('?/','?')
+            data = '/'.join(data).replace('//', '/').replace('?/', '?')
         else:
-            aux = '/'.join(data[:-1]).replace('//', '/').replace('?/','?')
+            aux = '/'.join(data[:-1]).replace('//', '/').replace('?/', '?')
             data = f"{aux}?{data[-1]}"
 
         return data
@@ -374,6 +378,8 @@ class GenerateRobotData:
         tp_id = self.generate_name()
         reference, clauses = self.generate_reference(version=version)
 
+        # TODO: robotframework==7.0 has not property keywords in the class TestSuite(), we can get the data from
+        #  [x.to_dict()['name'] for x in list(self.suite.resource.keywords)] but with some differences in execution code
         self.test_suite = {
             'tp_id': tp_id,
             'test_objective': self.suite.doc,
@@ -382,7 +388,8 @@ class GenerateRobotData:
             'parent_release': version,
             'clauses': clauses,
             'pics_selection': str(),
-            'keywords': [str(x) for x in self.suite.keywords],
+            # 'keywords': [str(x) for x in self.suite.keywords],
+            'keywords': [x.to_dict()['name'] for x in list(self.suite.resource.keywords)],
             'teardown': str(self.suite.teardown),
             'initial_condition': str(),
             'test_cases': list()
@@ -540,7 +547,8 @@ class GenerateRobotData:
 
         return reference, clauses
 
-    def get_substring(self, string: str, key: str):
+    @staticmethod
+    def get_substring(string: str, key: str):
         pos1 = string.find(key) - 1
         pos2 = string[pos1:].find('\n')
         result = string[pos1:pos1+pos2].split('    ')
diff --git a/doc/analysis/initial_setup.py b/doc/analysis/initial_setup.py
index 0ac0275308a5464cb7fe6bcb165111f7a1cb6c85..a23d90777071579155381b304e8d708e01f16c2c 100644
--- a/doc/analysis/initial_setup.py
+++ b/doc/analysis/initial_setup.py
@@ -227,12 +227,12 @@ class InitialSetup:
         if len(deleted_setup) != 0:
             print(f"    WARNING: Some of the Setup functions were deleted:\n{deleted_setup}")
         else:
-            print("    INFO: All current Setup functions are used in the Robot files")
+            print(f"    INFO: All current Setup functions are used in the Robot files")
 
         if len(not_included_keys) != 0:
             print(f"    ERROR: Some Setup functions are not include in the Class:\n{not_included_keys}")
         else:
-            print("    INFO: All the current Setup functions used in Robot files are included in the Class")
+            print(f"    INFO: All the current Setup functions used in Robot files are included in the Class")
 
         print()
 
@@ -264,14 +264,20 @@ class InitialSetup:
 
     def get_initial_condition(self, initial_condition: str) -> str:
         try:
-            return self.init[initial_condition]
+            if initial_condition is not None:
+                data = self.init[initial_condition]
+            else:
+                data = '''with {
+   the SUT containing an initial state
+}'''
         except KeyError:
             print(f"ERROR: the initial condition '{initial_condition}' is not defined in the dictionary. "
                   f"Please check it and add the new initial condition.")
             data = '''with {
    the SUT containing an initial state
 }'''
-            return data
+
+        return data
 
 
 if __name__ == "__main__":
diff --git a/doc/analysis/parseapiutilsfile.py b/doc/analysis/parseapiutilsfile.py
index 3c55f93ac32c91e2ca11eb5f81bf75c1bc8e9aff..d1caf3823b6905ec2922e13c470bf351a287c2cc 100644
--- a/doc/analysis/parseapiutilsfile.py
+++ b/doc/analysis/parseapiutilsfile.py
@@ -21,10 +21,9 @@ class ParseApiUtilsFile:
         string = string[index:]
         string = string.split('\n')
 
-        index = None
         for i, item in enumerate(string):
             if 'response' in item:
-                regex = "\s{4}\$\{response\}=\s{4}(POST|GET|PUT|PATCH|DELETE).*"
+                regex = r"\s{4}\$\{response\}=\s{4}(POST|GET|PUT|PATCH|DELETE).*"
                 match = re.match(pattern=regex, string=item)
 
                 if match:
@@ -35,8 +34,8 @@ class ParseApiUtilsFile:
         return verb, url, query_param
 
     @staticmethod
-    def get_url_request(url: str) -> list:
-        # We have two options, the url is defined in the same line of the response or it is defined in the following
+    def get_url_request(url: str) -> [list, bool]:
+        # We have two options, the url is defined in the same line of the response, or it is defined in the following
         # lines with '...'
         keys = list()
         parameters = list()
@@ -57,7 +56,7 @@ class ParseApiUtilsFile:
                 aux = parameters[0]
                 query_param = True
 
-            keys = re.split(r'\$|/', aux)
+            keys = re.split(r'[$/]', aux)
             keys = [k for k in keys if k != '']
 
             if len(parameters) != 0:
@@ -68,7 +67,7 @@ class ParseApiUtilsFile:
             match = re.match(pattern=regex, string=url)
             if match:
                 aux = match.groups()[0]
-                keys = re.split(r'\$|/', aux)
+                keys = re.split(r'[$/]', aux)
                 keys = [k for k in keys if k != '']
 
         return keys, query_param
@@ -81,7 +80,7 @@ class ParseApiUtilsFile:
 
     def get_variables_data_variables(self, string):
         # Get the simple variables from the file
-        regex = "^(\$\{.*\})\s*(.*)\n"
+        regex = r"^(\$\{.*\})\s*(.*)\n"
 
         matches = re.finditer(regex, string, re.MULTILINE)
         for match in matches:
@@ -94,7 +93,7 @@ class ParseApiUtilsFile:
 
     def get_variables_data_dictionaries(self, string):
         # Get the dictionary variables from the file
-        regex = '(\&\{.*\})'
+        regex = r'(\&\{.*\})'
         matches = re.finditer(regex, string, re.MULTILINE)
         for match in matches:
             # Check that we have two groups matched
@@ -109,7 +108,7 @@ class ParseApiUtilsFile:
                 index = aux.find('\n${')
                 aux = aux[:index + 1]
 
-                regex = '\.{3}[ ]*([a-zA-Z]+)=(.*)\n'
+                regex = r'\.{3}[ ]*([a-zA-Z]+)=(.*)\n'
                 matches2 = re.finditer(regex, aux, re.MULTILINE)
                 dict_values = dict()
                 for match2 in matches2:
diff --git a/doc/analysis/parserobotfile.py b/doc/analysis/parserobotfile.py
index 6fe294d6d55defdd9866ec8829c2a155c6449bc2..2d9666b5d565c654a830ba312257a8dd0538cb3b 100644
--- a/doc/analysis/parserobotfile.py
+++ b/doc/analysis/parserobotfile.py
@@ -1,7 +1,7 @@
 import re
 import os
-from analysis.checks import Checks
-from analysis.requests import Requests
+from doc.analysis.checks import Checks
+from doc.analysis.requests import Requests
 
 
 class ParseRobotFile:
diff --git a/doc/files/CommonBehaviours/043_01.json b/doc/files/CommonBehaviours/043_01.json
index 2e4dd494102e7257c7369b3329cd9091c77c8c8b..a2c342ab577e9a36726ed93d8889685216590c51 100644
--- a/doc/files/CommonBehaviours/043_01.json
+++ b/doc/files/CommonBehaviours/043_01.json
@@ -18,6 +18,7 @@
       "doc": "Verify receiving 503 \u2013 LdContextNotAvailable error if remote JSON-LD @context cannot be retrieved (Create entity)",
       "tags": [
         "5_2_2",
+        "cb-ldcontext",
         "e-create"
       ],
       "setup": null,
@@ -34,6 +35,7 @@
       "doc": "Verify receiving 503 \u2013 LdContextNotAvailable error if remote JSON-LD @context cannot be retrieved (Create subscription)",
       "tags": [
         "5_2_2",
+        "cb-ldcontext",
         "sub-create"
       ],
       "setup": null,
@@ -50,6 +52,7 @@
       "doc": "Verify receiving 503 \u2013 LdContextNotAvailable error if remote JSON-LD @context cannot be retrieved (Create Temporal Representation of Entities)",
       "tags": [
         "5_2_2",
+        "cb-ldcontext",
         "te-create"
       ],
       "setup": null,
@@ -66,7 +69,8 @@
       "doc": "Verify receiving 503 \u2013 LdContextNotAvailable error if remote JSON-LD @context cannot be retrieved (Batch entity create)",
       "tags": [
         "5_2_2",
-        "be-create"
+        "be-create",
+        "cb-ldcontext"
       ],
       "setup": null,
       "teardown": "Batch Delete Entities",
@@ -82,6 +86,7 @@
       "doc": "Verify receiving 503 \u2013 LdContextNotAvailable error if remote JSON-LD @context cannot be retrieved (Create context source registration)",
       "tags": [
         "5_2_2",
+        "cb-ldcontext",
         "csr-create"
       ],
       "setup": null,
@@ -94,9 +99,9 @@
     }
   ],
   "permutations": [
-    "when",
     "endpoint",
-    "then"
+    "then",
+    "when"
   ],
   "robotpath": "CommonBehaviours/CommonResponses/VerifyLdContextNotAvailable",
   "robotfile": "043_01"
diff --git a/doc/files/CommonBehaviours/044_01.json b/doc/files/CommonBehaviours/044_01.json
index 40386af320dfc30bf1ca30b183b834301c26e3bc..0452c10b00d28f82be3f1a24bf20d48e5bcdf3e6 100644
--- a/doc/files/CommonBehaviours/044_01.json
+++ b/doc/files/CommonBehaviours/044_01.json
@@ -8,7 +8,10 @@
     "6.3.4"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Create Initial Entity",
+    "Delete Initial Entity"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT containing an initial Entity ${entity} \n        with an id set to ${entityId} \n}",
   "test_cases": [
@@ -18,6 +21,7 @@
       "doc": "Verify that PATCH HTTP requests can be done with \"application/merge-patch+json\" as Content-Type",
       "tags": [
         "6_3_4",
+        "cb-mergepatch",
         "ea-partial-update"
       ],
       "setup": "Create Initial Entity",
diff --git a/doc/files/CommonBehaviours/044_02.json b/doc/files/CommonBehaviours/044_02.json
index 56c8ce7b6dda23f19925a4c9b56c09581826fd92..80ee40408aba5563f8709351fa56eddaa2acb0e4 100644
--- a/doc/files/CommonBehaviours/044_02.json
+++ b/doc/files/CommonBehaviours/044_02.json
@@ -8,7 +8,10 @@
     "6.3.4"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Create Initial Subscription",
+    "Delete Initial Subscription"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT containing an initial Subscription ${subscription} \n        with an id set to ${subscription_id} \n}",
   "test_cases": [
@@ -18,6 +21,7 @@
       "doc": "Verify that PATCH HTTP requests can be done with \"application/merge-patch+json\" as Content-Type",
       "tags": [
         "6_3_4",
+        "cb-mergepatch",
         "sub-update"
       ],
       "setup": "Create Initial Subscription",
diff --git a/doc/files/CommonBehaviours/045_01.json b/doc/files/CommonBehaviours/045_01.json
index c940f7dda3f08315b89ab62720f5d86902485f3a..f0c2261e4002b7d80715a3238a29e55894643b91 100644
--- a/doc/files/CommonBehaviours/045_01.json
+++ b/doc/files/CommonBehaviours/045_01.json
@@ -18,6 +18,7 @@
       "doc": "Verify that on a GET HTTP request if nothing is specified on the Accept header, \"application/json\" is assumed (/entities/{entityId})",
       "tags": [
         "6_3_4",
+        "cb-get",
         "e-query"
       ],
       "setup": null,
@@ -34,6 +35,7 @@
       "doc": "Verify that on a GET HTTP request if nothing is specified on the Accept header, \"application/json\" is assumed (/subscriptions/{subscriptionId})",
       "tags": [
         "6_3_4",
+        "cb-get",
         "sub-retrieve"
       ],
       "setup": null,
@@ -50,6 +52,7 @@
       "doc": "Verify that on a GET HTTP request if nothing is specified on the Accept header, \"application/json\" is assumed (/csourceRegistrations/)",
       "tags": [
         "6_3_4",
+        "cb-get",
         "csr-query"
       ],
       "setup": null,
@@ -66,6 +69,7 @@
       "doc": "Verify that on a GET HTTP request if nothing is specified on the Accept header, \"application/json\" is assumed (/temporal/entities)",
       "tags": [
         "6_3_4",
+        "cb-get",
         "te-query"
       ],
       "setup": null,
diff --git a/doc/files/CommonBehaviours/048_01.json b/doc/files/CommonBehaviours/048_01.json
index 2f5c4b4e9b930561ed9606d1977e95f6af94374e..5721211f0383b520151aa25fea70fc6b5820287c 100644
--- a/doc/files/CommonBehaviours/048_01.json
+++ b/doc/files/CommonBehaviours/048_01.json
@@ -18,6 +18,7 @@
       "doc": "Verify throwing 415 HTTP status code (Unsupported Media Type) if \"Content-Type\" header is not \"application/json\" or \"application/ld+json\" (patch /entities/{entityId}/attrs/{attrId})",
       "tags": [
         "6_3_4",
+        "cb-unsupport-medtype",
         "ea-partial-update"
       ],
       "setup": null,
@@ -34,6 +35,7 @@
       "doc": "Verify throwing 415 HTTP status code (Unsupported Media Type) if \"Content-Type\" header is not \"application/json\" or \"application/ld+json\" (patch /subscriptions/{subscriptionId})",
       "tags": [
         "6_3_4",
+        "cb-unsupport-medtype",
         "sub-update"
       ],
       "setup": null,
@@ -50,6 +52,7 @@
       "doc": "Verify throwing 415 HTTP status code (Unsupported Media Type) if \"Content-Type\" header is not \"application/json\" or \"application/ld+json\" (post /entities/)",
       "tags": [
         "6_3_4",
+        "cb-unsupport-medtype",
         "e-create"
       ],
       "setup": null,
@@ -66,6 +69,7 @@
       "doc": "Verify throwing 415 HTTP status code (Unsupported Media Type) if \"Content-Type\" header is not \"application/json\" or \"application/ld+json\" (post /subscriptions/)",
       "tags": [
         "6_3_4",
+        "cb-unsupport-medtype",
         "sub-create"
       ],
       "setup": null,
@@ -82,7 +86,8 @@
       "doc": "Verify throwing 415 HTTP status code (Unsupported Media Type) if \"Content-Type\" header is not \"application/json\" or \"application/ld+json\" (post /entityOperations/create)",
       "tags": [
         "6_3_4",
-        "be-create"
+        "be-create",
+        "cb-unsupport-medtype"
       ],
       "setup": null,
       "teardown": "Batch Delete Entities",
@@ -98,6 +103,7 @@
       "doc": "Verify throwing 415 HTTP status code (Unsupported Media Type) if \"Content-Type\" header is not \"application/json\" or \"application/ld+json\" (post /temporal/entities/)",
       "tags": [
         "6_3_4",
+        "cb-unsupport-medtype",
         "te-create"
       ],
       "setup": null,
@@ -110,10 +116,10 @@
     }
   ],
   "permutations": [
-    "when",
     "endpoint",
     "http_verb",
-    "then"
+    "then",
+    "when"
   ],
   "robotpath": "CommonBehaviours/CommonResponses/VerifyUnsupportedMediaType",
   "robotfile": "048_01"
diff --git a/doc/files/CommonBehaviours/049_01.json b/doc/files/CommonBehaviours/049_01.json
index 22e4546a09eca1f8299eb196509747fa22a83fc7..cc2f9a93fb8bd3cbff0346151ce73eec868a031e 100644
--- a/doc/files/CommonBehaviours/049_01.json
+++ b/doc/files/CommonBehaviours/049_01.json
@@ -18,6 +18,7 @@
       "doc": "Verify throwing 406 HTTP status code (Not Acceptable Media Type) if the \"Accept\" header does not imply \"application/json\" nor \"application/ld+json\" (get /entities/{entityId})",
       "tags": [
         "6_3_4",
+        "cb-noacceptable-medtype",
         "e-query"
       ],
       "setup": null,
@@ -34,6 +35,7 @@
       "doc": "Verify throwing 406 HTTP status code (Not Acceptable Media Type) if the \"Accept\" header does not imply \"application/json\" nor \"application/ld+json\" (get /subscriptions/{subscriptionId})",
       "tags": [
         "6_3_4",
+        "cb-noacceptable-medtype",
         "sub-retrieve"
       ],
       "setup": null,
@@ -50,6 +52,7 @@
       "doc": "Verify throwing 406 HTTP status code (Not Acceptable Media Type) if the \"Accept\" header does not imply \"application/json\" nor \"application/ld+json\" (get /csourceRegistrations/)",
       "tags": [
         "6_3_4",
+        "cb-noacceptable-medtype",
         "csr-query"
       ],
       "setup": null,
@@ -66,6 +69,7 @@
       "doc": "Verify throwing 406 HTTP status code (Not Acceptable Media Type) if the \"Accept\" header does not imply \"application/json\" nor \"application/ld+json\" (get /csourceSubscriptions/)",
       "tags": [
         "6_3_4",
+        "cb-noacceptable-medtype",
         "csrsub-query"
       ],
       "setup": null,
@@ -82,6 +86,7 @@
       "doc": "Verify throwing 406 HTTP status code (Not Acceptable Media Type) if the \"Accept\" header does not imply \"application/json\" nor \"application/ld+json\" (get /temporal/entities)",
       "tags": [
         "6_3_4",
+        "cb-noacceptable-medtype",
         "te-query"
       ],
       "setup": null,
diff --git a/doc/files/CommonBehaviours/049_02.json b/doc/files/CommonBehaviours/049_02.json
index 644c17e1992ab701449810a75d509007da1a1429..020f97efbd10a85d1e54e1bd727822adf956991a 100644
--- a/doc/files/CommonBehaviours/049_02.json
+++ b/doc/files/CommonBehaviours/049_02.json
@@ -18,6 +18,7 @@
       "doc": "Verify throwing 406 HTTP status code (Not Acceptable Media Type) if the \"Accept\" header is \"application/geo+json\" for operations different than \"Retrieve Entity\" and \"Query Entity\" (get /subscriptions/{subscriptionId})",
       "tags": [
         "6_3_4",
+        "cb-noacceptable-medtype",
         "sub-retrieve"
       ],
       "setup": null,
@@ -34,6 +35,7 @@
       "doc": "Verify throwing 406 HTTP status code (Not Acceptable Media Type) if the \"Accept\" header is \"application/geo+json\" for operations different than \"Retrieve Entity\" and \"Query Entity\" (get /temporal/entities)",
       "tags": [
         "6_3_4",
+        "cb-noacceptable-medtype",
         "te-query"
       ],
       "setup": null,
@@ -50,6 +52,7 @@
       "doc": "Verify throwing 406 HTTP status code (Not Acceptable Media Type) if the \"Accept\" header is \"application/geo+json\" for operations different than \"Retrieve Entity\" and \"Query Entity\" (get /csourceRegistrations)",
       "tags": [
         "6_3_4",
+        "cb-noacceptable-medtype",
         "csr-query"
       ],
       "setup": null,
diff --git a/doc/files/ContextInformation/Consumption/018_02.json b/doc/files/ContextInformation/Consumption/018_02.json
index 25da88c6af7731a1b1a14029fcebf70d8c7015d9..0edd12cc3eb476d64b61eb4fd8bfa30b099e3403 100644
--- a/doc/files/ContextInformation/Consumption/018_02.json
+++ b/doc/files/ContextInformation/Consumption/018_02.json
@@ -8,7 +8,9 @@
     "5.7.1"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Get Entity With Invalid Id"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n   the SUT containing an initial state\n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Consumption/018_04.json b/doc/files/ContextInformation/Consumption/018_04.json
index 0b3202c3808467b19176efd5ffe1353787196663..ed3011358f20ec6f5c2054949c3462c4425c59f0 100644
--- a/doc/files/ContextInformation/Consumption/018_04.json
+++ b/doc/files/ContextInformation/Consumption/018_04.json
@@ -8,7 +8,9 @@
     "6.3.7"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Delete Created Entity"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n   the SUT containing an initial state\n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Consumption/018_05.json b/doc/files/ContextInformation/Consumption/018_05.json
index 992e3f2413a2c5ccc2c26ed14f664ab7cb1d30b2..237b6beb0c4e65ba2d6bfe8d548e537d11acc2d7 100644
--- a/doc/files/ContextInformation/Consumption/018_05.json
+++ b/doc/files/ContextInformation/Consumption/018_05.json
@@ -9,6 +9,7 @@
   ],
   "pics_selection": "",
   "keywords": [
+    "Retrieve Entity In GeoJSON Representation",
     "Create Initial Entity",
     "Delete Created Entity"
   ],
diff --git a/doc/files/ContextInformation/Consumption/018_06.json b/doc/files/ContextInformation/Consumption/018_06.json
index d4d08d78e6a9d129393d3b999cde556c0df02ae3..a17ae1c3b896ee5c23728c70e27235a8f48cacef 100644
--- a/doc/files/ContextInformation/Consumption/018_06.json
+++ b/doc/files/ContextInformation/Consumption/018_06.json
@@ -8,7 +8,11 @@
     "6.3.5"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Review JSON-LD Resolution When retrieving an entity",
+    "Setup Initial Entity",
+    "Delete Created Entity"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT containing an initial Entity ${entity} \n        with an id set to ${entityId} \n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Consumption/019_07.json b/doc/files/ContextInformation/Consumption/019_07.json
index 1e0338efa22a4bbf76d5fd08bc4c54793feff81c..8b688e4978303c9515bdd828f850e1c60be9922d 100644
--- a/doc/files/ContextInformation/Consumption/019_07.json
+++ b/doc/files/ContextInformation/Consumption/019_07.json
@@ -5,10 +5,12 @@
   "config_id": "",
   "parent_release": "v1.3.1",
   "clauses": [
-    "5.7.2", "6.3.13"
+    "5.7.2",
+    "6.3.13"
   ],
   "pics_selection": "",
   "keywords": [
+    "Query Entities With Count",
     "Setup Initial Entities",
     "Delete Initial Entities"
   ],
diff --git a/doc/files/ContextInformation/Consumption/020_03.json b/doc/files/ContextInformation/Consumption/020_03.json
index 80e22538418cf62f852036490bab839e7ab1baf6..55afadde9d8442ccdc7cd57b35207b82facc4b7d 100644
--- a/doc/files/ContextInformation/Consumption/020_03.json
+++ b/doc/files/ContextInformation/Consumption/020_03.json
@@ -8,7 +8,10 @@
     "5.7.3"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Create Temporal Entity",
+    "Delete Initial Temporal Entity"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT containing an initial Temporal Entity ${entity} \n        with an id set to ${temporal_entity_representation_id} \n        and an attribute with an id set to ${atrId}\n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Consumption/020_04.json b/doc/files/ContextInformation/Consumption/020_04.json
index 33b309c15ad0adf2711b6ebb339c11cd15633ba2..2a74af7de6cd1afa907a2ec339383ab6fe46902e 100644
--- a/doc/files/ContextInformation/Consumption/020_04.json
+++ b/doc/files/ContextInformation/Consumption/020_04.json
@@ -8,7 +8,11 @@
     "5.7.3"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Retrieve the temporal evolution of an entity matching the given NGSI-LD temporal query",
+    "Create Temporal Entity",
+    "Delete Initial Temporal Entity"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT containing an initial Temporal Entity ${entity} \n        with an id set to ${temporal_entity_representation_id} \n        and an attribute with an id set to ${atrId}\n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Consumption/020_05.json b/doc/files/ContextInformation/Consumption/020_05.json
index 011e3c5070471072645c614599190df7d77ea68d..b47b46515ffa48e0b8417c11e9a2eaf3c4543cc6 100644
--- a/doc/files/ContextInformation/Consumption/020_05.json
+++ b/doc/files/ContextInformation/Consumption/020_05.json
@@ -8,7 +8,11 @@
     "5.7.3"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Retrieve the temporal evolution of the last N instances of entity attributes",
+    "Create Temporal Entity",
+    "Delete Initial Temporal Entity"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT containing an initial Temporal Entity ${entity} \n        with an id set to ${temporal_entity_representation_id} \n        and an attribute with an id set to ${atrId}\n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Consumption/020_09.json b/doc/files/ContextInformation/Consumption/020_09.json
index f3ac701b7b0190716070e0371d9609f4822d640e..2b0f0feb9547639c81d4cce93b55e059d7b108b9 100644
--- a/doc/files/ContextInformation/Consumption/020_09.json
+++ b/doc/files/ContextInformation/Consumption/020_09.json
@@ -8,7 +8,11 @@
     "5.7.3"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Retrieve the temporal evolution of an entity with an invalid request content",
+    "Create Temporal Entity",
+    "Delete Initial Temporal Entity"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT containing an initial Temporal Entity ${entity} \n        with an id set to ${temporal_entity_representation_id} \n        and an attribute with an id set to ${atrId}\n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Consumption/021_01.json b/doc/files/ContextInformation/Consumption/021_01.json
index e661bc31c7c94826b3eadb0c853c25eacc961544..ccf6e75f110e864b8927dab2b640973ee21da6c0 100644
--- a/doc/files/ContextInformation/Consumption/021_01.json
+++ b/doc/files/ContextInformation/Consumption/021_01.json
@@ -8,7 +8,11 @@
     "5.7.4"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Query the temporal evolution of entities",
+    "Setup Initial Entities",
+    "Delete Initial Entities"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    and containing a list of entities\n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Consumption/021_09.json b/doc/files/ContextInformation/Consumption/021_09.json
index 5a31df3555849c940693716e306ddd1bf0a50bc9..914b647546c4cad43fee418ab28918622be9ef57 100644
--- a/doc/files/ContextInformation/Consumption/021_09.json
+++ b/doc/files/ContextInformation/Consumption/021_09.json
@@ -8,7 +8,11 @@
     "5.7.4"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Query the temporal evolution of entities matching the given NGSI-LD geo-query",
+    "Setup Initial Temporal Entities",
+    "Delete Initial Temporal Entities"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT containing an a list of Temporal Entities \n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Consumption/021_10.json b/doc/files/ContextInformation/Consumption/021_10.json
index 2193f17e494e1c1f50c986fab1fa9c21423052f9..17082eaaafbc6bb8de9b5976bbadbefb6c3ccd5e 100644
--- a/doc/files/ContextInformation/Consumption/021_10.json
+++ b/doc/files/ContextInformation/Consumption/021_10.json
@@ -8,7 +8,10 @@
     "5.7.4"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Create Initial Context Source Registration and Mock Server",
+    "Delete Initial Context Source Registration and Mock Server"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT containing a Context Source Registration of a context source (CS1) \n        providing temporal information of two entities of type Building between 2020-08-01T22:07:00Z and 2021-08-01T21:07:00Z\n    and CS1 containing two temporal entities of type Building and temporal evolution of those entities in the mentioned interval.\n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Consumption/021_11.json b/doc/files/ContextInformation/Consumption/021_11.json
index 37914ee59d848fccc6abebf7d979682021ae5f6b..52059da0afda9969691f244a20645b085bee98db 100644
--- a/doc/files/ContextInformation/Consumption/021_11.json
+++ b/doc/files/ContextInformation/Consumption/021_11.json
@@ -8,7 +8,11 @@
     "5.7.4"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Query the temporal evolution of entities with a limit to the number of entities to be retrieved",
+    "Setup Initial Temporal Entities",
+    "Delete Initial Temporal Entities"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT containing an a list of Temporal Entities \n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Consumption/021_13.json b/doc/files/ContextInformation/Consumption/021_13.json
index 724da79d6ebd7106075714d0c1a1a94766089e91..ec2c4f635fa3dc5a6ee0cf16792bcb456822bb12 100644
--- a/doc/files/ContextInformation/Consumption/021_13.json
+++ b/doc/files/ContextInformation/Consumption/021_13.json
@@ -8,7 +8,11 @@
     "5.7.4"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Query the temporal evolution of entities using the entityOperations method",
+    "Setup Initial Temporal Entities",
+    "Delete Initial Temporal Entities"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT containing an a list of Temporal Entities \n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Consumption/021_14.json b/doc/files/ContextInformation/Consumption/021_14.json
index 78839898aaf6bb7f1b407d6f1b89e0f3f33a5dd4..2257cdf07a2cf544f7797cda6a0b7b331cdd0400 100644
--- a/doc/files/ContextInformation/Consumption/021_14.json
+++ b/doc/files/ContextInformation/Consumption/021_14.json
@@ -8,7 +8,11 @@
     "5.7.4"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Query the temporal evolution of entities",
+    "Setup Initial Entities",
+    "Delete Initial Entities"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    and containing a list of entities\n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Consumption/022_01.json b/doc/files/ContextInformation/Consumption/022_01.json
index 122573497059bda9b3b8b75d27c77d84363f447f..c81516bc0342921bb8ad347cdad05279e33fcd49 100644
--- a/doc/files/ContextInformation/Consumption/022_01.json
+++ b/doc/files/ContextInformation/Consumption/022_01.json
@@ -8,7 +8,11 @@
     "5.7.5"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Retrieve Available Entity Types",
+    "Setup Initial Entities",
+    "Delete Initial Entities"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    and containing a list of entities\n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Consumption/023_01.json b/doc/files/ContextInformation/Consumption/023_01.json
index 1a193c798fcf7ceba8d3c730f46887f0724ddb32..9304f516396f2f1f17314461219d29fe9c0390a5 100644
--- a/doc/files/ContextInformation/Consumption/023_01.json
+++ b/doc/files/ContextInformation/Consumption/023_01.json
@@ -8,7 +8,11 @@
     "5.7.6"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Retrieve Details Of Available Entity Types",
+    "Setup Initial Entities",
+    "Delete Initial Entities"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    and containing a list of entities\n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Consumption/025_01.json b/doc/files/ContextInformation/Consumption/025_01.json
index c74c1fa4aaa1a27c779a31cbd8a00fa8a618bba0..d7d1260bdcf8e19bf6abc396452160b439b7f2ac 100644
--- a/doc/files/ContextInformation/Consumption/025_01.json
+++ b/doc/files/ContextInformation/Consumption/025_01.json
@@ -8,7 +8,11 @@
     "5.7.8"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Retrieve Available Attributes",
+    "Setup Initial Entity",
+    "Delete Initial Entity"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT containing an initial Entity ${entity} \n        with an id set to ${entityId} \n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Consumption/026_01.json b/doc/files/ContextInformation/Consumption/026_01.json
index cf2fdf075ee75c3a0ef1ef524577e3e51c60c065..e00b43dc7e0e5d1404f774732245207ea4d39b1f 100644
--- a/doc/files/ContextInformation/Consumption/026_01.json
+++ b/doc/files/ContextInformation/Consumption/026_01.json
@@ -8,7 +8,11 @@
     "5.7.9"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Retrieve Details Of Available Attributes",
+    "Setup Initial Entity",
+    "Delete Initial Entity"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT containing an initial Entity ${entity} \n        with an id set to ${entityId} \n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Provision/001_01.json b/doc/files/ContextInformation/Provision/001_01.json
index 0ea9cceac8d93ebf0b3ded70ec7ec37875df4f4d..0bfc084d940a768c324f95448ddda0bf980e1e8f 100644
--- a/doc/files/ContextInformation/Provision/001_01.json
+++ b/doc/files/ContextInformation/Provision/001_01.json
@@ -8,7 +8,10 @@
     "5.6.1"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Create Entity Scenarios",
+    "Delete Initial Entity"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n   the SUT containing an initial state\n}",
   "test_cases": [
@@ -23,7 +26,7 @@
       "setup": null,
       "teardown": "Delete Initial Entity",
       "template": "Create Entity Scenarios",
-      "then": "then {\n    the SUT sends a valid Response for the operations:\n        Create Entity Selecting Content Type with Response Status Code set to 201     and\n        Create Entity Selecting Content Type with Response Header: Location containing $${entity_id}     and\n        Retrieve Entity by Id with Check Created Resource Set To and\n            Query Parameter: 'created_resource' set to 'created_entity' and\n            Query Parameter: 'response_body' set to 'response1.json()' and\n            Query Parameter: 'ignored_keys' set to '${None}'\n}",
+      "then": "then {\n    the SUT sends a valid Response for the operations:\n        Create Entity Selecting Content Type with Response Status Code set to 201     and\n        Create Entity Selecting Content Type with Response Header: Location containing $${entity_id}     and\n        Retrieve Entity by Id with Check Created Resource Set To and\n            Query Parameter: 'created_resource' set to 'created_entity' and\n            Query Parameter: 'response_body' set to 'response1.json()' and\n            Query Parameter: 'ignored_keys' set to '${None}' list of keys\n}",
       "when": "when {\n    the SUT receives a Request from the client containing:\n        URL set to '/ngsi-ld/v1/entities/'\n        method set to 'POST'\n        Request Header['Content-Type'] set to 'application/json' and\n payload defined in file: 'building-minimal-without-context-sample.jsonld'\n}",
       "http_verb": "POST",
       "endpoint": "entities/"
@@ -39,7 +42,7 @@
       "setup": null,
       "teardown": "Delete Initial Entity",
       "template": "Create Entity Scenarios",
-      "then": "then {\n    the SUT sends a valid Response for the operations:\n        Create Entity Selecting Content Type with Response Status Code set to 201     and\n        Create Entity Selecting Content Type with Response Header: Location containing $${entity_id}     and\n        Retrieve Entity by Id with Check Created Resource Set To and\n            Query Parameter: 'created_resource' set to 'created_entity' and\n            Query Parameter: 'response_body' set to 'response1.json()' and\n            Query Parameter: 'ignored_keys' set to '${None}'\n}",
+      "then": "then {\n    the SUT sends a valid Response for the operations:\n        Create Entity Selecting Content Type with Response Status Code set to 201     and\n        Create Entity Selecting Content Type with Response Header: Location containing $${entity_id}     and\n        Retrieve Entity by Id with Check Created Resource Set To and\n            Query Parameter: 'created_resource' set to 'created_entity' and\n            Query Parameter: 'response_body' set to 'response1.json()' and\n            Query Parameter: 'ignored_keys' set to '${None}' list of keys\n}",
       "when": "when {\n    the SUT receives a Request from the client containing:\n        URL set to '/ngsi-ld/v1/entities/'\n        method set to 'POST'\n        Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'building-simple-attributes-sample.jsonld'\n}",
       "http_verb": "POST",
       "endpoint": "entities/"
@@ -55,7 +58,7 @@
       "setup": null,
       "teardown": "Delete Initial Entity",
       "template": "Create Entity Scenarios",
-      "then": "then {\n    the SUT sends a valid Response for the operations:\n        Create Entity Selecting Content Type with Response Status Code set to 201     and\n        Create Entity Selecting Content Type with Response Header: Location containing $${entity_id}     and\n        Retrieve Entity by Id with Check Created Resource Set To and\n            Query Parameter: 'created_resource' set to 'created_entity' and\n            Query Parameter: 'response_body' set to 'response1.json()' and\n            Query Parameter: 'ignored_keys' set to '${None}'\n}",
+      "then": "then {\n    the SUT sends a valid Response for the operations:\n        Create Entity Selecting Content Type with Response Status Code set to 201     and\n        Create Entity Selecting Content Type with Response Header: Location containing $${entity_id}     and\n        Retrieve Entity by Id with Check Created Resource Set To and\n            Query Parameter: 'created_resource' set to 'created_entity' and\n            Query Parameter: 'response_body' set to 'response1.json()' and\n            Query Parameter: 'ignored_keys' set to '${None}' list of keys\n}",
       "when": "when {\n    the SUT receives a Request from the client containing:\n        URL set to '/ngsi-ld/v1/entities/'\n        method set to 'POST'\n        Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'building-relationship-of-property-sample.jsonld'\n}",
       "http_verb": "POST",
       "endpoint": "entities/"
@@ -71,7 +74,7 @@
       "setup": null,
       "teardown": "Delete Initial Entity",
       "template": "Create Entity Scenarios",
-      "then": "then {\n    the SUT sends a valid Response for the operations:\n        Create Entity Selecting Content Type with Response Status Code set to 201     and\n        Create Entity Selecting Content Type with Response Header: Location containing $${entity_id}     and\n        Retrieve Entity by Id with Check Created Resource Set To and\n            Query Parameter: 'created_resource' set to 'created_entity' and\n            Query Parameter: 'response_body' set to 'response1.json()' and\n            Query Parameter: 'ignored_keys' set to '${None}'\n}",
+      "then": "then {\n    the SUT sends a valid Response for the operations:\n        Create Entity Selecting Content Type with Response Status Code set to 201     and\n        Create Entity Selecting Content Type with Response Header: Location containing $${entity_id}     and\n        Retrieve Entity by Id with Check Created Resource Set To and\n            Query Parameter: 'created_resource' set to 'created_entity' and\n            Query Parameter: 'response_body' set to 'response1.json()' and\n            Query Parameter: 'ignored_keys' set to '${None}' list of keys\n}",
       "when": "when {\n    the SUT receives a Request from the client containing:\n        URL set to '/ngsi-ld/v1/entities/'\n        method set to 'POST'\n        Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'building-location-attribute-sample.jsonld'\n}",
       "http_verb": "POST",
       "endpoint": "entities/"
diff --git a/doc/files/ContextInformation/Provision/001_02.json b/doc/files/ContextInformation/Provision/001_02.json
index 969638a9bbb727a9c0b94280a353ee0bae216ba3..81a53fb3cec4f1f3f508841186dfdcc24945a573 100644
--- a/doc/files/ContextInformation/Provision/001_02.json
+++ b/doc/files/ContextInformation/Provision/001_02.json
@@ -8,7 +8,9 @@
     "5.6.1"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Create Entity With Invalid Request Scenarios"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n   the SUT containing an initial state\n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Provision/001_04.json b/doc/files/ContextInformation/Provision/001_04.json
index 919ebb16cc0ae98664ace9e649d56eb2d349371d..c52a5a09848383027c4e6c103ef7b9e9bfffd1cb 100644
--- a/doc/files/ContextInformation/Provision/001_04.json
+++ b/doc/files/ContextInformation/Provision/001_04.json
@@ -8,7 +8,9 @@
     "6.3.5"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Delete Initial Entity"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n   the SUT containing an initial state\n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Provision/001_05.json b/doc/files/ContextInformation/Provision/001_05.json
index a98b8792a5fb4ee94f883250c86d0fc1da914831..d62f0e51fa927a8b5748745986b6c75167b17a80 100644
--- a/doc/files/ContextInformation/Provision/001_05.json
+++ b/doc/files/ContextInformation/Provision/001_05.json
@@ -8,7 +8,9 @@
     "6.3.5"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Delete Initial Entity"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n   the SUT containing an initial state\n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Provision/001_07.json b/doc/files/ContextInformation/Provision/001_07.json
index e1e0dd176949f908bb1b105cf763ea6adb7bd308..5d99bef0b35aa40f61309f15b4514071e7889afe 100644
--- a/doc/files/ContextInformation/Provision/001_07.json
+++ b/doc/files/ContextInformation/Provision/001_07.json
@@ -8,7 +8,9 @@
     "6.3.5"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Delete Initial Entity"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n   the SUT containing an initial state\n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Provision/002_02.json b/doc/files/ContextInformation/Provision/002_02.json
index 057496dd7128ef9b948730737c0a2b28a4f34ce5..c563210c1e83e358f44b8384bcb94b0833e3cf0f 100644
--- a/doc/files/ContextInformation/Provision/002_02.json
+++ b/doc/files/ContextInformation/Provision/002_02.json
@@ -8,7 +8,9 @@
     "5.6.6"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Delete Entity Scenarios"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n   the SUT containing an initial state\n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Provision/003_01.json b/doc/files/ContextInformation/Provision/003_01.json
index b633052d1dd664afc8cd09fffaf4bbafa5505340..1aa60d5cc664fbd2e9a874c97e9c35a9ca3f28dc 100644
--- a/doc/files/ContextInformation/Provision/003_01.json
+++ b/doc/files/ContextInformation/Provision/003_01.json
@@ -8,7 +8,10 @@
     "5.6.7"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Batch Create Entity Scenarios",
+    "Delete Initial Entities"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n   the SUT containing an initial state\n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Provision/003_03.json b/doc/files/ContextInformation/Provision/003_03.json
index 00759f03136d0309034c1a1757368a443f8ad8a9..8edd0961f865dbd28478edbc3314dfa8612ad0f1 100644
--- a/doc/files/ContextInformation/Provision/003_03.json
+++ b/doc/files/ContextInformation/Provision/003_03.json
@@ -8,7 +8,9 @@
     "5.6.7"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Create Batch Entity With Invalid Request Scenarios"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n   the SUT containing an initial state\n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Provision/003_04.json b/doc/files/ContextInformation/Provision/003_04.json
index 44bf28ff2c4b0e8d2dfb6fc1641c2e03922dd3ef..dc73f06bc80cc82f54437ab38c7d71daf64f1a40 100644
--- a/doc/files/ContextInformation/Provision/003_04.json
+++ b/doc/files/ContextInformation/Provision/003_04.json
@@ -8,7 +8,9 @@
     "6.3.5"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Delete Initial Entities"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n   the SUT containing an initial state\n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Provision/003_05.json b/doc/files/ContextInformation/Provision/003_05.json
index 718fdff1b94a22edad52d6b3b2b7356c191b779d..0c1266991edf82d58d03a34f4c0d95e560cb967a 100644
--- a/doc/files/ContextInformation/Provision/003_05.json
+++ b/doc/files/ContextInformation/Provision/003_05.json
@@ -8,7 +8,9 @@
     "6.3.5"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Delete Initial Entities"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n   the SUT containing an initial state\n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Provision/003_07.json b/doc/files/ContextInformation/Provision/003_07.json
index e0926d562bbc17b29bab7a8e4cb239fbc6f03243..436f5d68628c880dc7a77a8964073c93dbde9962 100644
--- a/doc/files/ContextInformation/Provision/003_07.json
+++ b/doc/files/ContextInformation/Provision/003_07.json
@@ -8,7 +8,9 @@
     "6.3.5"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Delete Initial Entities"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n   the SUT containing an initial state\n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Provision/004_01.json b/doc/files/ContextInformation/Provision/004_01.json
index 4acb8504926006f69142097f242aea61fbe03024..37c74bf50996538b2c3c6060c7ebe6b343b306b6 100644
--- a/doc/files/ContextInformation/Provision/004_01.json
+++ b/doc/files/ContextInformation/Provision/004_01.json
@@ -8,7 +8,10 @@
     "5.6.8"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Batch Upsert Entity Scenarios",
+    "Delete Initial Entities"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n   the SUT containing an initial state\n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Provision/004_02.json b/doc/files/ContextInformation/Provision/004_02.json
index ccb59797a86ecbbd5bd68edc4af839102c7ef5be..4d2eec8c4ae255e9d490c5cee2540c72662bded0 100644
--- a/doc/files/ContextInformation/Provision/004_02.json
+++ b/doc/files/ContextInformation/Provision/004_02.json
@@ -8,7 +8,11 @@
     "5.6.8"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Batch Upsert Non-existing And Existing Entities Scenarios",
+    "Setup Initial Entities",
+    "Delete Initial Entities"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n   the SUT containing an initial state\n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Provision/004_03.json b/doc/files/ContextInformation/Provision/004_03.json
index 80692882d8ac9b8dbebb353f19dc9d7b171cbcb5..6e024155fec71e18772886e15447fb795d00e15f 100644
--- a/doc/files/ContextInformation/Provision/004_03.json
+++ b/doc/files/ContextInformation/Provision/004_03.json
@@ -8,7 +8,11 @@
     "5.6.8"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Batch Upsert Existing Entities Scenarios",
+    "Setup Initial Entities",
+    "Delete Initial Entities"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    and containing a list of entities\n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Provision/004_04.json b/doc/files/ContextInformation/Provision/004_04.json
index a680d135d7b4d0503504929b492bf2781e34e19c..33f7bd0aba739fc006c22d9742d9f475729499e3 100644
--- a/doc/files/ContextInformation/Provision/004_04.json
+++ b/doc/files/ContextInformation/Provision/004_04.json
@@ -8,7 +8,11 @@
     "5.6.8"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Batch Upsert Entities With Update Option Scenarios",
+    "Setup Initial Entity",
+    "Delete Initial Entities"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT containing an initial Entity ${entity} \n        with an id set to ${entityId} \n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Provision/004_05.json b/doc/files/ContextInformation/Provision/004_05.json
index 8ca25f8c6efbf5d2ce73d26cbd3c7621765cd2f8..551b379681a6fb72b13dad16e5738142b2897cc0 100644
--- a/doc/files/ContextInformation/Provision/004_05.json
+++ b/doc/files/ContextInformation/Provision/004_05.json
@@ -8,7 +8,9 @@
     "5.6.8"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Delete Entities"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n   the SUT containing an initial state\n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Provision/004_06.json b/doc/files/ContextInformation/Provision/004_06.json
index a333205d4b1f57d9df9e62a90ed414c44602e558..2e217abcd63c6087bd4146b691712e56dc2a1b03 100644
--- a/doc/files/ContextInformation/Provision/004_06.json
+++ b/doc/files/ContextInformation/Provision/004_06.json
@@ -8,7 +8,9 @@
     "5.6.8"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Batch Upsert Entity With Invalid Request Scenarios"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n   the SUT containing an initial state\n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Provision/005_01.json b/doc/files/ContextInformation/Provision/005_01.json
index 253e8900cc19138a591c708fa7d7e7620a84e4cb..946b236e07bd00aab249417cb670d432be3cf236 100644
--- a/doc/files/ContextInformation/Provision/005_01.json
+++ b/doc/files/ContextInformation/Provision/005_01.json
@@ -8,7 +8,11 @@
     "5.6.9"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Batch Update Entity Scenarios",
+    "Setup Initial Entities",
+    "Delete Initial Entities"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    and containing a list of entities\n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Provision/005_02.json b/doc/files/ContextInformation/Provision/005_02.json
index c370735b559e5c4013bd10689564b757360bc0de..aef00418b007e2d54292bfa50d91d48eb866e8db 100644
--- a/doc/files/ContextInformation/Provision/005_02.json
+++ b/doc/files/ContextInformation/Provision/005_02.json
@@ -8,7 +8,11 @@
     "5.6.9"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Batch Update Entity With NoOverwrite Option Scenarios",
+    "Setup Initial Entities",
+    "Delete Initial Entities"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    and containing a list of entities\n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Provision/005_04.json b/doc/files/ContextInformation/Provision/005_04.json
index 6cce182804b472124edbe06ddbb105be73b2195a..38527c528392528e07af9ad9b42e1dccc4811eb7 100644
--- a/doc/files/ContextInformation/Provision/005_04.json
+++ b/doc/files/ContextInformation/Provision/005_04.json
@@ -8,7 +8,9 @@
     "5.6.9"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Batch Update Entity With Invalid Request Scenarios"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n   the SUT containing an initial state\n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Provision/006_01.json b/doc/files/ContextInformation/Provision/006_01.json
index d9b98da972e1b7b0fba4bcf9372bca6e694b0b2f..81e54d432f87c4069071ecf46cf20ebb43075948 100644
--- a/doc/files/ContextInformation/Provision/006_01.json
+++ b/doc/files/ContextInformation/Provision/006_01.json
@@ -8,7 +8,9 @@
     "5.6.10"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Setup Initial Entities"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    and containing a list of entities\n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Provision/006_02.json b/doc/files/ContextInformation/Provision/006_02.json
index a700766acd4f55d1cb2e7658e56859869c19a777..ba73cc078dc6e4b06b2ad8c44f8bf352671949f1 100644
--- a/doc/files/ContextInformation/Provision/006_02.json
+++ b/doc/files/ContextInformation/Provision/006_02.json
@@ -8,7 +8,9 @@
     "5.6.10"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Setup Initial Entity"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT containing an initial Entity ${entity} \n        with an id set to ${entityId} \n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Provision/006_03.json b/doc/files/ContextInformation/Provision/006_03.json
index 18f1d8d3d710d6646f19822a59a1fd4acef39613..d7a8b45dd25bfa02beb02da1a5c0c3b1d9a06fff 100644
--- a/doc/files/ContextInformation/Provision/006_03.json
+++ b/doc/files/ContextInformation/Provision/006_03.json
@@ -8,7 +8,9 @@
     "5.6.10"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Batch Delete Entity With Invalid Request Scenarios"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n   the SUT containing an initial state\n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Provision/007_01.json b/doc/files/ContextInformation/Provision/007_01.json
index e00438b5b4dec0c2329005941aeac9af77f0000f..188bc965d4bb010c90e67f6d47509479da5b0ea5 100644
--- a/doc/files/ContextInformation/Provision/007_01.json
+++ b/doc/files/ContextInformation/Provision/007_01.json
@@ -8,7 +8,10 @@
     "5.6.11"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Create Temporal Entity",
+    "Delete Temporal Entity"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n   the SUT containing an initial state\n}",
   "test_cases": [
@@ -23,7 +26,7 @@
       "setup": null,
       "teardown": "Delete Temporal Entity",
       "template": "Create Temporal Entity",
-      "then": "then {\n    the SUT sends a valid Response for the operations:\n        Create Or Update Temporal Representation Of Entity Selecting Content Type with Response Status Code set to 201     and\n        Retrieve Temporal Representation Of Entity with Check Created Resource Set To and\n            Query Parameter: 'ignored_keys' set to '${None}'\n}",
+      "then": "then {\n    the SUT sends a valid Response for the operations:\n        Create Or Update Temporal Representation Of Entity Selecting Content Type with Response Status Code set to 201     and\n        Retrieve Temporal Representation Of Entity with Check Created Resource Set To and\n            Query Parameter: 'ignored_keys' set to '${None}' list of keys\n}",
       "when": "when {\n    the SUT receives a Request from the client containing:\n        URL set to '/ngsi-ld/v1/temporal/entities'\n        method set to 'POST'\n        Create or Update Temporal Representation of Entity Selecting Content Type: and\n    Query Parameter: temporal_entity_representation_id set to '${temporal_entity_representation_id}' and\n    Query Parameter: filename set to 'vehicle-create-temporal-representation-sample.jsonld' and\n    Query Parameter: content_type set to 'application/ld+json' and\n    Query Parameter: accept set to '${EMPTY}'\n}",
       "http_verb": "POST",
       "endpoint": "temporal/entities"
@@ -39,7 +42,7 @@
       "setup": null,
       "teardown": "Delete Temporal Entity",
       "template": "Create Temporal Entity",
-      "then": "then {\n    the SUT sends a valid Response for the operations:\n        Create Or Update Temporal Representation Of Entity Selecting Content Type with Response Status Code set to 201     and\n        Retrieve Temporal Representation Of Entity with Check Created Resource Set To and\n            Query Parameter: 'ignored_keys' set to '${None}'\n}",
+      "then": "then {\n    the SUT sends a valid Response for the operations:\n        Create Or Update Temporal Representation Of Entity Selecting Content Type with Response Status Code set to 201     and\n        Retrieve Temporal Representation Of Entity with Check Created Resource Set To and\n            Query Parameter: 'ignored_keys' set to '${None}' list of keys\n}",
       "when": "when {\n    the SUT receives a Request from the client containing:\n        URL set to '/ngsi-ld/v1/temporal/entities'\n        method set to 'POST'\n        Create or Update Temporal Representation of Entity Selecting Content Type: and\n    Query Parameter: temporal_entity_representation_id set to '${temporal_entity_representation_id}' and\n    Query Parameter: filename set to 'vehicle-create-temporal-representation-without-context-sample.jsonld' and\n    Query Parameter: content_type set to 'application/json' and\n    Query Parameter: accept set to '${EMPTY}'\n}",
       "http_verb": "POST",
       "endpoint": "temporal/entities"
diff --git a/doc/files/ContextInformation/Provision/007_02.json b/doc/files/ContextInformation/Provision/007_02.json
index 1cff06a0dfe9ecf63dcd2e2645f9597041ffa581..5bba381e84b98c4f49535fe17b7ddb3bfce0f3f4 100644
--- a/doc/files/ContextInformation/Provision/007_02.json
+++ b/doc/files/ContextInformation/Provision/007_02.json
@@ -8,7 +8,9 @@
     "5.6.11"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Create Temporal Entity From File"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n   the SUT containing an initial state\n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Provision/007_03.json b/doc/files/ContextInformation/Provision/007_03.json
index ba68fe4bc4cbe1491a82ca1d2f0d3af9dd8dd178..e1e4e21efb606cfb67c12962d4895f96be9d082c 100644
--- a/doc/files/ContextInformation/Provision/007_03.json
+++ b/doc/files/ContextInformation/Provision/007_03.json
@@ -8,7 +8,9 @@
     "5.6.11"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Create Temporal Entity"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n   the SUT containing an initial state\n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Provision/009_01.json b/doc/files/ContextInformation/Provision/009_01.json
index 206672062f0a3e6b437c69e62079ae0c567cc679..53e37b1ffacc41010420f6482b5d62bbe630be05 100644
--- a/doc/files/ContextInformation/Provision/009_01.json
+++ b/doc/files/ContextInformation/Provision/009_01.json
@@ -8,7 +8,9 @@
     "5.6.16"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Create Initial Temporal Entity"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT containing an initial Temporal Entity ${entity} \n        with an id set to ${temporal_entity_representation_id} \n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Provision/009_02.json b/doc/files/ContextInformation/Provision/009_02.json
index 02142d6dc0807eec086af95a4dcadacd6d7c8ac6..3ac4a799a21c424a12270cdb4214b17fa7300280 100644
--- a/doc/files/ContextInformation/Provision/009_02.json
+++ b/doc/files/ContextInformation/Provision/009_02.json
@@ -8,7 +8,9 @@
     "5.6.16"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Delete Temporal Entity"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n   the SUT containing an initial state\n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Provision/010_01.json b/doc/files/ContextInformation/Provision/010_01.json
index f7c5edaec7c3cdba6bc4c60fb2f44dd747f46869..dea3aca0a5123649148c7ebf3eff2f0ceef1427b 100644
--- a/doc/files/ContextInformation/Provision/010_01.json
+++ b/doc/files/ContextInformation/Provision/010_01.json
@@ -8,7 +8,11 @@
     "5.6.3"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Append Attributes Without Params",
+    "Create Initial Entity",
+    "Delete Initial Entity"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT containing an initial Entity ${entity} \n        with an id set to ${entityId} \n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Provision/010_02.json b/doc/files/ContextInformation/Provision/010_02.json
index c4c310be4b04b0aaeb507987f8f457cf2119b58a..14ecc1789146ebf886db1b56aba92fe376b7123f 100644
--- a/doc/files/ContextInformation/Provision/010_02.json
+++ b/doc/files/ContextInformation/Provision/010_02.json
@@ -8,7 +8,11 @@
     "5.6.3"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Append Attributes",
+    "Create Initial Entity",
+    "Delete Initial Entity"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT containing an initial Entity ${entity} \n        with an id set to ${entityId} \n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Provision/010_04.json b/doc/files/ContextInformation/Provision/010_04.json
index 5af12b2ae971e8f4f92f81dd9f8c7101d9ce8a70..310e64c2df513f4db25483aa739678e952d56664 100644
--- a/doc/files/ContextInformation/Provision/010_04.json
+++ b/doc/files/ContextInformation/Provision/010_04.json
@@ -8,7 +8,11 @@
     "5.6.3"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Append Attributes With Params",
+    "Create Initial Entity",
+    "Delete Initial Entity"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT containing an initial Entity ${entity} \n        with an id set to ${entityId} \n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Provision/010_05.json b/doc/files/ContextInformation/Provision/010_05.json
index 98140480c86edd6c53a4b4b6deb345d28c6d29ce..37db679d78b72be5f5b0770786f5435cf6e0316e 100644
--- a/doc/files/ContextInformation/Provision/010_05.json
+++ b/doc/files/ContextInformation/Provision/010_05.json
@@ -8,7 +8,10 @@
     "5.6.3"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Create Initial Entity",
+    "Delete Initial Entity"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT containing an initial Entity ${entity} \n        with an id set to ${entityId} \n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Provision/011_01.json b/doc/files/ContextInformation/Provision/011_01.json
index d12e941d616e7583ab24e92001f2a6af54afa2cf..4fcaa02264060e236897ca761e20c09683f4f3e1 100644
--- a/doc/files/ContextInformation/Provision/011_01.json
+++ b/doc/files/ContextInformation/Provision/011_01.json
@@ -8,7 +8,11 @@
     "5.6.2"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Update Attributes",
+    "Delete Initial Entities",
+    "Initialize Test"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT containing an initial Entity ${entity} \n        with an id set to ${entityId} \n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Provision/011_02.json b/doc/files/ContextInformation/Provision/011_02.json
index 1ad871236af53425e43b5cd7514f87d206200352..1817dff3ede04a37cb60735f5e04eaf3e19d58c9 100644
--- a/doc/files/ContextInformation/Provision/011_02.json
+++ b/doc/files/ContextInformation/Provision/011_02.json
@@ -8,7 +8,11 @@
     "5.6.2"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Update Attributes",
+    "Initialize Environment",
+    "Delete Entity"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT containing an initial Entity ${entity} \n        with an id set to ${entityId} \n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Provision/011_04.json b/doc/files/ContextInformation/Provision/011_04.json
index ff07bdb0460b783c135e89f16b530e644ae2d76a..1f8af27636fcd0367dbe01438d31d7594dd45391 100644
--- a/doc/files/ContextInformation/Provision/011_04.json
+++ b/doc/files/ContextInformation/Provision/011_04.json
@@ -8,7 +8,10 @@
     "5.6.2"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Update entity attributes with invalid entity fragments",
+    "Initialize Environment"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT containing an initial Entity ${entity} \n        with an id set to ${entityId} \n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Provision/012_01.json b/doc/files/ContextInformation/Provision/012_01.json
index c4114a8e2497e1d96b2344ce95b421c83d2b3cc2..2625f86c26f701837e7134efb3a18c7554fd42cd 100644
--- a/doc/files/ContextInformation/Provision/012_01.json
+++ b/doc/files/ContextInformation/Provision/012_01.json
@@ -8,7 +8,11 @@
     "5.6.4"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Update Attributes",
+    "Initiate Test Case",
+    "Delete Initial Entities"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT containing an initial Entity ${entity} \n        with an id set to ${entityId} \n        and an attribute with an id set to ${atrId}\n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Provision/012_02.json b/doc/files/ContextInformation/Provision/012_02.json
index ce3ef06e36a88f08be1a2ea81a4f7a35e2c09fdd..f19a1f8e73b95e938caa39eb0067ba762c3527ab 100644
--- a/doc/files/ContextInformation/Provision/012_02.json
+++ b/doc/files/ContextInformation/Provision/012_02.json
@@ -8,7 +8,11 @@
     "5.6.4"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Update Attributes",
+    "Setup Initial Entity",
+    "Delete Initial Entity"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT containing an initial Entity ${entity} \n        with an id set to ${entityId} \n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Provision/012_03.json b/doc/files/ContextInformation/Provision/012_03.json
index 0946ae087abcc840316e9b81f87d9f33817f8325..ae5e3e0ba302c31b4f7e43885b91844e75407ab9 100644
--- a/doc/files/ContextInformation/Provision/012_03.json
+++ b/doc/files/ContextInformation/Provision/012_03.json
@@ -8,7 +8,11 @@
     "5.6.4"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Partial Update Attributes",
+    "Create Initial Entity",
+    "Delete Initial Entity"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT containing an initial Entity ${entity} \n        with an id set to ${entityId} \n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Provision/013_01.json b/doc/files/ContextInformation/Provision/013_01.json
index 87610dd61e91aec13a62196435a8a6ba20f0ef93..5234a8e86731865b2eadad26a2fd5e1f82d2596d 100644
--- a/doc/files/ContextInformation/Provision/013_01.json
+++ b/doc/files/ContextInformation/Provision/013_01.json
@@ -8,7 +8,10 @@
     "5.6.5"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Delete Attributes",
+    "Delete Initial Entities"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n   the SUT containing an initial state\n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Provision/013_02.json b/doc/files/ContextInformation/Provision/013_02.json
index 9ca895488c9a83851f171e4ed4af04c7e1f9dbde..28b4b159d1321d8441b8c39175c987fb64351a8a 100644
--- a/doc/files/ContextInformation/Provision/013_02.json
+++ b/doc/files/ContextInformation/Provision/013_02.json
@@ -8,7 +8,11 @@
     "5.6.5"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Delete Attributes",
+    "Create Initial Entity",
+    "Delete Initial Entity"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT containing an initial Entity ${entity} \n        with an id set to ${entityId} \n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Provision/013_03.json b/doc/files/ContextInformation/Provision/013_03.json
index 5b91a3ddbe7897fe7732a06ca0350ce3f109aa31..0a1e8492ea0627f0b6064e69f9e52c20c75f74dd 100644
--- a/doc/files/ContextInformation/Provision/013_03.json
+++ b/doc/files/ContextInformation/Provision/013_03.json
@@ -8,7 +8,11 @@
     "5.6.5"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Delete Attributes",
+    "Setup Initial Entity",
+    "Delete Initial Entity"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT containing an initial Entity ${entity} \n        with an id set to ${entityId} \n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Provision/014_02.json b/doc/files/ContextInformation/Provision/014_02.json
index 657c964297362342f357c8ad3a3444fea1797e50..664ce732ee69616e413b47c781784081013ea8a9 100644
--- a/doc/files/ContextInformation/Provision/014_02.json
+++ b/doc/files/ContextInformation/Provision/014_02.json
@@ -8,7 +8,9 @@
     "5.6.12"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Add Attribute To Temporal Entity"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n   the SUT containing an initial state\n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Provision/014_04.json b/doc/files/ContextInformation/Provision/014_04.json
index 17a6e0aa81fd76ccf3d48b869f5ae429b71f0c62..95c7401a762ca57278ed8cc1a3cabb09cb4a73d4 100644
--- a/doc/files/ContextInformation/Provision/014_04.json
+++ b/doc/files/ContextInformation/Provision/014_04.json
@@ -8,7 +8,10 @@
     "5.6.12"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Add an Attribute To a Temporal Entity From File",
+    "Initialize Test Case"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT containing an initial Temporal Entity ${entity} \n        with an id set to ${temporal_entity_representation_id} \n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Provision/015_01.json b/doc/files/ContextInformation/Provision/015_01.json
index 780edcd285d8b9ae8d8050f4ce562e7de5d6ed87..131d2e6716286268d831eda49eaeb95f5736fea2 100644
--- a/doc/files/ContextInformation/Provision/015_01.json
+++ b/doc/files/ContextInformation/Provision/015_01.json
@@ -8,7 +8,11 @@
     "5.6.13"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Delete Attribute From A Temporal Entity",
+    "Initialize Setup",
+    "Delete Temporal Entity"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT containing an initial Temporal Entity ${entity} \n        with an id set to ${temporal_entity_representation_id} \n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Provision/015_02.json b/doc/files/ContextInformation/Provision/015_02.json
index 3724c826051dc20fee8e52ff5730467b7590e9c0..5cfa718914677f0010f4af21e81a49458484f5d5 100644
--- a/doc/files/ContextInformation/Provision/015_02.json
+++ b/doc/files/ContextInformation/Provision/015_02.json
@@ -8,7 +8,11 @@
     "5.6.13"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Delete attribute from temporal entity with unknow entity/attribute id",
+    "Create Temporal Entity",
+    "Delete Temporal Entity"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT containing an initial Temporal Entity ${entity} \n        with an id set to ${temporal_entity_representation_id} \n        and an attribute with an id set to ${atrId}\n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Provision/015_03.json b/doc/files/ContextInformation/Provision/015_03.json
index 0442b24171788b4dd569f237cc413b67f12c150a..75dfd73098e88b74f7b34bc6847c2a2ad47dd4a9 100644
--- a/doc/files/ContextInformation/Provision/015_03.json
+++ b/doc/files/ContextInformation/Provision/015_03.json
@@ -8,7 +8,11 @@
     "5.6.13"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Delete An Attribute",
+    "Create Id",
+    "Delete Temporal Entity"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT containing an initial Temporal Entity ${entity} \n        with an id set to ${temporal_entity_representation_id} \n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Provision/016_02.json b/doc/files/ContextInformation/Provision/016_02.json
index 640f83ecdce2ee1dd8353add558b15487889cd69..20aeedda033d1a667e3bf09d2d90f9619327c912 100644
--- a/doc/files/ContextInformation/Provision/016_02.json
+++ b/doc/files/ContextInformation/Provision/016_02.json
@@ -8,7 +8,11 @@
     "5.6.14"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Modify Attribute Instance Temporal Entity",
+    "Create Id",
+    "Delete Temporal Entity"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT containing an initial Temporal Entity ${entity} \n        with an id set to ${temporal_entity_representation_id} \n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Provision/016_03.json b/doc/files/ContextInformation/Provision/016_03.json
index 34ae23a60b55819dd6a1bf49f227ff4d84df7b6d..9eacd7f3a760e218647fc4d6fea1b40b50f10892 100644
--- a/doc/files/ContextInformation/Provision/016_03.json
+++ b/doc/files/ContextInformation/Provision/016_03.json
@@ -8,7 +8,11 @@
     "5.6.14"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Modify Attribute Instance Temporal Entity",
+    "Create Id",
+    "Delete Temporal Entity"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT containing an initial Temporal Entity ${entity} \n        with an id set to ${temporal_entity_representation_id} \n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Provision/017_02.json b/doc/files/ContextInformation/Provision/017_02.json
index 0cda68efd207a87e563325b181b484bec48d2b6c..26fe5e09ee8448458be01808aba0c879eac5ce45 100644
--- a/doc/files/ContextInformation/Provision/017_02.json
+++ b/doc/files/ContextInformation/Provision/017_02.json
@@ -8,7 +8,11 @@
     "5.6.15"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Delete attribute instance",
+    "Create Temporal Entity",
+    "Delete Temporal Entity"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT containing an initial Temporal Entity ${entity} \n        with an id set to ${temporal_entity_representation_id} \n        and an attribute with an id set to ${atrId}\n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Provision/017_03.json b/doc/files/ContextInformation/Provision/017_03.json
index 80b8bd15b02452e30b32fdc962cf9e96aa4a050d..65e268291bcf61f614e118763c494a64ef4d4000 100644
--- a/doc/files/ContextInformation/Provision/017_03.json
+++ b/doc/files/ContextInformation/Provision/017_03.json
@@ -8,7 +8,11 @@
     "5.6.15"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Delete An Attribute Instance",
+    "Create Id",
+    "Delete Initial Temporal Representation Of Entity"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT containing an initial Temporal Entity ${entity} \n        with an id set to ${temporal_entity_representation_id} \n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Subscription/028_01.json b/doc/files/ContextInformation/Subscription/028_01.json
index 3ee101501a715be5fb5ec0c47ceb0977671b0c43..9d5d377dc74a9f3953a357e3ed3ffab89bdcba17 100644
--- a/doc/files/ContextInformation/Subscription/028_01.json
+++ b/doc/files/ContextInformation/Subscription/028_01.json
@@ -25,7 +25,7 @@
       "setup": null,
       "teardown": null,
       "template": null,
-      "then": "then {\n    the SUT sends a valid Response for the operation:\n        Retrieve Subscription with Check Created Resource Set To and\n            Query Parameter: 'ignored_keys' set to '${None}'\n}",
+      "then": "then {\n    the SUT sends a valid Response for the operation:\n        Retrieve Subscription with Check Created Resource Set To and\n            Query Parameter: 'ignored_keys' set to '${None}' list of keys\n}",
       "when": "when {\n    the SUT receives a Request from the client containing:\n        URL set to '/ngsi-ld/v1/subscriptions/'\n        method set to 'POST'\n        Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'subscriptions/subscription-sample.jsonld'\n}",
       "http_verb": "POST",
       "endpoint": "subscriptions/"
diff --git a/doc/files/ContextInformation/Subscription/028_02.json b/doc/files/ContextInformation/Subscription/028_02.json
index c2067598e434dfc590b76e384c98f39508fbfd76..7320713546fd5a6c3d8bb1ad97e5b379afd62a47 100644
--- a/doc/files/ContextInformation/Subscription/028_02.json
+++ b/doc/files/ContextInformation/Subscription/028_02.json
@@ -8,7 +8,9 @@
     "5.8.1"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Create Subscription With Invalid Request"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n   the SUT containing an initial state\n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Subscription/028_03.json b/doc/files/ContextInformation/Subscription/028_03.json
index a6d134ea423a817c7779ee707142d1e1759c1bf0..b9c49e57acc0e2960721d985be1a26da60d4341e 100644
--- a/doc/files/ContextInformation/Subscription/028_03.json
+++ b/doc/files/ContextInformation/Subscription/028_03.json
@@ -9,6 +9,7 @@
   ],
   "pics_selection": "",
   "keywords": [
+    "Create Subscription With Invalid/Empty Id",
     "Delete Initial Subscriptions"
   ],
   "teardown": "Delete Initial Subscriptions",
diff --git a/doc/files/ContextInformation/Subscription/028_05.json b/doc/files/ContextInformation/Subscription/028_05.json
index 44f3770f7df94ef910a6e1c5c5fc27d64922c635..3931ff5eeb2bbbbc316487f0ef3610ccdd7b48e6 100644
--- a/doc/files/ContextInformation/Subscription/028_05.json
+++ b/doc/files/ContextInformation/Subscription/028_05.json
@@ -8,7 +8,9 @@
     "5.8.1"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Create Subscription With Invalid Throttling"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n   the SUT containing an initial state\n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Subscription/029_01.json b/doc/files/ContextInformation/Subscription/029_01.json
index 793d8f1454a3213157e6b8dafa92936e3c2bfa5f..1365a18e00345eb2ddc5d6d6346daf88979f9a56 100644
--- a/doc/files/ContextInformation/Subscription/029_01.json
+++ b/doc/files/ContextInformation/Subscription/029_01.json
@@ -8,7 +8,9 @@
     "5.8.2"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Update Subscription With Non present Or Invalid Id"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n   the SUT containing an initial state\n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Subscription/029_07.json b/doc/files/ContextInformation/Subscription/029_07.json
index 7976eac35d0df4e37088d5fcc239cece61e1a837..8d0133d92fd67a4a17db8d6ffb6bb6b43b72a4a6 100644
--- a/doc/files/ContextInformation/Subscription/029_07.json
+++ b/doc/files/ContextInformation/Subscription/029_07.json
@@ -9,6 +9,7 @@
   ],
   "pics_selection": "",
   "keywords": [
+    "Activate Paused Subscription With isActive Member",
     "Setup Initial Subscriptions",
     "Delete Initial Subscriptions"
   ],
diff --git a/doc/files/ContextInformation/Subscription/029_08.json b/doc/files/ContextInformation/Subscription/029_08.json
index 2cbd11d672ae184fdc3bc54bdb66538061a2d3e0..7e10a5ad22f7aa9406f3ca847d77673675f96393 100644
--- a/doc/files/ContextInformation/Subscription/029_08.json
+++ b/doc/files/ContextInformation/Subscription/029_08.json
@@ -9,6 +9,7 @@
   ],
   "pics_selection": "",
   "keywords": [
+    "Activate Paused Subscription With isActive And ExpiresAt Members",
     "Setup Initial Subscriptions",
     "Delete Initial Subscriptions"
   ],
diff --git a/doc/files/ContextInformation/Subscription/030_01.json b/doc/files/ContextInformation/Subscription/030_01.json
index 109a8a3ce9f8cc58199811917d8d795fd1d56f02..d7c80d4d3902792d722a8ea4be95689c93ff6391 100644
--- a/doc/files/ContextInformation/Subscription/030_01.json
+++ b/doc/files/ContextInformation/Subscription/030_01.json
@@ -8,7 +8,9 @@
     "5.8.3"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Retrieve Subscription With Invalid Id"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n   the SUT containing an initial state\n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Subscription/031_02.json b/doc/files/ContextInformation/Subscription/031_02.json
index dfaf49d17c33ccb1f54aa8878ea47407571b9b2c..834e05028ea4dde37aa1bc28d2552025ab55381c 100644
--- a/doc/files/ContextInformation/Subscription/031_02.json
+++ b/doc/files/ContextInformation/Subscription/031_02.json
@@ -8,7 +8,11 @@
     "5.8.4"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Query Subscriptions With Limit And Page Parameters",
+    "Setup Initial Subscriptions",
+    "Delete Initial Subscriptions"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT containing an initial Subscription ${subscription} \n        with an id set to ${subscription_id} \n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Subscription/032_01.json b/doc/files/ContextInformation/Subscription/032_01.json
index fe69db1bfa889a58a69bdefa33761e484059f46d..ddb2b395f4f1c53b4334165a91a8e1d6757f17ff 100644
--- a/doc/files/ContextInformation/Subscription/032_01.json
+++ b/doc/files/ContextInformation/Subscription/032_01.json
@@ -8,7 +8,9 @@
     "5.8.5"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Delete Subscription With Non present Or Invalid Id"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n   the SUT containing an initial state\n}",
   "test_cases": [
diff --git a/doc/files/ContextInformation/Subscription/046_01.json b/doc/files/ContextInformation/Subscription/046_01.json
index 43ad14dab963234b349834190dbe79f63677a1c6..071cbf6e562ffda5370bab7f45f3c8c59a0edf4f 100644
--- a/doc/files/ContextInformation/Subscription/046_01.json
+++ b/doc/files/ContextInformation/Subscription/046_01.json
@@ -10,7 +10,11 @@
   "pics_selection": "",
   "keywords": [
     "Before Test",
-    "After Test"
+    "Add Initial Entity",
+    "Setup Initial Subscriptions",
+    "After Test",
+    "Delete Initial Subscriptions",
+    "Delete Initial Entity"
   ],
   "teardown": "After Test",
   "initial_condition": "with {\n   the SUT containing an initial state\n}",
diff --git a/doc/files/ContextInformation/Subscription/046_02.json b/doc/files/ContextInformation/Subscription/046_02.json
index be270e833a1b723e3874a25ef4b4870ff5c31d4e..79698d74645296cfb83dd308711caa8f232b78ab 100644
--- a/doc/files/ContextInformation/Subscription/046_02.json
+++ b/doc/files/ContextInformation/Subscription/046_02.json
@@ -10,7 +10,10 @@
   "pics_selection": "",
   "keywords": [
     "Before Test",
-    "After Test"
+    "Setup Initial Subscriptions",
+    "After Test",
+    "Delete Initial Subscriptions",
+    "Delete Initial Entity"
   ],
   "teardown": "After Test",
   "initial_condition": "with {\n   the SUT containing an initial state\n}",
diff --git a/doc/files/ContextInformation/Subscription/046_03.json b/doc/files/ContextInformation/Subscription/046_03.json
index 63e976a79f491821ae03bf9a84f047d3e4992a1d..a2bcfc3ce064e8e57e67d7809ed8ba0465a2e8e4 100644
--- a/doc/files/ContextInformation/Subscription/046_03.json
+++ b/doc/files/ContextInformation/Subscription/046_03.json
@@ -10,7 +10,11 @@
   "pics_selection": "",
   "keywords": [
     "Before Test",
-    "After Test"
+    "Setup Initial Subscriptions",
+    "After Test",
+    "Delete Initial Subscriptions",
+    "Add Initial Entity",
+    "Delete Initial Entity"
   ],
   "teardown": "After Test",
   "initial_condition": "with {\n   the SUT containing an initial state\n}",
diff --git a/doc/files/ContextInformation/Subscription/046_04.json b/doc/files/ContextInformation/Subscription/046_04.json
index 8f1a648e6130993487c1a15cc0ee4353a52bf040..2883f38f2a35c2137f1c16ca397a20c6354ffa6a 100644
--- a/doc/files/ContextInformation/Subscription/046_04.json
+++ b/doc/files/ContextInformation/Subscription/046_04.json
@@ -10,7 +10,10 @@
   "pics_selection": "",
   "keywords": [
     "Before Test",
-    "After Test"
+    "Setup Initial Subscriptions",
+    "After Test",
+    "Delete Initial Subscriptions",
+    "Delete Initial Entity"
   ],
   "teardown": "After Test",
   "initial_condition": "with {\n   the SUT containing an initial state\n}",
diff --git a/doc/files/ContextInformation/Subscription/046_05.json b/doc/files/ContextInformation/Subscription/046_05.json
index 0e0ba4e083e44ab7bdaa89faee8f63d82b822a28..26c22b272bfe0c4e4fe12ff263e1926805953141 100644
--- a/doc/files/ContextInformation/Subscription/046_05.json
+++ b/doc/files/ContextInformation/Subscription/046_05.json
@@ -10,7 +10,10 @@
   "pics_selection": "",
   "keywords": [
     "Before Test",
-    "After Test"
+    "Setup Initial Subscriptions",
+    "After Test",
+    "Delete Initial Subscriptions",
+    "Delete Initial Entity"
   ],
   "teardown": "After Test",
   "initial_condition": "with {\n   the SUT containing an initial state\n}",
diff --git a/doc/files/ContextInformation/Subscription/046_07.json b/doc/files/ContextInformation/Subscription/046_07.json
index 21a5f5a54616f883732c7a2e83f63cce4dedfe69..462151ecdf53ed005a08e2284f65edfd5cb3bed4 100644
--- a/doc/files/ContextInformation/Subscription/046_07.json
+++ b/doc/files/ContextInformation/Subscription/046_07.json
@@ -10,6 +10,8 @@
   "pics_selection": "",
   "keywords": [
     "Before Suite",
+    "Setup Initial Subscriptions",
+    "After Test",
     "After Suite"
   ],
   "teardown": "After Suite",
diff --git a/doc/files/ContextInformation/Subscription/046_08.json b/doc/files/ContextInformation/Subscription/046_08.json
index 86ff622cb4c3c631b3ebf2caf23b11fc772b18f7..b459a48b132fc6208ff55ad65b81df1e6b5f916e 100644
--- a/doc/files/ContextInformation/Subscription/046_08.json
+++ b/doc/files/ContextInformation/Subscription/046_08.json
@@ -10,6 +10,8 @@
   "pics_selection": "",
   "keywords": [
     "Before Suite",
+    "Setup Initial Subscriptions",
+    "After Test",
     "After Suite"
   ],
   "teardown": "After Suite",
diff --git a/doc/files/ContextInformation/Subscription/046_09.json b/doc/files/ContextInformation/Subscription/046_09.json
index bd1b3ba3fef73bf9675dd71457fd3c8bf926ffa5..b4ac464f56e87ad8a9530f7d81d196419a2c08a9 100644
--- a/doc/files/ContextInformation/Subscription/046_09.json
+++ b/doc/files/ContextInformation/Subscription/046_09.json
@@ -10,7 +10,10 @@
   "pics_selection": "",
   "keywords": [
     "Before Test",
-    "After Test"
+    "Setup Initial Subscriptions",
+    "After Test",
+    "Delete Initial Subscriptions",
+    "Delete Initial Entity"
   ],
   "teardown": "After Test",
   "initial_condition": "with {\n   the SUT containing an initial state\n}",
diff --git a/doc/files/ContextInformation/Subscription/046_10.json b/doc/files/ContextInformation/Subscription/046_10.json
index 54ef95a1709935e98291cf0b00eee01fb1b143d2..ddcd0ea213472f76b0a00ad3819a76bde8451d78 100644
--- a/doc/files/ContextInformation/Subscription/046_10.json
+++ b/doc/files/ContextInformation/Subscription/046_10.json
@@ -10,7 +10,10 @@
   "pics_selection": "",
   "keywords": [
     "Before Test",
-    "After Test"
+    "Setup Initial Subscriptions",
+    "After Test",
+    "Delete Initial Subscriptions",
+    "Delete Initial Entity"
   ],
   "teardown": "After Test",
   "initial_condition": "with {\n   the SUT containing an initial state\n}",
diff --git a/doc/files/ContextInformation/Subscription/046_11.json b/doc/files/ContextInformation/Subscription/046_11.json
index e68888ae0ed8410ea36a96e3924dcbb245cc24dd..3b2672b7259578ce66834792c38f904f899bf1db 100644
--- a/doc/files/ContextInformation/Subscription/046_11.json
+++ b/doc/files/ContextInformation/Subscription/046_11.json
@@ -10,7 +10,11 @@
   "pics_selection": "",
   "keywords": [
     "Before Test",
-    "After Test"
+    "Setup Initial Subscriptions",
+    "Add Initial Entity",
+    "After Test",
+    "Delete Initial Subscriptions",
+    "Delete Initial Entity"
   ],
   "teardown": "After Test",
   "initial_condition": "with {\n   the SUT containing an initial state\n}",
diff --git a/doc/files/ContextInformation/Subscription/046_12.json b/doc/files/ContextInformation/Subscription/046_12.json
index 5661c72a6019a824e01097211ca4c24b2915e0c2..27f3def598abd0f993df4a05a92b23f9b652fb1e 100644
--- a/doc/files/ContextInformation/Subscription/046_12.json
+++ b/doc/files/ContextInformation/Subscription/046_12.json
@@ -9,8 +9,12 @@
   ],
   "pics_selection": "",
   "keywords": [
+    "Setup Initial Subscriptions",
+    "Delete Initial Subscriptions",
     "Before Test",
-    "After Test"
+    "After Test",
+    "Add Initial Entity",
+    "Delete Initial Entity"
   ],
   "teardown": "After Test",
   "initial_condition": "with {\n   the SUT containing an initial state\n}",
diff --git a/doc/files/ContextInformation/Subscription/046_13.json b/doc/files/ContextInformation/Subscription/046_13.json
index 8aa008145997def01e11329ac51108cc32f03a54..05648962a40a7d197a83a03a2377feee72fd2f3d 100644
--- a/doc/files/ContextInformation/Subscription/046_13.json
+++ b/doc/files/ContextInformation/Subscription/046_13.json
@@ -9,6 +9,10 @@
   ],
   "pics_selection": "",
   "keywords": [
+    "Setup Initial Subscription",
+    "Delete Initial Subscription",
+    "Add Initial Entity",
+    "Delete Initial Entity",
     "Before Test",
     "After Test"
   ],
diff --git a/doc/files/ContextInformation/Subscription/046_14.json b/doc/files/ContextInformation/Subscription/046_14.json
index 9fb901df04ac43dc490cf26fe16a561b68a248b2..ecc4b7a157b70c61572546e94e7086facb416dfe 100644
--- a/doc/files/ContextInformation/Subscription/046_14.json
+++ b/doc/files/ContextInformation/Subscription/046_14.json
@@ -9,8 +9,12 @@
   ],
   "pics_selection": "",
   "keywords": [
+    "Setup Initial Subscriptions",
+    "Delete Initial Subscriptions",
     "Before Test",
-    "After Test"
+    "After Test",
+    "Add Initial Entity",
+    "Delete Initial Entity"
   ],
   "teardown": "After Test",
   "initial_condition": "with {\n   the SUT containing an initial state\n}",
diff --git a/doc/files/ContextInformation/Subscription/046_15.json b/doc/files/ContextInformation/Subscription/046_15.json
index 283f83c1a47890e9e4fdbb0b27ecd30afafd87e8..39a82438d11afd3c680c4fa8e37ea86c75a02f00 100644
--- a/doc/files/ContextInformation/Subscription/046_15.json
+++ b/doc/files/ContextInformation/Subscription/046_15.json
@@ -10,7 +10,10 @@
   "pics_selection": "",
   "keywords": [
     "Before Test",
-    "After Test"
+    "Setup Initial Subscriptions",
+    "After Test",
+    "Delete Initial Subscriptions",
+    "Delete Initial Entity"
   ],
   "teardown": "After Test",
   "initial_condition": "with {\n   the SUT containing an initial state\n}",
diff --git a/doc/files/ContextSource/Discovery/036_01.json b/doc/files/ContextSource/Discovery/036_01.json
index 2f563a27936da1497522bea0bdaf3e6e316e9827..2d250319851588911a2693988b82d237c2238b61 100644
--- a/doc/files/ContextSource/Discovery/036_01.json
+++ b/doc/files/ContextSource/Discovery/036_01.json
@@ -8,7 +8,9 @@
     "5.10.1"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Retrieve Context Source Registration With An Invalid Id"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n   the SUT containing an initial state\n}",
   "test_cases": [
diff --git a/doc/files/ContextSource/Discovery/036_05.json b/doc/files/ContextSource/Discovery/036_05.json
index d00d3fbd83769dbe3ba34770271f0406617c2655..ffafda1785d6d838e567d3483f7e28e4ca879800 100644
--- a/doc/files/ContextSource/Discovery/036_05.json
+++ b/doc/files/ContextSource/Discovery/036_05.json
@@ -8,7 +8,11 @@
     "6.3.5"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Review JSON-LD resolution when retrieving a context source registration",
+    "Setup Initial Context Source Registration",
+    "Delete Created Context Source Registration"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT contains a Context Source Registration \n        with id equal to ${context_source_registration_id}\n        and payload set to ${context_source_registration_payload_file_path}\n}",
   "test_cases": [
diff --git a/doc/files/ContextSource/Discovery/037_01.json b/doc/files/ContextSource/Discovery/037_01.json
index daa308c04933f624efb9b37a727e8efcc37cf8d2..a82a652afa2ab14569995bfc0f603ef60da2816e 100644
--- a/doc/files/ContextSource/Discovery/037_01.json
+++ b/doc/files/ContextSource/Discovery/037_01.json
@@ -8,7 +8,11 @@
     "5.10.2"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Query A Context Source Registration",
+    "Setup Initial Context Source Registrations",
+    "Delete Created Context Source Registrations"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT containing a list of Context Source Registrations (CSRs) providing latest information about some entities\n}",
   "test_cases": [
diff --git a/doc/files/ContextSource/Discovery/037_03.json b/doc/files/ContextSource/Discovery/037_03.json
index 36d174a4894e1adc3e3ab295de915b695463d06a..67ff1c1ca2c727507a032d163d8c703a23386831 100644
--- a/doc/files/ContextSource/Discovery/037_03.json
+++ b/doc/files/ContextSource/Discovery/037_03.json
@@ -8,7 +8,9 @@
     "5.10.2"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Query Context Source Registration With Invalid Query Param"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n   the SUT containing an initial state\n}",
   "test_cases": [
diff --git a/doc/files/ContextSource/Discovery/037_05.json b/doc/files/ContextSource/Discovery/037_05.json
index 9d9cfcf864807c226ec44c930af2213aace4a0b3..b0c56e2763fa34f97f58a239d9083bee12381d15 100644
--- a/doc/files/ContextSource/Discovery/037_05.json
+++ b/doc/files/ContextSource/Discovery/037_05.json
@@ -8,7 +8,10 @@
     "5.10.2"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Query Context Source Registration Matching EntityInfo of RegistrationInfo",
+    "Delete Created Context Source Registration"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n   the SUT containing an initial state\n}",
   "test_cases": [
diff --git a/doc/files/ContextSource/Discovery/037_06.json b/doc/files/ContextSource/Discovery/037_06.json
index b1efcae427888831a52f1f76f48408733f5858c6..d17fa84d45db861b17b3348153ddedef3b2da4e9 100644
--- a/doc/files/ContextSource/Discovery/037_06.json
+++ b/doc/files/ContextSource/Discovery/037_06.json
@@ -8,7 +8,11 @@
     "5.10.2"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Query Context Source Registration Matching Properties And Relationships Of RegistrationInfo",
+    "Setup Initial Context Source Registration",
+    "Delete Created Context Source Registration"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT contains a Context Source Registration \n        with id equal to ${context_source_registration_id}\n        and payload set to ${context_source_registration_payload_file_path}\n}",
   "test_cases": [
diff --git a/doc/files/ContextSource/Discovery/037_07.json b/doc/files/ContextSource/Discovery/037_07.json
index 6481db11399930f769497f057efcee4673782580..6ee6113d454bb02e39642e7046ab2963420fa936 100644
--- a/doc/files/ContextSource/Discovery/037_07.json
+++ b/doc/files/ContextSource/Discovery/037_07.json
@@ -8,7 +8,11 @@
     "5.10.2"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Query Context Source Registration Matching Geoquery",
+    "Setup Initial Context Source Registration",
+    "Delete Created Context Source Registration"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT contains a Context Source Registration \n        with id equal to ${context_source_registration_id}\n        and payload set to ${context_source_registration_payload_file_path}\n}",
   "test_cases": [
diff --git a/doc/files/ContextSource/Discovery/037_09.json b/doc/files/ContextSource/Discovery/037_09.json
index 44df26557376990091df88edb7a71306a5abf590..28889eade603ea25caae0fe1431ce8e8422b7c33 100644
--- a/doc/files/ContextSource/Discovery/037_09.json
+++ b/doc/files/ContextSource/Discovery/037_09.json
@@ -8,7 +8,10 @@
     "5.10.2"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Query Context Source Registration Matching Temporal Query",
+    "Delete Created Context Source Registrations"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n   the SUT containing an initial state\n}",
   "test_cases": [
diff --git a/doc/files/ContextSource/Discovery/037_10.json b/doc/files/ContextSource/Discovery/037_10.json
index 70aab53d1133566e8545da516ee4ab02ffbc35c6..3373dd1ae94adb3e31b17e5df77c5aaeba492588 100644
--- a/doc/files/ContextSource/Discovery/037_10.json
+++ b/doc/files/ContextSource/Discovery/037_10.json
@@ -8,7 +8,11 @@
     "5.10.2"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Query Context Source Registration With Query Params",
+    "Setup Initial Context Source Registrations",
+    "Delete Created Context Source Registrations"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT containing a list of Context Source Registrations (CSRs) providing latest information about some entities\n}",
   "test_cases": [
diff --git a/doc/files/ContextSource/Discovery/037_11.json b/doc/files/ContextSource/Discovery/037_11.json
index a96ac86bd6bd9d6a250c7d094afb0144e108062b..0f38d5889275ab211e2a10ae3b3547c64da0841f 100644
--- a/doc/files/ContextSource/Discovery/037_11.json
+++ b/doc/files/ContextSource/Discovery/037_11.json
@@ -8,7 +8,11 @@
     "5.10.2"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Query Context Source Registration With Limit And Offset Parameters",
+    "Setup Initial Context Source Registrations",
+    "Delete Created Context Source Registrations"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT containing a list of Context Source Registrations (CSRs) providing latest information about some entities\n}",
   "test_cases": [
diff --git a/doc/files/ContextSource/Registration/033_01_01.json b/doc/files/ContextSource/Registration/033_01_01.json
index 58f6cd9de8956aa26fd1e9bfc7b97fbff6982983..053574567f3309a73a00e408bf67bb3c96095220 100644
--- a/doc/files/ContextSource/Registration/033_01_01.json
+++ b/doc/files/ContextSource/Registration/033_01_01.json
@@ -25,7 +25,7 @@
       "setup": null,
       "teardown": null,
       "template": null,
-      "then": "then {\n    the SUT sends a valid Response for the operations:\n        Create Context Source Registration With Return with Response Status Code set to 201     and\n        Retrieve Context Source Registration with Check Created Resource Set To and\n            Query Parameter: 'ignored_keys' set to '${None}'\n}",
+      "then": "then {\n    the SUT sends a valid Response for the operations:\n        Create Context Source Registration With Return with Response Status Code set to 201     and\n        Retrieve Context Source Registration with Check Created Resource Set To and\n            Query Parameter: 'ignored_keys' set to '${None}' list of keys\n}",
       "when": "when {\n    the SUT receives a Request from the client containing:\n        URL set to '/ngsi-ld/v1/csourceRegistrations'\n        method set to 'POST'\n        Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: '${registration_payload}'\n}",
       "http_verb": "POST",
       "endpoint": "csourceRegistrations"
diff --git a/doc/files/ContextSource/Registration/033_01_02.json b/doc/files/ContextSource/Registration/033_01_02.json
index f242261ad9bfb9ac53379984e62f35e16a368389..e00e099399e47a53b0837bd527d6053b841c3286 100644
--- a/doc/files/ContextSource/Registration/033_01_02.json
+++ b/doc/files/ContextSource/Registration/033_01_02.json
@@ -25,7 +25,7 @@
       "setup": null,
       "teardown": null,
       "template": null,
-      "then": "then {\n    the SUT sends a valid Response for the operations:\n        Create Context Source Registration With Return with Response Status Code set to 201     and\n        Create Context Source Registration With Return with Response Header: Location containing $${registration_id}     and\n        Retrieve Context Source Registration with Check Created Resource Set To and\n            Query Parameter: 'ignored_keys' set to '${None}'\n}",
+      "then": "then {\n    the SUT sends a valid Response for the operations:\n        Create Context Source Registration With Return with Response Status Code set to 201     and\n        Create Context Source Registration With Return with Response Header: Location containing $${registration_id}     and\n        Retrieve Context Source Registration with Check Created Resource Set To and\n            Query Parameter: 'ignored_keys' set to '${None}' list of keys\n}",
       "when": "when {\n    the SUT receives a Request from the client containing:\n        URL set to '/ngsi-ld/v1/csourceRegistrations'\n        method set to 'POST'\n        Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: '${registration_payload}'\n}",
       "http_verb": "POST",
       "endpoint": "csourceRegistrations"
diff --git a/doc/files/ContextSource/Registration/033_01_03.json b/doc/files/ContextSource/Registration/033_01_03.json
index 1af33e03f192a104826b416f25cffec8e695569c..ea4a3ea25cd9106e560b79414481bf1c23c12493 100644
--- a/doc/files/ContextSource/Registration/033_01_03.json
+++ b/doc/files/ContextSource/Registration/033_01_03.json
@@ -25,7 +25,7 @@
       "setup": null,
       "teardown": null,
       "template": null,
-      "then": "then {\n    the SUT sends a valid Response for the operations:\n        Create Context Source Registration With Return with Response Status Code set to 201     and\n        Retrieve Context Source Registration with Check Created Resource Set To and\n            Query Parameter: 'ignored_keys' set to '${None}'\n}",
+      "then": "then {\n    the SUT sends a valid Response for the operations:\n        Create Context Source Registration With Return with Response Status Code set to 201     and\n        Retrieve Context Source Registration with Check Created Resource Set To and\n            Query Parameter: 'ignored_keys' set to '${None}' list of keys\n}",
       "when": "when {\n    the SUT receives a Request from the client containing:\n        URL set to '/ngsi-ld/v1/csourceRegistrations'\n        method set to 'POST'\n        Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: '${payload}'\n}",
       "http_verb": "POST",
       "endpoint": "csourceRegistrations"
diff --git a/doc/files/ContextSource/Registration/033_03.json b/doc/files/ContextSource/Registration/033_03.json
index 9fb28693adea1647eb69d4427f1374cefcfd1d64..dd088e3f34e5611648b20fd8b4a98023603622ba 100644
--- a/doc/files/ContextSource/Registration/033_03.json
+++ b/doc/files/ContextSource/Registration/033_03.json
@@ -8,7 +8,10 @@
     "5.9.2"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Delete Created Context Source Registrations",
+    "Create New Context Source Registration"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT contains a Context Source Registration \n        with id equal to ${context_source_registration_id}\n        and payload set to ${context_source_registration_payload_file_path}\n}",
   "test_cases": [
diff --git a/doc/files/ContextSource/Registration/033_10.json b/doc/files/ContextSource/Registration/033_10.json
index ec33275c39517323a1f55734fe60d9589adb871c..4abc3f9f32d4014ffd828f5034bc23e1abf111b7 100644
--- a/doc/files/ContextSource/Registration/033_10.json
+++ b/doc/files/ContextSource/Registration/033_10.json
@@ -8,7 +8,9 @@
     "6.3.5"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Create Context Source With Invalid Content"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n   the SUT containing an initial state\n}",
   "test_cases": [
diff --git a/doc/files/ContextSource/Registration/034_01.json b/doc/files/ContextSource/Registration/034_01.json
index 007b715e48cfada120541e2f1b51f44e8fdbd26d..0662d55b3824a749828aca404726cdec5d508eb9 100644
--- a/doc/files/ContextSource/Registration/034_01.json
+++ b/doc/files/ContextSource/Registration/034_01.json
@@ -8,7 +8,11 @@
     "5.9.3"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Update A Context Source",
+    "Delete Updated Context Source Registration",
+    "Initialize the Test Case"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT contains a Context Source Registration \n        with id equal to ${context_source_registration_id}\n        and payload set to ${context_source_registration_payload_file_path}\n}",
   "test_cases": [
diff --git a/doc/files/ContextSource/Registration/034_02.json b/doc/files/ContextSource/Registration/034_02.json
index c8deb383a7747fc6f6cb13f5caf3575f4767cac3..7cf68cb546d78bcd0fd1051ee4c8b918357f0a7d 100644
--- a/doc/files/ContextSource/Registration/034_02.json
+++ b/doc/files/ContextSource/Registration/034_02.json
@@ -8,7 +8,11 @@
     "5.9.3"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Update A Context Source",
+    "Create Initial Context Source Registration",
+    "Delete Initial Context Source Registration"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT contains a Context Source Registration \n        with id equal to ${context_source_registration_id}\n        and payload set to ${context_source_registration_payload_file_path}\n}",
   "test_cases": [
diff --git a/doc/files/ContextSource/Registration/034_04.json b/doc/files/ContextSource/Registration/034_04.json
index 83c1305e9474667cd40147cc2f3e36de5efcf735..20c777a389df6ebb044f71a2ef3c9058709e2a4b 100644
--- a/doc/files/ContextSource/Registration/034_04.json
+++ b/doc/files/ContextSource/Registration/034_04.json
@@ -8,7 +8,10 @@
     "5.9.3"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Create Initial Context Source Registration",
+    "Delete Initial Context Source Registration"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT contains a Context Source Registration \n        with id equal to ${context_source_registration_id}\n        and payload set to ${context_source_registration_payload_file_path}\n}",
   "test_cases": [
diff --git a/doc/files/ContextSource/Registration/034_05.json b/doc/files/ContextSource/Registration/034_05.json
index 50c803525c6206f0e16a71083d0d57658f410ef3..6b33de7e45956bc2c664b00327bd25b215b1c94a 100644
--- a/doc/files/ContextSource/Registration/034_05.json
+++ b/doc/files/ContextSource/Registration/034_05.json
@@ -8,7 +8,11 @@
     "5.9.3"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Update A Context Source",
+    "Delete Updated Context Source Registration",
+    "Initialize the Test Case"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT contains a Context Source Registration \n        with id equal to ${context_source_registration_id}\n        and payload set to ${context_source_registration_payload_file_path}\n}",
   "test_cases": [
diff --git a/doc/files/ContextSource/Registration/034_06.json b/doc/files/ContextSource/Registration/034_06.json
index 4d844af6cef85f5a26c26dcf257deb67cde95837..af0989b7ae446ec0473205a847c193a363382097 100644
--- a/doc/files/ContextSource/Registration/034_06.json
+++ b/doc/files/ContextSource/Registration/034_06.json
@@ -8,7 +8,11 @@
     "5.9.3"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Update A Context Source",
+    "Create Initial Context Source Registration",
+    "Delete Initial Context Source Registration"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT contains a Context Source Registration \n        with id equal to ${context_source_registration_id}\n        and payload set to ${context_source_registration_payload_file_path}\n}",
   "test_cases": [
diff --git a/doc/files/ContextSource/Registration/035_02.json b/doc/files/ContextSource/Registration/035_02.json
index 71d9822ff09c7febc18550537bc6b7704254cf7e..731ac71f426c0383759fe8c5c0b41a66b83ae567 100644
--- a/doc/files/ContextSource/Registration/035_02.json
+++ b/doc/files/ContextSource/Registration/035_02.json
@@ -8,7 +8,11 @@
     "5.9.4"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Delete A Context Source",
+    "Delete Created Context Source Registrations",
+    "Create Initial Context Source Registration"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT contains a Context Source Registration \n        with id equal to ${context_source_registration_id}\n        and payload set to ${context_source_registration_payload_file_path}\n}",
   "test_cases": [
diff --git a/doc/files/ContextSource/RegistrationSubscription/038_01.json b/doc/files/ContextSource/RegistrationSubscription/038_01.json
index 10dc69b862e481fcb12eb6ec6d61e2102e575055..5577c37f9ae0c56747fa12c1ae0de74d21f1294d 100644
--- a/doc/files/ContextSource/RegistrationSubscription/038_01.json
+++ b/doc/files/ContextSource/RegistrationSubscription/038_01.json
@@ -26,7 +26,7 @@
       "setup": null,
       "teardown": null,
       "template": null,
-      "then": "then {\n    the SUT sends a valid Response for the operations:\n        Create Context Source Registration Subscription with Response Status Code set to 201     and\n        Create Context Source Registration Subscription with Response Header: Location containing $${subscription_id}     and\n        Retrieve Context Source Registration Subscription with Check Created Resource Set To and\n            Query Parameter: 'ignored_keys' set to '${None}'\n}",
+      "then": "then {\n    the SUT sends a valid Response for the operations:\n        Create Context Source Registration Subscription with Response Status Code set to 201     and\n        Create Context Source Registration Subscription with Response Header: Location containing $${subscription_id}     and\n        Retrieve Context Source Registration Subscription with Check Created Resource Set To and\n            Query Parameter: 'ignored_keys' set to '${None}' list of keys     and\n        Retrieve Context Source Registration Subscription with The dictionary `${response1.json()}' might contain the key 'lastNotification'     and\n        Retrieve Context Source Registration Subscription with The dictionary `${response1.json()}' might contain the key 'lastFailure'     and\n        Retrieve Context Source Registration Subscription with The dictionary `${response1.json()}' might contain the key 'lastSuccess'     and\n        Retrieve Context Source Registration Subscription with The dictionary `${response1.json()}' might contain the key 'timesSent'\n}",
       "when": "when {\n    the SUT receives a Request from the client containing:\n        URL set to '/ngsi-ld/v1/csourceSubscriptions'\n        method set to 'POST'\n        Create Context Source Registration Subscription with filename set to '${subscription_payload}', accept set to '${EMPTY}', and content-type set to 'application/ld+json'\n}",
       "http_verb": "POST",
       "endpoint": "csourceSubscriptions"
diff --git a/doc/files/ContextSource/RegistrationSubscription/038_02.json b/doc/files/ContextSource/RegistrationSubscription/038_02.json
index 5fcdc691b20dda3fd57f0ed1295a2ae7c8e15652..888112f1ba1fce0cc53f792a409e20f7f8521492 100644
--- a/doc/files/ContextSource/RegistrationSubscription/038_02.json
+++ b/doc/files/ContextSource/RegistrationSubscription/038_02.json
@@ -25,7 +25,7 @@
       "setup": null,
       "teardown": null,
       "template": null,
-      "then": "then {\n    the SUT sends a valid Response for the operations:\n        Create Context Source Registration Subscription with Response Status Code set to 201     and\n        Create Context Source Registration Subscription with Response Header: Location containing $${subscription_id}     and\n        Retrieve Context Source Registration Subscription with Check Created Resource Set To and\n            Query Parameter: 'ignored_keys' set to '${None}'\n}",
+      "then": "then {\n    the SUT sends a valid Response for the operations:\n        Create Context Source Registration Subscription with Response Status Code set to 201     and\n        Retrieve Context Source Registration Subscription with Check Created Resource Set To and\n            Query Parameter: 'ignored_keys' set to '${None}' list of keys\n}",
       "when": "when {\n    the SUT receives a Request from the client containing:\n        URL set to '/ngsi-ld/v1/csourceSubscriptions'\n        method set to 'POST'\n        Create Context Source Registration Subscription with filename set to '${subscription_payload}', accept set to '${EMPTY}', and content-type set to 'application/ld+json'\n}",
       "http_verb": "POST",
       "endpoint": "csourceSubscriptions"
diff --git a/doc/files/ContextSource/RegistrationSubscription/038_04.json b/doc/files/ContextSource/RegistrationSubscription/038_04.json
index 836527ca87d06082620606b63d760cfaf7e23cca..aa2b859b1d9d0c1b408077f2279af5496768302b 100644
--- a/doc/files/ContextSource/RegistrationSubscription/038_04.json
+++ b/doc/files/ContextSource/RegistrationSubscription/038_04.json
@@ -26,7 +26,7 @@
       "setup": null,
       "teardown": null,
       "template": null,
-      "then": "then {\n    the SUT sends a valid Response for the operations:\n        Create Context Source Registration Subscription with Response Status Code set to 201     and\n        Create Context Source Registration Subscription with Response Header: Location containing $${subscription_id}     and\n        Retrieve Context Source Registration Subscription with Check Response Body containing an Attribute set to and\n            Query Parameter: expected_attribute_name set to 'status' and\n            Query Parameter: response_body set to 'response1.json()' and\n            Query Parameter: expected_attribute_value set to 'paused'\n}",
+      "then": "then {\n    the SUT sends a valid Response for the operations:\n        Create Context Source Registration Subscription with Response Status Code set to 201     and\n        Create Context Source Registration Subscription with Response Header: Location containing $${subscription_id}     and\n        Retrieve Context Source Registration Subscription with Check that the payload body contains a boolean attribute with name 'expected_attribute_name=isActive' and value 'expected_attribute_value=False     and\n        Retrieve Context Source Registration Subscription with Check Response Body containing an Attribute set to and\n            Query Parameter: expected_attribute_name set to 'status' and\n            Query Parameter: response_body set to 'response1.json()' and\n            Query Parameter: expected_attribute_value set to 'paused'\n}",
       "when": "when {\n    the SUT receives a Request from the client containing:\n        URL set to '/ngsi-ld/v1/csourceSubscriptions'\n        method set to 'POST'\n        Create Context Source Registration Subscription with filename set to '${subscription_payload}', accept set to '${EMPTY}', and content-type set to 'application/ld+json'\n}",
       "http_verb": "POST",
       "endpoint": "csourceSubscriptions"
diff --git a/doc/files/ContextSource/RegistrationSubscription/038_05.json b/doc/files/ContextSource/RegistrationSubscription/038_05.json
index c4047ba710febb41d43b6bde08be5e163bbf5506..beba14053f93bbd08e4ab74c0df8cc8d0c719063 100644
--- a/doc/files/ContextSource/RegistrationSubscription/038_05.json
+++ b/doc/files/ContextSource/RegistrationSubscription/038_05.json
@@ -26,7 +26,7 @@
       "setup": null,
       "teardown": null,
       "template": null,
-      "then": "then {\n    the SUT sends a valid Response for the operations:\n        Create Context Source Registration Subscription with Response Status Code set to 201     and\n        Create Context Source Registration Subscription with Response Header: Location containing $${subscription_id}     and\n        Retrieve Context Source Registration Subscription with Check Response Body containing an Attribute set to and\n            Query Parameter: expected_attribute_name set to 'status' and\n            Query Parameter: response_body set to 'response1.json()' and\n            Query Parameter: expected_attribute_value set to 'expired'\n}",
+      "then": "then {\n    the SUT sends a valid Response for the operations:\n        Create Context Source Registration Subscription with Response Status Code set to 201     and\n        Create Context Source Registration Subscription with Response Header: Location containing $${subscription_id}     and\n        Retrieve Context Source Registration Subscription with Check that the dictionary contains the key 'key=expiresAt' with type DateTime and value set to 'expected value=${expiresAt}'     and\n        Retrieve Context Source Registration Subscription with Check Response Body containing an Attribute set to and\n            Query Parameter: expected_attribute_name set to 'status' and\n            Query Parameter: response_body set to 'response1.json()' and\n            Query Parameter: expected_attribute_value set to 'expired'\n}",
       "when": "when {\n    the SUT receives a Request from the client containing:\n        URL set to '/ngsi-ld/v1/csourceSubscriptions'\n        method set to 'POST'\n        Create Context Source Registration Subscription with filename set to '${subscription_payload}', accept set to '${EMPTY}', and content-type set to 'application/ld+json'\n}",
       "http_verb": "POST",
       "endpoint": "csourceSubscriptions"
diff --git a/doc/files/ContextSource/RegistrationSubscription/038_07.json b/doc/files/ContextSource/RegistrationSubscription/038_07.json
index 6282690b1cda8eac6c7a05a1ec48ce092bef3d97..e5ba028e82d6022f2be3feaf819671124351131a 100644
--- a/doc/files/ContextSource/RegistrationSubscription/038_07.json
+++ b/doc/files/ContextSource/RegistrationSubscription/038_07.json
@@ -8,7 +8,10 @@
     "5.11.2"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Setup Initial Context Source Registration Subscription",
+    "Delete Initial Context Source Registration Subscription"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT containing a Context Source Registration Subscription (CSRS1)\n}",
   "test_cases": [
@@ -23,7 +26,7 @@
       "setup": "Setup Initial Context Source Registration Subscription",
       "teardown": "Delete Initial Context Source Registration Subscription",
       "template": null,
-      "then": "then {\n    the SUT sends a valid Response for the operations:\n        Create Context Source Registration Subscription with Response Status Code set to 409     and\n        Create Context Source Registration Subscription with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/AlreadyExists'     and\n        Create Context Source Registration Subscription with Response body containing 'title' element\n}",
+      "then": "then {\n    the SUT sends a valid Response for the operations:\n        Create Context Source Registration Subscription with Response Status Code set to 409     and\n        Create Context Source Registration Subscription with Response Body containing the type 'problem_type=${ERROR_TYPE_ALREADY_EXISTS}' and Response Body Title is a string and is not ${EMPTY} and Response Body Detail is a string and is not ${EMPTY} and Response Boty Title is not equal to Response Body Detail\n}",
       "when": "when {\n    the SUT receives a Request from the client containing:\n        URL set to '/ngsi-ld/v1/csourceSubscriptions'\n        method set to 'POST'\n        Create Context Source Registration Subscription with filename set to '${subscription_payload}', accept set to '${EMPTY}', and content-type set to 'application/ld+json'\n}",
       "http_verb": "POST",
       "endpoint": "csourceSubscriptions"
diff --git a/doc/files/ContextSource/RegistrationSubscription/038_08.json b/doc/files/ContextSource/RegistrationSubscription/038_08.json
index 7347bcd35f0bfbaacf39d21f0eeea632184d4100..95d167e4e6420843743232e41dba4eb13aa0192e 100644
--- a/doc/files/ContextSource/RegistrationSubscription/038_08.json
+++ b/doc/files/ContextSource/RegistrationSubscription/038_08.json
@@ -8,7 +8,9 @@
     "5.11.2"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Create Invalid Context Source Registration Subscription"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n   the SUT containing an initial state\n}",
   "test_cases": [
@@ -23,7 +25,7 @@
       "setup": null,
       "teardown": null,
       "template": "Create Invalid Context Source Registration Subscription",
-      "then": "then {\n    the SUT sends a valid Response for the operations:\n        Create Context Source Registration Subscription with Response Status Code set to 400     and\n        Create Context Source Registration Subscription with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/BadRequestData'     and\n        Create Context Source Registration Subscription with Response body containing 'title' element\n}",
+      "then": "then {\n    the SUT sends a valid Response for the operations:\n        Create Context Source Registration Subscription with Response Status Code set to 400     and\n        Create Context Source Registration Subscription with Response Body containing the type 'problem_type=${ERROR_TYPE_BAD_REQUEST_DATA}' and Response Body Title is a string and is not ${EMPTY} and Response Body Detail is a string and is not ${EMPTY} and Response Boty Title is not equal to Response Body Detail\n}",
       "when": "when {\n    the SUT receives a Request from the client containing:\n        URL set to '/ngsi-ld/v1/csourceSubscriptions'\n        method set to 'POST'\n        Create Context Source Registration Subscription with filename set to '${subscription_payload}', accept set to '${EMPTY}', and content-type set to 'application/ld+json'\n}",
       "http_verb": "POST",
       "endpoint": "csourceSubscriptions"
@@ -39,7 +41,7 @@
       "setup": null,
       "teardown": null,
       "template": "Create Invalid Context Source Registration Subscription",
-      "then": "then {\n    the SUT sends a valid Response for the operations:\n        Create Context Source Registration Subscription with Response Status Code set to 400     and\n        Create Context Source Registration Subscription with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/BadRequestData'     and\n        Create Context Source Registration Subscription with Response body containing 'title' element\n}",
+      "then": "then {\n    the SUT sends a valid Response for the operations:\n        Create Context Source Registration Subscription with Response Status Code set to 400     and\n        Create Context Source Registration Subscription with Response Body containing the type 'problem_type=${ERROR_TYPE_BAD_REQUEST_DATA}' and Response Body Title is a string and is not ${EMPTY} and Response Body Detail is a string and is not ${EMPTY} and Response Boty Title is not equal to Response Body Detail\n}",
       "when": "when {\n    the SUT receives a Request from the client containing:\n        URL set to '/ngsi-ld/v1/csourceSubscriptions'\n        method set to 'POST'\n        Create Context Source Registration Subscription with filename set to '${subscription_payload}', accept set to '${EMPTY}', and content-type set to 'application/ld+json'\n}",
       "http_verb": "POST",
       "endpoint": "csourceSubscriptions"
@@ -55,7 +57,7 @@
       "setup": null,
       "teardown": null,
       "template": "Create Invalid Context Source Registration Subscription",
-      "then": "then {\n    the SUT sends a valid Response for the operations:\n        Create Context Source Registration Subscription with Response Status Code set to 400     and\n        Create Context Source Registration Subscription with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/BadRequestData'     and\n        Create Context Source Registration Subscription with Response body containing 'title' element\n}",
+      "then": "then {\n    the SUT sends a valid Response for the operations:\n        Create Context Source Registration Subscription with Response Status Code set to 400     and\n        Create Context Source Registration Subscription with Response Body containing the type 'problem_type=${ERROR_TYPE_BAD_REQUEST_DATA}' and Response Body Title is a string and is not ${EMPTY} and Response Body Detail is a string and is not ${EMPTY} and Response Boty Title is not equal to Response Body Detail\n}",
       "when": "when {\n    the SUT receives a Request from the client containing:\n        URL set to '/ngsi-ld/v1/csourceSubscriptions'\n        method set to 'POST'\n        Create Context Source Registration Subscription with filename set to '${subscription_payload}', accept set to '${EMPTY}', and content-type set to 'application/ld+json'\n}",
       "http_verb": "POST",
       "endpoint": "csourceSubscriptions"
@@ -71,7 +73,7 @@
       "setup": null,
       "teardown": null,
       "template": "Create Invalid Context Source Registration Subscription",
-      "then": "then {\n    the SUT sends a valid Response for the operations:\n        Create Context Source Registration Subscription with Response Status Code set to 400     and\n        Create Context Source Registration Subscription with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/BadRequestData'     and\n        Create Context Source Registration Subscription with Response body containing 'title' element\n}",
+      "then": "then {\n    the SUT sends a valid Response for the operations:\n        Create Context Source Registration Subscription with Response Status Code set to 400     and\n        Create Context Source Registration Subscription with Response Body containing the type 'problem_type=${ERROR_TYPE_BAD_REQUEST_DATA}' and Response Body Title is a string and is not ${EMPTY} and Response Body Detail is a string and is not ${EMPTY} and Response Boty Title is not equal to Response Body Detail\n}",
       "when": "when {\n    the SUT receives a Request from the client containing:\n        URL set to '/ngsi-ld/v1/csourceSubscriptions'\n        method set to 'POST'\n        Create Context Source Registration Subscription with filename set to '${subscription_payload}', accept set to '${EMPTY}', and content-type set to 'application/ld+json'\n}",
       "http_verb": "POST",
       "endpoint": "csourceSubscriptions"
diff --git a/doc/files/ContextSource/RegistrationSubscription/038_09.json b/doc/files/ContextSource/RegistrationSubscription/038_09.json
index e69a0e69ed2266838b13e42a9b7476d019a735d7..6748811d376c7ef1ef2c3806af0260408ba12f97 100644
--- a/doc/files/ContextSource/RegistrationSubscription/038_09.json
+++ b/doc/files/ContextSource/RegistrationSubscription/038_09.json
@@ -23,7 +23,7 @@
       "setup": null,
       "teardown": null,
       "template": null,
-      "then": "then {\n    the SUT sends a valid Response for the operations:\n        Create Context Source Registration Subscription with Response Status Code set to 400     and\n        Create Context Source Registration Subscription with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/BadRequestData'     and\n        Create Context Source Registration Subscription with Response body containing 'title' element\n}",
+      "then": "then {\n    the SUT sends a valid Response for the operations:\n        Create Context Source Registration Subscription with Response Status Code set to 400     and\n        Create Context Source Registration Subscription with Response Body containing the type 'problem_type=${ERROR_TYPE_BAD_REQUEST_DATA}' and Response Body Title is a string and is not ${EMPTY} and Response Body Detail is a string and is not ${EMPTY} and Response Boty Title is not equal to Response Body Detail\n}",
       "when": "when {\n    the SUT receives a Request from the client containing:\n        URL set to '/ngsi-ld/v1/csourceSubscriptions'\n        method set to 'POST'\n        Create Context Source Registration Subscription with filename set to '${subscription_payload}', accept set to '${EMPTY}', and content-type set to 'application/ld+json'\n}",
       "http_verb": "POST",
       "endpoint": "csourceSubscriptions"
diff --git a/doc/files/ContextSource/RegistrationSubscription/039_01.json b/doc/files/ContextSource/RegistrationSubscription/039_01.json
index cd9821c5fb7c141b55b2737b0ded0437dde7654a..c6a334e7fa42b462df762cf79eedf0261e2d5dc2 100644
--- a/doc/files/ContextSource/RegistrationSubscription/039_01.json
+++ b/doc/files/ContextSource/RegistrationSubscription/039_01.json
@@ -8,7 +8,10 @@
     "5.11.3"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Setup Initial Context Source Registration Subscriptions",
+    "Delete Initial Context Source Registration Subscriptions"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT containing a set of Context Source Registration Subscriptions (CSRSs)\n}",
   "test_cases": [
@@ -23,7 +26,7 @@
       "setup": "Setup Initial Context Source Registration Subscriptions",
       "teardown": "Delete Initial Context Source Registration Subscriptions",
       "template": null,
-      "then": "then {\n    the SUT sends a valid Response for the operations:\n        Update Context Source Registration Subscription with Response Status Code set to 204     and\n        Retrieve Context Source Registration Subscription with Updated Entity set to ${entity}\n}",
+      "then": "then {\n    the SUT sends a valid Response for the operations:\n        Update Context Source Registration Subscription with Response Status Code set to 204     and\n        Update Context Source Registration Subscription with Response does not contain a body     and\n        Update Context Source Registration Subscription with Response reason set to 'No Content'     and\n        Retrieve Context Source Registration Subscription with Updated Entity set to ${entity}\n}",
       "when": "when {\n    the SUT receives a Request from the client containing:\n        URL set to '/ngsi-ld/v1/csourceSubscriptions/{subscription_id}'\n        method set to 'PATCH'\n        Update Context Source Registration Subscription with subscription id set to '${subscription_id}' and subscription update fragment set to '${subscription_update_fragment}'\n}",
       "http_verb": "PATCH",
       "endpoint": "csourceSubscriptions/{subscription_id}"
diff --git a/doc/files/ContextSource/RegistrationSubscription/039_02.json b/doc/files/ContextSource/RegistrationSubscription/039_02.json
index 1c52801bb8135ef84246aa39ee93772e0434f989..73db9e13ba6d8d9251a6e2d728d92d34de986796 100644
--- a/doc/files/ContextSource/RegistrationSubscription/039_02.json
+++ b/doc/files/ContextSource/RegistrationSubscription/039_02.json
@@ -23,7 +23,7 @@
       "setup": null,
       "teardown": null,
       "template": null,
-      "then": "then {\n    the SUT sends a valid Response for the operations:\n        Update Context Source Registration Subscription with Response Status Code set to 400     and\n        Update Context Source Registration Subscription with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/BadRequestData'     and\n        Update Context Source Registration Subscription with Response body containing 'title' element\n}",
+      "then": "then {\n    the SUT sends a valid Response for the operations:\n        Update Context Source Registration Subscription with Response Status Code set to 400     and\n        Update Context Source Registration Subscription with Response Body containing the type 'problem_type=${ERROR_TYPE_BAD_REQUEST_DATA}' and Response Body Title is a string and is not ${EMPTY} and Response Body Detail is a string and is not ${EMPTY} and Response Boty Title is not equal to Response Body Detail\n}",
       "when": "when {\n    the SUT receives a Request from the client containing:\n        URL set to '/ngsi-ld/v1/csourceSubscriptions/{subscription_id}'\n        method set to 'PATCH'\n        Update Context Source Registration Subscription with subscription id set to 'invalidUri' and subscription update fragment set to '${subscription_update_fragment}'\n}",
       "http_verb": "PATCH",
       "endpoint": "csourceSubscriptions/{subscription_id}"
diff --git a/doc/files/ContextSource/RegistrationSubscription/039_03.json b/doc/files/ContextSource/RegistrationSubscription/039_03.json
index df288c9172539f27cf82cdf0b73cf3b8e7692a29..2d7b050c2ea2cfd57100b46d3fc3ab8706801c45 100644
--- a/doc/files/ContextSource/RegistrationSubscription/039_03.json
+++ b/doc/files/ContextSource/RegistrationSubscription/039_03.json
@@ -23,7 +23,7 @@
       "setup": null,
       "teardown": null,
       "template": null,
-      "then": "then {\n    the SUT sends a valid Response for the operations:\n        Update Context Source Registration Subscription with Response Status Code set to 404     and\n        Update Context Source Registration Subscription with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/ResourceNotFound'     and\n        Update Context Source Registration Subscription with Response body containing 'title' element\n}",
+      "then": "then {\n    the SUT sends a valid Response for the operations:\n        Update Context Source Registration Subscription with Response Status Code set to 404     and\n        Update Context Source Registration Subscription with Response Body containing the type 'problem_type=${ERROR_TYPE_RESOURCE_NOT_FOUND}' and Response Body Title is a string and is not ${EMPTY} and Response Body Detail is a string and is not ${EMPTY} and Response Boty Title is not equal to Response Body Detail\n}",
       "when": "when {\n    the SUT receives a Request from the client containing:\n        URL set to '/ngsi-ld/v1/csourceSubscriptions/{subscription_id}'\n        method set to 'PATCH'\n        Update Context Source Registration Subscription with subscription id set to 'urn:ngsi-ld:Subscription:unknowSubscription' and subscription update fragment set to '${subscription_update_fragment}'\n}",
       "http_verb": "PATCH",
       "endpoint": "csourceSubscriptions/{subscription_id}"
diff --git a/doc/files/ContextSource/RegistrationSubscription/039_04.json b/doc/files/ContextSource/RegistrationSubscription/039_04.json
index 90b3b382617bfb654aa03c12dcd133b6c4562154..77004d5d570af278f40d684c4e6c08071a325248 100644
--- a/doc/files/ContextSource/RegistrationSubscription/039_04.json
+++ b/doc/files/ContextSource/RegistrationSubscription/039_04.json
@@ -8,7 +8,11 @@
     "5.11.3"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Update Context Source Registration Subscription With Invalid Fragment",
+    "Setup Initial Context Source Registration Subscriptions",
+    "Delete Initial Context Source Registration Subscriptions"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT containing a set of Context Source Registration Subscriptions (CSRSs)\n}",
   "test_cases": [
@@ -23,7 +27,7 @@
       "setup": "Setup Initial Context Source Registration Subscriptions",
       "teardown": "Delete Initial Context Source Registration Subscriptions",
       "template": "Update Context Source Registration Subscription With Invalid Fragment",
-      "then": "then {\n    the SUT sends a valid Response for the operations:\n        Update Context Source Registration Subscription with Response Status Code set to 400     and\n        Update Context Source Registration Subscription with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/BadRequestData'     and\n        Update Context Source Registration Subscription with Response body containing 'title' element\n}",
+      "then": "then {\n    the SUT sends a valid Response for the operations:\n        Update Context Source Registration Subscription with Response Status Code set to 400     and\n        Update Context Source Registration Subscription with Response Body containing the type 'problem_type=${ERROR_TYPE_BAD_REQUEST_DATA}' and Response Body Title is a string and is not ${EMPTY} and Response Body Detail is a string and is not ${EMPTY} and Response Boty Title is not equal to Response Body Detail\n}",
       "when": "when {\n    the SUT receives a Request from the client containing:\n        URL set to '/ngsi-ld/v1/csourceSubscriptions/{subscription_id}'\n        method set to 'PATCH'\n        Update Context Source Registration Subscription with subscription id set to '${subscription_id}' and subscription update fragment set to '${subscription_update_fragment}'\n}",
       "http_verb": "PATCH",
       "endpoint": "csourceSubscriptions/{subscription_id}"
@@ -39,7 +43,7 @@
       "setup": "Setup Initial Context Source Registration Subscriptions",
       "teardown": "Delete Initial Context Source Registration Subscriptions",
       "template": "Update Context Source Registration Subscription With Invalid Fragment",
-      "then": "then {\n    the SUT sends a valid Response for the operations:\n        Update Context Source Registration Subscription with Response Status Code set to 400     and\n        Update Context Source Registration Subscription with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/BadRequestData'     and\n        Update Context Source Registration Subscription with Response body containing 'title' element\n}",
+      "then": "then {\n    the SUT sends a valid Response for the operations:\n        Update Context Source Registration Subscription with Response Status Code set to 400     and\n        Update Context Source Registration Subscription with Response Body containing the type 'problem_type=${ERROR_TYPE_BAD_REQUEST_DATA}' and Response Body Title is a string and is not ${EMPTY} and Response Body Detail is a string and is not ${EMPTY} and Response Boty Title is not equal to Response Body Detail\n}",
       "when": "when {\n    the SUT receives a Request from the client containing:\n        URL set to '/ngsi-ld/v1/csourceSubscriptions/{subscription_id}'\n        method set to 'PATCH'\n        Update Context Source Registration Subscription with subscription id set to '${subscription_id}' and subscription update fragment set to '${subscription_update_fragment}'\n}",
       "http_verb": "PATCH",
       "endpoint": "csourceSubscriptions/{subscription_id}"
diff --git a/doc/files/ContextSource/RegistrationSubscription/039_05.json b/doc/files/ContextSource/RegistrationSubscription/039_05.json
index 5a1d38ac4904c83a241b4c7e13e7f19f7e30fb1c..07f28243dd248d1989ce8076078ae723993a3580 100644
--- a/doc/files/ContextSource/RegistrationSubscription/039_05.json
+++ b/doc/files/ContextSource/RegistrationSubscription/039_05.json
@@ -8,7 +8,10 @@
     "5.11.3"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Setup Initial Context Source Registration Subscriptions",
+    "Delete Initial Context Source Registration Subscriptions"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT containing a set of Context Source Registration Subscriptions (CSRSs)\n}",
   "test_cases": [
@@ -23,7 +26,7 @@
       "setup": "Setup Initial Context Source Registration Subscriptions",
       "teardown": "Delete Initial Context Source Registration Subscriptions",
       "template": null,
-      "then": "then {\n    the SUT sends a valid Response for the operations:\n        Update Context Source Registration Subscription From File with Response Status Code set to 400     and\n        Update Context Source Registration Subscription From File with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/InvalidRequest'     and\n        Update Context Source Registration Subscription From File with Response body containing 'title' element\n}",
+      "then": "then {\n    the SUT sends a valid Response for the operations:\n        Update Context Source Registration Subscription From File with Response Status Code set to 400     and\n        Update Context Source Registration Subscription From File with Response Body containing the type 'problem_type=${ERROR_TYPE_BAD_REQUEST_DATA}' and Response Body Title is a string and is not ${EMPTY} and Response Body Detail is a string and is not ${EMPTY} and Response Boty Title is not equal to Response Body Detail\n}",
       "when": "when {\n    the SUT receives a Request from the client containing:\n        URL set to '/ngsi-ld/v1/csourceSubscriptions/{subscription_id}'\n        method set to 'PATCH'\n        Update Context Source Registration Subscription from file with subscription id set to '${subscription_id}' and subscription update fragment set to 'csourceSubscriptions/fragments/subscription-update-invalid-json-sample.json'\n}",
       "http_verb": "PATCH",
       "endpoint": "csourceSubscriptions/{subscription_id}"
diff --git a/doc/files/ContextSource/RegistrationSubscription/040_01.json b/doc/files/ContextSource/RegistrationSubscription/040_01.json
index 42eadd3f8365ac6f0ebbf578875a5888e3b4f8ff..43c2dba440f090ec986a6ee50ed237e025c9eaf0 100644
--- a/doc/files/ContextSource/RegistrationSubscription/040_01.json
+++ b/doc/files/ContextSource/RegistrationSubscription/040_01.json
@@ -8,7 +8,10 @@
     "5.11.4"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Setup Initial Context Source Registration Subscription",
+    "Delete Created Context Source Registration Subscription"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT containing a Context Source Registration Subscription (CSRS1)\n}",
   "test_cases": [
@@ -23,7 +26,7 @@
       "setup": "Setup Initial Context Source Registration Subscription",
       "teardown": "Delete Created Context Source Registration Subscription",
       "template": null,
-      "then": "then {\n    the SUT sends a valid Response for the operations:\n        Retrieve Context Source Registration Subscription with Response Status Code set to 200     and\n        Retrieve Context Source Registration Subscription with Response Body containing the same content defined in file 'csourceSubscriptions/expectations/subscriptions-040-01-expectation.json' with subscription id '${subscription_id}'\n}",
+      "then": "then {\n    the SUT sends a valid Response for the operations:\n        Retrieve Context Source Registration Subscription with Response Status Code set to 200     and\n        Retrieve Context Source Registration Subscription with Response reason set to 'OK'     and\n        Retrieve Context Source Registration Subscription with The response headers Link is set to 'expected_link_header=${expected link header}'     and\n        Retrieve Context Source Registration Subscription with Check Created Resource Set To and\n            Query Parameter: 'created_resource' set to 'expectation_payload' and\n            Query Parameter: 'response_body' set to 'response.json()' and\n            Query Parameter: 'ignored_keys' set to 'ignored_attributes' list of keys     and\n        Retrieve Context Source Registration Subscription with The dictionary `${response.json()}' might contain the key 'lastNotification'     and\n        Retrieve Context Source Registration Subscription with The dictionary `${response.json()}' might contain the key 'lastFailure'     and\n        Retrieve Context Source Registration Subscription with The dictionary `${response.json()}' might contain the key 'lastSuccess'     and\n        Retrieve Context Source Registration Subscription with The dictionary `${response.json()}' might contain the key 'timesSent'\n}",
       "when": "when {\n    the SUT receives a Request from the client containing:\n        URL set to '/ngsi-ld/v1/csourceSubscriptions/{subscription_id}'\n        method set to 'GET'\n        Retrieve Context Source Registration Subscription with data: and\n    Query Parameter: subscription id set to '${subscription_id}' and\n    Query Parameter: context set to 'https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld'\n}",
       "http_verb": "GET",
       "endpoint": "csourceSubscriptions/{subscription_id}"
diff --git a/doc/files/ContextSource/RegistrationSubscription/040_02.json b/doc/files/ContextSource/RegistrationSubscription/040_02.json
index 2cb34c2cba431400e0bb42d068f8f90a427c02c1..88036ffc8a4e9c3ad76f98b2fd4e2d7e3685ced8 100644
--- a/doc/files/ContextSource/RegistrationSubscription/040_02.json
+++ b/doc/files/ContextSource/RegistrationSubscription/040_02.json
@@ -23,7 +23,7 @@
       "setup": null,
       "teardown": null,
       "template": null,
-      "then": "then {\n    the SUT sends a valid Response for the operations:\n        Retrieve Context Source Registration Subscription with Response Status Code set to 400     and\n        Retrieve Context Source Registration Subscription with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/BadRequestData'     and\n        Retrieve Context Source Registration Subscription with Response body containing 'title' element\n}",
+      "then": "then {\n    the SUT sends a valid Response for the operations:\n        Retrieve Context Source Registration Subscription with Response Status Code set to 400     and\n        Retrieve Context Source Registration Subscription with Response reason set to 'Bad Request'     and\n        Retrieve Context Source Registration Subscription with Response Header: Content-Type set to application/json     and\n        Retrieve Context Source Registration Subscription with Response Body containing the type 'problem_type=${ERROR_TYPE_BAD_REQUEST_DATA}' and Response Body Title is a string and is not ${EMPTY} and Response Body Detail is a string and is not ${EMPTY} and Response Boty Title is not equal to Response Body Detail\n}",
       "when": "when {\n    the SUT receives a Request from the client containing:\n        URL set to '/ngsi-ld/v1/csourceSubscriptions/{subscription_id}'\n        method set to 'GET'\n        Retrieve Context Source Registration Subscription with data: and\n    Query Parameter: subscription id set to 'invalidUri'\n}",
       "http_verb": "GET",
       "endpoint": "csourceSubscriptions/{subscription_id}"
diff --git a/doc/files/ContextSource/RegistrationSubscription/040_03.json b/doc/files/ContextSource/RegistrationSubscription/040_03.json
index 497d9d906e52818786f32e7f247a1f7bb5e654fc..90ba05c28dcac410e219d2a0921e2acb91593a4d 100644
--- a/doc/files/ContextSource/RegistrationSubscription/040_03.json
+++ b/doc/files/ContextSource/RegistrationSubscription/040_03.json
@@ -23,7 +23,7 @@
       "setup": null,
       "teardown": null,
       "template": null,
-      "then": "then {\n    the SUT sends a valid Response for the operations:\n        Retrieve Context Source Registration Subscription with Response Status Code set to 404     and\n        Retrieve Context Source Registration Subscription with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/ResourceNotFound'     and\n        Retrieve Context Source Registration Subscription with Response body containing 'title' element\n}",
+      "then": "then {\n    the SUT sends a valid Response for the operations:\n        Retrieve Context Source Registration Subscription with Response Status Code set to 404     and\n        Retrieve Context Source Registration Subscription with Response reason set to 'Not Found'     and\n        Retrieve Context Source Registration Subscription with Response Header: Content-Type set to application/json     and\n        Retrieve Context Source Registration Subscription with Response Body containing the type 'problem_type=${ERROR_TYPE_RESOURCE_NOT_FOUND}' and Response Body Title is a string and is not ${EMPTY} and Response Body Detail is a string and is not ${EMPTY} and Response Boty Title is not equal to Response Body Detail\n}",
       "when": "when {\n    the SUT receives a Request from the client containing:\n        URL set to '/ngsi-ld/v1/csourceSubscriptions/{subscription_id}'\n        method set to 'GET'\n        Retrieve Context Source Registration Subscription with data: and\n    Query Parameter: subscription id set to 'urn:ngsi-ld:Subscription:unknowSubscription'\n}",
       "http_verb": "GET",
       "endpoint": "csourceSubscriptions/{subscription_id}"
diff --git a/doc/files/ContextSource/RegistrationSubscription/041_01.json b/doc/files/ContextSource/RegistrationSubscription/041_01.json
index 51c4882b844d7b5b16d077b3dcd598888c18acc7..b6d4be4bd6b5c566d66556594287e050a7b600b5 100644
--- a/doc/files/ContextSource/RegistrationSubscription/041_01.json
+++ b/doc/files/ContextSource/RegistrationSubscription/041_01.json
@@ -8,7 +8,10 @@
     "5.11.5"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Setup Initial Context Source Registration Subscriptions",
+    "Delete Created Context Source Registration Subscriptions"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT containing a set of Context Source Registration Subscriptions (CSRSs)\n}",
   "test_cases": [
@@ -21,7 +24,7 @@
         "csrsub-query"
       ],
       "setup": "Setup Initial Context Source Registration Subscriptions",
-      "teardown": "Delete Created Context Source Registration Subscription",
+      "teardown": "Delete Created Context Source Registration Subscriptions",
       "template": null,
       "then": "then {\n    the SUT sends a valid Response for the operations:\n        Query Context Source Registration Subscriptions with Response Status Code set to 200     and\n        Query Context Source Registration Subscriptions with Response containing:\n            * file set to 'csourceSubscriptions/expectations/subscriptions-035-01-expectation.json'\n            * id set to '${subscription_ids}'\n            * response set to '${response.json()}'\n}",
       "when": "when {\n    the SUT receives a Request from the client containing:\n        URL set to '/ngsi-ld/v1/csourceSubscriptions'\n        method set to 'GET'\n        Query Context Source Registration Subscriptions and\n    Query Parameter: context set to 'https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld'\n}",
diff --git a/doc/files/ContextSource/RegistrationSubscription/041_02.json b/doc/files/ContextSource/RegistrationSubscription/041_02.json
index 23d51f6629ec1b8b84ac856846b660fb40ee9497..d598284644c62591f8f02cad7866c2be3ffe2fb0 100644
--- a/doc/files/ContextSource/RegistrationSubscription/041_02.json
+++ b/doc/files/ContextSource/RegistrationSubscription/041_02.json
@@ -8,7 +8,11 @@
     "5.11.5"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Query Context Source Registration Subscriptions With Limit Parameter",
+    "Setup Initial Context Source Registration Subscriptions",
+    "Delete Created Context Source Registration Subscriptions"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT containing a set of Context Source Registration Subscriptions (CSRSs)\n}",
   "test_cases": [
diff --git a/doc/files/ContextSource/RegistrationSubscription/041_03.json b/doc/files/ContextSource/RegistrationSubscription/041_03.json
index d2580a2aa50a50be311f562c88f4392f0c6a80e9..b958bcbe02d9a66da80d7ccf349d4ab30aa3eacc 100644
--- a/doc/files/ContextSource/RegistrationSubscription/041_03.json
+++ b/doc/files/ContextSource/RegistrationSubscription/041_03.json
@@ -8,7 +8,11 @@
     "5.11.5"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Query Context Source Registration Subscriptions With Limit And Page Parameters",
+    "Setup Initial Context Source Registration Subscriptions",
+    "Delete Created Context Source Registration Subscriptions"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT containing a set of Context Source Registration Subscriptions (CSRSs)\n}",
   "test_cases": [
@@ -23,7 +27,7 @@
       "setup": "Setup Initial Context Source Registration Subscriptions",
       "teardown": "Delete Created Context Source Registration Subscriptions",
       "template": "Query Context Source Registration Subscriptions With Limit And Page Parameters",
-      "then": "then {\n    the SUT sends a valid Response for the operations:\n        Query Context Source Registration Subscriptions with Response Status Code set to 200     and\n        Query Context Source Registration Subscriptions with Response Body containing a list of entities equal to '${1}' of type 'Subscription' with response set to '${response.json()}'     and\n        Query Context Source Registration Subscriptions with Response header with 'Prev' header equal to '</ngsi-ld/v1/csourceSubscriptions?limit=1&page=3>;rel=\"next\";type=\"application/ld+json\"' and with 'Next' header equal to '${response.json()}'\n}",
+      "then": "then {\n    the SUT sends a valid Response for the operations:\n        Query Context Source Registration Subscriptions with Response Status Code set to 200     and\n        Query Context Source Registration Subscriptions with Response Body containing a list of entities equal to '${1}' of type 'Subscription' with response set to '${response.json()}'     and\n        Query Context Source Registration Subscriptions with Response header with 'Prev' header equal to '</ngsi-ld/v1/csourceSubscriptions?limit=1&page=3>;rel=\"next\";type=\"application/ld+json\"' and with 'Next' header equal to '${response.headers}'\n}",
       "when": "when {\n    the SUT receives a Request from the client containing:\n        URL set to '/ngsi-ld/v1/csourceSubscriptions'\n        method set to 'GET'\n        Query Context Source Registration Subscriptions and\n    Query Parameter: context set to 'https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld' and\n    Query Parameter: limit set to '${1}' and\n    Query Parameter: page set to '${2}'\n}",
       "http_verb": "GET",
       "endpoint": "csourceSubscriptions"
@@ -39,7 +43,7 @@
       "setup": "Setup Initial Context Source Registration Subscriptions",
       "teardown": "Delete Created Context Source Registration Subscriptions",
       "template": "Query Context Source Registration Subscriptions With Limit And Page Parameters",
-      "then": "then {\n    the SUT sends a valid Response for the operations:\n        Query Context Source Registration Subscriptions with Response Status Code set to 200     and\n        Query Context Source Registration Subscriptions with Response Body containing a list of entities equal to '${1}' of type 'Subscription' with response set to '${response.json()}'     and\n        Query Context Source Registration Subscriptions with Response header with 'Prev' header equal to '${EMPTY}' and with 'Next' header equal to '${response.json()}'\n}",
+      "then": "then {\n    the SUT sends a valid Response for the operations:\n        Query Context Source Registration Subscriptions with Response Status Code set to 200     and\n        Query Context Source Registration Subscriptions with Response Body containing a list of entities equal to '${1}' of type 'Subscription' with response set to '${response.json()}'     and\n        Query Context Source Registration Subscriptions with Response header with 'Prev' header equal to '${EMPTY}' and with 'Next' header equal to '${response.headers}'\n}",
       "when": "when {\n    the SUT receives a Request from the client containing:\n        URL set to '/ngsi-ld/v1/csourceSubscriptions'\n        method set to 'GET'\n        Query Context Source Registration Subscriptions and\n    Query Parameter: context set to 'https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld' and\n    Query Parameter: limit set to '${2}' and\n    Query Parameter: page set to '${2}'\n}",
       "http_verb": "GET",
       "endpoint": "csourceSubscriptions"
@@ -55,7 +59,7 @@
       "setup": "Setup Initial Context Source Registration Subscriptions",
       "teardown": "Delete Created Context Source Registration Subscriptions",
       "template": "Query Context Source Registration Subscriptions With Limit And Page Parameters",
-      "then": "then {\n    the SUT sends a valid Response for the operations:\n        Query Context Source Registration Subscriptions with Response Status Code set to 200     and\n        Query Context Source Registration Subscriptions with Response Body containing a list of entities equal to '${3}' of type 'Subscription' with response set to '${response.json()}'     and\n        Query Context Source Registration Subscriptions with Response header with 'Prev' header equal to '${EMPTY}' and with 'Next' header equal to '${response.json()}'\n}",
+      "then": "then {\n    the SUT sends a valid Response for the operations:\n        Query Context Source Registration Subscriptions with Response Status Code set to 200     and\n        Query Context Source Registration Subscriptions with Response Body containing a list of entities equal to '${3}' of type 'Subscription' with response set to '${response.json()}'     and\n        Query Context Source Registration Subscriptions with Response header with 'Prev' header equal to '${EMPTY}' and with 'Next' header equal to '${response.headers}'\n}",
       "when": "when {\n    the SUT receives a Request from the client containing:\n        URL set to '/ngsi-ld/v1/csourceSubscriptions'\n        method set to 'GET'\n        Query Context Source Registration Subscriptions and\n    Query Parameter: context set to 'https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld' and\n    Query Parameter: limit set to '${15}' and\n    Query Parameter: page set to '${1}'\n}",
       "http_verb": "GET",
       "endpoint": "csourceSubscriptions"
diff --git a/doc/files/ContextSource/RegistrationSubscription/041_04.json b/doc/files/ContextSource/RegistrationSubscription/041_04.json
index 8242c42d33fc97795a9448268bde8cc334ff06f4..91af96dd0e752818d44faa68c1f426ebbb22b01d 100644
--- a/doc/files/ContextSource/RegistrationSubscription/041_04.json
+++ b/doc/files/ContextSource/RegistrationSubscription/041_04.json
@@ -8,7 +8,9 @@
     "5.11.5"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Query Context Source Registration Subscriptions With Invalid Limit And Page Parameters"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n   the SUT containing an initial state\n}",
   "test_cases": [
diff --git a/doc/files/ContextSource/RegistrationSubscription/042_01.json b/doc/files/ContextSource/RegistrationSubscription/042_01.json
index 533431ff57fb686b41942bdde1726cc4c3cc46cb..8a8e6d08f21a523d3c013482de4c14a0d806c115 100644
--- a/doc/files/ContextSource/RegistrationSubscription/042_01.json
+++ b/doc/files/ContextSource/RegistrationSubscription/042_01.json
@@ -8,7 +8,9 @@
     "5.11.6"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Setup Initial Context Source Registration Subscription"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT containing a Context Source Registration Subscription (CSRS1)\n}",
   "test_cases": [
diff --git a/doc/files/ContextSource/RegistrationSubscription/047_02.json b/doc/files/ContextSource/RegistrationSubscription/047_02.json
index d4fa0ac4b9b7bf951476587f08f1c980818c82b9..c405b7248012b543341466795db0d4b4c14d2b8f 100644
--- a/doc/files/ContextSource/RegistrationSubscription/047_02.json
+++ b/doc/files/ContextSource/RegistrationSubscription/047_02.json
@@ -8,7 +8,10 @@
     "5.11.7"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Create Initial Context Source Registration and Context Source Registration Subscription",
+    "Delete Created Context Source Registration And Context Source Registration Subscription"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT containing a Context Source Registration (CSR1) providing latest information about some entities\n    and the SUT containing a Context Source Registration Subscription (CSRS1)\n}",
   "test_cases": [
diff --git a/doc/files/ContextSource/RegistrationSubscription/047_03.json b/doc/files/ContextSource/RegistrationSubscription/047_03.json
index c9f4f931a95f8d82544c465f93e093e4e77ce704..817b160894d56ea73b93710a7c689265270b8844 100644
--- a/doc/files/ContextSource/RegistrationSubscription/047_03.json
+++ b/doc/files/ContextSource/RegistrationSubscription/047_03.json
@@ -8,7 +8,10 @@
     "5.11.7"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Setup Initial Context Source Registration Subscription",
+    "Delete Created Context Source Registration And Subscription"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT containing a Context Source Registration Subscription (CSRS1)\n}",
   "test_cases": [
diff --git a/doc/files/ContextSource/RegistrationSubscription/047_04.json b/doc/files/ContextSource/RegistrationSubscription/047_04.json
index 7ef91e4dce325ad3196f745a5a57ff06653285fe..7f32eb37bd22a66fe44c3e18c479348e89e5f5eb 100644
--- a/doc/files/ContextSource/RegistrationSubscription/047_04.json
+++ b/doc/files/ContextSource/RegistrationSubscription/047_04.json
@@ -8,7 +8,10 @@
     "5.11.7"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Setup Initial Context Source Registration Subscription",
+    "Delete Created Context Source Registration And Subscription"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT containing a Context Source Registration Subscription (CSRS1)\n}",
   "test_cases": [
diff --git a/doc/files/ContextSource/RegistrationSubscription/047_05.json b/doc/files/ContextSource/RegistrationSubscription/047_05.json
index 89ec085530e73354bc03602da2b93e628cf17a8f..682659b16ca21f38fb8d6b48fed1431b34804022 100644
--- a/doc/files/ContextSource/RegistrationSubscription/047_05.json
+++ b/doc/files/ContextSource/RegistrationSubscription/047_05.json
@@ -8,7 +8,10 @@
     "5.11.7"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Setup Initial Context Source Registration Subscription",
+    "Delete Created Context Source Registration And Subscription"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT containing a Context Source Registration Subscription (CSRS1)\n}",
   "test_cases": [
diff --git a/doc/files/ContextSource/RegistrationSubscription/047_06.json b/doc/files/ContextSource/RegistrationSubscription/047_06.json
index 38bd10504afbddad7c5aba8f07acd309e5aed622..05cfa6750d051b7e436afd9b47a3f6c6b8707f7f 100644
--- a/doc/files/ContextSource/RegistrationSubscription/047_06.json
+++ b/doc/files/ContextSource/RegistrationSubscription/047_06.json
@@ -8,7 +8,10 @@
     "5.11.7"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Setup Initial Context Source Registration Subscription",
+    "Delete Created Context Source Registration And Subscription"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT containing a Context Source Registration Subscription (CSRS1)\n}",
   "test_cases": [
diff --git a/doc/files/ContextSource/RegistrationSubscription/047_07.json b/doc/files/ContextSource/RegistrationSubscription/047_07.json
index 394619bf4d3beaf17dc1f85d807bb8d29ec8926c..6dac13941d3ab7820ce600ca18b52fcac5613a88 100644
--- a/doc/files/ContextSource/RegistrationSubscription/047_07.json
+++ b/doc/files/ContextSource/RegistrationSubscription/047_07.json
@@ -8,7 +8,11 @@
     "5.11.7"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Do Not Receive cSourceNotification If Subscription Status Is Not Active",
+    "Setup Initial Context Source Registration Subscription",
+    "Delete Created Context Source Registration And Subscription"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT containing a Context Source Registration Subscription (CSRS1)\n}",
   "test_cases": [
diff --git a/doc/files/ContextSource/RegistrationSubscription/047_08.json b/doc/files/ContextSource/RegistrationSubscription/047_08.json
index f4358cc2a683a3a21ff3d50fddf332132b341434..699b06db54b0843fced8cfdc7d978790a1348c78 100644
--- a/doc/files/ContextSource/RegistrationSubscription/047_08.json
+++ b/doc/files/ContextSource/RegistrationSubscription/047_08.json
@@ -8,7 +8,10 @@
     "5.11.7"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Create Initial Context Source Registration and Context Source Registration Subscription",
+    "Delete Created Context Source Registration And Context Source Registration Subscription"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT containing a Context Source Registration (CSR1) providing latest information about some entities\n    and the SUT containing a Context Source Registration Subscription (CSRS1)\n}",
   "test_cases": [
diff --git a/doc/files/ContextSource/RegistrationSubscription/047_10.json b/doc/files/ContextSource/RegistrationSubscription/047_10.json
index c013bebbad125cf8b55f5203f287fcfce778ce99..7e7361bf7c446c980e968422f0f15c8c2d61fe96 100644
--- a/doc/files/ContextSource/RegistrationSubscription/047_10.json
+++ b/doc/files/ContextSource/RegistrationSubscription/047_10.json
@@ -8,7 +8,10 @@
     "5.11.7"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Setup Initial Context Source Registration Subscription",
+    "Delete Created Context Source Registration And Subscription"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT containing a Context Source Registration Subscription (CSRS1)\n}",
   "test_cases": [
diff --git a/doc/files/ContextSource/RegistrationSubscription/047_11.json b/doc/files/ContextSource/RegistrationSubscription/047_11.json
index 5883734bd60c8e61c1d4955fc850e4f11a6e7796..a123f8d0a3c7218cfbf48cd8811793b34e6eee24 100644
--- a/doc/files/ContextSource/RegistrationSubscription/047_11.json
+++ b/doc/files/ContextSource/RegistrationSubscription/047_11.json
@@ -9,8 +9,8 @@
   ],
   "pics_selection": "",
   "keywords": [
-    "Start Local Server",
-    "Stop Local Server"
+    "Receive cSourceNotification For Matching Context Source Registrations On Management Interval",
+    "Delete Created Context Source Registrations"
   ],
   "teardown": "Stop Local Server",
   "initial_condition": "with {\n   the SUT containing an initial state\n}",
diff --git a/doc/files/ContextSource/RegistrationSubscription/047_12.json b/doc/files/ContextSource/RegistrationSubscription/047_12.json
index ad5e6857ce138a5a895f2b00547ea0e0f90fde36..b534313d8a20fdb737a12b4cae5d4e1542a72d6e 100644
--- a/doc/files/ContextSource/RegistrationSubscription/047_12.json
+++ b/doc/files/ContextSource/RegistrationSubscription/047_12.json
@@ -8,7 +8,10 @@
     "5.11.7"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Setup Initial Context Source Registration Subscription",
+    "Delete Created Context Source Registration And Subscription"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT containing a Context Source Registration Subscription (CSRS1)\n}",
   "test_cases": [
diff --git a/doc/files/ContextSource/RegistrationSubscription/047_13.json b/doc/files/ContextSource/RegistrationSubscription/047_13.json
index c3ed6bca673d5fb8f2c91a33d45cdcdc53b013d6..958d298460cce4520f19602883a43194ca7df346 100644
--- a/doc/files/ContextSource/RegistrationSubscription/047_13.json
+++ b/doc/files/ContextSource/RegistrationSubscription/047_13.json
@@ -8,7 +8,10 @@
     "5.11.7"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Setup Initial Context Source Registration Subscription",
+    "Delete Created Context Source Registration And Subscription"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT containing a Context Source Registration Subscription (CSRS1)\n}",
   "test_cases": [
diff --git a/doc/files/ContextSource/RegistrationSubscription/047_14.json b/doc/files/ContextSource/RegistrationSubscription/047_14.json
index 1d099019ad83adb6e69a4c7df732360f14eaac1e..be0566f787406cfa8c2c26b01c9c5c8d0c2b5c04 100644
--- a/doc/files/ContextSource/RegistrationSubscription/047_14.json
+++ b/doc/files/ContextSource/RegistrationSubscription/047_14.json
@@ -8,7 +8,10 @@
     "5.11.7"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Setup Initial Context Source Registration Subscription",
+    "Delete Created Context Source Registration And Subscription"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT containing a Context Source Registration Subscription (CSRS1)\n}",
   "test_cases": [
diff --git a/doc/files/ContextSource/RegistrationSubscription/047_15.json b/doc/files/ContextSource/RegistrationSubscription/047_15.json
index 0a8ee0c95eb89346268f889e9cbc3a40437a4374..2516acf15c0245fc1a0c0e307b147467bef08ec5 100644
--- a/doc/files/ContextSource/RegistrationSubscription/047_15.json
+++ b/doc/files/ContextSource/RegistrationSubscription/047_15.json
@@ -8,7 +8,10 @@
     "5.11.7"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Setup Initial Context Source Registration Subscription",
+    "Delete Created Context Source Registration And Subscription"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT containing a Context Source Registration Subscription (CSRS1)\n}",
   "test_cases": [
diff --git a/doc/files/ContextSource/RegistrationSubscription/047_16.json b/doc/files/ContextSource/RegistrationSubscription/047_16.json
index 59980c70d9dcacf799243958d10c68dd2b4546eb..2c6919213e59801bb0b990e6e9166731a5ab3149 100644
--- a/doc/files/ContextSource/RegistrationSubscription/047_16.json
+++ b/doc/files/ContextSource/RegistrationSubscription/047_16.json
@@ -8,7 +8,11 @@
     "5.11.7"
   ],
   "pics_selection": "",
-  "keywords": [],
+  "keywords": [
+    "Receive cSourceNotification For Newly Matching Context Source Registrations",
+    "Create Initial Context Source Registrations And Context Source Registration Subscription",
+    "Delete Created Context Source Registrations And Context Source Registration Subscription"
+  ],
   "teardown": "None",
   "initial_condition": "with {\n    the SUT being in the \"initial state\" and\n    the SUT containing a list of Context Source Registrations (CSRs) providing latest information about some entities\n    and the SUT containing a Context Source Registration Subscription (CSRS1)\n}",
   "test_cases": [
diff --git a/requirements.txt b/requirements.txt
index b98ebc40f04c841310e84baad2b1755e896736fb..7599dc9eac2dbacaedcadd6caf0d37e80c18a4c3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,4 +5,4 @@ robotframework-requests==0.9.6
 deepdiff==6.7.1
 prettydiff==0.1.0
 robotframework-httpctrl==0.3.1
-robotframework-tidy==4.6.0
+robotframework-tidy==4.9.0
diff --git a/resources/AssertionUtils.resource b/resources/AssertionUtils.resource
index 91ef5da9587d992a177477948434538d89b793fc..aa172b43a40023788667defae7f69f20c372bed2 100755
--- a/resources/AssertionUtils.resource
+++ b/resources/AssertionUtils.resource
@@ -14,6 +14,11 @@ ${notification_timestamps_regex_expr}=      root\\['last.*'\\]
 ${notification_endpoint_uri_regex_expr}=    root\\['endpoint'\\]\\['uri'\\]
 ${context_regex_expr}=                      root\\['@context'\\]
 ${status_regex_expr}=                       root\\['status'\\]
+${lastfailure_regex_expr}=                  root\\['lastFailure'\\]
+${lastNotification_regex_expr}=             root\\['lastNotification'\\]
+${timesFailed_regex_expr}=                  root\\['timesFailed'\\]
+${timesSent_regex_expr}=                    root\\['timesSent'\\]
+${is_active_expr}=                          root\\['isActive'\\]
 
 
 *** Keywords ***
@@ -43,10 +48,18 @@ Check Response Headers Containing Content-Type set to
     [Arguments]    ${expected_content_type_content}    ${response_headers}
     Should Be Equal    ${response_headers['Content-Type']}    ${expected_content_type_content}
 
+Check Response Header is Empty
+    [Arguments]    ${response_headers}
+    Dictionaries Should Be Equal    ${response_headers}    {}
+
 Check Response Headers Link Not Empty
     [Arguments]    ${response_headers}
     Should Not Be Empty    ${response_headers['Link']}
 
+Check Response Headers Link set to
+    [Arguments]    ${response_headers}    ${expected_link_header}
+    Should Be Equal    ${response_headers['Link']}    ${expected_link_header}
+
 # Since Http headers names are case-insensitive (from Http specification)
 # We check both Location and location headers
 
@@ -84,6 +97,19 @@ Check Response Body Containing an Attribute set to
         Should Be Equal    ${response_body['${expected_attribute_name}']}    ${expected_attribute_value}
     END
 
+Check Response Body Containing a Boolean Attribute set to
+    [Arguments]    ${expected_attribute_name}    ${response_body}    ${expected_attribute_value}
+    Dictionary Should Contain Key    ${response_body}    ${expected_attribute_name}
+    IF    '${expected_attribute_value}'=='True'
+        Should Be True    ${response_body['${expected_attribute_name}']}
+    ELSE
+        IF    '${expected_attribute_value}'=='False'
+            Should Not Be True    ${response_body['${expected_attribute_name}']}
+        ELSE
+            Fail    Unexpected boolean value, only True/False are allowed, received ${expected_attribute_value}
+        END
+    END
+
 Check Response Body Containing Batch Operation Result
     [Arguments]    ${expected_batch_operation_result}    ${response_body}
     @{expected_successful_entities_ids}=    Get From Dictionary    ${expected_batch_operation_result}    success
@@ -448,3 +474,66 @@ Check Retrieving Context Source Registration
     ...    accept=${accept}
     ${ignored_attributes}=    Create List    ${status_regex_expr}    @context
     Check Updated Resource Set To    ${registration_payload}    ${response.json()}    ${ignored_attributes}
+
+Check Dictionary Might Contain Additional Members
+    # Check the Additional Members 5.2.14.2 in the NotificationParams data structure
+    [Arguments]    ${dictionary}    ${key}
+    Log    Dictionary Might Contain Key with a specific type
+    Log    Dictionary: ${dictionary}
+    Log    Key: ${key}
+
+    ${value}=    Evaluate    $dictionary.get($key)
+
+    IF    '${value}' != '' and '${value}' != 'None'
+        IF    "${key}" == "lastNotification" or "${key}" == "lastFailure" or "${key}" == "lastSuccess" or "${key}" == "expiresAt"
+            # Need to check that there is a DateTime value
+            ${type date}=    Parse Ngsild Date    ${dictionary}[${key}]
+            Should Not Be Equal
+            ...    ${type date}
+            ...    ${None}
+            ...    The Additional Member ${key} contains a value (${value}) that it is not in DateTime format
+        END
+        IF    "${key}" == "timesSent" or "${key}" == "throttling" or "${key}" == "timeInterval"
+            # Need to check that there is a Integer value
+            ${type int}=    Evaluate    type(${dictionary}[${key}]).__name__
+            Should Be Equal
+            ...    ${type int}
+            ...    int
+            ...    The Additonal Member ${key} contains a value (${value}) that it is not in Number format
+        END
+        IF    "${key}" == "isActive"
+            # Need to check that there is a Boolean balue
+            ${type bool}=    Evaluate    type(${dictionary}[${key}]).__name__
+            Should Be Equal
+            ...    ${type bool}
+            ...    bool
+            ...    The Additonal Member ${key} contains a value (${value}) that it is not in Boolean format
+        END
+        IF    "${key}" == "subscriptionName" or "${key}" == "description" or "${key}" == "q" or "${key}" == "csf" or "${key}" == "status"
+            # Need to check that there is a Boolean balue
+            ${type string}=    Evaluate    type(${dictionary}[${key}]).__name__
+            Should Be Equal
+            ...    ${type string}
+            ...    str
+            ...    The Additonal Member ${key} contains a value (${value}) that it is not in String format
+        END
+    ELSE
+        Log    The key '${key}' is not present in the dictionary
+    END
+
+Check Response Body Contains DateTime Value
+    [Arguments]    ${dictionary}    ${key}    ${expected value}
+    Dictionary Should Contain Key    ${dictionary}    ${key}
+
+    ${obtained value}=    Evaluate    $dictionary.get($key)
+    ${date}=    Parse Ngsild Date    ${dictionary}[${key}]
+
+    Should Not Be Equal
+    ...    ${date}
+    ...    ${None}
+    ...    The key (${key}) contains a value (${obtained value}) that it is not in DateTime format
+
+    Should Be Equal
+    ...    ${expected value}
+    ...    ${obtained value}
+    ...    The expected value (${expected value}) is not the same as the obtained value (${obtained value})
diff --git a/resources/HttpUtils.resource b/resources/HttpUtils.resource
index 8c68b6a0f2d1a1f76b22c033730d186068f2eb8f..b150ea68af153b75592964f19df796e90991851c 100755
--- a/resources/HttpUtils.resource
+++ b/resources/HttpUtils.resource
@@ -1,10 +1,11 @@
 *** Settings ***
 Variables       ./variables.py
-Library         String
+Library         Collections
 
 
 *** Keywords ***
 Fetch Id From Response Location Header
     [Arguments]    ${response_headers}
-    ${id}=    Fetch From Right    ${response_headers['Location']}    /
+    Dictionary Should Contain Key    ${response_headers}    Location    msg=HTTP Headers do not contain key 'Location'
+    ${id}=    Get From Dictionary    ${response_headers}    Location
     RETURN    ${id}
diff --git a/scripts/find_tc_using_test_data.py b/scripts/find_tc_using_test_data.py
index f2f67221248cf3d0a33ed3837aa08bb11f5d8e00..56fecf5e2d6a5cdb80d1c90a65dee6e867587c09 100644
--- a/scripts/find_tc_using_test_data.py
+++ b/scripts/find_tc_using_test_data.py
@@ -1,20 +1,25 @@
-import os
-import robot
+from os import listdir
+from os.path import isdir, dirname, abspath, join
+from robot import run
 
 
-def find_test_data_in_tc(dir, filename, run_matching_tc):
-    for file in os.listdir(dir):
-        path = dir + "/" + file
-        if os.path.isdir(path):
-            find_test_data_in_tc(path, filename, run_matching_tc)
+def find_test_data_in_tc(dir_name, filename, execute):
+    for file in listdir(dir_name):
+        path = dir_name + "/" + file
+        if isdir(path):
+            find_test_data_in_tc(path, filename, execute)
         else:
             if filename in open(path).read():
-                if run_matching_tc == "Y":
-                    robot.run(path)
+                if execute == "Y":
+                    run(path)
                 print(path)
 
 
 if __name__ == '__main__':
+    # Get the folder of the tests
+    base_folder = dirname(dirname(abspath(__file__)))
+    test_suite_folder = join(base_folder, "TP")
+
     test_data_file = input("Name of test data file to search for: ")
     run_matching_tc = input("Run matching Test Cases (Y/N)?: ")
-    find_test_data_in_tc("TP", test_data_file, run_matching_tc)
+    find_test_data_in_tc(dir_name=test_suite_folder, filename=test_data_file, execute=run_matching_tc)
diff --git a/scripts/find_unused_test_data.py b/scripts/find_unused_test_data.py
index 6a961e797ebb2aa38ec2df15d81347786f53e604..2e00342a8c9c44c0734de021737b831f4bdfdff8 100644
--- a/scripts/find_unused_test_data.py
+++ b/scripts/find_unused_test_data.py
@@ -1,23 +1,42 @@
-import os
+from os import listdir
+from os.path import isfile, isdir, dirname, abspath, join
+from colorama import Fore, Style
 
 
-def list_files_in_dir(dirname):
-    for fname in os.listdir(dirname):
-        if os.path.isfile(dirname + "/" + fname):
-            print("Looking at test data file: ", fname)
-            find_test_data_in_tc("TP", fname)
+def list_files_in_dir(test_suite_folder, data_folder):
+    for filename in listdir(data_folder):
+        aux = join(data_folder, filename)
+        if isfile(aux):
+            print(Style.RESET_ALL)
+            print("Looking at test data file: ", filename)
+            found = find_test_data_in_tc(dir_name=test_suite_folder, filename=filename)
+            if not found:
+                print(Fore.RED + "    Usage not found")
+
         else:
-            list_files_in_dir(dirname + "/" + fname)
+            list_files_in_dir(test_suite_folder=test_suite_folder, data_folder=aux)
 
 
-def find_test_data_in_tc(dir, filename):
-    for file in os.listdir(dir):
-        path = dir + "/" + file
-        if os.path.isdir(path):
-            find_test_data_in_tc(path, filename)
+def find_test_data_in_tc(dir_name, filename):
+    found = False
+    for file in listdir(dir_name):
+        path = join(dir_name, file)
+        if isdir(path):
+            aux = find_test_data_in_tc(path, filename)
+            found = aux or found
         else:
             if filename in open(path).read():
-                print("Found usage of", filename, "in", path)
+                found = True
+                print(Fore.GREEN + "    Found usage of", filename, "in", path)
+
+    return found
+
+
+if __name__ == '__main__':
+    # Get the folder of the tests
+    base_folder = dirname(dirname(abspath(__file__)))
 
+    test_suite_folder = join(base_folder, "TP")
+    data_folder = join(base_folder, 'data')
 
-list_files_in_dir("data")
+    list_files_in_dir(test_suite_folder=test_suite_folder, data_folder=data_folder)