diff --git a/src/Provider/AlgoliaPlaces/composer.json b/src/Provider/AlgoliaPlaces/composer.json
index 1baa4d9cb..9ada77c68 100644
--- a/src/Provider/AlgoliaPlaces/composer.json
+++ b/src/Provider/AlgoliaPlaces/composer.json
@@ -22,7 +22,7 @@
     },
     "require-dev": {
         "geocoder-php/provider-integration-tests": "^1.1",
-        "php-http/curl-client": "^1.7",
+        "php-http/curl-client": "^2.2",
         "php-http/message": "^1.0",
         "phpunit/phpunit": "^9.5"
     },
diff --git a/src/Provider/AlgoliaPlaces/phpunit.xml.dist b/src/Provider/AlgoliaPlaces/phpunit.xml.dist
index 945788bd9..334874f8d 100644
--- a/src/Provider/AlgoliaPlaces/phpunit.xml.dist
+++ b/src/Provider/AlgoliaPlaces/phpunit.xml.dist
@@ -1,29 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
->
-    <php>
-        <server name="ALGOLIA_API_KEY" value="" />
-        <server name="ALGOLIA_APP_ID" value="" />
-        <server name="USE_CACHED_RESPONSES" value="true" />
-    </php>
-    <testsuites>
-        <testsuite name="Geocoder Test Suite">
-            <directory>./Tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php">
+  <coverage>
+    <include>
+      <directory>./</directory>
+    </include>
+    <exclude>
+      <directory>./Tests</directory>
+      <directory>./vendor</directory>
+    </exclude>
+  </coverage>
+  <php>
+    <server name="ALGOLIA_API_KEY" value=""/>
+    <server name="ALGOLIA_APP_ID" value=""/>
+    <server name="USE_CACHED_RESPONSES" value="true"/>
+  </php>
+  <testsuites>
+    <testsuite name="Geocoder Test Suite">
+      <directory>./Tests/</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>
diff --git a/src/Provider/ArcGISOnline/composer.json b/src/Provider/ArcGISOnline/composer.json
index 7c96f5220..9811f63d3 100644
--- a/src/Provider/ArcGISOnline/composer.json
+++ b/src/Provider/ArcGISOnline/composer.json
@@ -21,7 +21,7 @@
     },
     "require-dev": {
         "geocoder-php/provider-integration-tests": "^1.0",
-        "php-http/curl-client": "^1.7",
+        "php-http/curl-client": "^2.2",
         "php-http/message": "^1.0",
         "phpunit/phpunit": "^9.5"
     },
diff --git a/src/Provider/ArcGISOnline/phpunit.xml.dist b/src/Provider/ArcGISOnline/phpunit.xml.dist
index f32adc6ed..8c2dfd69f 100644
--- a/src/Provider/ArcGISOnline/phpunit.xml.dist
+++ b/src/Provider/ArcGISOnline/phpunit.xml.dist
@@ -1,29 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
->
-    <php>
-        <server name="ARCGIS_TOKEN" value="YOUR_ARCGIS_TOKEN" />
-        <server name="USE_CACHED_RESPONSES" value="true" />
-    </php>
-
-    <testsuites>
-        <testsuite name="Geocoder Test Suite">
-            <directory>./Tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php">
+  <coverage>
+    <include>
+      <directory>./</directory>
+    </include>
+    <exclude>
+      <directory>./Tests</directory>
+      <directory>./vendor</directory>
+    </exclude>
+  </coverage>
+  <php>
+    <server name="ARCGIS_TOKEN" value="YOUR_ARCGIS_TOKEN"/>
+    <server name="USE_CACHED_RESPONSES" value="true"/>
+  </php>
+  <testsuites>
+    <testsuite name="Geocoder Test Suite">
+      <directory>./Tests/</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>
diff --git a/src/Provider/AzureMaps/composer.json b/src/Provider/AzureMaps/composer.json
index 836123955..34bf21156 100644
--- a/src/Provider/AzureMaps/composer.json
+++ b/src/Provider/AzureMaps/composer.json
@@ -20,7 +20,7 @@
     },
     "require-dev": {
         "geocoder-php/provider-integration-tests": "^1.0",
-        "php-http/curl-client": "^1.7",
+        "php-http/curl-client": "^2.2",
         "php-http/message": "^1.0",
         "phpunit/phpunit": "^9.5"
     },
diff --git a/src/Provider/AzureMaps/phpunit.xml.dist b/src/Provider/AzureMaps/phpunit.xml.dist
index bd9deb94b..62f7927de 100644
--- a/src/Provider/AzureMaps/phpunit.xml.dist
+++ b/src/Provider/AzureMaps/phpunit.xml.dist
@@ -1,29 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
->
-    <php>
-        <server name="AZURE_MAPS_SUBSCRIPTION_KEY" value="YOUR_AZURE_MAPS_SUBSCRIPTION_KEY" />
-        <server name="USE_CACHED_RESPONSES" value="true" />
-    </php>
-
-    <testsuites>
-        <testsuite name="Geocoder Test Suite">
-            <directory>./Tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php">
+  <coverage>
+    <include>
+      <directory>./</directory>
+    </include>
+    <exclude>
+      <directory>./Tests</directory>
+      <directory>./vendor</directory>
+    </exclude>
+  </coverage>
+  <php>
+    <server name="AZURE_MAPS_SUBSCRIPTION_KEY" value="YOUR_AZURE_MAPS_SUBSCRIPTION_KEY"/>
+    <server name="USE_CACHED_RESPONSES" value="true"/>
+  </php>
+  <testsuites>
+    <testsuite name="Geocoder Test Suite">
+      <directory>./Tests/</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>
diff --git a/src/Provider/BingMaps/composer.json b/src/Provider/BingMaps/composer.json
index 5f8751a9d..a220e4bea 100644
--- a/src/Provider/BingMaps/composer.json
+++ b/src/Provider/BingMaps/composer.json
@@ -21,7 +21,7 @@
     },
     "require-dev": {
         "geocoder-php/provider-integration-tests": "^1.0",
-        "php-http/curl-client": "^1.7",
+        "php-http/curl-client": "^2.2",
         "php-http/message": "^1.0",
         "phpunit/phpunit": "^9.5"
     },
