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 888c551eaab4c0bcb829f8dd131681aee98bc8e8..70110e7ab4047411c274e4eb7dd27fc4d08fd4a1 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_01.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_01.robot
@@ -17,6 +17,7 @@ Test Setup          Setup Initial Entities
     ${response}=    Batch Delete Entities    entities_ids_to_be_deleted=@{entities_ids_to_be_deleted}
 
     Check Response Status Code    204    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     ${expected_entities_ids}=    Catenate    SEPARATOR=,    @{entities_ids_to_be_deleted}
     ${response1}=    Query Entities
     ...    entity_ids=${expected_entities_ids}
diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/MergeBatchOfEntities/057_01.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/MergeBatchOfEntities/057_01.robot
index 92c61496582cd2a2d86fa109159e3916d8000ecd..686464c7a8bc36e9685f73af2b863d1a48b0f05a 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/MergeBatchOfEntities/057_01.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/MergeBatchOfEntities/057_01.robot
@@ -41,6 +41,7 @@ Batch Merge Entity Scenarios
     @{entities_to_be_merged}=    Create List    ${first_entity}    ${second_entity}
     ${response}=    Batch Merge Entities    @{entities_to_be_merged}
     Check Response Status Code    204    ${response.status_code}
+    Check Response Body Is Empty    ${response}
 
     ${expected_entities_ids}=    Catenate    SEPARATOR=,    @{entities_ids_to_be_merged}
     ${response1}=    Query Entities
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 550d5405ae8a652560a33896017613900e2de5b5..3bd605507e0c443ca8d17592e7e7760176439ab2 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_01.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_01.robot
@@ -40,6 +40,7 @@ Batch Update Entity Scenarios
     ${response}=    Batch Update Entities    @{entities_to_be_updated}
 
     Check Response Status Code    204    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     ${first_created_entity}=    Load Test Sample    entities/${entity_payload_filename}    ${first_entity_id}
     ${second_created_entity}=    Load Test Sample    entities/${entity_payload_filename}    ${second_entity_id}
     ${update_fragment}=    Load Test Sample    entities/${update_fragment_filename}
diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_05.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_05.robot
index b9c2645b68cf217e917fd7267c544a5dc9406230..019211c2e642b96941d68516d7fc27be8d042038 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_05.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_05.robot
@@ -32,6 +32,7 @@ Batch Update Entity Scenarios
     @{entities_to_be_updated}=    Create List    ${first_entity}    ${second_entity}
     ${response}=    Batch Update Entities    @{entities_to_be_updated}
     Check Response Status Code    204    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     ${first_created_entity}=    Load Test Sample    entities/${entity_payload_filename}    ${first_entity_id}
     ${second_created_entity}=    Load Test Sample    entities/${entity_payload_filename}    ${second_entity_id}
     ${update_fragment}=    Load Test Sample    entities/${update_fragment_filename}
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 dcd2612f183f415f40cf1c0996ccd2ff537f01e6..6d39c513513007c1d11578c5ae6a8fc5f65c2a19 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_03.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_03.robot
@@ -41,6 +41,7 @@ Batch Upsert Existing Entities Scenarios
     ${response}=    Batch Upsert Entities    @{entities_to_be_upserted}
 
     Check Response Status Code    204    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     @{upserted_entities_ids}=    Create List    ${first_existing_entity_id}    ${second_existing_entity_id}
     ${expected_updated_entities_ids}=    Catenate    SEPARATOR=,    @{upserted_entities_ids}
     ${response1}=    Query Entities
diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_08.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_08.robot
index e3ce82b15f95f5aa2d885a378fecfe1d24197d5b..34f2118ccc48fd18199e66e9514f86d7585bde9b 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_08.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_08.robot
@@ -27,6 +27,7 @@ Batch Upsert Existing Entities Scenarios
     @{entities_to_be_upserted}=    Create List    ${first_existing_entity}    ${second_existing_entity}
     ${response}=    Batch Upsert Entities    @{entities_to_be_upserted}
     Check Response Status Code    204    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     @{upserted_entities_ids}=    Create List    ${first_existing_entity_id}    ${second_existing_entity_id}
     ${expected_updated_entities_ids}=    Catenate    SEPARATOR=,    @{upserted_entities_ids}
     ${response1}=    Query Entities
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 860b9445c7c7cdcbd93f80e3ce3840bb99ffc0ca..acdacc0a67f67ed63c657cbf4011db7b70052ce3 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_01.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_01.robot
@@ -40,6 +40,7 @@ Create Entity Scenarios
     ...    ${entity_id}
     ...    ${content_type}
     Check Response Status Code    201    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     Check Response Headers Containing URI set to    ${entity_id}    ${response.headers}
     ${created_entity}=    Load Test Sample    entities/${filename}    ${entity_id}
     IF    '${content_type}' == 'application/json'
diff --git a/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_10.robot b/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_10.robot
index 6a8674543c29742453e359333624407fc18e458e..e63d6b41c9347edcbe347c79eec62fb51a61953a 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_10.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_10.robot
@@ -30,6 +30,7 @@ Create Entity Scenarios
     ...    ${content_type}
 
     Check Response Status Code    201    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     Check Response Headers Containing URI set to    ${entity_id}    ${response.headers}
     ${created_entity}=    Load Test Sample    entities/${filename}    ${entity_id}
     ${response1}=    Retrieve Entity by Id
diff --git a/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_11.robot b/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_11.robot
index cc98c873bf79350d37748efb8fa5badeacbcac5a..9d3c3fe77152022eb7fd899f25b53432fbf6bc45 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_11.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_11.robot
@@ -33,6 +33,7 @@ Create Entity Scenarios
     ...    ${content_type}
 
     Check Response Status Code    201    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     Check Response Headers Containing URI set to    ${entity_id}    ${response.headers}
     ${created_entity}=    Load Test Sample    entities/${filename}    ${entity_id}
     ${response1}=    Retrieve Entity by Id    ${entity_id}    ${content_type}
diff --git a/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_12.robot b/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_12.robot
index 73a88dfc6325a682559364ba2a565095d0a5affe..1a1df17877ba971ab365cfde3a2e92108a7a3800 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_12.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_12.robot
@@ -29,6 +29,7 @@ ${content_type}=    application/ld+json
     ...    ${content_type}
 
     Check Response Status Code    201    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     Check Response Headers Containing URI set to    ${entity_id}    ${response.headers}
     ${created_entity}=    Load Test Sample    entities/${filename}    ${entity_id}
     ${response1}=    Retrieve Entity by Id
