diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_09.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_09.robot
index ff1be30b259660dda5427eb64d39a98dd3d0cc3e..a2fde19fb21ba079f17d76a994602b51fdbc439b 100644
--- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_09.robot
+++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_09.robot
@@ -17,7 +17,7 @@ ${expectation_file}=    vehicles-temporal-representation-021-09-expectation.json
 Near Point            near;maxDistance==2000    Point       [-8.503,41.202]                                                                  ${EMPTY}       vehicles-temporal-representation-021-09-01-expectation.jsonld
                       [Tags]                    te-query    5_7_4
 
-Within Polygon        within                    Polygon     [[-13.503,47.202],[6.541, 52.961],[20.37,44.653],[9.46,32.57],[-15.23,21.37]]    location       vehicles-temporal-representation-021-09-02-expectation.jsonld
+Within Polygon        contains                  Polygon     [[[-13.503,47.202],[6.541, 52.961],[20.37,44.653],[9.46,32.57],[-13.503,32.57],[-13.503,47.202]]]  location       vehicles-temporal-representation-021-09-02-expectation.jsonld
                       [Tags]                    te-query    5_7_4
 
 *** Keywords ***
diff --git a/data/temporalEntities/2020-10-vehicule-temporal-representation-with-location-sample.jsonld b/data/temporalEntities/2020-10-vehicule-temporal-representation-with-location-sample.jsonld
index 95f6ffc010105c373ac56c178780ebf665bca13f..6b4f6c1effeb37e987e1b5825b62b0117b3198a6 100644
--- a/data/temporalEntities/2020-10-vehicule-temporal-representation-with-location-sample.jsonld
+++ b/data/temporalEntities/2020-10-vehicule-temporal-representation-with-location-sample.jsonld
@@ -37,20 +37,26 @@
    ],
    "location":[
       {
-         "type":"Point",
-         "coordinates":[
-            -8.5,
-            41.2
-         ],
-         "observedAt":"2020-10-01T12:03:00Z"
+        "type": "GeoProperty",
+        "value": {
+            "type":"Point",
+            "coordinates":[
+                2.35,
+                42.22
+            ]
+        },
+        "observedAt":"2020-10-01T12:03:00Z"
       },
       {
-         "type":"Point",
-         "coordinates":[
-            2.35,
-            42.22
-         ],
-         "observedAt":"2020-10-01T12:05:00Z"
+        "type": "GeoProperty",
+        "value": {
+             "type":"Point",
+             "coordinates":[
+                -8.5,
+                41.2
+            ]
+        },
+        "observedAt":"2020-10-01T12:05:00Z"
       }
    ],
    "@context":[
diff --git a/data/temporalEntities/expectations/vehicles-temporal-representation-021-09-01-expectation.jsonld b/data/temporalEntities/expectations/vehicles-temporal-representation-021-09-01-expectation.jsonld
index bb57e441be7ccf4ada775eb8138f1e41bab889ed..f72267e5cdcb741156012a000e482e0a5e1bcb7f 100644
--- a/data/temporalEntities/expectations/vehicles-temporal-representation-021-09-01-expectation.jsonld
+++ b/data/temporalEntities/expectations/vehicles-temporal-representation-021-09-01-expectation.jsonld
@@ -38,12 +38,26 @@
       ],
       "location":[
          {
-            "type":"Point",
-            "coordinates":[
-               -8.5,
-               41.2
-            ],
+            "type": "GeoProperty",
+            "value": {
+                "type":"Point",
+                "coordinates":[
+                    2.35,
+                    42.22
+                ]
+            },
             "observedAt":"2020-10-01T12:03:00Z"
+         },
+         {
+            "type": "GeoProperty",
+            "value": {
+                "type":"Point",
+                "coordinates":[
+                   -8.5,
+                   41.2
+                ]
+            },
+            "observedAt":"2020-10-01T12:05:00Z"
          }
       ]
    }
diff --git a/data/temporalEntities/expectations/vehicles-temporal-representation-021-09-02-expectation.jsonld b/data/temporalEntities/expectations/vehicles-temporal-representation-021-09-02-expectation.jsonld
index 5930cc29e97c265c17e6e1bc156d27d95c7579d8..f72267e5cdcb741156012a000e482e0a5e1bcb7f 100644
--- a/data/temporalEntities/expectations/vehicles-temporal-representation-021-09-02-expectation.jsonld
+++ b/data/temporalEntities/expectations/vehicles-temporal-representation-021-09-02-expectation.jsonld
@@ -38,19 +38,25 @@
       ],
       "location":[
          {
-            "type":"Point",
-            "coordinates":[
-               -8.5,
-               41.2
-            ],
+            "type": "GeoProperty",
+            "value": {
+                "type":"Point",
+                "coordinates":[
+                    2.35,
+                    42.22
+                ]
+            },
             "observedAt":"2020-10-01T12:03:00Z"
          },
          {
-            "type":"Point",
-            "coordinates":[
-               -8.45,
-               41.22
-            ],
+            "type": "GeoProperty",
+            "value": {
+                "type":"Point",
+                "coordinates":[
+                   -8.5,
+                   41.2
+                ]
+            },
             "observedAt":"2020-10-01T12:05:00Z"
          }
       ]