diff --git a/testing/indexer-test-core/src/main/resources/features/indexrecord/IndexRecord.feature b/testing/indexer-test-core/src/main/resources/features/indexrecord/IndexRecord.feature
index a06fa2efcbcb9107b184934c0304bf105afbb85e..3e1a935f606ae0e0758074ae2106ac03893f23c7 100644
--- a/testing/indexer-test-core/src/main/resources/features/indexrecord/IndexRecord.feature
+++ b/testing/indexer-test-core/src/main/resources/features/indexrecord/IndexRecord.feature
@@ -15,8 +15,8 @@ Feature: Indexing of the documents
 
     Examples:
       | kind                                      | recordFile        | number | index                                     | type   | acl                                    | mapping                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
-      | "tenant1:testindex<timestamp>:well:1.0.0" | "index_records_1" | 5      | "tenant1-testindex<timestamp>-well-1.0.0" | "well" | "data.default.viewers@tenant1" | "{"mappings":{"well":{"dynamic":"false","properties":{"acl":{"properties":{"owners":{"type":"keyword"},"viewers":{"type":"keyword"}}},"ancestry":{"properties":{"parents":{"type":"keyword"}}},"data":{"properties":{"Basin":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"Country":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"County":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"EmptyAttribute":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"Established":{"type":"date"},"Field":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"Location":{"type":"geo_point"},"OriginalOperator":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"Rank":{"type":"integer"},"Score":{"type":"integer"},"State":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"WellName":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"WellStatus":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"WellType":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"DblArray":{"type":"double"}}},"id":{"type":"keyword"},"index":{"properties":{"lastUpdateTime":{"type":"date"},"statusCode":{"type":"integer"},"trace":{"type":"text"}}},"kind":{"type":"keyword"},"legal":{"properties":{"legaltags":{"type":"keyword"},"otherRelevantDataCountries":{"type":"keyword"},"status":{"type":"keyword"}}},"namespace":{"type":"keyword"},"type":{"type":"keyword"},"version":{"type":"long"},"x-acl":{"type":"keyword"}}}}}" |
-      | "tenant1:testindex<timestamp>:well:3.0.0" | "index_records_1" | 5      | "tenant1-testindex<timestamp>-well-3.0.0" | "well" | "data.default.viewers@tenant1" | "{"mappings":{"well":{"dynamic":"false","properties":{"acl":{"properties":{"owners":{"type":"keyword"},"viewers":{"type":"keyword"}}},"ancestry":{"properties":{"parents":{"type":"keyword"}}},"data":{"properties":{"Basin":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"Country":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"County":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"EmptyAttribute":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"Established":{"type":"date"},"Field":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"Location":{"type":"geo_point"},"OriginalOperator":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"Rank":{"type":"integer"},"Score":{"type":"integer"},"State":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"WellName":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"WellStatus":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"WellType":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"DblArray":{"type":"double"}}},"id":{"type":"keyword"},"index":{"properties":{"lastUpdateTime":{"type":"date"},"statusCode":{"type":"integer"},"trace":{"type":"text"}}},"kind":{"type":"keyword"},"legal":{"properties":{"legaltags":{"type":"keyword"},"otherRelevantDataCountries":{"type":"keyword"},"status":{"type":"keyword"}}},"namespace":{"type":"keyword"},"type":{"type":"keyword"},"version":{"type":"long"},"x-acl":{"type":"keyword"}}}}}" |
+      | "tenant1:testindex<timestamp>:well:1.0.0" | "index_records_1" | 5      | "tenant1-testindex<timestamp>-well-1.0.0" | "well" | "data.default.viewers@tenant1" | "{"mappings":{"well":{"dynamic":"false","properties":{"acl":{"properties":{"owners":{"type":"keyword"},"viewers":{"type":"keyword"}}},"ancestry":{"properties":{"parents":{"type":"keyword"}}},"data":{"properties":{"Basin":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"Country":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"County":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"EmptyAttribute":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"Established":{"type":"date"},"Field":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"Location":{"type":"geo_point"},"OriginalOperator":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"Rank":{"type":"integer"},"Score":{"type":"long"},"State":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"WellName":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"WellStatus":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"WellType":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"DblArray":{"type":"double"}}},"id":{"type":"keyword"},"index":{"properties":{"lastUpdateTime":{"type":"date"},"statusCode":{"type":"integer"},"trace":{"type":"text"}}},"kind":{"type":"keyword"},"legal":{"properties":{"legaltags":{"type":"keyword"},"otherRelevantDataCountries":{"type":"keyword"},"status":{"type":"keyword"}}},"namespace":{"type":"keyword"},"type":{"type":"keyword"},"version":{"type":"long"},"x-acl":{"type":"keyword"}}}}}" |
+      | "tenant1:testindex<timestamp>:well:3.0.0" | "index_records_1" | 5      | "tenant1-testindex<timestamp>-well-3.0.0" | "well" | "data.default.viewers@tenant1" | "{"mappings":{"well":{"dynamic":"false","properties":{"acl":{"properties":{"owners":{"type":"keyword"},"viewers":{"type":"keyword"}}},"ancestry":{"properties":{"parents":{"type":"keyword"}}},"data":{"properties":{"Basin":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"Country":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"County":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"EmptyAttribute":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"Established":{"type":"date"},"Field":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"Location":{"type":"geo_point"},"OriginalOperator":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"Rank":{"type":"integer"},"Score":{"type":"long"},"State":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"WellName":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"WellStatus":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"WellType":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"DblArray":{"type":"double"}}},"id":{"type":"keyword"},"index":{"properties":{"lastUpdateTime":{"type":"date"},"statusCode":{"type":"integer"},"trace":{"type":"text"}}},"kind":{"type":"keyword"},"legal":{"properties":{"legaltags":{"type":"keyword"},"otherRelevantDataCountries":{"type":"keyword"},"status":{"type":"keyword"}}},"namespace":{"type":"keyword"},"type":{"type":"keyword"},"version":{"type":"long"},"x-acl":{"type":"keyword"}}}}}" |
 
   Scenario Outline: Ingest the record and Index in the Elastic Search with bad attribute
     When I ingest records with the <recordFile> with <acl> for a given <kind>
