diff --git a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_01.robot b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_01.robot
index ac00e333c44125659e45bcc28fd16408e9db2657..aebf283097ac0dfb438a6b189d0f100071b0d4c7 100644
--- a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_01.robot
+++ b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_01.robot
@@ -23,7 +23,7 @@ ${notification_server_send_url}=        http://${notification_server_host}:${not
 *** Test Cases ***
 046_01_01 Check that a notification is only sent if status is active
     [Documentation]    Check that a notification is only sent if and only if the status is active
-    [Tags]    sub-notification    5_8_6    046_01
+    [Tags]    sub-notification    5_8_6
 
     Add Initial Entity
     Sleep    1s
diff --git a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_02.robot b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_02.robot
index f9905f726c632189e6ebed2f0fc0e426f7e7948d..9fb9e494660a117b7cd6d30cd0004c56ce52b5b8 100644
--- a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_02.robot
+++ b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_02.robot
@@ -22,7 +22,7 @@ ${entity_building_filepath}=            building-simple-attributes-sample.jsonld
 *** Test Cases ***
 046_02_01 Check that a notification is sent on the timeInterval
     [Documentation]    If a Subscription defines a timeInterval member, a Notification shall be sent periodically, when the time interval (in seconds) specified in such value field is reached, regardless of Attribute changes.
-    [Tags]    sub-notification    5_8_6    046_02
+    [Tags]    sub-notification    5_8_6
     ${response}=    Setup Initial Subscriptions
 
     ${notification}    ${headers}=    Wait for notification    timeout=${15}
diff --git a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_03.robot b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_03.robot
index 2be76dd978eb16c294c907c18192173e762782f3..b8cb874b07fe001f38def9bcfaf15f11aaba2bd8 100644
--- a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_03.robot
+++ b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_03.robot
@@ -23,7 +23,7 @@ ${fragment_filename}=                   airQualityLevel-fragment.jsonld
 *** Test Cases ***
 046_03_01 Check that a notification is sent with all entities
     [Documentation]    A notification with all subscribed Entities will be included if query or geoquery are not defined.
-    [Tags]    sub-notification    5_8_6    046_03
+    [Tags]    sub-notification    5_8_6
     ${response}=    Setup Initial Subscriptions
 
     Update Entity Attributes    ${entity_id}    ${fragment_filename}    ${CONTENT_TYPE_LD_JSON}
diff --git a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_04.robot b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_04.robot
index 912158c4d197af7c3fbb21de97b856024b2eb814..3e487cafebd90b13387854e99968dbb68700c1d8 100644
--- a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_04.robot
+++ b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_04.robot
@@ -23,7 +23,7 @@ ${fragment_filename}=                   airQualityLevel-fragment.jsonld
 *** Test Cases ***
 046_04_01 Check that a notification is sent with all entities
     [Documentation]    The notification message shall include all the subscribed Entities that changed and that match (as mandated by clauses 4.9 and 4.10) the query and geoquery conditions
-    [Tags]    sub-notification    5_8_6    046_04
+    [Tags]    sub-notification    5_8_6
     ${response}=    Setup Initial Subscriptions
 
     ${response1}=    Update Entity Attributes    ${entity_id}    ${fragment_filename}    ${CONTENT_TYPE_LD_JSON}
diff --git a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_05.robot b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_05.robot
index 4eb6bc5f2247054d550820621deef4f5cd43c3dc..b698a8c25f1d6a374d4f37bdc95f4e7eb931bd81 100644
--- a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_05.robot
+++ b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_05.robot
@@ -23,7 +23,7 @@ ${fragment_filename}=                   airQualityLevel-fragment.jsonld
 *** Test Cases ***
 046_05_01 Check that a notification is sent with all entities
     [Documentation]    The notification message shall include all the subscribed Entities that changed and that match (as mandated by clauses 4.9 and 4.10) the query and geoquery conditions
-    [Tags]    sub-notification    5_8_6    046_05
+    [Tags]    sub-notification    5_8_6
     Setup Initial Subscriptions
 
     ${response}=    Update Entity Attributes    ${entity_id}    ${fragment_filename}    ${CONTENT_TYPE_LD_JSON}
diff --git a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_06.robot b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_06.robot
index 6c190eb5fd2a4213df2335fdb00af10fb6dde058..021d8432be0ec71a271ffc6314fd04c03d70a54c 100644
--- a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_06.robot
+++ b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_06.robot
@@ -22,7 +22,7 @@ ${notification_server_send_url}=        http://${notification_server_host}:${not
 *** Test Cases ***
 046_06_01 Check that a notification is sent with all matching entities
     [Documentation]    only the subscribed Entities matching the query and watched attributes shall be included.
