diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_01.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_01.robot
index 7da5ac0cf438809295811e6b6af38331961c8601..314dd96ce61dcd282b58e50b65d88c5db0512ec8 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_01.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_01.robot
@@ -29,12 +29,14 @@ Batch Create Entity Scenarios
 
     Batch Create Entities   @{entities_to_be_created}
 
-    ${expected_entities_ids}=  Catenate    SEPARATOR=,     ${first_entity_id}     ${second_entity_id}
+    @{expected_entities_ids}=  Create List   ${first_entity_id}     ${second_entity_id}
+    ${entities_to_be_queried}=  Catenate    SEPARATOR=,     ${first_entity_id}     ${second_entity_id}
 
     Check Response Status Code Set To  201
     Check Response Body Containing Array Of URIs set to   @{expected_entities_ids}
 
-    Query Entities    ${expected_entities_ids}  Building    context=${ngsild_test_suite_context}
-    Check Created Resources Set To     ${entities_to_be_created}
+    Query Entities    ${entities_to_be_queried}  Building    context=${ngsild_test_suite_context}
+    ${ignored_keys}=    Create List     ${context_regex_expr}
+    Check Created Resources Set To     ${entities_to_be_created}    ${ignored_keys}
 
     Batch Delete Entities       @{expected_entities_ids}
diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_02.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_02.robot
index aa31e1fc2c582d09b36609cae64bdd3946b19ae3..9d44a5edb254279b344b5b1156b913530a4159fb 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_02.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_02.robot
@@ -34,8 +34,8 @@ Create a batch of two valid entities and one invalid entity
 
     Query Entities    ${expected_entities_ids}  Building    context=${ngsild_test_suite_context}
     @{created_entities}=  Create List   ${first_entity}     ${second_entity}
-    Check Created Resources Set To     ${created_entities}
-
+    ${ignored_keys}=    Create List     ${context_regex_expr}
+    Check Created Resources Set To     ${created_entities}      ${ignored_keys}
     @{entities_ids_to_be_deleted}=  Create List   ${first_entity_id}     ${second_entity_id}    ${existing_entity_id}
     Batch Delete Entities       @{entities_ids_to_be_deleted}
 
diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_01.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_01.robot
index df1dc42dbf642c114a5b63c2f6281d339576ce47..8d830ddda21425c9bda957bf30bfa3e84aad2f60 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_01.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_01.robot
@@ -40,7 +40,8 @@ Batch Update Entity Scenarios
     @{updated_entities}=  Create List   ${first_updated_entity}     ${second_updated_entity}
     ${expected_entities_ids}=  Catenate    SEPARATOR=,     @{entities_ids_to_be_updated}
     Query Entities    ${expected_entities_ids}  Building    context=${ngsild_test_suite_context}
-    Check Updated Resources Set To   ${updated_entities}
+    ${ignored_keys}=    Create List     ${context_regex_expr}
+    Check Updated Resources Set To   ${updated_entities}    ${ignored_keys}
 
 Setup Initial Entities
     ${first_entity_id}=     Generate Random Entity Id    ${building_id_prefix}
diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_02.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_02.robot
index e16007bcc77304141329192e551b38fb7cd705fa..e6ca0b0cdf3761a863a5a59673725242d96ca9d9 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_02.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_02.robot
@@ -40,7 +40,8 @@ Batch Update Entity With NoOverwrite Option Scenarios
     @{updated_entities}=  Create List   ${first_updated_entity}     ${second_updated_entity}
     ${expected_entities_ids}=  Catenate    SEPARATOR=,     @{entities_ids_to_be_updated}
     Query Entities    ${expected_entities_ids}  Building    context=${ngsild_test_suite_context}
-    Check Updated Resources Set To   ${updated_entities}
+    ${ignored_keys}=    Create List     ${context_regex_expr}
+    Check Updated Resources Set To   ${updated_entities}    ${ignored_keys}
 
 Setup Initial Entities
     ${first_entity_id}=     Generate Random Entity Id    ${building_id_prefix}
diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_03.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_03.robot
index d5c1c91eb2badc6f8a23637121ab67a448933bbd..98ae819818793f299793d1971114947bae71eb61 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_03.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_03.robot
@@ -40,7 +40,8 @@ Update a batch of non existing and existing entities
     @{updated_entities}=  Create List   ${first_updated_entity}     ${second_updated_entity}
     ${expected_entities_ids}=  Catenate    SEPARATOR=,     @{expected_successful_entities_ids}
     Query Entities    ${expected_entities_ids}  Building    context=${ngsild_test_suite_context}
-    Check Updated Resources Set To   ${updated_entities}
+    ${ignored_keys}=    Create List     ${context_regex_expr}
+    Check Updated Resources Set To   ${updated_entities}    ${ignored_keys}
 
     Batch Delete Entities       @{expected_successful_entities_ids}
 
diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_01.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_01.robot
index c385d7a51b00fed6cb018b20fdaf64847e014471..3f6f448076c1cb37ad19bc39b53a08b97ffa6935 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_01.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_01.robot
@@ -33,6 +33,7 @@ Batch Upsert Entity Scenarios
     Check Response Body Containing Array Of URIs set to   @{expected_entities_ids}
     ${expected_updated_entities_ids}=  Catenate    SEPARATOR=,     @{expected_entities_ids}
     Query Entities    ${expected_updated_entities_ids}  Building    context=${ngsild_test_suite_context}
-    Check Updated Resources Set To   ${entities_to_be_upserted}
+    ${ignored_keys}=    Create List     ${context_regex_expr}
+    Check Updated Resources Set To   ${entities_to_be_upserted}     ${ignored_keys}
 
     Batch Delete Entities       @{expected_entities_ids}
diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_02.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_02.robot
index 0272920d5a36a82016361f64bdd1e1820165196c..bede8155398f1b873428f4ef1d191808a9902b58 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_02.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_02.robot
@@ -37,7 +37,8 @@ Batch Upsert Non-existing And Existing Entities Scenarios
     @{upserted_entities_ids}=  Create List   ${new_entity_id}   ${first_existing_entity_id}    ${second_existing_entity_id}
     ${expected_updated_entities_ids}=  Catenate    SEPARATOR=,     @{upserted_entities_ids}
     Query Entities    ${expected_updated_entities_ids}  Building    context=${ngsild_test_suite_context}
-    Check Updated Resources Set To   ${entities_to_be_upserted}
+    ${ignored_keys}=    Create List     ${context_regex_expr}
+    Check Updated Resources Set To   ${entities_to_be_upserted}     ${ignored_keys}
 
     @{entities_ids_to_be_deleted}=  Create List   ${new_entity_id}
     Batch Delete Entities       @{entities_ids_to_be_deleted}
diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_03.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_03.robot
index 0e16528ce87c70e74d103a07fc088028cb2444fe..d4ee1825036e080c3eb92197743a84367c467f35 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_03.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_03.robot
@@ -33,7 +33,8 @@ Batch Upsert Existing Entities Scenarios
     @{upserted_entities_ids}=  Create List   ${first_existing_entity_id}    ${second_existing_entity_id}
     ${expected_updated_entities_ids}=  Catenate    SEPARATOR=,     @{upserted_entities_ids}
     Query Entities    ${expected_updated_entities_ids}  Building    context=${ngsild_test_suite_context}
-    Check Updated Resources Set To   ${entities_to_be_upserted}
+    ${ignored_keys}=    Create List     ${context_regex_expr}
+    Check Updated Resources Set To   ${entities_to_be_upserted}     ${ignored_keys}
 
 Setup Initial Entities
     ${first_existing_entity_id}=     Generate Random Entity Id    ${building_id_prefix}
diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_04.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_04.robot
index ebaa3ce31fb16fe8c58b1487d43632ccd97eb7ae..cc014f5a0e6518a338e0004053139c9f6012f8c8 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_04.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_04.robot
@@ -41,7 +41,8 @@ Batch Upsert Entities With Update Option Scenarios
     @{updated_entities}=  Create List   ${new_entity}     ${old_updated_entity}
     ${expected_updated_entities_ids}=  Catenate    SEPARATOR=,     @{entities_ids_to_be_upserted}
     Query Entities    ${expected_updated_entities_ids}  Building    context=${ngsild_test_suite_context}
-    Check Updated Resources Set To   ${updated_entities}
+    ${ignored_keys}=    Create List     ${context_regex_expr}
+    Check Updated Resources Set To   ${updated_entities}    ${ignored_keys}
 
     @{entities_ids_to_be_deleted}=  Create List   ${new_entity_id}
     Batch Delete Entities       @{entities_ids_to_be_deleted}
diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_05.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_05.robot
index dd6b8727749d671397829c54f9eab1f38635c909..6875bbae021fead441914ade0fafccb228be21fa 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_05.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_05.robot
@@ -32,6 +32,7 @@ Upsert a batch of two valid entities and one invalid entity
     ${expected_updated_entities_ids}=  Catenate    SEPARATOR=,     @{expected_successful_entities_ids}
     Query Entities    ${expected_updated_entities_ids}  Building    context=${ngsild_test_suite_context}
     @{upserted_entities}=  Create List   ${first_entity}     ${second_entity}
-    Check Updated Resources Set To   ${upserted_entities}
+    ${ignored_keys}=    Create List     ${context_regex_expr}
+    Check Updated Resources Set To   ${upserted_entities}   ${ignored_keys}
 
     Batch Delete Entities       @{expected_successful_entities_ids}