diff --git a/testing/indexer-test-core/src/main/resources/features/indexrecord/indexRecord-schema-service.feature b/testing/indexer-test-core/src/main/resources/features/indexrecord/indexRecord-schema-service.feature
index 02d4c86981b31a6eb9247bf4f47916d685d1b7e1..3531a34cda79b814119c547824e537f2380c63b4 100644
--- a/testing/indexer-test-core/src/main/resources/features/indexrecord/indexRecord-schema-service.feature
+++ b/testing/indexer-test-core/src/main/resources/features/indexrecord/indexRecord-schema-service.feature
@@ -17,8 +17,8 @@ Feature: Indexing of the documents
 
     Examples:
       | kind                                           | recordFile               | number | index                                          | type                     | acl                            | mapping                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | elastic_data |
-      | "tenant1:indexer:test-data--Integration:1.0.0" | "index_records_schema_1" | 5      | "tenant1-indexer-test-data--integration-1.0.0" | "test-data--Integration" | "data.default.viewers@tenant1" | "{"mappings":{"well":{"dynamic":"false","properties":{"acl":{"properties":{"owners":{"type":"keyword"},"viewers":{"type":"keyword"}}},"ancestry":{"properties":{"parents":{"type":"keyword"}}},"data":{"properties":{"Basin":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"Country":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"County":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"EmptyAttribute":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"Established":{"type":"date"},"Field":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"Location":{"type":"geo_point"},"OriginalOperator":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"Rank":{"type":"integer"},"Score":{"type":"integer"},"State":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"WellName":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"WellStatus":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"WellType":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"DblArray":{"type":"double"}}},"id":{"type":"keyword"},"index":{"properties":{"lastUpdateTime":{"type":"date"},"statusCode":{"type":"integer"},"trace":{"type":"text"}}},"kind":{"type":"keyword"},"legal":{"properties":{"legaltags":{"type":"keyword"},"otherRelevantDataCountries":{"type":"keyword"},"status":{"type":"keyword"}}},"namespace":{"type":"keyword"},"type":{"type":"keyword"},"version":{"type":"long"},"x-acl":{"type":"keyword"}}}}}" | "elastic_data_schema_1.json" |
-      | "tenant1:indexer:test-data--Integration:3.0.0" | "index_records_schema_3" | 7      | "tenant1-indexer-test-data--integration-3.0.0" | "test-data--Integration" | "data.default.viewers@tenant1" | "{"mappings":{"well":{"dynamic":"false","properties":{"acl":{"properties":{"owners":{"type":"keyword"},"viewers":{"type":"keyword"}}},"ancestry":{"properties":{"parents":{"type":"keyword"}}},"data":{"properties":{"Basin":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"Country":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"County":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"EmptyAttribute":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"Established":{"type":"date"},"Field":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"Location":{"type":"geo_point"},"OriginalOperator":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"Rank":{"type":"integer"},"Score":{"type":"integer"},"State":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"WellName":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"WellStatus":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"WellType":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"DblArray":{"type":"double"}}},"id":{"type":"keyword"},"index":{"properties":{"lastUpdateTime":{"type":"date"},"statusCode":{"type":"integer"},"trace":{"type":"text"}}},"kind":{"type":"keyword"},"legal":{"properties":{"legaltags":{"type":"keyword"},"otherRelevantDataCountries":{"type":"keyword"},"status":{"type":"keyword"}}},"namespace":{"type":"keyword"},"type":{"type":"keyword"},"version":{"type":"long"},"x-acl":{"type":"keyword"}}}}}" | "elastic_data_schema_3.json" |
+      | "tenant1:indexer:test-data--Integration:1.0.0" | "index_records_schema_1" | 5      | "tenant1-indexer-test-data--integration-1.0.0" | "test-data--Integration" | "data.default.viewers@tenant1" | "{"mappings":{"well":{"dynamic":"false","properties":{"acl":{"properties":{"owners":{"type":"keyword"},"viewers":{"type":"keyword"}}},"ancestry":{"properties":{"parents":{"type":"keyword"}}},"data":{"properties":{"Basin":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"Country":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"County":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"EmptyAttribute":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"Established":{"type":"date"},"Field":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"Location":{"type":"geo_point"},"OriginalOperator":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"Rank":{"type":"integer"},"Score":{"type":"long"},"State":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"WellName":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"WellStatus":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"WellType":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"DblArray":{"type":"double"}}},"id":{"type":"keyword"},"index":{"properties":{"lastUpdateTime":{"type":"date"},"statusCode":{"type":"integer"},"trace":{"type":"text"}}},"kind":{"type":"keyword"},"legal":{"properties":{"legaltags":{"type":"keyword"},"otherRelevantDataCountries":{"type":"keyword"},"status":{"type":"keyword"}}},"namespace":{"type":"keyword"},"type":{"type":"keyword"},"version":{"type":"long"},"x-acl":{"type":"keyword"}}}}}" | "elastic_data_schema_1.json" |
+      | "tenant1:indexer:test-data--Integration:3.0.0" | "index_records_schema_3" | 7      | "tenant1-indexer-test-data--integration-3.0.0" | "test-data--Integration" | "data.default.viewers@tenant1" | "{"mappings":{"well":{"dynamic":"false","properties":{"acl":{"properties":{"owners":{"type":"keyword"},"viewers":{"type":"keyword"}}},"ancestry":{"properties":{"parents":{"type":"keyword"}}},"data":{"properties":{"Basin":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"Country":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"County":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"EmptyAttribute":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"Established":{"type":"date"},"Field":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"Location":{"type":"geo_point"},"OriginalOperator":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"Rank":{"type":"integer"},"Score":{"type":"long"},"State":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"WellName":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"WellStatus":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"WellType":{"type":"text","fields":{"keyword":{"type":"keyword","null_value":"null","ignore_above":256}}},"DblArray":{"type":"double"}}},"id":{"type":"keyword"},"index":{"properties":{"lastUpdateTime":{"type":"date"},"statusCode":{"type":"integer"},"trace":{"type":"text"}}},"kind":{"type":"keyword"},"legal":{"properties":{"legaltags":{"type":"keyword"},"otherRelevantDataCountries":{"type":"keyword"},"status":{"type":"keyword"}}},"namespace":{"type":"keyword"},"type":{"type":"keyword"},"version":{"type":"long"},"x-acl":{"type":"keyword"}}}}}" | "elastic_data_schema_3.json" |
 
   Scenario Outline: Ingest the record and Index in the Elastic Search with bad attribute
     When I ingest records with the <recordFile> with <acl> for a given <kind>