diff --git a/src/Provider/BingMaps/phpunit.xml.dist b/src/Provider/BingMaps/phpunit.xml.dist
index 21fa59518..548cbd0e8 100644
--- a/src/Provider/BingMaps/phpunit.xml.dist
+++ b/src/Provider/BingMaps/phpunit.xml.dist
@@ -1,29 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
->
-    <php>
-        <server name="BINGMAPS_API_KEY" value="YOUR_API_KEY" />
-        <server name="USE_CACHED_RESPONSES" value="true" />
-    </php>
-
-    <testsuites>
-        <testsuite name="Geocoder Test Suite">
-            <directory>./Tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php">
+  <coverage>
+    <include>
+      <directory>./</directory>
+    </include>
+    <exclude>
+      <directory>./Tests</directory>
+      <directory>./vendor</directory>
+    </exclude>
+  </coverage>
+  <php>
+    <server name="BINGMAPS_API_KEY" value="YOUR_API_KEY"/>
+    <server name="USE_CACHED_RESPONSES" value="true"/>
+  </php>
+  <testsuites>
+    <testsuite name="Geocoder Test Suite">
+      <directory>./Tests/</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>
diff --git a/src/Provider/Cache/phpunit.xml.dist b/src/Provider/Cache/phpunit.xml.dist
index 61ffe462a..963a4f5fa 100644
--- a/src/Provider/Cache/phpunit.xml.dist
+++ b/src/Provider/Cache/phpunit.xml.dist
@@ -1,25 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
->
-
-    <testsuites>
-        <testsuite name="Geocoder Test Suite">
-            <directory>./Tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php">
+  <coverage>
+    <include>
+      <directory>./</directory>
+    </include>
+    <exclude>
+      <directory>./Tests</directory>
+      <directory>./vendor</directory>
+    </exclude>
+  </coverage>
+  <testsuites>
+    <testsuite name="Geocoder Test Suite">
+      <directory>./Tests/</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>
diff --git a/src/Provider/Chain/composer.json b/src/Provider/Chain/composer.json
index 041a544c9..8484aa3ae 100644
--- a/src/Provider/Chain/composer.json
+++ b/src/Provider/Chain/composer.json
@@ -21,7 +21,7 @@
     },
     "require-dev": {
         "nyholm/nsa": "^1.1",
-        "php-http/curl-client": "^1.7",
+        "php-http/curl-client": "^2.2",
         "php-http/message": "^1.0",
         "phpunit/phpunit": "^9.5"
     },
diff --git a/src/Provider/Chain/phpunit.xml.dist b/src/Provider/Chain/phpunit.xml.dist
index 7581e8757..030308e1f 100644
--- a/src/Provider/Chain/phpunit.xml.dist
+++ b/src/Provider/Chain/phpunit.xml.dist
@@ -1,28 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
->
-    <php>
-        <ini name="error_reporting" value="-1" />
-    </php>
-
-    <testsuites>
-        <testsuite name="Geocoder Test Suite">
-            <directory>./Tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php">
+  <coverage>
+    <include>
+      <directory>./</directory>
+    </include>
+    <exclude>
+      <directory>./Tests</directory>
+      <directory>./vendor</directory>
+    </exclude>
+  </coverage>
+  <php>
+    <ini name="error_reporting" value="-1"/>
+  </php>
+  <testsuites>
+    <testsuite name="Geocoder Test Suite">
+      <directory>./Tests/</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>
diff --git a/src/Provider/FreeGeoIp/composer.json b/src/Provider/FreeGeoIp/composer.json
index e898eda29..59a3c9e9e 100644
--- a/src/Provider/FreeGeoIp/composer.json
+++ b/src/Provider/FreeGeoIp/composer.json
@@ -21,7 +21,7 @@
     },
     "require-dev": {
         "geocoder-php/provider-integration-tests": "^1.0",
-        "php-http/curl-client": "^1.7",
+        "php-http/curl-client": "^2.2",
         "php-http/message": "^1.0",
         "phpunit/phpunit": "^9.5"
     },
diff --git a/src/Provider/FreeGeoIp/phpunit.xml.dist b/src/Provider/FreeGeoIp/phpunit.xml.dist
index a158c9a38..26265855a 100644
--- a/src/Provider/FreeGeoIp/phpunit.xml.dist
+++ b/src/Provider/FreeGeoIp/phpunit.xml.dist
@@ -1,28 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
->
-    <php>
-        <server name="USE_CACHED_RESPONSES" value="true" />
-    </php>
-
-    <testsuites>
-        <testsuite name="Geocoder Test Suite">
-            <directory>./Tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php">
+  <coverage>
+    <include>
+      <directory>./</directory>
+    </include>
+    <exclude>
+      <directory>./Tests</directory>
+      <directory>./vendor</directory>
+    </exclude>
+  </coverage>
+  <php>
+    <server name="USE_CACHED_RESPONSES" value="true"/>
+  </php>
+  <testsuites>
+    <testsuite name="Geocoder Test Suite">
+      <directory>./Tests/</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>
diff --git a/src/Provider/GeoIP2/phpunit.xml.dist b/src/Provider/GeoIP2/phpunit.xml.dist
index a158c9a38..26265855a 100644
--- a/src/Provider/GeoIP2/phpunit.xml.dist
+++ b/src/Provider/GeoIP2/phpunit.xml.dist
@@ -1,28 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
->
-    <php>
-        <server name="USE_CACHED_RESPONSES" value="true" />
-    </php>
-
-    <testsuites>
-        <testsuite name="Geocoder Test Suite">
-            <directory>./Tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php">
+  <coverage>
+    <include>
+      <directory>./</directory>
+    </include>
+    <exclude>
+      <directory>./Tests</directory>
+      <directory>./vendor</directory>
+    </exclude>
+  </coverage>
+  <php>
+    <server name="USE_CACHED_RESPONSES" value="true"/>
+  </php>
+  <testsuites>
+    <testsuite name="Geocoder Test Suite">
+      <directory>./Tests/</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>
diff --git a/src/Provider/GeoIPs/composer.json b/src/Provider/GeoIPs/composer.json
index 47b70198a..53b4dda27 100644
--- a/src/Provider/GeoIPs/composer.json
+++ b/src/Provider/GeoIPs/composer.json
@@ -21,7 +21,7 @@
     },
     "require-dev": {
         "geocoder-php/provider-integration-tests": "^1.0",
-        "php-http/curl-client": "^1.7",
+        "php-http/curl-client": "^2.2",
         "php-http/message": "^1.0",
         "phpunit/phpunit": "^9.5"
     },
diff --git a/src/Provider/GeoIPs/phpunit.xml.dist b/src/Provider/GeoIPs/phpunit.xml.dist
index a182a951e..8244caeb8 100644
--- a/src/Provider/GeoIPs/phpunit.xml.dist
+++ b/src/Provider/GeoIPs/phpunit.xml.dist
@@ -1,29 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
->
-    <php>
-        <server name="USE_CACHED_RESPONSES" value="true" />
-        <server name="GEOIPS_API_KEY" value="YOUR_API_KEY" />
-    </php>
-
-    <testsuites>
-        <testsuite name="Geocoder Test Suite">
-            <directory>./Tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php">
+  <coverage>
+    <include>
+      <directory>./</directory>
+    </include>
+    <exclude>
+      <directory>./Tests</directory>
+      <directory>./vendor</directory>
+    </exclude>
+  </coverage>
+  <php>
+    <server name="USE_CACHED_RESPONSES" value="true"/>
+    <server name="GEOIPS_API_KEY" value="YOUR_API_KEY"/>
+  </php>
+  <testsuites>
+    <testsuite name="Geocoder Test Suite">
+      <directory>./Tests/</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>
diff --git a/src/Provider/GeoPlugin/composer.json b/src/Provider/GeoPlugin/composer.json
index 2289cbc71..d35b7bcce 100644
--- a/src/Provider/GeoPlugin/composer.json
+++ b/src/Provider/GeoPlugin/composer.json
@@ -22,7 +22,7 @@
     },
     "require-dev": {
         "geocoder-php/provider-integration-tests": "^1.0",
-        "php-http/curl-client": "^1.7",
+        "php-http/curl-client": "^2.2",
         "php-http/message": "^1.0",
         "phpunit/phpunit": "^9.5"
     },
