diff --git a/data/csourceRegistrations/fragments/context-source-registration-update-sample.jsonld b/data/csourceRegistrations/fragments/context-source-registration-update-sample.jsonld
deleted file mode 100644
index 795d209e4484698edd1e43a9a750622e7a8e8c87..0000000000000000000000000000000000000000
--- a/data/csourceRegistrations/fragments/context-source-registration-update-sample.jsonld
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-   "endpoint":"http://my.new.csource.org:1026",
-   "@context": [
-       "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.3.jsonld"
-   ]
-}
\ No newline at end of file
diff --git a/data/entities/building-minimal.jsonld b/data/entities/building-minimal.jsonld
deleted file mode 100644
index 3de15791f3e396964b4372134517b6656b338fde..0000000000000000000000000000000000000000
--- a/data/entities/building-minimal.jsonld
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "id": "urn:ngsi-ld:Building:3009ef20-9f62-41f5-bd66-92f041b428b9",
-    "type": "Building",
-    "@context": [
-        "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld",
-        "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.3.jsonld"
-    ]
-}
\ No newline at end of file
diff --git a/data/entities/building-no-attributes.jsonld b/data/entities/building-no-attributes.jsonld
deleted file mode 100644
index 42c0f2af8430b1e31e517906e628376d292e7b25..0000000000000000000000000000000000000000
--- a/data/entities/building-no-attributes.jsonld
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "id": "urn:ngsi-ld:Building:randomUUID",
-    "type": "Building",
-    "name": {
-        "type": "Property",
-        "value": "Eiffel Tower"
-    },
-    "@context": [
-        "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld"
-    ]
-}
\ No newline at end of file
diff --git a/data/entities/building-relationship.jsonld b/data/entities/building-relationship.jsonld
deleted file mode 100644
index d2151f1ec7113bb8c6bdb3634d1c69adb8d61e02..0000000000000000000000000000000000000000
--- a/data/entities/building-relationship.jsonld
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "id": "urn:ngsi-ld:Building:3009ef20-9f62-41f5-bd66-92f041b428b9",
-    "type": "Building",
-    "locatedAt": {
-        "type": "Relationship",
-        "object": "urn:ngsi-ld:City:Paris"
-    },
-    "@context": [
-        "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld",
-        "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.3.jsonld"
-    ]
-}
\ No newline at end of file
diff --git a/data/entities/expectations/vehicle-parking-sample-expectation.json b/data/entities/expectations/vehicle-parking-sample-expectation.json
deleted file mode 100644
index 0205a53fbc0486aa63a51f59fefeab0eb8675d1e..0000000000000000000000000000000000000000
--- a/data/entities/expectations/vehicle-parking-sample-expectation.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "id": "urn:ngsi-ld:OffStreetParking:randomUUID",
-        "type": "https://ngsi-ld-test-suite/context#OffStreetParking",
-        "availableSpotNumber": {
-            "type": "Property",
-            "providedBy": {
-                "type": "Relationship",
-                "object": "urn:ngsi-ld:Camera:C1"
-            },
-            "reliability": {
-                "type": "Property",
-                "value": 0.7
-            },
-            "value": 121,
-            "observedAt": "2017-07-29T12:05:02Z"
-        },
-        "totalSpotNumber": {
-            "type": "Property",
-            "value": 200
-        },
-        "location": {
-            "type": "GeoProperty",
-            "value": {
-                "type": "Point",
-                "coordinates": [
-                    -8.5,
-                    41.2
-                ]
-            }
-        },
-        "name": {
-            "type": "Property",
-            "value": "Downtown One"
-        }
-    },
-    {
-        "id": "urn:ngsi-ld:Vehicle:randomUUID",
-        "type": "https://ngsi-ld-test-suite/context#Vehicle",
-        "https://ngsi-ld-test-suite/context#brandName": {
-            "type": "Property",
-            "value": "Mercedes"
-        },
-        "isParked": {
-            "type": "Relationship",
-            "providedBy": {
-                "type": "Relationship",
-                "object": "urn:ngsi-ld:Person:Bob"
-            },
-            "object": "urn:ngsi-ld:OffStreetParking:Downtown1",
-            "observedAt": "2017-07-29T12:00:04Z"
-        }
-    }
-]
\ No newline at end of file
diff --git a/data/entities/fragmentEntities/vehicle-empty-fragment.jsonld b/data/entities/fragmentEntities/vehicle-empty-fragment.jsonld
deleted file mode 100644
index 7a73a41bfdf76d6f793007240d80983a52f15f97..0000000000000000000000000000000000000000
--- a/data/entities/fragmentEntities/vehicle-empty-fragment.jsonld
+++ /dev/null
@@ -1,2 +0,0 @@
-{
-}
\ No newline at end of file
diff --git a/data/subscriptions/fragments/subscription-building-entities-sample.json b/data/subscriptions/fragments/subscription-building-entities-sample.json
deleted file mode 100644
index b6630a1f0e7ddb8aa3aa2583d9ff6229b9b7733a..0000000000000000000000000000000000000000
--- a/data/subscriptions/fragments/subscription-building-entities-sample.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-   "type":"Subscription",
-   "entities":[
-      {
-         "type":"Building"
-      }
-   ],
-   "notification":{
-      "format":"keyValues",
-      "endpoint":{
-         "uri":"http://my.endpoint.org/notify",
-         "accept":"application/json"
-      }
-   }
-}
\ No newline at end of file
diff --git a/data/temporalEntities/expectations/vehicles-temporal-representation-021-11-01-expectation.jsonld b/data/temporalEntities/expectations/vehicles-temporal-representation-021-11-01-expectation.jsonld
deleted file mode 100644
index 5044fa08184054eda1b0425557c9ac9e7f2cebd7..0000000000000000000000000000000000000000
--- a/data/temporalEntities/expectations/vehicles-temporal-representation-021-11-01-expectation.jsonld
+++ /dev/null
@@ -1,78 +0,0 @@
-[
-   {
-      "id":"urn:ngsi-ld:Vehicle:randomUUID",
-      "type":"Vehicle",
-      "fuelLevel":[
-         {
-            "type":"Property",
-            "value":67,
-            "observedAt":"2020-08-01T12:03:00Z"
-         },
-         {
-            "type":"Property",
-            "value":53,
-            "observedAt":"2020-08-01T13:05:00Z"
-         },
-         {
-            "type":"Property",
-            "value":40,
-            "observedAt":"2020-08-01T14:07:00Z"
-         }
-      ],
-      "speed":[
-         {
-            "type":"Property",
-            "value":120,
-            "observedAt":"2020-08-01T12:03:00Z"
-         },
-         {
-            "type":"Property",
-            "value":80,
-            "observedAt":"2020-08-01T12:05:00Z"
-         },
-         {
-            "type":"Property",
-            "value":100,
-            "observedAt":"2020-08-01T12:07:00Z"
-         }
-      ]
-   },
-   {
-      "id":"urn:ngsi-ld:Vehicle:randomUUID",
-      "type":"Vehicle",
-      "fuelLevel":[
-         {
-            "type":"Property",
-            "value":53,
-            "observedAt":"2020-09-01T13:05:00Z"
-         },
-         {
-            "type":"Property",
-            "value":67,
-            "observedAt":"2020-09-01T12:03:00Z"
-         },
-         {
-            "type":"Property",
-            "value":40,
-            "observedAt":"2020-09-01T14:07:00Z"
-         }
-      ],
-      "speed":[
-         {
-            "type":"Property",
-            "value":120,
-            "observedAt":"2020-09-01T12:03:00Z"
-         },
-         {
-            "type":"Property",
-            "value":80,
-            "observedAt":"2020-09-01T12:05:00Z"
-         },
-         {
-            "type":"Property",
-            "value":100,
-            "observedAt":"2020-09-01T12:07:00Z"
-         }
-      ]
-   }
-]
\ No newline at end of file
diff --git a/data/temporalEntities/expectations/vehicles-temporal-representation-021-11-02-expectation.jsonld b/data/temporalEntities/expectations/vehicles-temporal-representation-021-11-02-expectation.jsonld
deleted file mode 100644
index e48ad9d2f48b4b805dbb01d761403960daeb1634..0000000000000000000000000000000000000000
--- a/data/temporalEntities/expectations/vehicles-temporal-representation-021-11-02-expectation.jsonld
+++ /dev/null
@@ -1,116 +0,0 @@
-[
-   {
-      "id":"urn:ngsi-ld:Vehicle:randomUUID",
-      "type":"Vehicle",
-      "fuelLevel":[
-         {
-            "type":"Property",
-            "value":67,
-            "observedAt":"2020-08-01T12:03:00Z"
-         },
-         {
-            "type":"Property",
-            "value":53,
-            "observedAt":"2020-08-01T13:05:00Z"
-         },
-         {
-            "type":"Property",
-            "value":40,
-            "observedAt":"2020-08-01T14:07:00Z"
-         }
-      ],
-      "speed":[
-         {
-            "type":"Property",
-            "value":120,
-            "observedAt":"2020-08-01T12:03:00Z"
-         },
-         {
-            "type":"Property",
-            "value":80,
-            "observedAt":"2020-08-01T12:05:00Z"
-         },
-         {
-            "type":"Property",
-            "value":100,
-            "observedAt":"2020-08-01T12:07:00Z"
-         }
-      ]
-   },
-   {
-      "id":"urn:ngsi-ld:Vehicle:randomUUID",
-      "type":"Vehicle",
-      "fuelLevel":[
-         {
-            "type":"Property",
-            "value":53,
-            "observedAt":"2020-09-01T13:05:00Z"
-         },
-         {
-            "type":"Property",
-            "value":67,
-            "observedAt":"2020-09-01T12:03:00Z"
-         },
-         {
-            "type":"Property",
-            "value":40,
-            "observedAt":"2020-09-01T14:07:00Z"
-         }
-      ],
-      "speed":[
-         {
-            "type":"Property",
-            "value":120,
-            "observedAt":"2020-09-01T12:03:00Z"
-         },
-         {
-            "type":"Property",
-            "value":80,
-            "observedAt":"2020-09-01T12:05:00Z"
-         },
-         {
-            "type":"Property",
-            "value":100,
-            "observedAt":"2020-09-01T12:07:00Z"
-         }
-      ]
-   },
-   {
-      "id":"urn:ngsi-ld:Bus:randomUUID",
-      "type":"Bus",
-      "fuelLevel":[
-         {
-            "type":"Property",
-            "value":210,
-            "observedAt":"2020-08-01T12:03:00Z"
-         },
-         {
-            "type":"Property",
-            "value":145,
-            "observedAt":"2020-08-01T13:05:00Z"
-         },
-         {
-            "type":"Property",
-            "value":124,
-            "observedAt":"2020-08-01T14:07:00Z"
-         }
-      ],
-      "speed":[
-         {
-            "type":"Property",
-            "value":45,
-            "observedAt":"2020-08-01T12:03:00Z"
-         },
-         {
-            "type":"Property",
-            "value":25,
-            "observedAt":"2020-08-01T12:05:00Z"
-         },
-         {
-            "type":"Property",
-            "value":67,
-            "observedAt":"2020-08-01T12:07:00Z"
-         }
-      ]
-   }
-]
\ No newline at end of file
diff --git a/data/temporalEntities/vehicle-simplified-temporal-representation-sample.jsonld b/data/temporalEntities/vehicle-simplified-temporal-representation-sample.jsonld
deleted file mode 100644
index 8ffa880fa4c7566a00f25053ac684080057a79c2..0000000000000000000000000000000000000000
--- a/data/temporalEntities/vehicle-simplified-temporal-representation-sample.jsonld
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-   "id": "urn:ngsi-ld:Vehicle:randomUUID",
-   "type": "Vehicle",
-   "brandName": {
-      "type": "Property",
-      "values": [
-         ["Volvo",""]
-      ]
-   },
-   "speed": {
-      "type": "Property",
-      "values": [
-         [120,"2018-08-01T12:03:00Z"],
-         [80,"2018-08-01T12:05:00Z"],
-         [100,"2018-08-01T12:07:00Z"]
-      ]
-   }, 
-   "@context":[
-      "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld"
-   ]
-}
\ No newline at end of file
diff --git a/data/temporalEntities/vehicle-temporal-invalid-context-sample.jsonld b/data/temporalEntities/vehicle-temporal-invalid-context-sample.jsonld
deleted file mode 100644
index 33659f6b0c9d4dfa58b5a6d6012c281ee8914c96..0000000000000000000000000000000000000000
--- a/data/temporalEntities/vehicle-temporal-invalid-context-sample.jsonld
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-   "id":"urn:ngsi-ld:Vehicle:randomUUID",
-   "type":"Vehicle",
-   "speed":[
-      {
-         "type":"Property",
-         "value":120,
-         "observedAt":"2020-09-01T12:03:00Z"
-      },
-      {
-         "type":"Property",
-         "value":80,
-         "observedAt":"2020-09-01T12:05:00Z"
-      },
-      {
-         "type":"Property",
-         "value":100,
-         "observedAt":"2020-09-01T12:07:00Z"
-      }
-   ],
-   "fuelLevel":[
-      {
-         "type":"Property",
-         "value":67,
-         "observedAt":"2020-09-01T12:03:00Z"
-      },
-      {
-         "type":"Property",
-         "value":53,
-         "observedAt":"2020-09-01T13:05:00Z"
-      },
-      {
-         "type":"Property",
-         "value":40,
-         "observedAt":"2020-09-01T14:07:00Z"
-      }
-   ],
-   "@context":[
-      "invalidcontext"
-   ]
-}
\ No newline at end of file
diff --git a/data/temporalEntities/vehicle-temporal-representation-without-context-sample.jsonld b/data/temporalEntities/vehicle-temporal-representation-without-context-sample.jsonld
deleted file mode 100644
index b50a1eab2323c6ad6ee9d0e4035b8dded9d77883..0000000000000000000000000000000000000000
--- a/data/temporalEntities/vehicle-temporal-representation-without-context-sample.jsonld
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-   "id":"urn:ngsi-ld:Vehicle:randomUUID",
-   "type":"Vehicle",
-   "speed":[
-      {
-         "type":"Property",
-         "value":120,
-         "observedAt":"2020-09-01T12:03:00Z"
-      },
-      {
-         "type":"Property",
-         "value":80,
-         "observedAt":"2020-09-01T12:05:00Z"
-      },
-      {
-         "type":"Property",
-         "value":100,
-         "observedAt":"2020-09-01T12:07:00Z"
-      }
-   ],
-   "fuelLevel":[
-      {
-         "type":"Property",
-         "value":67,
-         "observedAt":"2020-09-01T12:03:00Z"
-      },
-      {
-         "type":"Property",
-         "value":53,
-         "observedAt":"2020-09-01T13:05:00Z"
-      },
-      {
-         "type":"Property",
-         "value":40,
-         "observedAt":"2020-09-01T14:07:00Z"
-      }
-   ]
-}
\ No newline at end of file