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 99903ba3f0c5839c6235d12e203e1f36e475d1b7..52f642b9a8eb174c077e38c20dd1ae99cc68f007 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_02.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_02.robot
@@ -17,15 +17,15 @@ ${entity_payload_filename}=     building-simple-attributes-sample.jsonld
 
 
 *** Test Cases ***    FILENAME    UPDATE_FRAGMENT_FILENAME    EXPECTED_STATUS
-005_02_01 EntityWithSimpleProperties
+005_02_01 EntityWithExistingAttributes
     [Tags]    be-update    5_6_9
-    building-simple-attributes-sample.jsonld    fragmentEntities/empty-fragment.json    207
-005_02_02 EntityWithSimpleRelationships
+    building-simple-attributes-sample.jsonld    fragmentEntities/empty-fragment.json    204
+005_02_02 EntityWithNewAttribute
     [Tags]    be-update    5_6_9
     building-relationship-sample.jsonld    fragmentEntities/locatedAt-fragment.json    204
-005_02_03 EntityWithRelationshipsProperties
+005_02_03 EntityWithNewAndExistingAttribute
     [Tags]    be-update    5_6_9
-    building-relationship-of-property-sample.jsonld    fragmentEntities/empty-fragment.json    207
+    building-location-attribute-sample.jsonld    fragmentEntities/location-fragment.json    204
 
 
 *** Keywords ***
diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_04.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_04.robot
index 48f05489db270248e6f9cf9ff03ba8e093120484..df1b0df48ebe6773d93de58490ef69be2d58de93 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_04.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_04.robot
@@ -17,9 +17,9 @@ ${filename}=                vehicle-speed-two-datasetid-sample.jsonld
 
 
 *** Test Cases ***    STATUS_CODE    FRAGMENT_FILENAME    EXPECTATION_RESPONSE_BODY    EXPECTATION_FILENAME
-010_04_01 Append entity attributes
-    207    vehicle-attribute-to-add-fragment.jsonld    add-attribute-expectation.jsonld    vehicle-speed-appended-expectation.jsonld
-010_04_02 Append entity attributes
+010_04_01 Append entity attributes and ignore existing multi-attribute instance
+    204    vehicle-attribute-to-add-fragment.jsonld    ${EMPTY}    vehicle-speed-appended-expectation.jsonld
+010_04_02 Append entity attributes with a new multi-attribute instance
     204    vehicle-speed-different-datasetid-fragment.jsonld    ${EMPTY}    vehicle-speed-different-datasetid-expectation.jsonld
 
 
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 7acc04ab7e72295a90f75ba74f0a4836d42e84af..b69c09fc80fa3cb25863e65d02d45f291efa71e4 100644
--- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_01.robot
+++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_01.robot
@@ -21,8 +21,8 @@ ${filename}=                vehicle-two-datasetid-attributes-sample.jsonld
     204    vehicle-speed-two-datasetid-01-fragment.jsonld    ${EMPTY}    expectations/vehicle-update-attributes-expectation.jsonld
 011_01_02 Check that you can update existing attributes with the datasetId
     204    vehicle-speed-two-datasetid-02-fragment.jsonld    ${EMPTY}    expectations/vehicle-update-datasetid-attributes-expectation.jsonld
-011_01_03 Check that you can update only some attributes while others failed
-    207    vehicle-speed-two-datasetid-03-fragment.jsonld    vehicle-speed-datasetid-expectation.jsonld    expectations/vehicle-multi-attributes-expectation.jsonld
+011_01_03 Check that you can update only some attributes while unknown are ignored
+    204    vehicle-speed-two-datasetid-03-fragment.jsonld    ${EMPTY}    expectations/vehicle-multi-attributes-expectation.jsonld
 
 
 *** Keywords ***
diff --git a/data/entities/expectations/add-attribute-expectation.jsonld b/data/entities/expectations/add-attribute-expectation.jsonld
deleted file mode 100644
index c6c6eb75115ed6f6fa660edeed6a6659691f13e2..0000000000000000000000000000000000000000
--- a/data/entities/expectations/add-attribute-expectation.jsonld
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "updated":[
-       "https://uri.etsi.org/ngsi-ld/default-context/attribute_to_be_added"
-    ],
-    "notUpdated":[ 
-      {
-         "attributeName": "https://ngsi-ld-test-suite/context#speed",
-         "reason": "a reason ignored during the comparison"
-      }
-    ]
- }
\ No newline at end of file
diff --git a/data/entities/expectations/vehicle-speed-datasetid-expectation.jsonld b/data/entities/expectations/vehicle-speed-datasetid-expectation.jsonld
deleted file mode 100644
index d1ea2d5444c9e6b894986adef2672f3782e46ec7..0000000000000000000000000000000000000000
--- a/data/entities/expectations/vehicle-speed-datasetid-expectation.jsonld
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "updated":[
-        "https://ngsi-ld-test-suite/context#speed"
-    ],
-    "notUpdated":[ ]
- }
\ No newline at end of file
diff --git a/data/entities/fragmentEntities/location-fragment.json b/data/entities/fragmentEntities/location-fragment.json
new file mode 100644
index 0000000000000000000000000000000000000000..00006a2a814b7eb03cb0ee8b8ecf0b94d3f65f19
--- /dev/null
+++ b/data/entities/fragmentEntities/location-fragment.json
@@ -0,0 +1,12 @@
+{
+  "location": {
+    "type": "GeoProperty",
+    "value": {
+      "type": "Point",
+      "coordinates": [
+        13.3986,
+        52.5547
+      ]
+    }
+  }
+}
\ No newline at end of file