diff --git a/src/Provider/GeoPlugin/phpunit.xml.dist b/src/Provider/GeoPlugin/phpunit.xml.dist
index a158c9a38..26265855a 100644
--- a/src/Provider/GeoPlugin/phpunit.xml.dist
+++ b/src/Provider/GeoPlugin/phpunit.xml.dist
@@ -1,28 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
->
-    <php>
-        <server name="USE_CACHED_RESPONSES" value="true" />
-    </php>
-
-    <testsuites>
-        <testsuite name="Geocoder Test Suite">
-            <directory>./Tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php">
+  <coverage>
+    <include>
+      <directory>./</directory>
+    </include>
+    <exclude>
+      <directory>./Tests</directory>
+      <directory>./vendor</directory>
+    </exclude>
+  </coverage>
+  <php>
+    <server name="USE_CACHED_RESPONSES" value="true"/>
+  </php>
+  <testsuites>
+    <testsuite name="Geocoder Test Suite">
+      <directory>./Tests/</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>
diff --git a/src/Provider/GeocodeEarth/composer.json b/src/Provider/GeocodeEarth/composer.json
index ccec8572d..2db3132f2 100644
--- a/src/Provider/GeocodeEarth/composer.json
+++ b/src/Provider/GeocodeEarth/composer.json
@@ -22,7 +22,7 @@
     },
     "require-dev": {
         "geocoder-php/provider-integration-tests": "^1.0",
-        "php-http/curl-client": "^1.7",
+        "php-http/curl-client": "^2.2",
         "php-http/message": "^1.0",
         "phpunit/phpunit": "^9.5"
     },
diff --git a/src/Provider/GeocodeEarth/phpunit.xml.dist b/src/Provider/GeocodeEarth/phpunit.xml.dist
index b05739515..ec02f9fee 100644
--- a/src/Provider/GeocodeEarth/phpunit.xml.dist
+++ b/src/Provider/GeocodeEarth/phpunit.xml.dist
@@ -1,29 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
->
-    <php>
-        <server name="GEOCODE_EARTH_API_KEY" value="YOUR_GEOCODE_EARTH_API_KEY" />
-        <server name="USE_CACHED_RESPONSES" value="true" />
-    </php>
-
-    <testsuites>
-        <testsuite name="Geocoder Test Suite">
-            <directory>./Tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php">
+  <coverage>
+    <include>
+      <directory>./</directory>
+    </include>
+    <exclude>
+      <directory>./Tests</directory>
+      <directory>./vendor</directory>
+    </exclude>
+  </coverage>
+  <php>
+    <server name="GEOCODE_EARTH_API_KEY" value="YOUR_GEOCODE_EARTH_API_KEY"/>
+    <server name="USE_CACHED_RESPONSES" value="true"/>
+  </php>
+  <testsuites>
+    <testsuite name="Geocoder Test Suite">
+      <directory>./Tests/</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>
diff --git a/src/Provider/Geonames/composer.json b/src/Provider/Geonames/composer.json
index 03fc5ad02..088afdc07 100644
--- a/src/Provider/Geonames/composer.json
+++ b/src/Provider/Geonames/composer.json
@@ -21,7 +21,7 @@
     },
     "require-dev": {
         "geocoder-php/provider-integration-tests": "^1.0",
-        "php-http/curl-client": "^1.7",
+        "php-http/curl-client": "^2.2",
         "php-http/message": "^1.0",
         "phpunit/phpunit": "^9.5"
     },
diff --git a/src/Provider/Geonames/phpunit.xml.dist b/src/Provider/Geonames/phpunit.xml.dist
index 6c5b4290e..994a40c6a 100644
--- a/src/Provider/Geonames/phpunit.xml.dist
+++ b/src/Provider/Geonames/phpunit.xml.dist
@@ -1,29 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
->
-    <php>
-        <server name="GEONAMES_USERNAME" value="YOUR_USERNAME" />
-        <server name="USE_CACHED_RESPONSES" value="true" />
-    </php>
-
-    <testsuites>
-        <testsuite name="Geocoder Test Suite">
-            <directory>./Tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php">
+  <coverage>
+    <include>
+      <directory>./</directory>
+    </include>
+    <exclude>
+      <directory>./Tests</directory>
+      <directory>./vendor</directory>
+    </exclude>
+  </coverage>
+  <php>
+    <server name="GEONAMES_USERNAME" value="YOUR_USERNAME"/>
+    <server name="USE_CACHED_RESPONSES" value="true"/>
+  </php>
+  <testsuites>
+    <testsuite name="Geocoder Test Suite">
+      <directory>./Tests/</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>
diff --git a/src/Provider/GoogleMaps/composer.json b/src/Provider/GoogleMaps/composer.json
index 217815d74..01bbaa69c 100644
--- a/src/Provider/GoogleMaps/composer.json
+++ b/src/Provider/GoogleMaps/composer.json
@@ -21,7 +21,7 @@
     },
     "require-dev": {
         "geocoder-php/provider-integration-tests": "^1.0",
-        "php-http/curl-client": "^1.7",
+        "php-http/curl-client": "^2.2",
         "php-http/message": "^1.0",
         "phpunit/phpunit": "^9.5"
     },
diff --git a/src/Provider/GoogleMaps/phpunit.xml.dist b/src/Provider/GoogleMaps/phpunit.xml.dist
index 2d1ef879a..3401f732c 100644
--- a/src/Provider/GoogleMaps/phpunit.xml.dist
+++ b/src/Provider/GoogleMaps/phpunit.xml.dist
@@ -1,29 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
->
-    <php>
-        <server name="GOOGLE_GEOCODING_KEY" value="YOUR_GEOCODING_KEY" />
-        <server name="USE_CACHED_RESPONSES" value="true" />
-    </php>
-
-    <testsuites>
-        <testsuite name="Geocoder Test Suite">
-            <directory>./Tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php">
+  <coverage>
+    <include>
+      <directory>./</directory>
+    </include>
+    <exclude>
+      <directory>./Tests</directory>
+      <directory>./vendor</directory>
+    </exclude>
+  </coverage>
+  <php>
+    <server name="GOOGLE_GEOCODING_KEY" value="YOUR_GEOCODING_KEY"/>
+    <server name="USE_CACHED_RESPONSES" value="true"/>
+  </php>
+  <testsuites>
+    <testsuite name="Geocoder Test Suite">
+      <directory>./Tests/</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>
diff --git a/src/Provider/GoogleMapsPlaces/composer.json b/src/Provider/GoogleMapsPlaces/composer.json
index 56c8af63d..50f922f31 100644
--- a/src/Provider/GoogleMapsPlaces/composer.json
+++ b/src/Provider/GoogleMapsPlaces/composer.json
@@ -21,7 +21,7 @@
     },
     "require-dev": {
         "geocoder-php/provider-integration-tests": "^1.0",
-        "php-http/curl-client": "^1.7",
+        "php-http/curl-client": "^2.2",
         "php-http/message": "^1.0",
         "phpunit/phpunit": "^9.5"
     },
