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 028c3599ca292df49ddfbfd3a2820048d710dbfe..4de7f40ab6f574ea953bb334a0860f34517dbec8 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_01.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_01.robot
@@ -34,6 +34,6 @@ Batch Create Entity Scenarios
     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 Entities Set To     ${entities_to_be_created}
+    Check Created Resources Set To     ${entities_to_be_created}
 
     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 1a7a5973e254b8a0bb7f587f718692d8e30df064..c7b24622754bf35793af4950801975ca30d4d11d 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_02.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_02.robot
@@ -32,7 +32,7 @@ Create a batch of two valid entities and one invalid entity
 
     Query Entities    ${expected_successful_entities_ids}  Building    context=${ngsild_test_suite_context}
     @{created_entities}=  Create List   ${first_entity}     ${second_entity}
-    Check Created Entities Set To     ${created_entities}
+    Check Created Resources Set To     ${created_entities}
 
     @{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/DeleteBatchOfEntities/006_01.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_01.robot
index 4433b560864994b49c9f4832d8fe8a23c9409894..f2f36c0e9b1f46ecaeb0f6db5a43d70ed35c273f 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_01.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_01.robot
@@ -21,7 +21,7 @@ Delete a batch of entities
     Check Response Status Code Set To  204
 
     Query Entities    ${entities_ids_to_be_deleted}  Building    context=${ngsild_test_suite_context}
-    Check SUT Not Containing Entities
+    Check SUT Not Containing Resources
 
 *** Keywords ***
 Setup Initial Entities
diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_02.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_02.robot
index 0d559adab912ab8a5f78657aa60bb8aa394555d3..f4856a7af529b5638ecfb30efc7ea7b20cd3751b 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_02.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_02.robot
@@ -26,7 +26,7 @@ Delete a batch of non existing and existing entities
     Check Response Body Containing Batch Operation Result   ${expected_batch_operation_result}
 
     Query Entities    ${expected_successful_entities_ids}  Building    context=${ngsild_test_suite_context}
-    Check SUT Not Containing Entities
+    Check SUT Not Containing Resources
 
 
 *** Keywords ***
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 f0215370455e8a775fa1cebc0121ef118b5ced89..b46530400b35f1dec0bb56d5acea6638a569946e 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_01.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_01.robot
@@ -39,7 +39,7 @@ Batch Update Entity Scenarios
     ${second_updated_entity}=    Upsert Element In Entity     ${second_created_entity}    ${update_fragment}      $
     @{updated_entities}=  Create List   ${first_updated_entity}     ${second_updated_entity}
     Query Entities    ${entities_ids_to_be_updated}  Building    context=${ngsild_test_suite_context}
-    Check Updated Entities Set To   ${updated_entities}
+    Check Updated Resources Set To   ${updated_entities}
 
 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 fc27ef356cfc9df6c6d099598ea33dd2f1e771c3..c4b15cad0108207859ed27cfed7b72b8511fec0e 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_02.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_02.robot
@@ -39,7 +39,7 @@ Batch Update Entity With NoOverwrite Option Scenarios
     ${second_updated_entity}=    Upsert Element In Entity     ${second_created_entity}    ${update_fragment}      $
     @{updated_entities}=  Create List   ${first_updated_entity}     ${second_updated_entity}
     Query Entities    ${entities_ids_to_be_updated}  Building    context=${ngsild_test_suite_context}
-    Check Updated Entities Set To   ${updated_entities}
+    Check Updated Resources Set To   ${updated_entities}
 
 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 9e73433063eca4ff13e938be8ec03cbcb6e4d085..f6130d64d90d24fca2032bb95aa268be0a421fdf 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_03.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_03.robot
@@ -39,7 +39,7 @@ Update a batch of non existing and existing entities
     ${second_updated_entity}=    Upsert Element In Entity     ${second_created_entity}    ${update_fragment}      $
     @{updated_entities}=  Create List   ${first_updated_entity}     ${second_updated_entity}
     Query Entities    ${expected_successful_entities_ids}  Building    context=${ngsild_test_suite_context}
-    Check Updated Entities Set To   ${updated_entities}
+    Check Updated Resources Set To   ${updated_entities}
 
     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 362634a2fc0daf85d33b4e0794bb4e4942e795f5..710f4c1386680e6cb7908eff78f049ca358cef5a 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,6 @@ Batch Upsert Entity Scenarios
     Check Response Body Containing Array Of URIs set to   @{expected_entities_ids}
 
     Query Entities    ${expected_entities_ids}  Building    context=${ngsild_test_suite_context}
-    Check Updated Entities Set To   ${entities_to_be_upserted}
+    Check Updated Resources Set To   ${entities_to_be_upserted}
 
     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 5b083c5526e9fe29686cbf51cffbe4c9dda3656b..3c643b81c102c9a09c98bd5f2b75c70e143418cb 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_02.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_02.robot
@@ -36,7 +36,7 @@ Batch Upsert Non-existing And Existing Entities Scenarios
 
     @{upserted_entities_ids}=  Create List   ${new_entity_id}   ${first_existing_entity_id}    ${second_existing_entity_id}
     Query Entities    ${upserted_entities_ids}  Building    context=${ngsild_test_suite_context}
-    Check Updated Entities Set To   ${entities_to_be_upserted}
+    Check Updated Resources Set To   ${entities_to_be_upserted}
 
     @{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 3974abf665ccdd4fb9dc3ad93107795cbd64f16b..16a632e2184e2161f2a678b97dfbe9fc899a8b2d 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_03.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_03.robot
@@ -32,7 +32,7 @@ Batch Upsert Existing Entities Scenarios
 
     @{upserted_entities_ids}=  Create List   ${first_existing_entity_id}    ${second_existing_entity_id}
     Query Entities    ${upserted_entities_ids}  Building    context=${ngsild_test_suite_context}
-    Check Updated Entities Set To   ${entities_to_be_upserted}
+    Check Updated Resources Set To   ${entities_to_be_upserted}
 
 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 1092a0b7824b0650618aabd57735692ba6c33967..472296c694f68907aee8c139f20d5c9967ecfb11 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_04.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_04.robot
@@ -40,7 +40,7 @@ Batch Upsert Entities With Update Option Scenarios
     ${old_updated_entity}=    Upsert Element In Entity     ${old_entity}    ${update_fragment}      $
     @{updated_entities}=  Create List   ${new_entity}     ${old_updated_entity}
     Query Entities    ${entities_ids_to_be_upserted}  Building    context=${ngsild_test_suite_context}
-    Check Updated Entities Set To   ${updated_entities}
+    Check Updated Resources Set To   ${updated_entities}
 
     @{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 b85cd6cbfcee089b423100c16b876c89fdfb3fb0..91426f048fa6099f564362677f5067efaeeabe17 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,6 @@ Upsert a batch of two valid entities and one invalid entity
 
     Query Entities    ${expected_successful_entities_ids}  Building    context=${ngsild_test_suite_context}
     @{upserted_entities}=  Create List   ${first_entity}     ${second_entity}
-    Check Updated Entities Set To   ${upserted_entities}
+    Check Updated Resources Set To   ${upserted_entities}
 
     Batch Delete Entities       @{expected_successful_entities_ids}
diff --git a/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_01.robot b/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_01.robot
index bcee2fcb1dec2b258d8ba922d7e5649a33d7b5ce..b35b351b9b84ec4cfd135673dea49cf7ce123661 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_01.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_01.robot
@@ -30,6 +30,6 @@ Create Entity Scenarios
     ${created_entity}=    Load Test Sample    entities/${filename}      ${entity_id}
     Run Keyword If     '${content_type}'=='application/json'     Retrieve Entity by Id    ${entity_id}    ${content_type}
     Run Keyword If     '${content_type}'=='application/ld+json'     Retrieve Entity by Id    ${entity_id}    ${content_type}     context=${ngsild_test_suite_context}
-    Check Created Entity Set To     ${created_entity}
+    Check Created Resource Set To     ${created_entity}
 
     [Teardown]    Delete Entity by Id       ${entity_id}
\ No newline at end of file
diff --git a/TP/NGSI-LD/ContextInformation/Provision/Entities/DeleteEntity/002_01.robot b/TP/NGSI-LD/ContextInformation/Provision/Entities/DeleteEntity/002_01.robot
index 0425b9685a3edf8d391a4714acb4cc93ddf23181..c7529b70b7d9ca4349fcbe7d422069288452948a 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/Entities/DeleteEntity/002_01.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/Entities/DeleteEntity/002_01.robot
@@ -19,5 +19,5 @@ Delete an entity
     ${response}=    Delete Entity by Id Returning Response   ${entity_id}
     Check Response Status Code  204    ${response['status']}
 
-    Query Entities    ${entity_id}  Building    context=${ngsild_test_suite_context}
-    Check SUT Not Containing Entities
+    Retrieve Entity by Id    ${entity_id}     context=${ngsild_test_suite_context}
+    Check SUT Not Containing Resource
diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_01.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_01.robot
index 2e97d9ddc9a7442aaa5b2cd36e44750ed10ff931..c02db3b7ce9f5c0d5f3f629df2a685b65d92c68e 100644
--- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_01.robot
+++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_01.robot
@@ -10,6 +10,7 @@ Suite Teardown      Delete Created Context Source Registration Subscriptions
 *** Variable ***
 ${subscription_id_prefix}=  urn:ngsi-ld:Subscription:
 ${subscription_payload_file_path}=   csourceSubscriptions/subscription-sample.jsonld
+${active_status_fragment_file_path}=   csourceSubscriptions/fragments/subscription-active-sample.json
 
 *** Test Case ***
 Create Context Source Registration Subscription
@@ -23,6 +24,11 @@ Create Context Source Registration Subscription
     Check Response Status Code Set To  201
     Check Response Headers Containing URI set to    ${request['path']}/    ${subscription_id}  ${response}
 
+    ${active_status_fragment}=    Load Test Sample    ${active_status_fragment_file_path}
+    ${created_subscription_payload}=    Upsert Element In Entity    ${subscription_payload}     ${active_status_fragment}   $
+    Retrieve Context Source Registration Subscription   ${subscription_id}   context=${ngsild_test_suite_context}   accept=application/ld+json
+    Check Created Resource Set To     ${created_subscription_payload}
+
 *** Keywords ***
 Generate Random Ids For Context Source Registration Subscriptions
     # TODO: Refactor Generate Random Entity Id to Generate Random Test Sample Id
diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_02.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_02.robot
index e5347ac431560d93439bd74e8a321298a6f9ed4e..de6f38e0050b2dc6b03608742393b0ebcf82f8d8 100644
--- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_02.robot
+++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_02.robot
@@ -9,6 +9,7 @@ Suite Teardown      Delete Created Context Source Registration Subscriptions
 
 *** Variable ***
 ${subscription_payload_file_path}=   csourceSubscriptions/subscription-sample.jsonld
+${active_status_fragment_file_path}=   csourceSubscriptions/fragments/subscription-active-sample.json
 
 *** Test Case ***
 Create Context Source Registration Subscription Without An Id
@@ -25,6 +26,12 @@ Create Context Source Registration Subscription Without An Id
 
     Set Suite Variable  ${subscription_id}
 
+    ${active_status_fragment}=    Load Test Sample    ${active_status_fragment_file_path}
+    ${subscription_payload_with_id}=  Load Test Sample    ${subscription_payload_file_path}     ${subscription_id}
+    ${created_subscription_payload}=    Upsert Element In Entity    ${subscription_payload_with_id}     ${active_status_fragment}   $
+    Retrieve Context Source Registration Subscription   ${subscription_id}   context=${ngsild_test_suite_context}   accept=application/ld+json
+    Check Created Resource Set To     ${created_subscription_payload}
+
 *** Keywords ***
 Delete Created Context Source Registration Subscriptions
     Delete Context Source Registration Subscription     ${subscription_id}
diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/DeleteContextSourceRegistrationSubscription/042_01.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/DeleteContextSourceRegistrationSubscription/042_01.robot
index e422665c6aa9e29c8bb63cc6d923b3e8ff5ec9d0..53629a0f398935f9352c9f222f68973e35e23036 100644
--- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/DeleteContextSourceRegistrationSubscription/042_01.robot
+++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/DeleteContextSourceRegistrationSubscription/042_01.robot
@@ -19,6 +19,9 @@ Delete Context Source Registration Subscription
 
     Check Response Status Code Set To  204
 
+    Retrieve Context Source Registration Subscription   ${subscription_id}   context=${ngsild_test_suite_context}
+    Check SUT Not Containing Resource
+
 *** Keywords ***
 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_01.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_01.robot
index c72a111ccc70bf836da27240898db130f9f93c20..4e74fb9e8d3e4b0adf63e144b9e4ce73110f25a9 100644
--- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_01.robot
+++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_01.robot
@@ -11,6 +11,7 @@ Suite Teardown      Delete Initial Context Source Registration Subscriptions
 ${subscription_id_prefix}=  urn:ngsi-ld:Subscription:
 ${subscription_payload_file_path}=   csourceSubscriptions/subscription-sample.jsonld
 ${subscription_update_fragment_file_path}=   csourceSubscriptions/fragments/subscription-update-sample.json
+${active_status_fragment_file_path}=   csourceSubscriptions/fragments/subscription-active-sample.json
 
 *** Test Case ***
 Update Context Source Registration Subscription
@@ -22,6 +23,13 @@ Update Context Source Registration Subscription
 
     Check Response Status Code Set To  204
 
+    ${subscription}=    Upsert Element In Entity     ${subscription_payload}    ${subscription_update_fragment}      $
+    ${active_status_fragment}=    Load Test Sample    ${active_status_fragment_file_path}
+    ${updated_susbcription}=    Upsert Element In Entity    ${subscription}     ${active_status_fragment}   $
+    Retrieve Context Source Registration Subscription   ${subscription_id}   context=${ngsild_test_suite_context}   accept=application/ld+json
+    Check Updated Resource Set To     ${updated_susbcription}
+
+
 *** Keywords ***
 Setup Initial Context Source Registration Subscriptions
     ${subscription_id}=     Generate Random Entity Id    ${subscription_id_prefix}
@@ -30,6 +38,7 @@ Setup Initial Context Source Registration Subscriptions
     Create Context Source Registration Subscription  ${subscription_payload}
 
     Set Suite Variable  ${subscription_id}
+    Set Suite Variable  ${subscription_payload}
 
 Delete Initial Context Source Registration Subscriptions
     Delete Context Source Registration Subscription     ${subscription_id}
diff --git a/data/csourceSubscriptions/fragments/subscription-active-sample.json b/data/csourceSubscriptions/fragments/subscription-active-sample.json
new file mode 100644
index 0000000000000000000000000000000000000000..649f707bc5e99d2b20db742df8c27003ee8c45e9
--- /dev/null
+++ b/data/csourceSubscriptions/fragments/subscription-active-sample.json
@@ -0,0 +1,3 @@
+{
+   "isActive": true
+}
\ No newline at end of file
diff --git a/resources/ApiUtils.resource b/resources/ApiUtils.resource
index f7a439f2ceb88eeafa719b61d090ca237f069caf..90a9349f831e96916e77aaa290e2be654426a669 100755
--- a/resources/ApiUtils.resource
+++ b/resources/ApiUtils.resource
@@ -571,9 +571,10 @@ Update Context Source Registration Subscription
     Set Test Variable  ${response}
 
 Retrieve Context Source Registration Subscription
-    [Arguments]  ${subscription_id}     ${context}=${EMPTY}
+    [Arguments]  ${subscription_id}     ${context}=${EMPTY}     ${accept}=${CONTENT_TYPE_JSON}
 
     &{headers}=  Create Dictionary
+    Set To Dictionary   ${headers}   Accept    ${accept}
     Run Keyword If     '${context}'!=''       Set To Dictionary   ${headers}    Link=<${context}>; rel="http://www.w3.org/ns/json-ld#context";type="application/ld+json"
     ${response}=  GET  ${CONTEXT_SOURCE_REGISTRATION_SUBSCRIPTION_ENDPOINT_PATH}/${subscription_id}     headers=${headers}
     Output  request
diff --git a/resources/AssertionUtils.resource b/resources/AssertionUtils.resource
index 068f9a8654d604890c94dc625cade7e8456a3acd..703ddd2631673793f1f7669a861855cbe52c3e48 100755
--- a/resources/AssertionUtils.resource
+++ b/resources/AssertionUtils.resource
@@ -286,28 +286,36 @@ Check Pagination Prev And Next Headers
     Run Keyword If     '${prev_link}'!='' and '${next_link}'==''       Should Be Equal      ${response['headers']['Link']}    ${prev_link}
     Run Keyword If     '${prev_link}'=='' and '${next_link}'!=''       Should Be Equal      ${response['headers']['Link']}    ${next_link}
 
-Check Created Entity Set To
+Check Created Resource Set To
     [Arguments]  ${created_entity}
 
     ${ignored_keys}=    Create List
     ${comparison_result}=    Compare Dictionaries Ignoring Keys    ${response['body']}    ${created_entity}     ${ignored_keys}
     Should Be True      ${comparison_result}   msg=Created Entity Comparison Failed
 
-Check Created Entities Set To
+Check Created Resources Set To
     [Arguments]  ${created_entities}
 
     ${ignored_keys}=    Create List
     ${comparison_result}=    Compare Dictionaries Ignoring Keys    ${response['body']}    ${created_entities}     ${ignored_keys}
     Should Be True      ${comparison_result}   msg=Created Entities Comparison Failed
 
-Check Updated Entities Set To
+Check Updated Resource Set To
+    [Arguments]  ${updated_entity}
+    ${ignored_keys}=    Create List
+    ${comparison_result}=    Compare Dictionaries Ignoring Keys    ${response['body']}    ${updated_entity}     ${ignored_keys}
+    Should Be True      ${comparison_result}   msg=Updated Entity Comparison Failed
+
+Check Updated Resources Set To
     [Arguments]  ${updated_entities}
 
-    log     ${updated_entities}
-    log     ${response['body']}
     ${ignored_keys}=    Create List
     ${comparison_result}=    Compare Dictionaries Ignoring Keys    ${response['body']}    ${updated_entities}     ${ignored_keys}
     Should Be True      ${comparison_result}   msg=Updated Entities Comparison Failed
 
-Check SUT Not Containing Entities
+Check SUT Not Containing Resource
+    ${response_status}=  convert to string  ${response['status']}
+    Should Be Equal  ${response_status}  404
+
+Check SUT Not Containing Resources
     Should Be Empty     ${response['body']}