diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_02_01.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_02_01.robot
index cc7199b4be86d5f8d4792590af53c6491657ec0e..16e60ab330808932239439bcb411f0026229f69c 100644
--- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_02_01.robot
+++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_02_01.robot
@@ -16,7 +16,7 @@ ${entity_type}=             https://ngsi-ld-test-suite/context#Building
 
 
 *** Test Cases ***
-Query several entities via POST Interaction based on ids
+019_02_01 Query several entities via POST Interaction based on ids
     [Documentation]    Check that you can query several entities via POST Interaction based on ids
     [Tags]    e-query    5_7_2
     ${first_entity_id}=    Generate Random Entity Id    ${building_id_prefix}
@@ -26,11 +26,6 @@ Query several entities via POST Interaction based on ids
     ...    ${first_entity_id}
     ...    ${CONTENT_TYPE_LD_JSON}
     Check Response Status Code    201    ${response.status_code}
-    ${response}=    Create Entity Selecting Content Type
-    ...    ${filename}
-    ...    ${first_entity_id}
-    ...    ${CONTENT_TYPE_LD_JSON}
-    Check Response Status Code    201    ${response.status_code}
     ${second_entity_id}=    Generate Random Entity Id    ${building_id_prefix}
     Set Suite Variable    ${second_entity_id}
     ${response}=    Create Entity Selecting Content Type
@@ -45,6 +40,11 @@ Query several entities via POST Interaction based on ids
     ...    ${third_entity_id}
     ...    ${CONTENT_TYPE_LD_JSON}
     Check Response Status Code    201    ${response.status_code}
+    ${response}=    Create Entity Selecting Content Type
+    ...    ${filename}
+    ...    ${third_entity_id}
+    ...    ${CONTENT_TYPE_LD_JSON}
+    Check Response Status Code    409    ${response.status_code}
     @{entities_ids_to_be_compared}=    Create List    ${first_entity_id}    ${second_entity_id}
     ${entities_ids_to_be_retrieved}=    Catenate    SEPARATOR=,    ${first_entity_id}    ${second_entity_id}
     ${entity_types_to_be_retrieved}=    Catenate    SEPARATOR=,    ${entity_type}
diff --git a/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_02.robot b/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_02.robot
index 97fda2bb05980b6746663778090f5adc06727cce..21d13f5fd6f853f1a7b26f4cd4e82f40803cd92d 100644
--- a/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_02.robot
+++ b/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_02.robot
@@ -45,7 +45,7 @@ Create a context source registration with invalid JSON file
     ${registration_id}=    Generate Random Entity Id    ${registration_id_prefix}
     ${response}=    Create Context Source Registration
     ...    ${registration_payload_file_path}
-    Check Response Status Code    <Response [400]>    ${response.status_code}
+    Check Response Status Code    400    ${response.status_code}
     Check Response Body Type When Using Session Request    ${response.json()}    ${ERROR_TYPE_BAD_REQUEST_DATA}
     Check Response Body Title When Using Session Request    ${response.json()}
     [Teardown]    Delete Entity by Id Returning Response    ${registration_id}
diff --git a/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_04.robot b/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_04.robot
index 7a4ac3e658455228a909173f598b2a560f016028..9e4d9e4795f28d47e5ec4446927d93af9dbaf28a 100644
--- a/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_04.robot
+++ b/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_04.robot
@@ -14,7 +14,7 @@ ${registration_payload_file_path}=      csourceRegistrations/context-source-regi
 
 
 *** Test Cases ***
-Create one context source registration using a provided Link header with JSON content type
+033_04_01 Create one context source registration using a provided Link header with JSON content type
     [Documentation]    Check that the @context is obtained from a Link Header if the Content-Type header is "application/json"
     [Tags]    csr-create    6_3_5
     ${registration_id}=    Generate Random Entity Id    ${registration_id_prefix}