diff --git a/src/Provider/GoogleMapsPlaces/phpunit.xml.dist b/src/Provider/GoogleMapsPlaces/phpunit.xml.dist
index 2d1ef879a..3401f732c 100644
--- a/src/Provider/GoogleMapsPlaces/phpunit.xml.dist
+++ b/src/Provider/GoogleMapsPlaces/phpunit.xml.dist
@@ -1,29 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
->
-    <php>
-        <server name="GOOGLE_GEOCODING_KEY" value="YOUR_GEOCODING_KEY" />
-        <server name="USE_CACHED_RESPONSES" value="true" />
-    </php>
-
-    <testsuites>
-        <testsuite name="Geocoder Test Suite">
-            <directory>./Tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php">
+  <coverage>
+    <include>
+      <directory>./</directory>
+    </include>
+    <exclude>
+      <directory>./Tests</directory>
+      <directory>./vendor</directory>
+    </exclude>
+  </coverage>
+  <php>
+    <server name="GOOGLE_GEOCODING_KEY" value="YOUR_GEOCODING_KEY"/>
+    <server name="USE_CACHED_RESPONSES" value="true"/>
+  </php>
+  <testsuites>
+    <testsuite name="Geocoder Test Suite">
+      <directory>./Tests/</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>
diff --git a/src/Provider/GraphHopper/composer.json b/src/Provider/GraphHopper/composer.json
index c6b6d8bee..11d5f39a0 100644
--- a/src/Provider/GraphHopper/composer.json
+++ b/src/Provider/GraphHopper/composer.json
@@ -15,7 +15,7 @@
     },
     "require-dev": {
         "geocoder-php/provider-integration-tests": "^1.0",
-        "php-http/curl-client": "^1.7",
+        "php-http/curl-client": "^2.2",
         "php-http/message": "^1.0",
         "phpunit/phpunit": "^9.5"
     },
diff --git a/src/Provider/GraphHopper/phpunit.xml.dist b/src/Provider/GraphHopper/phpunit.xml.dist
index 0f3f508e5..ab67250b1 100644
--- a/src/Provider/GraphHopper/phpunit.xml.dist
+++ b/src/Provider/GraphHopper/phpunit.xml.dist
@@ -1,29 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
->
-    <php>
-        <server name="GRAPHHOPPER_API_KEY" value="YOUR_GRAPHHOPPER_API_KEY" />
-        <server name="USE_CACHED_RESPONSES" value="true" />
-    </php>
-
-    <testsuites>
-        <testsuite name="Geocoder Test Suite">
-            <directory>./Tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php">
+  <coverage>
+    <include>
+      <directory>./</directory>
+    </include>
+    <exclude>
+      <directory>./Tests</directory>
+      <directory>./vendor</directory>
+    </exclude>
+  </coverage>
+  <php>
+    <server name="GRAPHHOPPER_API_KEY" value="YOUR_GRAPHHOPPER_API_KEY"/>
+    <server name="USE_CACHED_RESPONSES" value="true"/>
+  </php>
+  <testsuites>
+    <testsuite name="Geocoder Test Suite">
+      <directory>./Tests/</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>
diff --git a/src/Provider/Here/composer.json b/src/Provider/Here/composer.json
index 98ad52ed1..1608da52d 100644
--- a/src/Provider/Here/composer.json
+++ b/src/Provider/Here/composer.json
@@ -21,7 +21,7 @@
     },
     "require-dev": {
         "geocoder-php/provider-integration-tests": "^1.1",
-        "php-http/curl-client": "^1.7",
+        "php-http/curl-client": "^2.2",
         "php-http/message": "^1.0",
         "phpunit/phpunit": "^9.5"
     },
diff --git a/src/Provider/Here/phpunit.xml.dist b/src/Provider/Here/phpunit.xml.dist
index 6bb4ac685..8a67c7b55 100644
--- a/src/Provider/Here/phpunit.xml.dist
+++ b/src/Provider/Here/phpunit.xml.dist
@@ -1,31 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
->
-    <php>
-        <server name="HERE_APP_ID" value="YOUR_APP_ID" />
-        <server name="HERE_APP_CODE" value="YOUR_APP_CODE" />
-        <server name="HERE_API_KEY" value="YOUR_API_KEY" />
-        <server name="USE_CACHED_RESPONSES" value="true" />
-    </php>
-
-    <testsuites>
-        <testsuite name="Geocoder Test Suite">
-            <directory>./Tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php">
+  <coverage>
+    <include>
+      <directory>./</directory>
+    </include>
+    <exclude>
+      <directory>./Tests</directory>
+      <directory>./vendor</directory>
+    </exclude>
+  </coverage>
+  <php>
+    <server name="HERE_APP_ID" value="YOUR_APP_ID"/>
+    <server name="HERE_APP_CODE" value="YOUR_APP_CODE"/>
+    <server name="HERE_API_KEY" value="YOUR_API_KEY"/>
+    <server name="USE_CACHED_RESPONSES" value="true"/>
+  </php>
+  <testsuites>
+    <testsuite name="Geocoder Test Suite">
+      <directory>./Tests/</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>
diff --git a/src/Provider/HostIp/composer.json b/src/Provider/HostIp/composer.json
index 588769d58..399da5f45 100644
--- a/src/Provider/HostIp/composer.json
+++ b/src/Provider/HostIp/composer.json
@@ -21,7 +21,7 @@
     },
     "require-dev": {
         "geocoder-php/provider-integration-tests": "^1.0",
-        "php-http/curl-client": "^1.7",
+        "php-http/curl-client": "^2.2",
         "php-http/message": "^1.0",
         "phpunit/phpunit": "^9.5"
     },
diff --git a/src/Provider/HostIp/phpunit.xml.dist b/src/Provider/HostIp/phpunit.xml.dist
index a158c9a38..26265855a 100644
--- a/src/Provider/HostIp/phpunit.xml.dist
+++ b/src/Provider/HostIp/phpunit.xml.dist
@@ -1,28 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
->
-    <php>
-        <server name="USE_CACHED_RESPONSES" value="true" />
-    </php>
-
-    <testsuites>
-        <testsuite name="Geocoder Test Suite">
-            <directory>./Tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php">
+  <coverage>
+    <include>
+      <directory>./</directory>
+    </include>
+    <exclude>
+      <directory>./Tests</directory>
+      <directory>./vendor</directory>
+    </exclude>
+  </coverage>
+  <php>
+    <server name="USE_CACHED_RESPONSES" value="true"/>
+  </php>
+  <testsuites>
+    <testsuite name="Geocoder Test Suite">
+      <directory>./Tests/</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>
diff --git a/src/Provider/IP2Location/composer.json b/src/Provider/IP2Location/composer.json
index ce6bf57a0..d7d9d2759 100644
--- a/src/Provider/IP2Location/composer.json
+++ b/src/Provider/IP2Location/composer.json
@@ -21,7 +21,7 @@
     },
     "require-dev": {
         "geocoder-php/provider-integration-tests": "^1.0",
-        "php-http/curl-client": "^1.7",
+        "php-http/curl-client": "^2.2",
         "php-http/message": "^1.0",
         "phpunit/phpunit": "^9.5"
     },