diff --git a/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_13.robot b/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_13.robot
index 3358c56e944de35a3b55bc9b59a2cc1e23b88dcb..198e5b71e94446493965337ab1681fac0f15e4a9 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_13.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_13.robot
@@ -29,6 +29,7 @@ ${content_type}=    application/ld+json
     ...    ${content_type}
 
     Check Response Status Code    201    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     Check Response Headers Containing URI set to    ${entity_id}    ${response.headers}
     ${created_entity}=    Load Test Sample    entities/${filename}    ${entity_id}
     ${response1}=    Retrieve Entity by Id
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 eebee0b62b21aec8fe831d657d73ca9efb778acd..d7792dee0bd0967f2774f31ee07e3cc0dbbb3941 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/Entities/DeleteEntity/002_01.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/Entities/DeleteEntity/002_01.robot
@@ -16,6 +16,7 @@ Test Setup          Setup Initial Entity
     [Tags]    e-delete    5_6_6
     ${response}=    Delete Entity by Id    ${entity_id}
     Check Response Status Code    204    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     ${response2}=    Retrieve Entity by Id    id=${entity_id}    context=${ngsild_test_suite_context}
     Check SUT Not Containing Resource    ${response2.status_code}
 
diff --git a/TP/NGSI-LD/ContextInformation/Provision/Entities/MergeEntity/056_01.robot b/TP/NGSI-LD/ContextInformation/Provision/Entities/MergeEntity/056_01.robot
index 278c6df32146255b65ac5fc95f90988e41cf29fc..b108da2baef43ac8ef27c4b808dc325b4ea26afa 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/Entities/MergeEntity/056_01.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/Entities/MergeEntity/056_01.robot
@@ -40,6 +40,7 @@ Merge Entity Scenarios
     ...    entity_filename=${filename}
     ...    content_type=${CONTENT_TYPE_LD_JSON}
     Check Response Status Code    204    ${response.status_code}
+    Check Response Body Is Empty    ${response}
 
     ${response1}=    Query Entity
     ...    id=${entity_id}
diff --git a/TP/NGSI-LD/ContextInformation/Provision/Entities/MergeEntity/056_03.robot b/TP/NGSI-LD/ContextInformation/Provision/Entities/MergeEntity/056_03.robot
index 247992bd90ef65393c09ac9e13c71e6c35086095..3d81f42b0b220df35be69c8862bc399d1edaa20d 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/Entities/MergeEntity/056_03.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/Entities/MergeEntity/056_03.robot
@@ -40,6 +40,7 @@ Merge Entity Scenarios
     ...    entity_filename=${filename}
     ...    content_type=${CONTENT_TYPE_LD_JSON}
     Check Response Status Code    204    ${response.status_code}
+    Check Response Body Is Empty    ${response}
 
     ${response1}=    Query Entity
     ...    id=${entity_id}
diff --git a/TP/NGSI-LD/ContextInformation/Provision/Entities/MergeEntity/056_04.robot b/TP/NGSI-LD/ContextInformation/Provision/Entities/MergeEntity/056_04.robot
index d2ffb5308672708384911bb226c452b7c8af2209..feada65d88965dad3189dc2f2bd24c7458d35b4f 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/Entities/MergeEntity/056_04.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/Entities/MergeEntity/056_04.robot
@@ -40,6 +40,7 @@ Merge Entity Scenarios
     ...    entity_filename=${filename}
     ...    content_type=${CONTENT_TYPE_LD_JSON}
     Check Response Status Code    204    ${response.status_code}
+    Check Response Body Is Empty    ${response}
 
     ${response1}=    Query Entity
     ...    id=${entity_id}
diff --git a/TP/NGSI-LD/ContextInformation/Provision/Entities/MergeEntity/056_05.robot b/TP/NGSI-LD/ContextInformation/Provision/Entities/MergeEntity/056_05.robot
index f53da455259ec3d2e446ec71224bf84455fc7239..70b1db8d3a2a2648ed4fd65e4ac63a2f32a18492 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/Entities/MergeEntity/056_05.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/Entities/MergeEntity/056_05.robot
@@ -40,6 +40,7 @@ Merge Entity Scenarios
     ...    entity_filename=${filename}
     ...    content_type=${CONTENT_TYPE_LD_JSON}
     Check Response Status Code    204    ${response.status_code}
+    Check Response Body Is Empty    ${response}
 
     ${response1}=    Query Entity
     ...    id=${entity_id}
diff --git a/TP/NGSI-LD/ContextInformation/Provision/Entities/ReplaceEntity/054_01.robot b/TP/NGSI-LD/ContextInformation/Provision/Entities/ReplaceEntity/054_01.robot
index d5ccbc163f969f05244690c5629046adabd198c6..771728f5d05d667d31605eb8ff516d247c235230 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/Entities/ReplaceEntity/054_01.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/Entities/ReplaceEntity/054_01.robot
@@ -30,6 +30,7 @@ ${expectation_filename}             building-locatedAt-and-name-normalized.jsonl
     ...    content_type=${CONTENT_TYPE_JSON}
     ...    context=${ngsild_test_suite_context}
     Check Response Status Code    204    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     ${response1}=    Retrieve Entity by Id
     ...    id=${entity_id}
     ...    context=${ngsild_test_suite_context}
diff --git a/TP/NGSI-LD/ContextInformation/Provision/Entities/ReplaceEntity/054_03.robot b/TP/NGSI-LD/ContextInformation/Provision/Entities/ReplaceEntity/054_03.robot
index 1f5837606e1a72ad075c08850f47d07153c118ad..90c53babdc4d3e5568bcfc1c922699e961b2aafc 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/Entities/ReplaceEntity/054_03.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/Entities/ReplaceEntity/054_03.robot
@@ -26,6 +26,7 @@ ${expectation_filename}             building-minimal-with-two-scopes.json
     ...    content_type=${CONTENT_TYPE_JSON}
     ...    context=${ngsild_test_suite_context}
     Check Response Status Code    204    ${response.status_code}
+    Check Response Body Is Empty    ${response}
 
     ${response1}=    Retrieve Entity by Id
     ...    id=${entity_id}
diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_01.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_01.robot
index cb9f8934fa420987008ea95bc42167f021c0c43f..22b1bbac6524a7962e1fb72748076403058aab9b 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_01.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_01.robot
@@ -31,6 +31,7 @@ Append Attributes Without Params
     [Arguments]    ${status_code}    ${fragment_filename}    ${expectation_filename}
     ${response}=    Append Entity Attributes    ${entity_id}    ${fragment_filename}    ${CONTENT_TYPE_LD_JSON}
     Check Response Status Code    ${status_code}    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     ${entity_expectation_payload}=    Load Test Sample    entities/expectations/${expectation_filename}    ${entity_id}
     ${response1}=    Retrieve Entity by Id
     ...    id=${entity_id}
diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_06.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_06.robot
index b9de0b2de0a567bd659b691e29032d5eae3338bd..4f1ad98ab379b52a2e4c162e7083ce8a81e40822 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_06.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_06.robot
@@ -28,6 +28,7 @@ Append Attributes Without Params
     [Arguments]    ${status_code}    ${fragment_filename}    ${expectation_filename}
     ${response}=    Append Entity Attributes    ${entity_id}    ${fragment_filename}    ${CONTENT_TYPE_LD_JSON}
     Check Response Status Code    ${status_code}    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     ${entity_expectation_payload}=    Load Test Sample    entities/expectations/${expectation_filename}    ${entity_id}
     ${response1}=    Retrieve Entity by Id
     ...    id=${entity_id}
diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_07.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_07.robot
index a9520bdaf99037884430f62a2ec7bcc6cd412043..5873c371139a6f5d1a6645639b53eaf80a00bd1d 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_07.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_07.robot
@@ -25,6 +25,7 @@ ${scope_fragment_filename}=     one-scope-fragment.json
     ...    ${scope_fragment_filename}
     ...    ${CONTENT_TYPE_JSON}
     Check Response Status Code    204    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     ${expectation_filename}=    Set Variable    building-minimal-with-one-scope.json
     ${entity_expectation_payload}=    Load Test Sample    entities/expectations/${expectation_filename}    ${entity_id}
     ${response}=    Retrieve Entity by Id
@@ -42,6 +43,7 @@ ${scope_fragment_filename}=     one-scope-fragment.json
     ...    ${CONTENT_TYPE_JSON}
     ...    noOverwrite
     Check Response Status Code    204    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     ${expectation_filename}=    Set Variable    building-minimal-with-two-scopes.json
     ${entity_expectation_payload}=    Load Test Sample    entities/expectations/${expectation_filename}    ${entity_id}
     ${response}=    Retrieve Entity by Id
diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_08.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_08.robot
index f625be32a89204d30a0ec2f6dcf141c6caa4f706..e664fd7778b8f1f923bf3b43b093e0426b21b363 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_08.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_08.robot
@@ -26,6 +26,7 @@ ${expectation_filename}=                    building-observation-space-geoproper
     ...    ${observation_space_fragment_filename}
     ...    ${CONTENT_TYPE_JSON}
     Check Response Status Code    204    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     ${entity_expectation_payload}=    Load Test Sample    entities/expectations/${expectation_filename}    ${entity_id}
     ${response}=    Retrieve Entity by Id
     ...    ${entity_id}
diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_09.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_09.robot
index 6e78b67c627a7eb381eaace89ae5caa29604402d..3f0f42cf9785314f5e0814f8577a8a3de07ac28b 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_09.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_09.robot
@@ -26,6 +26,7 @@ ${expectation_filename}=                    building-operation-space-geoproperty
     ...    ${operation_space_fragment_filename}
     ...    ${CONTENT_TYPE_JSON}
     Check Response Status Code    204    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     ${entity_expectation_payload}=    Load Test Sample    entities/expectations/${expectation_filename}    ${entity_id}
     ${response}=    Retrieve Entity by Id
     ...    ${entity_id}
diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/DeleteEntityAttribute/013_01.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/DeleteEntityAttribute/013_01.robot
index 96648d8a1f30727ac4c3e99c7b304e55cde7ab11..a5f8a687e58265d33d434ac9a96ac00242c95b9f 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/DeleteEntityAttribute/013_01.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/DeleteEntityAttribute/013_01.robot
@@ -40,6 +40,7 @@ Delete Attributes
     ...    context=${ngsild_test_suite_context}
 
     Check Response Status Code    ${status_code}    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     ${entity_expectation_payload}=    Load Test Sample    entities/expectations/${expectation_filename}    ${entity_id}
     ${response2}=    Retrieve Entity by Id
     ...    id=${entity_id}
diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/DeleteEntityAttribute/013_04.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/DeleteEntityAttribute/013_04.robot
index c4793c28b8bceebdc4f0c44fd3e9d8ec164188aa..c1ea0267c8c64a73c80d438215c03e94151d26a8 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/DeleteEntityAttribute/013_04.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/DeleteEntityAttribute/013_04.robot
@@ -26,6 +26,7 @@ ${expectation_filename}=    building-minimal-compacted.json
     ...    ${EMPTY}
     ...    false
     Check Response Status Code    204    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     ${entity_expectation_payload}=    Load Test Sample    entities/expectations/${expectation_filename}    ${entity_id}
     ${response}=    Retrieve Entity by Id
     ...    ${entity_id}
diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/DeleteEntityAttribute/013_05.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/DeleteEntityAttribute/013_05.robot
index 82cee02c14c6f708ebb3eee4bb937312de155790..5250755a27a6e021179d542ecdfda732e10c1d8b 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/DeleteEntityAttribute/013_05.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/DeleteEntityAttribute/013_05.robot
@@ -26,6 +26,7 @@ ${expectation_filename}=    building-minimal-compacted.json
     ...    ${EMPTY}
     ...    false
     Check Response Status Code    204    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     ${entity_expectation_payload}=    Load Test Sample    entities/expectations/${expectation_filename}    ${entity_id}
     ${response}=    Query Entity
     ...    id=${entity_id}
diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/DeleteEntityAttribute/013_06.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/DeleteEntityAttribute/013_06.robot
index c7952056cc373133400053eff28315df819f8822..45cd2b7207cdb083115abc82c9f129c4251ef113 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/DeleteEntityAttribute/013_06.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/DeleteEntityAttribute/013_06.robot
@@ -26,6 +26,7 @@ ${expectation_filename}=    building-minimal-compacted.json
     ...    ${EMPTY}
     ...    false
     Check Response Status Code    204    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     ${entity_expectation_payload}=    Load Test Sample    entities/expectations/${expectation_filename}    ${entity_id}
     ${response}=    Query Entity
     ...    id=${entity_id}
diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/PartialAttributeUpdate/012_01.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/PartialAttributeUpdate/012_01.robot
index cd86697d65b63638bf03172e0189e913cf24c531..38e4c6ab63b0451cf3b26006190ce7a198be91f8 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/PartialAttributeUpdate/012_01.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/PartialAttributeUpdate/012_01.robot
@@ -35,6 +35,7 @@ Update Attributes
     ...    fragment_filename=${fragment_filename}
     ...    content_type=${CONTENT_TYPE_LD_JSON}
     Check Response Status Code    ${status_code}    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     ${entity_expectation_payload}=    Load Test Sample    entities/expectations/${expectation_filename}    ${entity_id}
     ${response1}=    Retrieve Entity by Id
     ...    id=${entity_id}
diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/PartialAttributeUpdate/012_04.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/PartialAttributeUpdate/012_04.robot
index ebbd6c4723862b3a44eef69d4fa9928d0814d59f..dbafcc0ec976404077fdacae8fa746946d444690 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/PartialAttributeUpdate/012_04.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/PartialAttributeUpdate/012_04.robot
@@ -33,6 +33,7 @@ Update Attributes
     ...    fragment_filename=${fragment_filename}
     ...    content_type=${CONTENT_TYPE_LD_JSON}
     Check Response Status Code    ${status_code}    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     ${entity_expectation_payload}=    Load Test Sample    entities/expectations/${expectation_filename}    ${entity_id}
     ${response1}=    Retrieve Entity by Id
     ...    id=${entity_id}
diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/PartialAttributeUpdate/012_05.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/PartialAttributeUpdate/012_05.robot
index 9779ba3a77f3fe84ecaf1680de3aa027f2fe4f9f..47e7b8e0ebdf1346bd3e700ad34e2a03514c263a 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/PartialAttributeUpdate/012_05.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/PartialAttributeUpdate/012_05.robot
@@ -46,6 +46,7 @@ Update Attributes
     ...    content_type=${CONTENT_TYPE_LD_JSON}
 
     Check Response Status Code    ${status_code}    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     ${response1}=    Retrieve Entity by Id
     ...    id=${entity_id}
     ...    context=${ngsild_test_suite_context}
diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/PartialAttributeUpdate/012_06.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/PartialAttributeUpdate/012_06.robot
index 30d494b2f261cf7009447f70289cc772d9be700a..b65ce263c93140225606ac00bc8409bccfa1c49e 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/PartialAttributeUpdate/012_06.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/PartialAttributeUpdate/012_06.robot
@@ -46,6 +46,7 @@ Update Attributes
     ...    content_type=${CONTENT_TYPE_LD_JSON}
 
     Check Response Status Code    ${status_code}    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     ${response1}=    Retrieve Entity by Id
     ...    id=${entity_id}
     ...    context=${ngsild_test_suite_context}
diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/PartialAttributeUpdate/012_07.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/PartialAttributeUpdate/012_07.robot
index 67074f83b4aecd06f27a814317032a8c856de37c..abbfedacbcb401a1aa01a0a55914e6682042a8f5 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/PartialAttributeUpdate/012_07.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/PartialAttributeUpdate/012_07.robot
@@ -46,6 +46,7 @@ Update Attributes
     ...    content_type=${CONTENT_TYPE_LD_JSON}
 
     Check Response Status Code    ${status_code}    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     ${response1}=    Retrieve Entity by Id
     ...    id=${entity_id}
     ...    context=${ngsild_test_suite_context}
diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/ReplaceEntityAttribute/055_01.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/ReplaceEntityAttribute/055_01.robot
index f5a9724b79a6d24d208caa9ab6cb54b2b57a5872..073369e2f6c6befd5ffdc9a88bbf48a266ffb9d9 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/ReplaceEntityAttribute/055_01.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/ReplaceEntityAttribute/055_01.robot
@@ -39,6 +39,7 @@ Replace Entity Attribute
     ...    content_type=${CONTENT_TYPE_JSON}
     ...    context=${ngsild_test_suite_context}
     Check Response Status Code    204    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     ${response1}=    Retrieve Entity by Id
     ...    id=${entity_id}
     ...    context=${ngsild_test_suite_context}
diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/ReplaceEntityAttribute/055_02.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/ReplaceEntityAttribute/055_02.robot
index 5b4ae8915f2c442c0ff8982a572182074df584df..c7115c6090edf40b2e16776746cd2cca69061e0b 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/ReplaceEntityAttribute/055_02.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/ReplaceEntityAttribute/055_02.robot
@@ -39,6 +39,7 @@ Replace Multi Instance Entity Attribute
     ...    content_type=${CONTENT_TYPE_JSON}
     ...    context=${ngsild_test_suite_context}
     Check Response Status Code    204    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     ${response1}=    Retrieve Entity by Id
     ...    id=${entity_id}
     ...    context=${ngsild_test_suite_context}
diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_01.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_01.robot
index c7851b32f7766e232ea1af399e55cbbe9a475c23..0de6feb840f99939611c0d466d8aa377ed9db829 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_01.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_01.robot
@@ -40,6 +40,7 @@ Update Attributes
     ...    ${fragment_filename}
     ...    ${CONTENT_TYPE_LD_JSON}
     Check Response Status Code    ${status_code}    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     ${entity_expectation_payload}=    Load Test Sample    entities/${expectation_filename}    ${entity_id}
     ${response1}=    Retrieve Entity by Id
     ...    id=${entity_id}
diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_05.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_05.robot
index b26ae606514f362f46a3921788b9e888c1fa5198..86c63bf82db7a02b7ef46b5618b3ef57856a85dc 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_05.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_05.robot
@@ -24,6 +24,7 @@ ${scope_fragment_filename}=     one-scope-fragment.json
     ...    ${scope_fragment_filename}
     ...    ${CONTENT_TYPE_JSON}
     Check Response Status Code    204    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     ${expectation_filename}=    Set Variable    building-minimal-with-one-scope.json
     ${entity_expectation_payload}=    Load Test Sample    entities/expectations/${expectation_filename}    ${entity_id}
     ${response}=    Retrieve Entity by Id
diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_06.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_06.robot
index 27838eeb1388a473a06a116d1534f33c434c51ef..dda974e8b5114428592bc0c4d361505eb7c2bcf4 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_06.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_06.robot
@@ -39,6 +39,7 @@ Append Types to an Entity
     ...    ${CONTENT_TYPE_LD_JSON}
 
     Check Response Status Code    204    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     ${response}=    Retrieve Entity by Id
     ...    ${entity_id}
     ...    accept=${CONTENT_TYPE_JSON}
diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_07.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_07.robot
index f4339e354a5bcb0e76bc222a836208370e7225ec..6308bbf5f6473a6e98802f6e633e96a15e1ee112 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_07.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_07.robot
@@ -44,6 +44,7 @@ Update Attributes
     ...    ${CONTENT_TYPE_LD_JSON}
 
     Check Response Status Code    ${status_code}    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     ${response1}=    Retrieve Entity by Id
     ...    id=${entity_id}
     ...    context=${ngsild_test_suite_context}
diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_08.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_08.robot
index f0b4617526d322ed2bdbc282d4256d505e90c95e..aea4410fc6c7b6f74d3b84e1cb84f456896c36ed 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_08.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_08.robot
@@ -44,6 +44,7 @@ Update Attributes
     ...    ${CONTENT_TYPE_LD_JSON}
 
     Check Response Status Code    ${status_code}    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     ${response1}=    Retrieve Entity by Id
     ...    id=${entity_id}
     ...    context=${ngsild_test_suite_context}
diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_09.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_09.robot
index 7e8d48aa5b394a4979fd17e525aa3547b9addc32..b50e52fd39f3bb6e86b18c2a5dc89f0fb37ce9fe 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_09.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_09.robot
@@ -44,6 +44,7 @@ Update Attributes
     ...    ${CONTENT_TYPE_LD_JSON}
 
     Check Response Status Code    ${status_code}    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     ${response1}=    Retrieve Entity by Id
     ...    id=${entity_id}
     ...    context=${ngsild_test_suite_context}
diff --git a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/CreateTemporalRepresentationOfEntity/007_01.robot b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/CreateTemporalRepresentationOfEntity/007_01.robot
index 2e30ee5f995eae4a3f725a7782dc11c33df4c4e5..aae4124644b62fc47723e434adf130d17c5bf08f 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/CreateTemporalRepresentationOfEntity/007_01.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/CreateTemporalRepresentationOfEntity/007_01.robot
@@ -32,6 +32,7 @@ Create Temporal Entity
     ...    content_type=${content_type}
 
     Check Response Status Code    201    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     ${created_temporal_entity}=    Load Test Sample
     ...    temporalEntities/${filename}
     ...    ${temporal_entity_representation_id}