@@ -27,10 +27,10 @@ Create one context source registration using a provided Link header with JSON co
     ...    ${ngsild_test_suite_context}
     Check Response Status Code    201    ${response.status_code}
     ${response}=    Retrieve Context Source Registration    ${registration_id}    context=${ngsild_test_suite_context}
-    Check JSON Value In Response Body    ['information']['entities'][0]['type']    Building    ${response.json()}
+    Check JSON Value In Response Body    ['information'][0]['entities'][0]['type']    Building    ${response.json()}
     ${response}=    Retrieve Context Source Registration    ${registration_id}
     Check JSON Value In Response Body
-    ...    ['information']['entities'][0]['type']
+    ...    ['information'][0]['entities'][0]['type']
     ...    https://ngsi-ld-test-suite/context#Building
     ...    ${response.json()}
 
diff --git a/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_05.robot b/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_05.robot
index a22690bf6ba23a0c4df38c83320067e09cd3332b..6864dd43bad55d76e904bd42fc416762e1af37e9 100644
--- a/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_05.robot
+++ b/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_05.robot
@@ -14,7 +14,7 @@ ${registration_payload_file_path}=      csourceRegistrations/context-source-regi
 
 
 *** Test Cases ***
-Create one context source registration using the default context with JSON content type
+033_05_01 Create one context source registration using the default context with JSON content type
     [Documentation]    Check that the default @context is used if the Content-Type header is "application/json" and the Link header does not contain a JSON-LD @context
     [Tags]    csr-create    6_3_5
     ${registration_id}=    Generate Random Entity Id    ${registration_id_prefix}
@@ -27,11 +27,11 @@ Create one context source registration using the default context with JSON conte
     Check Response Status Code    201    ${response.status_code}
     ${response}=    Retrieve Context Source Registration    ${registration_id}    context=${ngsild_test_suite_context}
     Check JSON Value In Response Body
-    ...    ['information']['entities'][0]['type']
+    ...    ['information'][0]['entities'][0]['type']
     ...    ngsi-ld:default-context/Building
     ...    ${response.json()}
     ${response}=    Retrieve Context Source Registration    ${registration_id}
-    Check JSON Value In Response Body    ['information']['entities'][0]['type']    Building    ${response.json()}
+    Check JSON Value In Response Body    ['information'][0]['entities'][0]['type']    Building    ${response.json()}
 
 
 *** Keywords ***
diff --git a/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_07.robot b/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_07.robot
index 7af118db1ba5c32536bee28991e0b66301356741..d80bfecdab7967e9ef70db5738c6c81907b2d72d 100644
--- a/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_07.robot
+++ b/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_07.robot
@@ -14,7 +14,7 @@ ${registration_payload_file_path}=      csourceRegistrations/context-source-regi
 
 
 *** Test Cases ***
-Create one context source registration using a JSON-LD @context obtained from the request payload
+033_07_01 Create one context source registration using a JSON-LD @context obtained from the request payload
     [Documentation]    Check that the @context is obtained from the request payload body itself if the Content-Type header is "application/ld+json"
     [Tags]    csr-create    6_3_5
     ${registration_id}=    Generate Random Entity Id    ${registration_id_prefix}
@@ -26,10 +26,10 @@ Create one context source registration using a JSON-LD @context obtained from th
     ...    ${CONTENT_TYPE_LD_JSON}
     Check Response Status Code    201    ${response.status_code}
     ${response}=    Retrieve Context Source Registration    ${registration_id}    context=${ngsild_test_suite_context}
-    Check JSON Value In Response Body    ['information']['entities'][0]['type']    Building    ${response.json()}
+    Check JSON Value In Response Body    ['information'][0]['entities'][0]['type']    Building    ${response.json()}
     ${response}=    Retrieve Context Source Registration    ${registration_id}
     Check JSON Value In Response Body
-    ...    ['information']['entities'][0]['type']
+    ...    ['information'][0]['entities'][0]['type']
     ...    https://ngsi-ld-test-suite/context#Building
     ...    ${response.json()}