diff --git a/src/Provider/IP2Location/phpunit.xml.dist b/src/Provider/IP2Location/phpunit.xml.dist
index a3395ffc6..360d204cd 100644
--- a/src/Provider/IP2Location/phpunit.xml.dist
+++ b/src/Provider/IP2Location/phpunit.xml.dist
@@ -1,29 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
->
-    <php>
-        <!--<server name="IP2LOCATION_API_KEY" value="YOUR_API_KEY" />-->
-        <server name="USE_CACHED_RESPONSES" value="true" />
-    </php>
-
-    <testsuites>
-        <testsuite name="Geocoder Test Suite">
-            <directory>./Tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php">
+  <coverage>
+    <include>
+      <directory>./</directory>
+    </include>
+    <exclude>
+      <directory>./Tests</directory>
+      <directory>./vendor</directory>
+    </exclude>
+  </coverage>
+  <php>
+    <!--<server name="IP2LOCATION_API_KEY" value="YOUR_API_KEY" />-->
+    <server name="USE_CACHED_RESPONSES" value="true"/>
+  </php>
+  <testsuites>
+    <testsuite name="Geocoder Test Suite">
+      <directory>./Tests/</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>
diff --git a/src/Provider/IP2LocationBinary/phpunit.xml.dist b/src/Provider/IP2LocationBinary/phpunit.xml.dist
index a158c9a38..26265855a 100644
--- a/src/Provider/IP2LocationBinary/phpunit.xml.dist
+++ b/src/Provider/IP2LocationBinary/phpunit.xml.dist
@@ -1,28 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
->
-    <php>
-        <server name="USE_CACHED_RESPONSES" value="true" />
-    </php>
-
-    <testsuites>
-        <testsuite name="Geocoder Test Suite">
-            <directory>./Tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php">
+  <coverage>
+    <include>
+      <directory>./</directory>
+    </include>
+    <exclude>
+      <directory>./Tests</directory>
+      <directory>./vendor</directory>
+    </exclude>
+  </coverage>
+  <php>
+    <server name="USE_CACHED_RESPONSES" value="true"/>
+  </php>
+  <testsuites>
+    <testsuite name="Geocoder Test Suite">
+      <directory>./Tests/</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>
diff --git a/src/Provider/IpInfo/composer.json b/src/Provider/IpInfo/composer.json
index 7746a14f1..7a1eb28fc 100644
--- a/src/Provider/IpInfo/composer.json
+++ b/src/Provider/IpInfo/composer.json
@@ -21,7 +21,7 @@
     },
     "require-dev": {
         "geocoder-php/provider-integration-tests": "^1.0",
-        "php-http/curl-client": "^1.7",
+        "php-http/curl-client": "^2.2",
         "php-http/message": "^1.0",
         "phpunit/phpunit": "^9.5"
     },
diff --git a/src/Provider/IpInfo/phpunit.xml.dist b/src/Provider/IpInfo/phpunit.xml.dist
index a158c9a38..26265855a 100644
--- a/src/Provider/IpInfo/phpunit.xml.dist
+++ b/src/Provider/IpInfo/phpunit.xml.dist
@@ -1,28 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
->
-    <php>
-        <server name="USE_CACHED_RESPONSES" value="true" />
-    </php>
-
-    <testsuites>
-        <testsuite name="Geocoder Test Suite">
-            <directory>./Tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php">
+  <coverage>
+    <include>
+      <directory>./</directory>
+    </include>
+    <exclude>
+      <directory>./Tests</directory>
+      <directory>./vendor</directory>
+    </exclude>
+  </coverage>
+  <php>
+    <server name="USE_CACHED_RESPONSES" value="true"/>
+  </php>
+  <testsuites>
+    <testsuite name="Geocoder Test Suite">
+      <directory>./Tests/</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>
diff --git a/src/Provider/IpInfoDb/composer.json b/src/Provider/IpInfoDb/composer.json
index 3a7640bbc..ace3ab15a 100644
--- a/src/Provider/IpInfoDb/composer.json
+++ b/src/Provider/IpInfoDb/composer.json
@@ -21,7 +21,7 @@
     },
     "require-dev": {
         "geocoder-php/provider-integration-tests": "^1.0",
-        "php-http/curl-client": "^1.7",
+        "php-http/curl-client": "^2.2",
         "php-http/message": "^1.0",
         "phpunit/phpunit": "^9.5"
     },
diff --git a/src/Provider/IpInfoDb/phpunit.xml.dist b/src/Provider/IpInfoDb/phpunit.xml.dist
index 076702157..30693edbe 100644
--- a/src/Provider/IpInfoDb/phpunit.xml.dist
+++ b/src/Provider/IpInfoDb/phpunit.xml.dist
@@ -1,29 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
->
-    <php>
-        <server name="IPINFODB_API_KEY" value="YOUR_API_KEY" />
-        <server name="USE_CACHED_RESPONSES" value="true" />
-    </php>
-
-    <testsuites>
-        <testsuite name="Geocoder Test Suite">
-            <directory>./Tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php">
+  <coverage>
+    <include>
+      <directory>./</directory>
+    </include>
+    <exclude>
+      <directory>./Tests</directory>
+      <directory>./vendor</directory>
+    </exclude>
+  </coverage>
+  <php>
+    <server name="IPINFODB_API_KEY" value="YOUR_API_KEY"/>
+    <server name="USE_CACHED_RESPONSES" value="true"/>
+  </php>
+  <testsuites>
+    <testsuite name="Geocoder Test Suite">
+      <directory>./Tests/</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>
diff --git a/src/Provider/Ipstack/composer.json b/src/Provider/Ipstack/composer.json
index 552ba16a9..a7083280d 100644
--- a/src/Provider/Ipstack/composer.json
+++ b/src/Provider/Ipstack/composer.json
@@ -21,7 +21,7 @@
     },
     "require-dev": {
         "geocoder-php/provider-integration-tests": "^1.0",
-        "php-http/curl-client": "^1.7",
+        "php-http/curl-client": "^2.2",
         "php-http/message": "^1.0",
         "phpunit/phpunit": "^9.5"
     },
diff --git a/src/Provider/Ipstack/phpunit.xml.dist b/src/Provider/Ipstack/phpunit.xml.dist
index 0c34374b5..df5d8f954 100644
--- a/src/Provider/Ipstack/phpunit.xml.dist
+++ b/src/Provider/Ipstack/phpunit.xml.dist
@@ -1,29 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
->
-    <php>
-        <server name="IPSTACK_API_KEY" value="YOUR_API_KEY" />
-        <server name="USE_CACHED_RESPONSES" value="true" />
-    </php>
-
-    <testsuites>
-        <testsuite name="Geocoder Test Suite">
-            <directory>./Tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php">
+  <coverage>
+    <include>
+      <directory>./</directory>
+    </include>
+    <exclude>
+      <directory>./Tests</directory>
+      <directory>./vendor</directory>
+    </exclude>
+  </coverage>
+  <php>
+    <server name="IPSTACK_API_KEY" value="YOUR_API_KEY"/>
+    <server name="USE_CACHED_RESPONSES" value="true"/>
+  </php>
+  <testsuites>
+    <testsuite name="Geocoder Test Suite">
+      <directory>./Tests/</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>
diff --git a/src/Provider/LocationIQ/composer.json b/src/Provider/LocationIQ/composer.json
index 928fa8c04..c606e8c4c 100644
--- a/src/Provider/LocationIQ/composer.json
+++ b/src/Provider/LocationIQ/composer.json
@@ -25,7 +25,7 @@
         "phpunit/phpunit": "^9.5",
         "geocoder-php/provider-integration-tests": "^1.0",
         "php-http/message": "^1.0",