diff --git a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/DeleteTemporalRepresentationOfEntity/009_01.robot b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/DeleteTemporalRepresentationOfEntity/009_01.robot
index 2cb8ededc6e045a2faf6dbd0c610123f97fdb555..4273f69059561d64597ceea9da2ee80c400a6a81 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/DeleteTemporalRepresentationOfEntity/009_01.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/DeleteTemporalRepresentationOfEntity/009_01.robot
@@ -21,6 +21,7 @@ ${filename}=    vehicle-temporal-representation.jsonld
     ${response}=    Delete Temporal Representation Of Entity With Returning Response
     ...    ${temporal_entity_representation_id}
     Check Response Status Code    204    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     ${response1}=    Retrieve Temporal Representation Of Entity
     ...    temporal_entity_representation_id=${temporal_entity_representation_id}
     ...    context=${ngsild_test_suite_context}
diff --git a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/UpdateTemporalRepresentationOfEntity/008_01.robot b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/UpdateTemporalRepresentationOfEntity/008_01.robot
index 398c2e55198d2f0e8a04c6c8ef8a6df2e31eb883..2a3aabf5e69ed030dc39c77cbde318f34ee62baf 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/UpdateTemporalRepresentationOfEntity/008_01.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/UpdateTemporalRepresentationOfEntity/008_01.robot
@@ -27,6 +27,7 @@ ${expectation_filename}=    vehicle-temporal-representation-update.jsonld
     ...    content_type=${CONTENT_TYPE_LD_JSON}
 
     Check Response Status Code    204    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     ${temporal_entity_expectation_payload}=    Load Test Sample
     ...    temporalEntities/expectations/${expectation_filename}
     ...    ${temporal_entity_representation_id}
diff --git a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/AddAttributes/014_01.robot b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/AddAttributes/014_01.robot
index 23a9b371cd4b8fcb5b3c1cb277f79eb39484ebd2..e5f2ad8968d9f2013f71a1d1e075199a8b1fef66 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/AddAttributes/014_01.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/AddAttributes/014_01.robot
@@ -27,6 +27,7 @@ ${expectation_filename}=    vehicle-temporal-representation-added-attribute.json
     ...    ${CONTENT_TYPE_LD_JSON}
 
     Check Response Status Code    204    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     ${temporal_entity_expectation_payload}=    Load Test Sample
     ...    temporalEntities/expectations/${expectation_filename}
     ...    ${temporal_entity_representation_id}
diff --git a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/DeleteAttribute/015_01.robot b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/DeleteAttribute/015_01.robot
index aa1e6b1256e2cdfb28f59a9e567a978bf2ecc57f..d9a7ae93fd33a36a938817c27062f87f6a2359c4 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/DeleteAttribute/015_01.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/DeleteAttribute/015_01.robot
@@ -41,6 +41,7 @@ Delete Attribute From A Temporal Entity
     ...    context=${ngsild_test_suite_context}
 
     Check Response Status Code    ${status_code}    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     ${temporal_entity_expectation_payload}=    Load Test Sample
     ...    temporalEntities/expectations/${expectation_filename}
     ...    ${temporal_entity_representation_id}
diff --git a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/DeleteAttributeInstance/017_01.robot b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/DeleteAttributeInstance/017_01.robot
index 105ed76b7efe228750ce9983d29491e1c7b49d53..f2dbb4e7060d2b4f2abcfb09b47b2d888878503b 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/DeleteAttributeInstance/017_01.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/DeleteAttributeInstance/017_01.robot
@@ -35,6 +35,7 @@ ${expectation_filename}=    vehicle-temporal-representation-delete-speed-instanc
     ...    ${ngsild_test_suite_context}
 
     Check Response Status Code    204    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     ${temporal_entity_expectation_payload}=    Load Test Sample
     ...    temporalEntities/expectations/${expectation_filename}
     ...    ${temporal_entity_representation_id}
diff --git a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/PartialUpdateAttributeInstance/016_01.robot b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/PartialUpdateAttributeInstance/016_01.robot
index d8c1ee172834b0a71e58b8d43c5968941a02bac3..f6688478859f786ef0764b6979752e22bfb280de 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/PartialUpdateAttributeInstance/016_01.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/PartialUpdateAttributeInstance/016_01.robot
@@ -37,6 +37,7 @@ ${attributeId}=             speed
     ...    ${ngsild_test_suite_context}
 
     Check Response Status Code    204    ${response2.status_code}
+    Check Response Body Is Empty    ${response2}
     ${temporal_entity_expectation_payload}=    Load Test Sample
     ...    temporalEntities/expectations/${expectation_filename}
     ...    ${temporal_entity_representation_id}
diff --git a/TP/NGSI-LD/ContextInformation/Subscription/DeleteSubscription/032_03.robot b/TP/NGSI-LD/ContextInformation/Subscription/DeleteSubscription/032_03.robot
index a092939dc1a47aef711ebc6498583735d65bf140..ab7cc0f137276ae6f112117751baae5ee62f6dde 100644
--- a/TP/NGSI-LD/ContextInformation/Subscription/DeleteSubscription/032_03.robot
+++ b/TP/NGSI-LD/ContextInformation/Subscription/DeleteSubscription/032_03.robot
@@ -19,6 +19,7 @@ ${subscription_payload_file_path}=      subscriptions/subscription.jsonld
     [Tags]    sub-delete    5_8_5
     ${response}=    Delete Subscription    ${subscription_id}
     Check Response Status Code    204    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     ${response1}=    Retrieve Subscription
     ...    id=${subscription_id}
     Check SUT Not Containing Resource    ${response1.status_code}
diff --git a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_05.robot b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_05.robot
index b1c38a78117defc12926321df6c8cfaf452b1a8c..6c0b664864dab370a944c3f6fcc251805032022e 100644
--- a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_05.robot
+++ b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_05.robot
@@ -27,6 +27,7 @@ ${expected_expanded_subscription_payload_file_path}=    subscriptions/expectatio
     ...    ${CONTENT_TYPE_JSON}
     ...    context=${ngsild_test_suite_context}
     Check Response Status Code    204    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     ${response1}=    Retrieve Subscription
     ...    id=${subscription_id}
     ...    context=${ngsild_test_suite_context}
@@ -44,6 +45,7 @@ ${expected_expanded_subscription_payload_file_path}=    subscriptions/expectatio
     ...    ${CONTENT_TYPE_JSON}
     ...    context=${ngsild_test_suite_context}
     Check Response Status Code    204    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     ${response1}=    Retrieve Subscription
     ...    id=${subscription_id}
     Check Response Body Containing Subscription element
diff --git a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_06.robot b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_06.robot
index 003a5802a71b1c9c286fbe4bdaffaf04491ada27..e021b6c92a4f86ce447e415697c5a70e3fd3fe6a 100644
--- a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_06.robot
+++ b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_06.robot
@@ -25,6 +25,7 @@ ${subscription_update_fragment_file_path}=      subscriptions/fragments/subscrip
     ...    ${CONTENT_TYPE_JSON}
     ...    context=${ngsild_test_suite_context}
     Check Response Status Code    204    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     ${subscription_update_fragment}=    Load Test Sample    ${subscription_update_fragment_file_path}
     ${subscription}=    Upsert Element In Entity    ${subscription_payload}    ${subscription_update_fragment}
     ${response1}=    Retrieve Subscription