-    [Tags]    sub-notification    5_8_6    046_06
+    [Tags]    sub-notification    5_8_6
     ${entity_id}=    Generate Random Entity Id    ${building_id_prefix}
     Set Suite Variable    ${entity_id}
 
diff --git a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_07.robot b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_07.robot
index c20751d2ea696a557c0d8ddb0ff1d0378c11be32..cbba2962734a6f85029e5c383ce1de115af987d3 100644
--- a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_07.robot
+++ b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_07.robot
@@ -28,7 +28,7 @@ ${date_format_with_millis}                                  %Y-%m-%dT%H:%M:%S.%f
 *** Test Cases ***
 046_07_01 Check notification structure
     [Documentation]    The structure of the notification message shall be as mandated by clause 5.3. Valid notification with attributes as stated above
-    [Tags]    sub-notification    5_8_6    046_07
+    [Tags]    sub-notification    5_8_6
     [Setup]    Setup Initial Subscriptions    ${subscription_payload_file_path}
 
     ${response}=    Update Entity Attributes    ${entity_id}    ${fragment_filename}    ${CONTENT_TYPE_LD_JSON}
@@ -41,7 +41,7 @@ ${date_format_with_millis}                                  %Y-%m-%dT%H:%M:%S.%f
 
 046_07_02 Check correct attributes are included
     [Documentation]    The structure of the notification message shall be as mandated by clause 5.3.    The Entity Attributes included (Properties or Relationships) shall be those specified by the notification.attributes member in the Subscription data type (clause 5.2.12).
-    [Tags]    sub-notification    5_8_6    046_07
+    [Tags]    sub-notification    5_8_6
     [Setup]    Setup Initial Subscriptions    ${subscription_payload_file_path_notificationAttributes}
 
     ${response}=    Update Entity Attributes    ${entity_id}    ${fragment_filename}    ${CONTENT_TYPE_LD_JSON}
@@ -56,7 +56,7 @@ ${date_format_with_millis}                                  %Y-%m-%dT%H:%M:%S.%f
 
 046_07_03 Check URI expansion is observed
     [Documentation]    The structure of the notification message shall be as mandated by clause 5.3.    URI expansion shall be observed (clause 5.5.7).
-    [Tags]    sub-notification    5_8_6    046_07
+    [Tags]    sub-notification    5_8_6
     [Setup]    Setup Initial Subscriptions    ${subscription_payload_file_path_default_context}
 
     ${response}=    Update Entity Attributes    ${entity_id}    ${fragment_filename}    ${CONTENT_TYPE_LD_JSON}
diff --git a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_08.robot b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_08.robot
index 7dbc0f0a57cef265310ec7152597175a6264b0e4..3e685e6224da6de7b58b963c3cb171717ec36d18 100644
--- a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_08.robot
+++ b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_08.robot
@@ -25,7 +25,7 @@ ${fragment_filename}=                   airQualityLevel-fragment.jsonld
 *** Test Cases ***
 046_08_01 Check that a notification is sent with all attributes
     [Documentation]    The structure of the notification message shall be as mandated by clause 5.3.1. The absence of the notification.attributes member of a Subscription means that all Entity Attributes shall be included. All attributes are included
-    [Tags]    sub-notification    5_8_6    046_08
+    [Tags]    sub-notification    5_8_6
     [Setup]    Setup Initial Subscriptions    ${False}
 
     ${response}=    Update Entity Attributes    ${entity_id}    ${fragment_filename}    ${CONTENT_TYPE_LD_JSON}
@@ -43,7 +43,7 @@ ${fragment_filename}=                   airQualityLevel-fragment.jsonld
 
 046_08_02 Check that a notification is sent with all attributes in simplified format
     [Documentation]    The structure of the notification message shall be as mandated by clause 5.3.1. The absence of the notification.attributes member of a Subscription means that all Entity Attributes shall be included    If the notification.format member value is "keyValues" then a simplified representation of the entities (as mandated by clause 4.5.3) shall be provided
-    [Tags]    sub-notification    5_8_6    046_08
+    [Tags]    sub-notification    5_8_6
     [Setup]    Setup Initial Subscriptions    ${True}
 
     ${response}=    Update Entity Attributes    ${entity_id}    ${fragment_filename}    ${CONTENT_TYPE_LD_JSON}