-        "php-http/curl-client": "^1.7"
+        "php-http/curl-client": "^2.2"
     },
     "provide": {
         "geocoder-php/provider-implementation": "1.0"
diff --git a/src/Provider/LocationIQ/phpunit.xml.dist b/src/Provider/LocationIQ/phpunit.xml.dist
index 37caf719d..d5c318e7e 100644
--- a/src/Provider/LocationIQ/phpunit.xml.dist
+++ b/src/Provider/LocationIQ/phpunit.xml.dist
@@ -1,29 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
->
-    <php>
-        <server name="LOCATIONIQ_API_KEY" value="YOUR_API_KEY" />
-        <server name="USE_CACHED_RESPONSES" value="true" />
-    </php>
-
-    <testsuites>
-        <testsuite name="Geocoder Test Suite">
-            <directory>./Tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php">
+  <coverage>
+    <include>
+      <directory>./</directory>
+    </include>
+    <exclude>
+      <directory>./Tests</directory>
+      <directory>./vendor</directory>
+    </exclude>
+  </coverage>
+  <php>
+    <server name="LOCATIONIQ_API_KEY" value="YOUR_API_KEY"/>
+    <server name="USE_CACHED_RESPONSES" value="true"/>
+  </php>
+  <testsuites>
+    <testsuite name="Geocoder Test Suite">
+      <directory>./Tests/</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>
diff --git a/src/Provider/MapQuest/composer.json b/src/Provider/MapQuest/composer.json
index 942ac7757..9fd76e3a9 100644
--- a/src/Provider/MapQuest/composer.json
+++ b/src/Provider/MapQuest/composer.json
@@ -21,7 +21,7 @@
     },
     "require-dev": {
         "geocoder-php/provider-integration-tests": "^1.1",
-        "php-http/curl-client": "^1.7",
+        "php-http/curl-client": "^2.2",
         "php-http/message": "^1.0",
         "phpunit/phpunit": "^9.5"
     },
diff --git a/src/Provider/MapQuest/phpunit.xml.dist b/src/Provider/MapQuest/phpunit.xml.dist
index 0f20edf8b..d97ed92ac 100644
--- a/src/Provider/MapQuest/phpunit.xml.dist
+++ b/src/Provider/MapQuest/phpunit.xml.dist
@@ -1,29 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
->
-    <php>
-        <server name="MAPQUEST_API_KEY" value="YOUR_API_KEY" />
-        <server name="USE_CACHED_RESPONSES" value="true" />
-    </php>
-
-    <testsuites>
-        <testsuite name="Geocoder Test Suite">
-            <directory>./Tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php">
+  <coverage>
+    <include>
+      <directory>./</directory>
+    </include>
+    <exclude>
+      <directory>./Tests</directory>
+      <directory>./vendor</directory>
+    </exclude>
+  </coverage>
+  <php>
+    <server name="MAPQUEST_API_KEY" value="YOUR_API_KEY"/>
+    <server name="USE_CACHED_RESPONSES" value="true"/>
+  </php>
+  <testsuites>
+    <testsuite name="Geocoder Test Suite">
+      <directory>./Tests/</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>
diff --git a/src/Provider/Mapbox/composer.json b/src/Provider/Mapbox/composer.json
index cd4fa90fa..c847ff2d0 100644
--- a/src/Provider/Mapbox/composer.json
+++ b/src/Provider/Mapbox/composer.json
@@ -21,7 +21,7 @@
     },
     "require-dev": {
         "geocoder-php/provider-integration-tests": "^1.0",
-        "php-http/curl-client": "^1.7",
+        "php-http/curl-client": "^2.2",
         "php-http/message": "^1.0",
         "phpunit/phpunit": "^9.5"
     },
diff --git a/src/Provider/Mapbox/phpunit.xml.dist b/src/Provider/Mapbox/phpunit.xml.dist
index 770f8f745..73f7d38f9 100644
--- a/src/Provider/Mapbox/phpunit.xml.dist
+++ b/src/Provider/Mapbox/phpunit.xml.dist
@@ -1,29 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
->
-    <php>
-        <server name="MAPBOX_GEOCODING_KEY" value="YOUR_GEOCODING_KEY" />
-        <server name="USE_CACHED_RESPONSES" value="true" />
-    </php>
-
-    <testsuites>
-        <testsuite name="Geocoder Test Suite">
-            <directory>./Tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php">
+  <coverage>
+    <include>
+      <directory>./</directory>
+    </include>
+    <exclude>
+      <directory>./Tests</directory>
+      <directory>./vendor</directory>
+    </exclude>
+  </coverage>
+  <php>
+    <server name="MAPBOX_GEOCODING_KEY" value="YOUR_GEOCODING_KEY"/>
+    <server name="USE_CACHED_RESPONSES" value="true"/>
+  </php>
+  <testsuites>
+    <testsuite name="Geocoder Test Suite">
+      <directory>./Tests/</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>
diff --git a/src/Provider/Mapzen/composer.json b/src/Provider/Mapzen/composer.json
index e26029a06..484d28da6 100644
--- a/src/Provider/Mapzen/composer.json
+++ b/src/Provider/Mapzen/composer.json
@@ -21,7 +21,7 @@
     },
     "require-dev": {
         "geocoder-php/provider-integration-tests": "^1.0",
-        "php-http/curl-client": "^1.7",
+        "php-http/curl-client": "^2.2",
         "php-http/message": "^1.0",
         "phpunit/phpunit": "^9.5"
     },
diff --git a/src/Provider/Mapzen/phpunit.xml.dist b/src/Provider/Mapzen/phpunit.xml.dist
index 7974e80f9..14176910c 100644
--- a/src/Provider/Mapzen/phpunit.xml.dist
+++ b/src/Provider/Mapzen/phpunit.xml.dist
@@ -1,29 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
->
-    <php>
-        <server name="MAPZEN_API_KEY" value="YOUR_MAPZEN_API_KEY" />
-        <server name="USE_CACHED_RESPONSES" value="true" />
-    </php>
-
-    <testsuites>
-        <testsuite name="Geocoder Test Suite">
-            <directory>./Tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php">
+  <coverage>
+    <include>
+      <directory>./</directory>
+    </include>
+    <exclude>
+      <directory>./Tests</directory>
+      <directory>./vendor</directory>
+    </exclude>
+  </coverage>
+  <php>
+    <server name="MAPZEN_API_KEY" value="YOUR_MAPZEN_API_KEY"/>
+    <server name="USE_CACHED_RESPONSES" value="true"/>
+  </php>
+  <testsuites>
+    <testsuite name="Geocoder Test Suite">
+      <directory>./Tests/</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>
diff --git a/src/Provider/MaxMind/composer.json b/src/Provider/MaxMind/composer.json
index 4a3644565..be0de718d 100644
--- a/src/Provider/MaxMind/composer.json
+++ b/src/Provider/MaxMind/composer.json
@@ -22,7 +22,7 @@
     "require-dev": {
         "geocoder-php/common-http": "^4.0",
         "geocoder-php/provider-integration-tests": "^1.0",
-        "php-http/curl-client": "^1.7",
+        "php-http/curl-client": "^2.2",
         "php-http/message": "^1.0",
         "phpunit/phpunit": "^9.5"
     },