diff --git a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_07.robot b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_07.robot
index 6f7f021c3aa4f876bec4e82164766583aadf1660..beabf27304962b93db1c9eda5a23eed654e1034a 100644
--- a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_07.robot
+++ b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_07.robot
@@ -30,6 +30,7 @@ Activate Paused Subscription With isActive Member
     ...    ${subscription_update_fragment_file_path}
     ...    ${CONTENT_TYPE_JSON}
     Check Response Status Code    204    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     ${response1}=    Retrieve Subscription
     ...    id=${subscription_id}
     Check Response Body Containing an Attribute set to
diff --git a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_08.robot b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_08.robot
index 5ad4cbf5baf69e133d1f2776d7494c7558fefa40..818393a0cdfb86ef486a27af3ea08b79a0951f37 100644
--- a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_08.robot
+++ b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_08.robot
@@ -30,6 +30,7 @@ Activate Paused Subscription With isActive And ExpiresAt Members
     ...    ${subscription_update_fragment_file_path}
     ...    ${CONTENT_TYPE_JSON}
     Check Response Status Code    204    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     ${response1}=    Retrieve Subscription
     ...    id=${subscription_id}
     Check Response Body Containing an Attribute set to
diff --git a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_09.robot b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_09.robot
index 2748e5ed63ddfc6fac2c42c87ed431a1d2c594cc..d340616f5b683ea25c777718d97acba7325f6bd5 100644
--- a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_09.robot
+++ b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_09.robot
@@ -24,6 +24,7 @@ ${subscription_update_fragment_file_path}=      subscriptions/fragments/subscrip
     ...    ${subscription_update_fragment_file_path}
     ...    ${CONTENT_TYPE_JSON}
     Check Response Status Code    204    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     ${response1}=    Retrieve Subscription
     ...    id=${subscription_id}
     Check Response Body Containing an Attribute set to
diff --git a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_10.robot b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_10.robot
index 2d5ebb42c71b38b5c1cf2208cb08120579775209..fb9d0a051792afa5df0cc9cb76ad4e209a2a527a 100644
--- a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_10.robot
+++ b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_10.robot
@@ -35,6 +35,7 @@ ${subscription_update_fragment_file_path}       subscriptions/fragments/subscrip
     ...    ${subscription_update_fragment_file_path}
     ...    ${CONTENT_TYPE_JSON}
     Check Response Status Code    204    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     ${response1}=    Retrieve Subscription
     ...    id=${subscription_id}
     Check Response Body Containing an Attribute set to
diff --git a/TP/NGSI-LD/ContextSource/Registration/DeleteContextSourceRegistration/035_01.robot b/TP/NGSI-LD/ContextSource/Registration/DeleteContextSourceRegistration/035_01.robot
index 4db4751a9fafb58577abe3cf4fb879adc7eeb44d..2b746db62c403712d955b5d968eed06af5fb1b13 100644
--- a/TP/NGSI-LD/ContextSource/Registration/DeleteContextSourceRegistration/035_01.robot
+++ b/TP/NGSI-LD/ContextSource/Registration/DeleteContextSourceRegistration/035_01.robot
@@ -23,6 +23,7 @@ ${registration_payload_file_path}=      context-source-registration.jsonld
     ${response}=    Delete Context Source Registration With Return    ${registration_id}
 
     Check Response Status Code    204    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     ${response1}=    Retrieve Context Source Registration
     ...    context_source_registration_id=${registration_id}
     ...    context=${ngsild_test_suite_context}
diff --git a/TP/NGSI-LD/ContextSource/Registration/DeleteContextSourceRegistration/035_02.robot b/TP/NGSI-LD/ContextSource/Registration/DeleteContextSourceRegistration/035_02.robot
index 5c808ab2b0bf1ac0be440a39d4139232e4c70391..8e52961605efac8963bbc4fd1df9f2b9463c90da 100644
--- a/TP/NGSI-LD/ContextSource/Registration/DeleteContextSourceRegistration/035_02.robot
+++ b/TP/NGSI-LD/ContextSource/Registration/DeleteContextSourceRegistration/035_02.robot
@@ -30,6 +30,7 @@ Delete A Context Source
     [Arguments]    ${invalid_registration_id}    ${expected_status_code}    ${problem_type}
     ${response}=    Delete Context Source Registration With Return    ${invalid_registration_id}
     Check Response Status Code    ${expected_status_code}    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     IF    "${problem_type}"!="${EMPTY}"
         Check Response Body Containing ProblemDetails Element Containing Type Element set to
         ...    ${response.json()}
diff --git a/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_01_01.robot b/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_01_01.robot
index 7d8cd53182d03e0cd998faab47a8c6e00f388ccd..359511209552c0b386615e1320510107d92b2446 100644
--- a/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_01_01.robot
+++ b/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_01_01.robot
@@ -24,6 +24,7 @@ ${registration_payload_file_path}=      csourceRegistrations/context-source-regi
     ${registration_payload}=    Update Value To JSON    ${payload}    $..id    ${registration_id}
     ${response}=    Create Context Source Registration With Return    ${registration_payload}
     Check Response Status Code    201    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     ${response1}=    Retrieve Context Source Registration
     ...    context_source_registration_id=${registration_id}
     ...    context=${ngsild_test_suite_context}
diff --git a/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_01_02.robot b/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_01_02.robot
index 71ef3c4cd65b952ee3957706f114cc48d0043de5..f3d822c9a691baeaf6f1de89cf61150c5f43dc26 100644
--- a/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_01_02.robot
+++ b/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_01_02.robot
@@ -24,6 +24,7 @@ ${registration_payload_file_path}=      csourceRegistrations/context-source-regi
     ${registration_payload}=    Update Value To JSON    ${payload}    $..id    ${registration_id}
     ${response}=    Create Context Source Registration With Return    ${registration_payload}
     Check Response Status Code    201    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     Check Response Headers Containing URI set to    ${registration_id}    ${response.headers}
     ${response1}=    Retrieve Context Source Registration
     ...    context_source_registration_id=${registration_id}
diff --git a/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_01_03.robot b/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_01_03.robot
index 0f3974d159d1c2a68fb845839a413ffde1422943..4cbc3f27c30e5063ed45e6b55216f4a072fd12af 100644
--- a/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_01_03.robot
+++ b/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_01_03.robot
@@ -20,6 +20,7 @@ ${registration_payload_file_path}=      csourceRegistrations/context-source-regi
     ${payload}=    Load JSON From File    ${EXECDIR}/data/${registration_payload_file_path}
     ${response}=    Create Context Source Registration With Return    ${payload}
     Check Response Status Code    201    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     ${registration_id}=    Check Response Headers ID Not Empty    ${response.headers}
     Set Suite Variable    ${registration_id}
     ${id_dict}=    Create Dictionary    id=${registration_id}
diff --git a/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_04.robot b/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_04.robot
index 764c9c518ec0c0208963db3ae4055a6dba356f7b..86f49ecc3c60fbcc67fc160b243e0522bca8ee46 100644
--- a/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_04.robot
+++ b/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_04.robot
@@ -27,6 +27,7 @@ ${registration_payload_file_path}=      csourceRegistrations/context-source-regi
     ...    ${CONTENT_TYPE_JSON}
     ...    ${ngsild_test_suite_context}
     Check Response Status Code    201    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     ${response1}=    Retrieve Context Source Registration
     ...    context_source_registration_id=${registration_id}
     ...    context=${ngsild_test_suite_context}