diff --git a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_09.robot b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_09.robot
index 0e8ddedd4666fa108410e56cf8e8d80fcd31f76c..359b126ccd57effa546b16a4433b2ed8765e315b 100644
--- a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_09.robot
+++ b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_09.robot
@@ -23,7 +23,7 @@ ${notification_server_send_url}         http://${notification_server_host}:${not
 *** Test Cases ***
 046_09_01 Check that a notification is sent to the endpoint
     [Documentation]    A Notification shall be sent (as mandated by each concrete binding and including any optional endpoint.receiverInfo defined by clause 5.2.22) to the endpoint specified by the endpoint.uri member of the notification structure defined by clause 5.2.1
-    [Tags]    sub-notification    5_8_6    046_09
+    [Tags]    sub-notification    5_8_6
 
     Setup Initial Subscriptions
 
diff --git a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_10.robot b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_10.robot
index fbda28c0df04ee38eb9979fd31ae15d0ac144f32..31866d310216a7371be5c2d468611bb4ca233f65 100644
--- a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_10.robot
+++ b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_10.robot
@@ -24,7 +24,7 @@ ${expected_header_links}                <${ngsild_test_suite_context}>; rel="htt
 *** Test Cases ***
 046_10_01 Check that the notification is sent as JSON
     [Documentation]    The Notification shall be sent as JSON
-    [Tags]    sub-notification    5_8_6    046_10
+    [Tags]    sub-notification    5_8_6
 
     Setup Initial Subscriptions
 
diff --git a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_11.robot b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_11.robot
index 75392451d0e7bf25e505edd5ff0dd7c8d65576ee..f8b2d391902549cf325d1570566255e6bd9d0c1e 100644
--- a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_11.robot
+++ b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_11.robot
@@ -25,7 +25,7 @@ ${date_format_with_millis}=             %Y-%m-%dT%H:%M:%S.%fZ
 *** Test Cases ***
 046_11_01 Check that timesSent is increased by one
     [Documentation]    The notification.timesSent member shall be incremented by one.
-    [Tags]    sub-notification    5_8_6    046_11
+    [Tags]    sub-notification    5_8_6
 
     Add Initial Entity
     Sleep    1s
diff --git a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_12.robot b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_12.robot
index 6f81177793f82b92930e615540724c5d0b4d6032..bacdb570e68d875e42531193233b8ae241bd435a 100644
--- a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_12.robot
+++ b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_12.robot
@@ -23,7 +23,7 @@ ${notification_server_send_url}=        http://${notification_server_host}:${not
 *** Test Cases ***
 046_12_01 Check that lastNotification is updated
     [Documentation]    The status, lastNotification and lastSuccess members shall be updated with expected value and dates. This test will check these formats.
-    [Tags]    sub-notification    5_8_6    046_12
+    [Tags]    sub-notification    5_8_6
 
     Add Initial Entity
     Sleep    1s
diff --git a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_13.robot b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_13.robot
index 7f79fd41ab1332bf00d8d98674c1bf6d064ccc9d..ccc6ef86c8fa3e6d72a3ff884b5bca2f98bc3c06 100644
--- a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_13.robot
+++ b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_13.robot
@@ -23,7 +23,7 @@ ${fragment_filename}=                   airQualityLevel-fragment.jsonld
 *** Test Cases ***
 046_13_01 Check that lastFailure and status are updated if a notification could not be sent
     [Documentation]    If the response to the notification request is different than 200 OK then implementations shall: Update notification.lastFailure with a timestamp representing the current date and time, update notification.status to "failed"
-    [Tags]    sub-notification    5_8_6    046_13
+    [Tags]    sub-notification    5_8_6
 
     @{expected_notification_data_entities}=    Create List    Building
     Update Entity Attributes    ${entity_id}    ${fragment_filename}    ${CONTENT_TYPE_LD_JSON}
diff --git a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_14.robot b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_14.robot
index ecf8a9128aca26f35b26da764857daad2041b3a8..b5258eb652207f473d502666afb99e8d4ba0bd98 100644
--- a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_14.robot
+++ b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_14.robot
@@ -23,7 +23,7 @@ ${notification_server_send_url}         http://${notification_server_host}:${not
 *** Test Cases ***
 046_14_01 Check that a notification is sent as JSON-LD
     [Documentation]    The Notification content shall be JSON-LD when endpoint.accept is set to 'application/ld+json'
-    [Tags]    sub-notification    5_8_6    046_14
+    [Tags]    sub-notification    5_8_6
 
     Add Initial Entity
     Sleep    1s