diff --git a/src/Provider/MaxMind/phpunit.xml.dist b/src/Provider/MaxMind/phpunit.xml.dist
index 8651f3c65..3ba11f98f 100644
--- a/src/Provider/MaxMind/phpunit.xml.dist
+++ b/src/Provider/MaxMind/phpunit.xml.dist
@@ -1,29 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
->
-    <php>
-        <!--<server name="MAXMIND_API_KEY" value="YOUR_API_KEY" />-->
-        <server name="USE_CACHED_RESPONSES" value="true" />
-    </php>
-
-    <testsuites>
-        <testsuite name="Geocoder Test Suite">
-            <directory>./Tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php">
+  <coverage>
+    <include>
+      <directory>./</directory>
+    </include>
+    <exclude>
+      <directory>./Tests</directory>
+      <directory>./vendor</directory>
+    </exclude>
+  </coverage>
+  <php>
+    <!--<server name="MAXMIND_API_KEY" value="YOUR_API_KEY" />-->
+    <server name="USE_CACHED_RESPONSES" value="true"/>
+  </php>
+  <testsuites>
+    <testsuite name="Geocoder Test Suite">
+      <directory>./Tests/</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>
diff --git a/src/Provider/MaxMindBinary/phpunit.xml.dist b/src/Provider/MaxMindBinary/phpunit.xml.dist
index 21fa59518..548cbd0e8 100644
--- a/src/Provider/MaxMindBinary/phpunit.xml.dist
+++ b/src/Provider/MaxMindBinary/phpunit.xml.dist
@@ -1,29 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
->
-    <php>
-        <server name="BINGMAPS_API_KEY" value="YOUR_API_KEY" />
-        <server name="USE_CACHED_RESPONSES" value="true" />
-    </php>
-
-    <testsuites>
-        <testsuite name="Geocoder Test Suite">
-            <directory>./Tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php">
+  <coverage>
+    <include>
+      <directory>./</directory>
+    </include>
+    <exclude>
+      <directory>./Tests</directory>
+      <directory>./vendor</directory>
+    </exclude>
+  </coverage>
+  <php>
+    <server name="BINGMAPS_API_KEY" value="YOUR_API_KEY"/>
+    <server name="USE_CACHED_RESPONSES" value="true"/>
+  </php>
+  <testsuites>
+    <testsuite name="Geocoder Test Suite">
+      <directory>./Tests/</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>
diff --git a/src/Provider/Nominatim/composer.json b/src/Provider/Nominatim/composer.json
index a2ee28626..2b27f4d93 100644
--- a/src/Provider/Nominatim/composer.json
+++ b/src/Provider/Nominatim/composer.json
@@ -21,7 +21,7 @@
     },
     "require-dev": {
         "geocoder-php/provider-integration-tests": "^1.0",
-        "php-http/curl-client": "^1.7",
+        "php-http/curl-client": "^2.2",
         "php-http/message": "^1.0",
         "phpunit/phpunit": "^9.5"
     },
diff --git a/src/Provider/Nominatim/phpunit.xml.dist b/src/Provider/Nominatim/phpunit.xml.dist
index a158c9a38..26265855a 100644
--- a/src/Provider/Nominatim/phpunit.xml.dist
+++ b/src/Provider/Nominatim/phpunit.xml.dist
@@ -1,28 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
->
-    <php>
-        <server name="USE_CACHED_RESPONSES" value="true" />
-    </php>
-
-    <testsuites>
-        <testsuite name="Geocoder Test Suite">
-            <directory>./Tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php">
+  <coverage>
+    <include>
+      <directory>./</directory>
+    </include>
+    <exclude>
+      <directory>./Tests</directory>
+      <directory>./vendor</directory>
+    </exclude>
+  </coverage>
+  <php>
+    <server name="USE_CACHED_RESPONSES" value="true"/>
+  </php>
+  <testsuites>
+    <testsuite name="Geocoder Test Suite">
+      <directory>./Tests/</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>
diff --git a/src/Provider/OpenCage/composer.json b/src/Provider/OpenCage/composer.json
index 782f4b8fa..32292e438 100644
--- a/src/Provider/OpenCage/composer.json
+++ b/src/Provider/OpenCage/composer.json
@@ -21,7 +21,7 @@
     },
     "require-dev": {
         "geocoder-php/provider-integration-tests": "^1.2",
-        "php-http/curl-client": "^1.7",
+        "php-http/curl-client": "^2.2",
         "php-http/message": "^1.0",
         "phpunit/phpunit": "^9.5"
     },
diff --git a/src/Provider/OpenCage/phpunit.xml.dist b/src/Provider/OpenCage/phpunit.xml.dist
index ea1a1fe43..5e2acc6bc 100644
--- a/src/Provider/OpenCage/phpunit.xml.dist
+++ b/src/Provider/OpenCage/phpunit.xml.dist
@@ -1,29 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
->
-    <php>
-        <server name="OPENCAGE_API_KEY" value="YOUR_GEOCODING_KEY" />
-        <server name="USE_CACHED_RESPONSES" value="true" />
-    </php>
-
-    <testsuites>
-        <testsuite name="Geocoder Test Suite">
-            <directory>./Tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php">
+  <coverage>
+    <include>
+      <directory>./</directory>
+    </include>
+    <exclude>
+      <directory>./Tests</directory>
+      <directory>./vendor</directory>
+    </exclude>
+  </coverage>
+  <php>
+    <server name="OPENCAGE_API_KEY" value="YOUR_GEOCODING_KEY"/>
+    <server name="USE_CACHED_RESPONSES" value="true"/>
+  </php>
+  <testsuites>
+    <testsuite name="Geocoder Test Suite">
+      <directory>./Tests/</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>
diff --git a/src/Provider/OpenRouteService/composer.json b/src/Provider/OpenRouteService/composer.json
index c011e019b..e01cdd20c 100644
--- a/src/Provider/OpenRouteService/composer.json
+++ b/src/Provider/OpenRouteService/composer.json
@@ -21,7 +21,7 @@
     },
     "require-dev": {
         "geocoder-php/provider-integration-tests": "^1.0",
-        "php-http/curl-client": "^1.7",
+        "php-http/curl-client": "^2.2",
         "php-http/message": "^1.0",
         "phpunit/phpunit": "^9.5"
     },
diff --git a/src/Provider/OpenRouteService/phpunit.xml.dist b/src/Provider/OpenRouteService/phpunit.xml.dist
index e8e4c9975..fd86edb1f 100644
--- a/src/Provider/OpenRouteService/phpunit.xml.dist
+++ b/src/Provider/OpenRouteService/phpunit.xml.dist
@@ -1,29 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
->
-    <php>
-        <server name="OPEN_ROUTE_SERVICE_API_KEY" value="YOUR_OPEN_ROUTE_SERVICE_API_KEY" />
-        <server name="USE_CACHED_RESPONSES" value="true" />
-    </php>
-
-    <testsuites>
-        <testsuite name="Geocoder Test Suite">
-            <directory>./Tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php">
+  <coverage>
+    <include>
+      <directory>./</directory>
+    </include>
+    <exclude>
+      <directory>./Tests</directory>
+      <directory>./vendor</directory>
+    </exclude>
+  </coverage>
+  <php>
+    <server name="OPEN_ROUTE_SERVICE_API_KEY" value="YOUR_OPEN_ROUTE_SERVICE_API_KEY"/>
+    <server name="USE_CACHED_RESPONSES" value="true"/>
+  </php>
+  <testsuites>
+    <testsuite name="Geocoder Test Suite">
+      <directory>./Tests/</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>
diff --git a/src/Provider/Pelias/composer.json b/src/Provider/Pelias/composer.json
index eb0c8fabf..186b6d4be 100644
--- a/src/Provider/Pelias/composer.json
+++ b/src/Provider/Pelias/composer.json
@@ -21,7 +21,7 @@
     },
     "require-dev": {
         "geocoder-php/provider-integration-tests": "^1.0",
-        "php-http/curl-client": "^1.7",
+        "php-http/curl-client": "^2.2",
         "php-http/message": "^1.7",
         "phpunit/phpunit": "^9.5"
     },