@@ -47,6 +48,7 @@ ${registration_payload_file_path}=      csourceRegistrations/context-source-regi
     ...    ${CONTENT_TYPE_JSON}
     ...    ${ngsild_test_suite_context}
     Check Response Status Code    201    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     ${response1}=    Retrieve Context Source Registration
     ...    context_source_registration_id=${registration_id}
     Check JSON Value In Response Body
diff --git a/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_05.robot b/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_05.robot
index 4732aea516c2ee3a9109a03e5f80f6dad83ab3ff..c83383b34c320c43aac0e0b1bd3a54fcb8474eaf 100644
--- a/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_05.robot
+++ b/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_05.robot
@@ -26,6 +26,7 @@ ${registration_payload_file_path}=      csourceRegistrations/context-source-regi
     ...    ${updated_payload}
     ...    ${CONTENT_TYPE_JSON}
     Check Response Status Code    201    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     ${response1}=    Retrieve Context Source Registration
     ...    context_source_registration_id=${registration_id}
     ...    context=${ngsild_test_suite_context}
@@ -45,6 +46,7 @@ ${registration_payload_file_path}=      csourceRegistrations/context-source-regi
     ...    ${updated_payload}
     ...    ${CONTENT_TYPE_JSON}
     Check Response Status Code    201    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     ${response1}=    Retrieve Context Source Registration
     ...    context_source_registration_id=${registration_id}
     Check JSON Value In Response Body
diff --git a/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_07.robot b/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_07.robot
index ed0689e12527c280abc2f95913f059bca0d6a3d0..1cc60971de35060b62e3efc42590095e475113e4 100644
--- a/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_07.robot
+++ b/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_07.robot
@@ -26,6 +26,7 @@ ${registration_payload_file_path}=      csourceRegistrations/context-source-regi
     ...    ${updated_payload}
     ...    ${CONTENT_TYPE_LD_JSON}
     Check Response Status Code    201    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     ${response1}=    Retrieve Context Source Registration
     ...    context_source_registration_id=${registration_id}
     ...    context=${ngsild_test_suite_context}
@@ -45,6 +46,7 @@ ${registration_payload_file_path}=      csourceRegistrations/context-source-regi
     ...    ${updated_payload}
     ...    ${CONTENT_TYPE_LD_JSON}
     Check Response Status Code    201    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     ${response1}=    Retrieve Context Source Registration
     ...    context_source_registration_id=${registration_id}
     Check JSON Value In Response Body
diff --git a/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_01.robot b/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_01.robot
index fb70435691a24b6e9268f4d9491a0c6e2d106484..1b97de9667dc37fcc7ece3462229aab61772a58f 100644
--- a/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_01.robot
+++ b/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_01.robot
@@ -30,6 +30,7 @@ Update A Context Source
     ...    ${registration_update_fragment}
     ...    ${CONTENT_TYPE_JSON}
     Check Response Status Code    204    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     ${response1}=    Retrieve Context Source Registration
     ...    context_source_registration_id=${registration_id}
     Check JSON Value In Response Body
diff --git a/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_05.robot b/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_05.robot
index 2d4b4e7f4def39b357ae31fcb9a1857bd135725f..1d624e9d90813089be976c9116e148a090539fda 100644
--- a/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_05.robot
+++ b/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_05.robot
@@ -30,6 +30,7 @@ Update A Context Source
     ...    ${registration_update_fragment}
     ...    ${CONTENT_TYPE_JSON}
     Check Response Status Code    204    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     ${response1}=    Retrieve Context Source Registration
     ...    context_source_registration_id=${registration_id}
     Check JSON Value Not In Response Body
diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_01.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_01.robot
index 58762a26282b46ba35e804f42242819533496d5b..a3b08b2d4c45ff5b00549e487313a0df43047b95 100644
--- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_01.robot
+++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_01.robot
@@ -21,6 +21,7 @@ ${subscription_payload_file_path}=      csourceSubscriptions/subscription.jsonld
     ${subscription_payload}=    Load Test Sample    ${subscription_payload_file_path}    ${subscription_id}
     ${response}=    Create Context Source Registration Subscription    ${subscription_payload}
     Check Response Status Code    201    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     Check Response Headers Containing URI set to    ${subscription_id}    ${response.headers}
     ${response1}=    Retrieve Context Source Registration Subscription
     ...    subscription_id=${subscription_id}
diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_02.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_02.robot
index 48da4ed16a6a5e59e3a90bcd68e2265d7d239e71..e50bf18fffcb77dc91951207971b68c1feb9a35d 100644
--- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_02.robot
+++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_02.robot
@@ -26,6 +26,7 @@ ${subscription_id}=                     ${EMPTY}
     Set Suite Variable    ${subscription_id}
 
     Check Response Status Code    201    ${response.status_code}
+    Check Response Body Is Empty    ${response}
 
     ${response1}=    Retrieve Context Source Registration Subscription
     ...    subscription_id=${subscription_id}
diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_03.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_03.robot
index 9019a2cd182b0d2e7a1dbd1b98ca0654afc71481..1d0564e616e28ee45a5fd28af01a7aa052d7bb04 100644
--- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_03.robot
+++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_03.robot
@@ -21,6 +21,7 @@ ${subscription_payload_file_path}=      csourceSubscriptions/subscription.jsonld
     ${subscription_payload}=    Load Test Sample    ${subscription_payload_file_path}    ${subscription_id}
     ${response}=    Create Context Source Registration Subscription    ${subscription_payload}
     Check Response Status Code    201    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     Check Response Headers Containing URI set to    ${subscription_id}    ${response.headers}
     ${response1}=    Retrieve Context Source Registration Subscription
     ...    subscription_id=${subscription_id}
diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_04.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_04.robot
index 0a26912358d7e3e3714fcfe3e5565678e34d59d5..9d5e58363c85c7fe21a8e52f114c418e62efa051 100644
--- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_04.robot
+++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_04.robot
@@ -21,6 +21,7 @@ ${subscription_payload_file_path}=      csourceSubscriptions/subscription-inacti
     ${subscription_payload}=    Load Test Sample    ${subscription_payload_file_path}    ${subscription_id}
     ${response}=    Create Context Source Registration Subscription    ${subscription_payload}
     Check Response Status Code    201    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     Check Response Headers Containing URI set to    ${subscription_id}    ${response.headers}
     ${response1}=    Retrieve Context Source Registration Subscription
     ...    subscription_id=${subscription_id}
diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_05.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_05.robot
index 9a251162a46cd137e9e17ccbc7e786c14cd66dda..63711cf74775bbfa2bd185feac14faf03e84af90 100644
--- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_05.robot
+++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_05.robot
@@ -24,6 +24,7 @@ ${subscription_payload_file_path}=      csourceSubscriptions/subscription-expire
     ${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 Body Is Empty    ${response}
     Check Response Headers Containing URI set to    ${subscription_id}    ${response.headers}
     Sleep    15s
 
diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_06.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_06.robot
index 1ce57412a1a3af0006ab1a1673d62b3d615d8290..bc68ba4320ef976a35e0cc040185d0fd45b7867e 100644
--- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_06.robot
+++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_06.robot
@@ -21,6 +21,7 @@ ${subscription_payload_file_path}=      csourceSubscriptions/subscription.jsonld
     ${subscription_payload}=    Load Test Sample    ${subscription_payload_file_path}    ${subscription_id}
     ${response}=    Create Context Source Registration Subscription    ${subscription_payload}
     Check Response Status Code    201    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     Check Response Headers Containing URI set to    ${subscription_id}    ${response.headers}
     # Let's say if the subscription stills active after 10s it will be considered as perpetual, but this is not enough
     Sleep    10s
diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/DeleteContextSourceRegistrationSubscription/042_01.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/DeleteContextSourceRegistrationSubscription/042_01.robot
index 22580179fc5bbb975c2c1a9f46da9190d332da3f..340ffb040c44a624c13eb66619a24cf130159790 100644
--- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/DeleteContextSourceRegistrationSubscription/042_01.robot
+++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/DeleteContextSourceRegistrationSubscription/042_01.robot
@@ -19,6 +19,7 @@ ${subscription_payload_file_path}=      csourceSubscriptions/subscription.jsonld
     [Tags]    csrsub-delete    5_11_6
     ${response}=    Delete Context Source Registration Subscription    ${subscription_id}
     Check Response Status Code    204    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     ${response1}=    Retrieve Context Source Registration Subscription
     ...    subscription_id=${subscription_id}
     ...    context=${ngsild_test_suite_context}
diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_01.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_01.robot
index 21c60e73424163f9d77cc401c3bb5639d2b88234..8f393da9200f63d82dcb78189585984b1ffd6fdd 100644
--- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_01.robot
+++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_01.robot
@@ -24,6 +24,7 @@ ${subscription_update_fragment_file_path}=      csourceSubscriptions/fragments/s
     ...    ${subscription_id}
     ...    ${subscription_update_fragment}
     Check Response Status Code    204    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     Check Response Does Not Contain Body    ${response}
     Check Response Reason set to    ${response.reason}    No Content
 
diff --git a/TP/NGSI-LD/jsonldContext/Provision/AddContext/050_01.robot b/TP/NGSI-LD/jsonldContext/Provision/AddContext/050_01.robot
index b1deb126ea588ee19e5202cc2b65e8ea08533d90..80e1b321202c2c53f18bd61487971526f0ba384d 100644
--- a/TP/NGSI-LD/jsonldContext/Provision/AddContext/050_01.robot
+++ b/TP/NGSI-LD/jsonldContext/Provision/AddContext/050_01.robot
@@ -34,6 +34,7 @@ Add a valid @context
     ${response}=    Add a new @context    ${filename}
 
     Check Response Status Code    201    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     Check Response Does Not Contain Body    ${response}
     Check Response Reason set to    ${response.reason}    ${reason_201}
 
diff --git a/TP/NGSI-LD/jsonldContext/Provision/AddContext/050_04.robot b/TP/NGSI-LD/jsonldContext/Provision/AddContext/050_04.robot
index 8de4524a3dff15bc1e7fa0eda4f55c0773c93d31..3a424dcc101542424f59e86ddd5505c3fbf42c8d 100644
--- a/TP/NGSI-LD/jsonldContext/Provision/AddContext/050_04.robot
+++ b/TP/NGSI-LD/jsonldContext/Provision/AddContext/050_04.robot
@@ -27,6 +27,7 @@ ${content_type}=        application/json
     ${response}=    Add a new @context    ${filename_list}
 
     Check Response Status Code    201    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     Check Response Does Not Contain Body    ${response}
     Check Response Reason set to    ${response.reason}    ${reason_201}
 
diff --git a/TP/NGSI-LD/jsonldContext/Provision/DeleteContext/051_01.robot b/TP/NGSI-LD/jsonldContext/Provision/DeleteContext/051_01.robot
index 76db2a75b94a8ef821feee211afad50e5881e43e..f8b7cb877c319f734d31bea1470b3ef4651fdc54 100644
--- a/TP/NGSI-LD/jsonldContext/Provision/DeleteContext/051_01.robot
+++ b/TP/NGSI-LD/jsonldContext/Provision/DeleteContext/051_01.robot
@@ -21,6 +21,7 @@ ${reason_204}=      No Content
     ${response}=    Delete a @context    ${uri}
 
     Check Response Status Code    204    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     Check Response Reason set to    ${response.reason}    ${reason_204}
     Check Response Does Not Contain Body    ${response}
 
diff --git a/TP/NGSI-LD/jsonldContext/Provision/DeleteContext/051_03.robot b/TP/NGSI-LD/jsonldContext/Provision/DeleteContext/051_03.robot
index 5de3ac093df3f7dbe64dd1655865aedcb3257bcb..df7603b7fa881bc86d6160e6361eefef934909ea 100644
--- a/TP/NGSI-LD/jsonldContext/Provision/DeleteContext/051_03.robot
+++ b/TP/NGSI-LD/jsonldContext/Provision/DeleteContext/051_03.robot
@@ -27,6 +27,7 @@ ${reason_204}=          No Content
     ${response}=    Delete a @context    ${contextId}
 
     Check Response Status Code    204    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     Check Response Reason set to    ${response.reason}    ${reason_204}
     Check Response Does Not Contain Body    ${response}
 
diff --git a/TP/NGSI-LD/jsonldContext/Provision/DeleteContext/051_06.robot b/TP/NGSI-LD/jsonldContext/Provision/DeleteContext/051_06.robot
index f9df65d8b5c53fe61d6f051159172de59d742e17..0912fee7a62cc3e018ef062fa34f094f42948ba0 100644
--- a/TP/NGSI-LD/jsonldContext/Provision/DeleteContext/051_06.robot
+++ b/TP/NGSI-LD/jsonldContext/Provision/DeleteContext/051_06.robot
@@ -23,6 +23,7 @@ ${reason_204}=                          No Content
     ${response}=    Delete a @context    ${implicit_id}
 
     Check Response Status Code    204    ${response.status_code}
+    Check Response Body Is Empty    ${response}
     Check Response Reason set to    ${response.reason}    ${reason_204}
     Check Response Does Not Contain Body    ${response}
 
diff --git a/resources/AssertionUtils.resource b/resources/AssertionUtils.resource
index 5e4991c57cec23c27e4ed76e97b12a14db9adec7..ca5ca922fefd2af5e91b853f0f1a73e3acc321a0 100755
--- a/resources/AssertionUtils.resource
+++ b/resources/AssertionUtils.resource
@@ -59,6 +59,11 @@ Check Response Body Content
     ...    ${all_ignored_paths}
     Should Be Empty    ${comparison_result}    msg=${comparison_result.pretty()}
 
+Check Response Body Is Empty
+    [Arguments]    ${response}
+    ${response_text}=    Convert To String    ${response.text}
+    Should Be Empty    ${response_text}
+
 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}