diff --git a/testing/indexer-test-core/src/main/resources/testData/elastic_data_schema_1.json b/testing/indexer-test-core/src/main/resources/testData/elastic_data_schema_1.json
index 3452bc41643f91b1a37d219ce6f91d15acee1f21..099e89303a035b51779cd1ef28f702a3ee4eeee4 100644
--- a/testing/indexer-test-core/src/main/resources/testData/elastic_data_schema_1.json
+++ b/testing/indexer-test-core/src/main/resources/testData/elastic_data_schema_1.json
@@ -1,5 +1,5 @@
 {
-  "opendes:sample-schema-1:testIngest6": {
+  "opendes:test-data--Integration:testIngest6": {
     "WellName": "Data Platform Services",
     "WellStatus": "Under development",
     "WellType": "Data Lake Cloud",
@@ -11,18 +11,6 @@
     "EmptyAttribute": "",
     "Basin": "Houston",
     "State": "TX",
-    "x-geojson": {
-      "geometries": [
-        {
-          "coordinates": [
-            -86.565593,
-            32.406403
-          ],
-          "type": "point"
-        }
-      ],
-      "type": "geometrycollection"
-    },
     "Country": "USA",
     "Established": "2000-03-27T23:38:48+0000",
     "Location": {
@@ -30,30 +18,22 @@
       "lat": 32.406403
     }
   },
-  "opendes:sample-schema-1:testIngest3": {
+  "opendes:test-data--Integration:testIngest3": {
     "WellName": "Data Platform Services",
     "WellStatus": "Under development",
     "WellType": "Data Lake Cloud",
     "Rank": 1,
+    "DblArray": [
+      62.4,
+      60.0
+    ],
     "County": "Harris",
     "Field": "OSDU OFFICE - 2",
-    "Score": 123456789123456789,
+    "Score" : 123456789123456789,
     "OriginalOperator": "OFFICE2",
     "EmptyAttribute": "",
     "Basin": "Houston",
     "State": "TX",
-    "x-geojson": {
-      "geometries": [
-        {
-          "coordinates": [
-            -86.565593,
-            32.406403
-          ],
-          "type": "point"
-        }
-      ],
-      "type": "geometrycollection"
-    },
     "Country": "USA",
     "Established": "2000-03-27T23:38:48+0000",
     "Location": {
@@ -61,30 +41,23 @@
       "lat": 32.406403
     }
   },
-  "opendes:sample-schema-1:testIngest2": {
+  "opendes:test-data--Integration:testIngest2": {
     "WellName": "Data Platform Services",
     "WellStatus": "Under development",
     "WellType": "Data Lake Cloud",
     "Rank": 1,
+    "DblArray": [
+      32.4,
+      36.45,
+      40.0
+    ],
     "County": "Harris",
     "Field": "OSDU OFFICE - 2",
-    "Score": 123456789123456789,
+    "Score" : 123456789123456789,
     "OriginalOperator": "OFFICE - 2",
     "EmptyAttribute": "",
     "Basin": "Houston",
     "State": "TX",
-    "x-geojson": {
-      "geometries": [
-        {
-          "coordinates": [
-            -86.565593,
-            32.406403
-          ],
-          "type": "point"
-        }
-      ],
-      "type": "geometrycollection"
-    },
     "Country": "USA",
     "Established": "2000-03-27T23:38:48+0000",
     "Location": {
@@ -92,30 +65,18 @@
       "lat": 32.406403
     }
   },
-  "opendes:sample-schema-1:testIngest5": {
+  "opendes:test-data--Integration:testIngest5": {
     "WellName": "Data Platform Services",
     "WellStatus": "Under development",
     "WellType": "Data Lake Cloud",
     "Rank": 1,
     "County": "Harris",
     "Field": "OSDU OFFICE - 2",
-    "Score": 123456789123456789,
+    "Score" : 123456789123456789,
     "OriginalOperator": "OFFICE2",
     "EmptyAttribute": "",
     "Basin": "Houston",
     "State": "TX",
-    "x-geojson": {
-      "geometries": [
-        {
-          "coordinates": [
-            -86.565593,
-            32.406403
-          ],
-          "type": "point"
-        }
-      ],
-      "type": "geometrycollection"
-    },
     "Country": "USA",
     "Established": "2000-03-27T23:38:48+0000",
     "Location": {
@@ -123,30 +84,18 @@
       "lat": 32.406403
     }
   },
-  "opendes:sample-schema-1:testIngest4": {
+  "opendes:test-data--Integration:testIngest4": {
     "WellName": "Data Platform Services",
     "WellStatus": "Under development",
     "WellType": "Data Lake Cloud",
     "Rank": 1,
     "County": "Harris",
     "Field": "OSDU OFFICE - 2",
-    "Score": 123456789123456789,
+    "Score" : 123456789123456789,
     "OriginalOperator": "OFFICE2",
     "EmptyAttribute": "",
     "Basin": "Houston",
     "State": "TX",
-    "x-geojson": {
-      "geometries": [
-        {
-          "coordinates": [
-            -86.565593,
-            32.406403
-          ],
-          "type": "point"
-        }
-      ],
-      "type": "geometrycollection"
-    },
     "Country": "USA",
     "Established": "2000-03-27T23:38:48+0000",
     "Location": {
diff --git a/testing/indexer-test-core/src/main/resources/testData/elastic_data_schema_3.json b/testing/indexer-test-core/src/main/resources/testData/elastic_data_schema_3.json
index 118ae64d6b2323f46a8f21ef8a92b0e79ef33b0d..ede20b1c8908a2aedb79b3f2cdac5ec91eee5654 100644
--- a/testing/indexer-test-core/src/main/resources/testData/elastic_data_schema_3.json
+++ b/testing/indexer-test-core/src/main/resources/testData/elastic_data_schema_3.json
@@ -1,17 +1,501 @@
 {
-  "opendes:sample-schema-3:testIngest6": {
-    "WellName": "Data Platform Services"
+  "opendes:test-data--Integration:testIngest56": {
+    "WellName": "Data Platform Services - 56",
+    "GeoShape": {
+      "geometries": [
+        {
+          "coordinates": [
+            [
+              [
+                [
+                  107.0,
+                  7.0
+                ],
+                [
+                  108.0,
+                  7.0
+                ],
+                [
+                  108.0,
+                  8.0
+                ],
+                [
+                  107.0,
+                  8.0
+                ],
+                [
+                  107.0,
+                  7.0
+                ]
+              ]
+            ],
+            [
+              [
+                [
+                  100.0,
+                  0.0
+                ],
+                [
+                  101.0,
+                  0.0
+                ],
+                [
+                  101.0,
+                  1.0
+                ],
+                [
+                  100.0,
+                  1.0
+                ],
+                [
+                  100.0,
+                  0.0
+                ]
+              ]
+            ]
+          ],
+          "type": "multipolygon"
+        }
+      ],
+      "type": "geometrycollection"
+    }
   },
-  "opendes:sample-schema-3:testIngest3": {
-    "WellName": "Data Platform Services"
+  "opendes:test-data--Integration:testIngest57": {
+    "WellName": "Data Platform Services - 57",
+    "GeoShape": {
+      "geometries": [
+        {
+          "coordinates": [
+            [
+              -80.662372,
+              35.059509
+            ],
+            [
+              -80.662693,
+              35.059263
+            ],
+            [
+              -80.662844,
+              35.05893
+            ],
+            [
+              -80.66308,
+              35.058332
+            ],
+            [
+              -80.663595,
+              35.057753
+            ],
+            [
+              -80.663874,
+              35.057401
+            ],
+            [
+              -80.66441,
+              35.057033
+            ],
+            [
+              -80.664861,
+              35.056787
+            ],
+            [
+              -80.665419,
+              35.056506
+            ],
+            [
+              -80.665633,
+              35.056312
+            ],
+            [
+              -80.666019,
+              35.055891
+            ],
+            [
+              -80.666191,
+              35.055452
+            ],
+            [
+              -80.666191,
+              35.055171
+            ],
+            [
+              -80.666255,
+              35.05489
+            ],
+            [
+              -80.666213,
+              35.054222
+            ],
+            [
+              -80.666213,
+              35.053924
+            ],
+            [
+              -80.665955,
+              35.052905
+            ],
+            [
+              -80.665698,
+              35.052044
+            ],
+            [
+              -80.665504,
+              35.051482
+            ],
+            [
+              -80.665762,
+              35.050481
+            ],
+            [
+              -80.66617,
+              35.049725
+            ],
+            [
+              -80.666513,
+              35.049286
+            ],
+            [
+              -80.666921,
+              35.048531
+            ],
+            [
+              -80.667006,
+              35.048215
+            ],
+            [
+              -80.667071,
+              35.047775
+            ],
+            [
+              -80.667049,
+              35.047389
+            ],
+            [
+              -80.666964,
+              35.046985
+            ],
+            [
+              -80.666813,
+              35.046353
+            ],
+            [
+              -80.666599,
+              35.045966
+            ],
+            [
+              -80.666406,
+              35.045615
+            ],
+            [
+              -80.665998,
+              35.045193
+            ],
+            [
+              -80.665526,
+              35.044877
+            ],
+            [
+              -80.664989,
+              35.044543
+            ],
+            [
+              -80.664496,
+              35.044174
+            ],
+            [
+              -80.663852,
+              35.043876
+            ],
+            [
+              -80.663037,
+              35.043717
+            ]
+          ],
+          "type": "linestring"
+        }
+      ],
+      "type": "geometrycollection"
+    }
   },
-  "opendes:sample-schema-3:testIngest2": {
-    "WellName": "Data Platform Services"
+  "opendes:test-data--Integration:testIngest52": {
+    "WellName": "Data Platform Services - 52",
+    "GeoShape": {
+      "geometries": [
+        {
+          "coordinates": [
+            [
+              -105.01621,
+              39.57422
+            ],
+            [
+              -80.666513,
+              35.053994
+            ]
+          ],
+          "type": "multipoint"
+        }
+      ],
+      "type": "geometrycollection"
+    }
   },
-  "opendes:sample-schema-3:testIngest5": {
-    "WellName": "Data Platform Services"
+  "opendes:test-data--Integration:testIngest53": {
+    "WellName": "Data Platform Services - 53",
+    "GeoShape": {
+      "geometries": [
+        {
+          "coordinates": [
+            [
+              -101.744384,
+              39.32155
+            ],
+            [
+              -101.552124,
+              39.330048
+            ],
+            [
+              -101.403808,
+              39.330048
+            ],
+            [
+              -101.332397,
+              39.364032
+            ],
+            [
+              -101.041259,
+              39.368279
+            ],
+            [
+              -100.975341,
+              39.304549
+            ],
+            [
+              -100.914916,
+              39.245016
+            ],
+            [
+              -100.843505,
+              39.164141
+            ],
+            [
+              -100.805053,
+              39.104488
+            ],
+            [
+              -100.491943,
+              39.100226
+            ],
+            [
+              -100.437011,
+              39.095962
+            ],
+            [
+              -100.338134,
+              39.095962
+            ],
+            [
+              -100.195312,
+              39.027718
+            ],
+            [
+              -100.008544,
+              39.010647
+            ],
+            [
+              -99.865722,
+              39.00211
+            ],
+            [
+              -99.684448,
+              38.972221
+            ],
+            [
+              -99.51416,
+              38.929502
+            ],
+            [
+              -99.382324,
+              38.920955
+            ],
+            [
+              -99.321899,
+              38.895308
+            ],
+            [
+              -99.113159,
+              38.869651
+            ],
+            [
+              -99.0802,
+              38.85682
+            ],
+            [
+              -98.822021,
+              38.85682
+            ],
+            [
+              -98.448486,
+              38.848264
+            ],
+            [
+              -98.206787,
+              38.848264
+            ],
+            [
+              -98.020019,
+              38.878204
+            ],
+            [
+              -97.635498,
+              38.873928
+            ]
+          ],
+          "type": "linestring"
+        }
+      ],
+      "type": "geometrycollection"
+    }
   },
-  "opendes:sample-schema-3:testIngest4": {
-    "WellName": "Data Platform Services"
+  "opendes:test-data--Integration:testIngest54": {
+    "WellName": "Data Platform Services - 54",
+    "GeoShape": {
+      "geometries": [
+        {
+          "coordinates": [
+            [
+              [
+                -105.021443,
+                39.578057
+              ],
+              [
+                -105.021507,
+                39.577809
+              ],
+              [
+                -105.021572,
+                39.577495
+              ],
+              [
+                -105.021572,
+                39.577164
+              ],
+              [
+                -105.021572,
+                39.577032
+              ],
+              [
+                -105.021529,
+                39.576784
+              ]
+            ],
+            [
+              [
+                -105.019898,
+                39.574997
+              ],
+              [
+                -105.019598,
+                39.574898
+              ],
+              [
+                -105.019061,
+                39.574782
+              ]
+            ],
+            [
+              [
+                -105.017173,
+                39.574402
+              ],
+              [
+                -105.01698,
+                39.574385
+              ],
+              [
+                -105.016636,
+                39.574385
+              ],
+              [
+                -105.016508,
+                39.574402
+              ],
+              [
+                -105.01595,
+                39.57427
+              ]
+            ],
+            [
+              [
+                -105.014276,
+                39.573972
+              ],
+              [
+                -105.014126,
+                39.574038
+              ],
+              [
+                -105.013825,
+                39.57417
+              ],
+              [
+                -105.01331,
+                39.574452
+              ]
+            ]
+          ],
+          "type": "multilinestring"
+        }
+      ],
+      "type": "geometrycollection"
+    }
+  },
+  "opendes:test-data--Integration:testIngest55": {
+    "WellName": "Data Platform Services - 55",
+    "GeoShape": {
+      "geometries": [
+        {
+          "coordinates": [
+            [
+              [
+                100.0,
+                0.0
+              ],
+              [
+                101.0,
+                0.0
+              ],
+              [
+                101.0,
+                1.0
+              ],
+              [
+                100.0,
+                1.0
+              ],
+              [
+                100.0,
+                0.0
+              ]
+            ]
+          ],
+          "type": "polygon"
+        }
+      ],
+      "type": "geometrycollection"
+    }
+  },
+  "opendes:test-data--Integration:testIngest51": {
+    "WellName": "Data Platform Services - 51",
+    "GeoShape": {
+      "geometries": [
+        {
+          "coordinates": [
+            -105.01621,
+            39.57422
+          ],
+          "type": "point"
+        }
+      ],
+      "type": "geometrycollection"
+    }
   }
 }
\ No newline at end of file