diff --git a/src/Provider/Pelias/phpunit.xml.dist b/src/Provider/Pelias/phpunit.xml.dist
index a158c9a38..26265855a 100644
--- a/src/Provider/Pelias/phpunit.xml.dist
+++ b/src/Provider/Pelias/phpunit.xml.dist
@@ -1,28 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
->
-    <php>
-        <server name="USE_CACHED_RESPONSES" value="true" />
-    </php>
-
-    <testsuites>
-        <testsuite name="Geocoder Test Suite">
-            <directory>./Tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php">
+  <coverage>
+    <include>
+      <directory>./</directory>
+    </include>
+    <exclude>
+      <directory>./Tests</directory>
+      <directory>./vendor</directory>
+    </exclude>
+  </coverage>
+  <php>
+    <server name="USE_CACHED_RESPONSES" value="true"/>
+  </php>
+  <testsuites>
+    <testsuite name="Geocoder Test Suite">
+      <directory>./Tests/</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>
diff --git a/src/Provider/Photon/composer.json b/src/Provider/Photon/composer.json
index 8c600dae9..88efd4851 100644
--- a/src/Provider/Photon/composer.json
+++ b/src/Provider/Photon/composer.json
@@ -20,7 +20,7 @@
     },
     "require-dev": {
         "geocoder-php/provider-integration-tests": "^1.0",
-        "php-http/curl-client": "^1.7",
+        "php-http/curl-client": "^2.2",
         "php-http/message": "^1.0",
         "phpunit/phpunit": "^9.5"
     },
diff --git a/src/Provider/Photon/phpunit.xml.dist b/src/Provider/Photon/phpunit.xml.dist
index a158c9a38..26265855a 100644
--- a/src/Provider/Photon/phpunit.xml.dist
+++ b/src/Provider/Photon/phpunit.xml.dist
@@ -1,28 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
->
-    <php>
-        <server name="USE_CACHED_RESPONSES" value="true" />
-    </php>
-
-    <testsuites>
-        <testsuite name="Geocoder Test Suite">
-            <directory>./Tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php">
+  <coverage>
+    <include>
+      <directory>./</directory>
+    </include>
+    <exclude>
+      <directory>./Tests</directory>
+      <directory>./vendor</directory>
+    </exclude>
+  </coverage>
+  <php>
+    <server name="USE_CACHED_RESPONSES" value="true"/>
+  </php>
+  <testsuites>
+    <testsuite name="Geocoder Test Suite">
+      <directory>./Tests/</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>
diff --git a/src/Provider/PickPoint/composer.json b/src/Provider/PickPoint/composer.json
index fe22878e9..b6da4ae22 100644
--- a/src/Provider/PickPoint/composer.json
+++ b/src/Provider/PickPoint/composer.json
@@ -21,7 +21,7 @@
     },
     "require-dev": {
         "geocoder-php/provider-integration-tests": "^1.0",
-        "php-http/curl-client": "^1.7",
+        "php-http/curl-client": "^2.2",
         "php-http/message": "^1.0",
         "phpunit/phpunit": "^9.5"
     },
diff --git a/src/Provider/PickPoint/phpunit.xml.dist b/src/Provider/PickPoint/phpunit.xml.dist
index 6dda22e49..ba7b53018 100644
--- a/src/Provider/PickPoint/phpunit.xml.dist
+++ b/src/Provider/PickPoint/phpunit.xml.dist
@@ -1,29 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
->
-    <php>
-        <server name="PICKPOINT_API_KEY" value="YOUR_API_KEY" />
-        <server name="USE_CACHED_RESPONSES" value="true" />
-    </php>
-
-    <testsuites>
-        <testsuite name="Geocoder Test Suite">
-            <directory>./Tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php">
+  <coverage>
+    <include>
+      <directory>./</directory>
+    </include>
+    <exclude>
+      <directory>./Tests</directory>
+      <directory>./vendor</directory>
+    </exclude>
+  </coverage>
+  <php>
+    <server name="PICKPOINT_API_KEY" value="YOUR_API_KEY"/>
+    <server name="USE_CACHED_RESPONSES" value="true"/>
+  </php>
+  <testsuites>
+    <testsuite name="Geocoder Test Suite">
+      <directory>./Tests/</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>
diff --git a/src/Provider/TomTom/composer.json b/src/Provider/TomTom/composer.json
index efe290eaa..adb948f00 100644
--- a/src/Provider/TomTom/composer.json
+++ b/src/Provider/TomTom/composer.json
@@ -21,7 +21,7 @@
     },
     "require-dev": {
         "geocoder-php/provider-integration-tests": "^1.0",
-        "php-http/curl-client": "^1.7",
+        "php-http/curl-client": "^2.2",
         "php-http/message": "^1.0",
         "phpunit/phpunit": "^9.5"
     },
diff --git a/src/Provider/TomTom/phpunit.xml.dist b/src/Provider/TomTom/phpunit.xml.dist
index 54657b912..46e7ec276 100644
--- a/src/Provider/TomTom/phpunit.xml.dist
+++ b/src/Provider/TomTom/phpunit.xml.dist
@@ -1,29 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
->
-    <php>
-        <server name="TOMTOM_MAP_KEY" value="YOUR_MAP_KEY" />
-        <server name="USE_CACHED_RESPONSES" value="true" />
-    </php>
-
-    <testsuites>
-        <testsuite name="Geocoder Test Suite">
-            <directory>./Tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php">
+  <coverage>
+    <include>
+      <directory>./</directory>
+    </include>
+    <exclude>
+      <directory>./Tests</directory>
+      <directory>./vendor</directory>
+    </exclude>
+  </coverage>
+  <php>
+    <server name="TOMTOM_MAP_KEY" value="YOUR_MAP_KEY"/>
+    <server name="USE_CACHED_RESPONSES" value="true"/>
+  </php>
+  <testsuites>
+    <testsuite name="Geocoder Test Suite">
+      <directory>./Tests/</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>
diff --git a/src/Provider/Yandex/composer.json b/src/Provider/Yandex/composer.json
index c2afcf914..65c086086 100644
--- a/src/Provider/Yandex/composer.json
+++ b/src/Provider/Yandex/composer.json
@@ -21,7 +21,7 @@
     },
     "require-dev": {
         "geocoder-php/provider-integration-tests": "^1.0",
-        "php-http/curl-client": "^1.7",
+        "php-http/curl-client": "^2.2",
         "php-http/message": "^1.0",
         "phpunit/phpunit": "^9.5"
     },
diff --git a/src/Provider/Yandex/phpunit.xml.dist b/src/Provider/Yandex/phpunit.xml.dist
index bf93050cf..c607aa531 100644
--- a/src/Provider/Yandex/phpunit.xml.dist
+++ b/src/Provider/Yandex/phpunit.xml.dist
@@ -1,29 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
->
-    <php>
-        <server name="USE_CACHED_RESPONSES" value="true" />
-        <server name="YANDEX_API_KEY" value="YOUR_API_KEY" />
-    </php>
-
-    <testsuites>
-        <testsuite name="Geocoder Test Suite">
-            <directory>./Tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php">
+  <coverage>
+    <include>
+      <directory>./</directory>
+    </include>
+    <exclude>
+      <directory>./Tests</directory>
+      <directory>./vendor</directory>
+    </exclude>
+  </coverage>
+  <php>
+    <server name="USE_CACHED_RESPONSES" value="true"/>
+    <server name="YANDEX_API_KEY" value="YOUR_API_KEY"/>
+  </php>
+  <testsuites>
+    <testsuite name="Geocoder Test Suite">
+      <directory>./Tests/</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>