diff --git a/Directory.build.props b/Directory.build.props
index 953a4da..11d9258 100644
--- a/Directory.build.props
+++ b/Directory.build.props
@@ -15,16 +15,15 @@
     <PackageReference Include="StyleCop.CSharp.Async.Rules" Version="6.1.41">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Text.Analyzers" Version="2.6.4">
-      <PrivateAssets>All</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Analyzers" Version="2.2.0">
+    <PackageReference Include="Text.Analyzers" Version="3.3.4">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
   </ItemGroup>
   
   <PropertyGroup>
     <AnalysisMode>AllEnabledByDefault</AnalysisMode>
+    <IncludeOpenAPIAnalyzers>true</IncludeOpenAPIAnalyzers>
+    <EnableNETAnalyzers>true</EnableNETAnalyzers>
   </PropertyGroup>
 
 </Project>
diff --git a/Geo.NET.ruleset b/Geo.NET.ruleset
index a260842..3c0fd06 100644
--- a/Geo.NET.ruleset
+++ b/Geo.NET.ruleset
@@ -3,6 +3,7 @@
 
 	<Rules AnalyzerId="System.Diagnostics.CodeAnalysis" RuleNamespace="System.Diagnostics.CodeAnalysis">
 		<Rule Id="CA1014" Action="None"/>
+		<Rule Id="CA1704" Action="None"/>
 		<Rule Id="CA1805" Action="None"/>
 		<Rule Id="CA2208" Action="None"/>
 	</Rules>
diff --git a/src/Geo.ArcGIS/DependencyInjection/ServiceCollectionExtensions.cs b/src/Geo.ArcGIS/DependencyInjection/ServiceCollectionExtensions.cs
index e1da716..e86bb18 100644
--- a/src/Geo.ArcGIS/DependencyInjection/ServiceCollectionExtensions.cs
+++ b/src/Geo.ArcGIS/DependencyInjection/ServiceCollectionExtensions.cs
@@ -6,6 +6,7 @@
 namespace Geo.ArcGIS.DependencyInjection
 {
     using System;
+    using System.Net.Http;
     using Geo.ArcGIS.Abstractions;
     using Geo.ArcGIS.Models;
     using Geo.ArcGIS.Services;
@@ -26,10 +27,15 @@ public static class ServiceCollectionExtensions
         /// </list>
         /// </para>
         /// </summary>
-        /// <param name="services">A <see cref="IServiceCollection"/> to add the ArcGIS services to.</param>
+        /// <param name="services">An <see cref="IServiceCollection"/> to add the ArcGIS services to.</param>
         /// <param name="optionsBuilder">A <see cref="Action{ArcGISOptionsBuilder}"/> with the options to add to the ArcGIS configuration.</param>
-        /// <returns>A <see cref="IServiceCollection"/> with the added services.</returns>
-        public static IServiceCollection AddArcGISServices(this IServiceCollection services, Action<ArcGISOptionsBuilder> optionsBuilder)
+        /// <param name="configureClient">Optional. A delegate that is used to configure the <see cref="HttpClient"/>.</param>
+        /// <returns>An <see cref="IHttpClientBuilder"/> to configure the http client.</returns>
+        /// <exception cref="ArgumentNullException">Thrown if <paramref name="services"/> is null.</exception>
+        public static IHttpClientBuilder AddArcGISServices(
+            this IServiceCollection services,
+            Action<ArcGISOptionsBuilder> optionsBuilder,
+            Action<HttpClient> configureClient = null)
         {
             services.AddCoreServices();
 
@@ -47,9 +53,13 @@ public static IServiceCollection AddArcGISServices(this IServiceCollection servi
 
             services.AddHttpClient<IArcGISTokenRetrevial, ArcGISTokenRetrevial>();
             services.AddSingleton<IArcGISTokenContainer, ArcGISTokenContainer>();
-            services.AddHttpClient<IArcGISGeocoding, ArcGISGeocoding>();
 
-            return services;
+            return services.AddHttpClient<IArcGISGeocoding, ArcGISGeocoding>(configureClient ?? DefaultHttpClientConfiguration);
+        }
+
+        private static void DefaultHttpClientConfiguration(HttpClient client)
+        {
+            // No-op
         }
     }
 }
diff --git a/src/Geo.ArcGIS/Services/ArcGISGeocoding.cs b/src/Geo.ArcGIS/Services/ArcGISGeocoding.cs
index b97ca00..bafe8df 100644
--- a/src/Geo.ArcGIS/Services/ArcGISGeocoding.cs
+++ b/src/Geo.ArcGIS/Services/ArcGISGeocoding.cs
@@ -43,7 +43,7 @@ public class ArcGISGeocoding : ClientExecutor, IArcGISGeocoding
         /// Initializes a new instance of the <see cref="ArcGISGeocoding"/> class.
         /// </summary>
         /// <param name="client">A <see cref="HttpClient"/> used for making calls to the ArcGIS system.</param>
-        /// <param name="tokenContainer">A <see cref="IArcGISTokenContainer"/> used for retreiving the ArcGIS token.</param>
+        /// <param name="tokenContainer">An <see cref="IArcGISTokenContainer"/> used for retreiving the ArcGIS token.</param>
         /// <param name="exceptionProvider">An <see cref="IGeoNETExceptionProvider"/> used to provide exceptions based on an exception type.</param>
         /// <param name="resourceStringProviderFactory">An <see cref="IGeoNETResourceStringProviderFactory"/> used to create a resource string provider for log or exception messages.</param>
         /// <param name="loggerFactory">An <see cref="ILoggerFactory"/> used to create a logger used for logging information.</param>
diff --git a/src/Geo.ArcGIS/Services/ArcGISTokenContainer.cs b/src/Geo.ArcGIS/Services/ArcGISTokenContainer.cs
index 589a0d4..e6b0326 100644
--- a/src/Geo.ArcGIS/Services/ArcGISTokenContainer.cs
+++ b/src/Geo.ArcGIS/Services/ArcGISTokenContainer.cs
@@ -24,7 +24,7 @@ public class ArcGISTokenContainer : IArcGISTokenContainer
         /// <summary>
         /// Initializes a new instance of the <see cref="ArcGISTokenContainer"/> class.
         /// </summary>
-        /// <param name="tokenRetrevial">A <see cref="IArcGISTokenRetrevial"/> used to retrieve the token if expired of none existant.</param>
+        /// <param name="tokenRetrevial">An <see cref="IArcGISTokenRetrevial"/> used to retrieve the token if expired of none existant.</param>
         public ArcGISTokenContainer(IArcGISTokenRetrevial tokenRetrevial)
         {
             _tokenRetrevial = tokenRetrevial ?? throw new ArgumentNullException(nameof(tokenRetrevial));
diff --git a/src/Geo.ArcGIS/Services/ArcGISTokenRetrevial.cs b/src/Geo.ArcGIS/Services/ArcGISTokenRetrevial.cs
index 2e56894..f2bedaa 100644
--- a/src/Geo.ArcGIS/Services/ArcGISTokenRetrevial.cs
+++ b/src/Geo.ArcGIS/Services/ArcGISTokenRetrevial.cs
@@ -27,7 +27,7 @@ public class ArcGISTokenRetrevial : IArcGISTokenRetrevial
         /// Initializes a new instance of the <see cref="ArcGISTokenRetrevial"/> class.
         /// </summary>
         /// <param name="client">A <see cref="HttpClient"/> used for placing calls to the ArcGIS token generation API.</param>
-        /// <param name="credentialsContainer">A <see cref="IArcGISCredentialsContainer"/> used for fetching the ArcGIS credentials.</param>
+        /// <param name="credentialsContainer">An <see cref="IArcGISCredentialsContainer"/> used for fetching the ArcGIS credentials.</param>
         public ArcGISTokenRetrevial(
             HttpClient client,
             IArcGISCredentialsContainer credentialsContainer)
diff --git a/src/Geo.Bing/DependencyInjection/ServiceCollectionExtensions.cs b/src/Geo.Bing/DependencyInjection/ServiceCollectionExtensions.cs
index 0076a37..c468b5c 100644
--- a/src/Geo.Bing/DependencyInjection/ServiceCollectionExtensions.cs
+++ b/src/Geo.Bing/DependencyInjection/ServiceCollectionExtensions.cs
@@ -6,6 +6,7 @@
 namespace Geo.Bing.DependencyInjection
 {
     using System;
+    using System.Net.Http;
     using Geo.Bing.Abstractions;
     using Geo.Bing.Models;
     using Geo.Bing.Services;
@@ -26,10 +27,15 @@ public static class ServiceCollectionExtensions
         /// </list>
         /// </para>
         /// </summary>
-        /// <param name="services">A <see cref="IServiceCollection"/> to add the Bing services to.</param>
+        /// <param name="services">An <see cref="IServiceCollection"/> to add the Bing services to.</param>
         /// <param name="optionsBuilder">A <see cref="Action{BingOptionsBuilder}"/> with the options to add to the Bing configuration.</param>
-        /// <returns>A <see cref="IServiceCollection"/> with the added services.</returns>
-        public static IServiceCollection AddBingServices(this IServiceCollection services, Action<BingOptionsBuilder> optionsBuilder)
+        /// <param name="configureClient">Optional. A delegate that is used to configure the <see cref="HttpClient"/>.</param>
+        /// <returns>An <see cref="IHttpClientBuilder"/> to configure the http client.</returns>
+        /// <exception cref="ArgumentNullException">Thrown if <paramref name="services"/> is null.</exception>
+        public static IHttpClientBuilder AddBingServices(
+            this IServiceCollection services,
+            Action<BingOptionsBuilder> optionsBuilder,
+            Action<HttpClient> configureClient = null)
         {
             services.AddCoreServices();
 
@@ -45,9 +51,12 @@ public static IServiceCollection AddBingServices(this IServiceCollection service
                 services.AddSingleton<IBingKeyContainer>(new BingKeyContainer(string.Empty));
             }
 
-            services.AddHttpClient<IBingGeocoding, BingGeocoding>();
+            return services.AddHttpClient<IBingGeocoding, BingGeocoding>(configureClient ?? DefaultHttpClientConfiguration);
+        }
 
-            return services;
+        private static void DefaultHttpClientConfiguration(HttpClient client)
+        {
+            // No-op
         }
     }
 }
diff --git a/src/Geo.Bing/Services/BingGeocoding.cs b/src/Geo.Bing/Services/BingGeocoding.cs
index 99be37f..a771f7a 100644
--- a/src/Geo.Bing/Services/BingGeocoding.cs
+++ b/src/Geo.Bing/Services/BingGeocoding.cs
@@ -35,7 +35,7 @@ public class BingGeocoding : ClientExecutor, IBingGeocoding
         /// Initializes a new instance of the <see cref="BingGeocoding"/> class.
         /// </summary>
         /// <param name="client">A <see cref="HttpClient"/> used for placing calls to the Bing Geocoding API.</param>
-        /// <param name="keyContainer">A <see cref="IBingKeyContainer"/> used for fetching the Bing key.</param>
+        /// <param name="keyContainer">An <see cref="IBingKeyContainer"/> used for fetching the Bing key.</param>
         /// <param name="exceptionProvider">An <see cref="IGeoNETExceptionProvider"/> used to provide exceptions based on an exception type.</param>
         /// <param name="resourceStringProviderFactory">An <see cref="IGeoNETResourceStringProviderFactory"/> used to create a resource string provider for log or exception messages.</param>
         /// <param name="loggerFactory">An <see cref="ILoggerFactory"/> used to create a logger used for logging information.</param>
diff --git a/src/Geo.Core/Abstractions/IGeoNETResourceStringProviderFactory.cs b/src/Geo.Core/Abstractions/IGeoNETResourceStringProviderFactory.cs
index eeb3331..bea47ac 100644
--- a/src/Geo.Core/Abstractions/IGeoNETResourceStringProviderFactory.cs
+++ b/src/Geo.Core/Abstractions/IGeoNETResourceStringProviderFactory.cs
@@ -14,21 +14,21 @@ namespace Geo.Core
     public interface IGeoNETResourceStringProviderFactory
     {
         /// <summary>
-        /// Creates a <see cref="IGeoNETResourceStringProvider"/> based on a type.
+        /// Creates an <see cref="IGeoNETResourceStringProvider"/> based on a type.
         /// </summary>
         /// <typeparam name="TResource">The type of the resource to create an <see cref="IGeoNETResourceStringProvider"/> for.</typeparam>
         /// <returns>An <see cref="IGeoNETResourceStringProvider"/>.</returns>
         IGeoNETResourceStringProvider CreateResourceStringProvider<TResource>();
 
         /// <summary>
-        /// Creates a <see cref="IGeoNETResourceStringProvider"/> based on a type.
+        /// Creates an <see cref="IGeoNETResourceStringProvider"/> based on a type.
         /// </summary>
         /// <param name="resourceType">The type of the resource to create an <see cref="IGeoNETResourceStringProvider"/> for.</param>
         /// <returns>An <see cref="IGeoNETResourceStringProvider"/>.</returns>
         IGeoNETResourceStringProvider CreateResourceStringProvider(Type resourceType);
 
         /// <summary>
-        /// Creates a <see cref="IGeoNETResourceStringProvider"/> based on the resouce file name and assembly.
+        /// Creates an <see cref="IGeoNETResourceStringProvider"/> based on the resouce file name and assembly.
         /// </summary>
         /// <param name="resourceFileName">The name of the resource file.</param>
         /// <param name="assembly">Optional. The assembly the resource file is located in. If not passed in, the current assembly will be used.</param>
diff --git a/src/Geo.Core/DependencyInjection/ServiceCollectionExtensions.cs b/src/Geo.Core/DependencyInjection/ServiceCollectionExtensions.cs
index 0f088af..35bfa24 100644
--- a/src/Geo.Core/DependencyInjection/ServiceCollectionExtensions.cs
+++ b/src/Geo.Core/DependencyInjection/ServiceCollectionExtensions.cs
@@ -5,7 +5,9 @@
 
 namespace Geo.Core.DependencyInjection
 {
+    using System;
     using Microsoft.Extensions.DependencyInjection;
+    using Microsoft.Extensions.DependencyInjection.Extensions;
 
     /// <summary>
     /// Extension methods for the <see cref="IServiceCollection"/> class.
@@ -14,14 +16,26 @@ public static class ServiceCollectionExtensions
     {
         /// <summary>
         /// Adds the Core services to the service collection.
+        /// <para>
+        /// Adds the services:
+        /// <list type="bullet">
+        /// <item><see cref="IGeoNETResourceStringProviderFactory"/></item>
+        /// <item><see cref="IGeoNETExceptionProvider"/></item>
+        /// </list>
+        /// </para>
         /// </summary>
-        /// <param name="services">A <see cref="IServiceCollection"/> to add the Core services to.</param>
-        /// <returns>A <see cref="IServiceCollection"/> with the added services.</returns>
+        /// <param name="services">An <see cref="IServiceCollection"/> to add the Core services to.</param>
+        /// <returns>The <see cref="IServiceCollection"/> for chaining.</returns>
+        /// <exception cref="ArgumentNullException">Thrown if <paramref name="services"/> is null.</exception>
         public static IServiceCollection AddCoreServices(this IServiceCollection services)
         {
-            services
-                .AddTransient<IGeoNETResourceStringProviderFactory, GeoNETResourceStringProviderFactory>()
-                .AddTransient<IGeoNETExceptionProvider, GeoNETExceptionProvider>();
+            if (services == null)
+            {
+                throw new ArgumentNullException(nameof(services));
+            }
+
+            services.TryAddTransient<IGeoNETResourceStringProviderFactory, GeoNETResourceStringProviderFactory>();
+            services.TryAddTransient<IGeoNETExceptionProvider, GeoNETExceptionProvider>();
 
             return services;
         }
diff --git a/src/Geo.Google/DependencyInjection/ServiceCollectionExtensions.cs b/src/Geo.Google/DependencyInjection/ServiceCollectionExtensions.cs
index 963935e..d7b58a7 100644
--- a/src/Geo.Google/DependencyInjection/ServiceCollectionExtensions.cs
+++ b/src/Geo.Google/DependencyInjection/ServiceCollectionExtensions.cs
@@ -6,6 +6,7 @@
 namespace Geo.Google.DependencyInjection
 {
     using System;
+    using System.Net.Http;
     using Geo.Core.DependencyInjection;
     using Geo.Google.Abstractions;
     using Geo.Google.Models;
@@ -26,10 +27,15 @@ public static class ServiceCollectionExtensions
         /// </list>
         /// </para>
         /// </summary>
-        /// <param name="services">A <see cref="IServiceCollection"/> to add the Google services to.</param>
+        /// <param name="services">An <see cref="IServiceCollection"/> to add the Google services to.</param>
         /// <param name="optionsBuilder">A <see cref="Action{GoogleOptionsBuilder}"/> with the options to add to the Google configuration.</param>
-        /// <returns>A <see cref="IServiceCollection"/> with the added services.</returns>
-        public static IServiceCollection AddGoogleServices(this IServiceCollection services, Action<GoogleOptionsBuilder> optionsBuilder)
+        /// <param name="configureClient">Optional. A delegate that is used to configure the <see cref="HttpClient"/>.</param>
+        /// <returns>An <see cref="IHttpClientBuilder"/> to configure the http client.</returns>
+        /// <exception cref="ArgumentNullException">Thrown if <paramref name="services"/> is null.</exception>
+        public static IHttpClientBuilder AddGoogleServices(
+            this IServiceCollection services,
+            Action<GoogleOptionsBuilder> optionsBuilder,
+            Action<HttpClient> configureClient = null)
         {
             services.AddCoreServices();
 
@@ -45,9 +51,12 @@ public static IServiceCollection AddGoogleServices(this IServiceCollection servi
                 services.AddSingleton<IGoogleKeyContainer>(new GoogleKeyContainer(string.Empty));
             }
 
-            services.AddHttpClient<IGoogleGeocoding, GoogleGeocoding>();
+            return services.AddHttpClient<IGoogleGeocoding, GoogleGeocoding>(configureClient ?? DefaultHttpClientConfiguration);
+        }
 
-            return services;
+        private static void DefaultHttpClientConfiguration(HttpClient client)
+        {
+            // No-op
         }
     }
 }
diff --git a/src/Geo.Google/Services/GoogleGeocoding.cs b/src/Geo.Google/Services/GoogleGeocoding.cs
index 329047e..588859f 100644
--- a/src/Geo.Google/Services/GoogleGeocoding.cs
+++ b/src/Geo.Google/Services/GoogleGeocoding.cs
@@ -45,7 +45,7 @@ public class GoogleGeocoding : ClientExecutor, IGoogleGeocoding
         /// Initializes a new instance of the <see cref="GoogleGeocoding"/> class.
         /// </summary>
         /// <param name="client">A <see cref="HttpClient"/> used for placing calls to the Google Geocoding API.</param>
-        /// <param name="keyContainer">A <see cref="IGoogleKeyContainer"/> used for fetching the Google key.</param>
+        /// <param name="keyContainer">An <see cref="IGoogleKeyContainer"/> used for fetching the Google key.</param>
         /// <param name="exceptionProvider">An <see cref="IGeoNETExceptionProvider"/> used to provide exceptions based on an exception type.</param>
         /// <param name="resourceStringProviderFactory">An <see cref="IGeoNETResourceStringProviderFactory"/> used to create a resource string provider for log or exception messages.</param>
         /// <param name="loggerFactory">An <see cref="ILoggerFactory"/> used to create a logger used for logging information.</param>
diff --git a/src/Geo.Here/DependencyInjection/ServiceCollectionExtensions.cs b/src/Geo.Here/DependencyInjection/ServiceCollectionExtensions.cs
index 3426b34..6c4e542 100644
--- a/src/Geo.Here/DependencyInjection/ServiceCollectionExtensions.cs
+++ b/src/Geo.Here/DependencyInjection/ServiceCollectionExtensions.cs
@@ -6,6 +6,7 @@
 namespace Geo.Here.DependencyInjection
 {
     using System;
+    using System.Net.Http;
     using Geo.Core.DependencyInjection;
     using Geo.Here.Abstractions;
     using Geo.Here.Models;
@@ -26,10 +27,15 @@ public static class ServiceCollectionExtensions
         /// </list>
         /// </para>
         /// </summary>
-        /// <param name="services">A <see cref="IServiceCollection"/> to add the HERE services to.</param>
+        /// <param name="services">An <see cref="IServiceCollection"/> to add the HERE services to.</param>
         /// <param name="optionsBuilder">A <see cref="Action{HereOptionsBuilder}"/> with the options to add to the HERE configuration.</param>
-        /// <returns>A <see cref="IServiceCollection"/> with the added services.</returns>
-        public static IServiceCollection AddHereServices(this IServiceCollection services, Action<HereOptionsBuilder> optionsBuilder)
+        /// <param name="configureClient">Optional. A delegate that is used to configure the <see cref="HttpClient"/>.</param>
+        /// <returns>An <see cref="IHttpClientBuilder"/> to configure the http client.</returns>
+        /// <exception cref="ArgumentNullException">Thrown if <paramref name="services"/> is null.</exception>
+        public static IHttpClientBuilder AddHereServices(
+            this IServiceCollection services,
+            Action<HereOptionsBuilder> optionsBuilder,
+            Action<HttpClient> configureClient = null)
         {
             services.AddCoreServices();
 
@@ -45,9 +51,12 @@ public static IServiceCollection AddHereServices(this IServiceCollection service
                 services.AddSingleton<IHereKeyContainer>(new HereKeyContainer(string.Empty));
             }
 
-            services.AddHttpClient<IHereGeocoding, HereGeocoding>();
+            return services.AddHttpClient<IHereGeocoding, HereGeocoding>(configureClient ?? DefaultHttpClientConfiguration);
+        }
 
-            return services;
+        private static void DefaultHttpClientConfiguration(HttpClient client)
+        {
+            // No-op
         }
     }
 }
diff --git a/src/Geo.Here/Services/HereGeocoding.cs b/src/Geo.Here/Services/HereGeocoding.cs
index 060c18c..a04508c 100644
--- a/src/Geo.Here/Services/HereGeocoding.cs
+++ b/src/Geo.Here/Services/HereGeocoding.cs
@@ -40,7 +40,7 @@ public class HereGeocoding : ClientExecutor, IHereGeocoding
         /// Initializes a new instance of the <see cref="HereGeocoding"/> class.
         /// </summary>
         /// <param name="client">A <see cref="HttpClient"/> used for placing calls to the HERE Geocoding API.</param>
-        /// <param name="keyContainer">A <see cref="IHereKeyContainer"/> used for fetching the HERE key.</param>
+        /// <param name="keyContainer">An <see cref="IHereKeyContainer"/> used for fetching the HERE key.</param>
         /// <param name="exceptionProvider">An <see cref="IGeoNETExceptionProvider"/> used to provide exceptions based on an exception type.</param>
         /// <param name="resourceStringProviderFactory">An <see cref="IGeoNETResourceStringProviderFactory"/> used to create a resource string provider for log or exception messages.</param>
         /// <param name="loggerFactory">An <see cref="ILoggerFactory"/> used to create a logger used for logging information.</param>
diff --git a/src/Geo.Here/Services/PolylineEncoderDecoder.cs b/src/Geo.Here/Services/PolylineEncoderDecoder.cs
index 39f0b5c..3f38654 100644
--- a/src/Geo.Here/Services/PolylineEncoderDecoder.cs
+++ b/src/Geo.Here/Services/PolylineEncoderDecoder.cs
@@ -26,7 +26,7 @@ internal class PolylineEncoderDecoder
         /// The third dimension value will be eligible for encoding only when ThirdDimension is other than ABSENT.
         /// This is lossy compression based on precision accuracy.
         /// </summary>
-        /// <param name="coordinates">A <see cref="IEnumerable{T}"/> of <see cref="LatLngZ"/> of coordinate triples that to be encoded.</param>
+        /// <param name="coordinates">An <see cref="IEnumerable{T}"/> of <see cref="LatLngZ"/> of coordinate triples that to be encoded.</param>
         /// <param name="precision">Floating point precision of the coordinate to be encoded.</param>
         /// <param name="thirdDimension">A <see cref="ThirdDimension"/> which may be a level, altitude, elevation or some other custom value.</param>
         /// <param name="thirdDimPrecision">Floating point precision for thirdDimension value.</param>
@@ -53,10 +53,10 @@ public static string Encode(IEnumerable<LatLngZ> coordinates, int precision, Thi
         }
 
         /// <summary>
-        /// Decode the encoded input <see cref="string"/> to a <see cref="IReadOnlyList{T}"/> of <see cref="LatLngZ"/>.
+        /// Decode the encoded input <see cref="string"/> to an <see cref="IReadOnlyList{T}"/> of <see cref="LatLngZ"/>.
         /// </summary>
         /// <param name="encoded">The encoded URL-safe encoded <see cref="string"/>.</param>
-        /// <returns>A <see cref="IReadOnlyList{T}"/> of <see cref="LatLngZ"/> coordinate triples that are decoded from the input.</returns>
+        /// <returns>An <see cref="IReadOnlyList{T}"/> of <see cref="LatLngZ"/> coordinate triples that are decoded from the input.</returns>
         public static IReadOnlyList<LatLngZ> Decode(string encoded)
         {
             if (string.IsNullOrEmpty(encoded?.Trim()))
diff --git a/src/Geo.MapBox/DependencyInjection/ServiceCollectionExtensions.cs b/src/Geo.MapBox/DependencyInjection/ServiceCollectionExtensions.cs
index a02db9f..cd60f06 100644
--- a/src/Geo.MapBox/DependencyInjection/ServiceCollectionExtensions.cs
+++ b/src/Geo.MapBox/DependencyInjection/ServiceCollectionExtensions.cs
@@ -6,6 +6,7 @@
 namespace Geo.MapBox.DependencyInjection
 {
     using System;
+    using System.Net.Http;
     using Geo.Core.DependencyInjection;
     using Geo.MapBox.Abstractions;
     using Geo.MapBox.Models;
@@ -26,10 +27,15 @@ public static class ServiceCollectionExtensions
         /// </list>
         /// </para>
         /// </summary>
-        /// <param name="services">A <see cref="IServiceCollection"/> to add the MapBox services to.</param>
+        /// <param name="services">An <see cref="IServiceCollection"/> to add the MapBox services to.</param>
         /// <param name="optionsBuilder">A <see cref="Action{MapBoxOptionsBuilder}"/> with the options to add to the MapBox configuration.</param>
-        /// <returns>A <see cref="IServiceCollection"/> with the added services.</returns>
-        public static IServiceCollection AddMapBoxServices(this IServiceCollection services, Action<MapBoxOptionsBuilder> optionsBuilder)
+        /// <param name="configureClient">Optional. A delegate that is used to configure the <see cref="HttpClient"/>.</param>
+        /// <returns>An <see cref="IHttpClientBuilder"/> to configure the http client.</returns>
+        /// <exception cref="ArgumentNullException">Thrown if <paramref name="services"/> is null.</exception>
+        public static IHttpClientBuilder AddMapBoxServices(
+            this IServiceCollection services,
+            Action<MapBoxOptionsBuilder> optionsBuilder,
+            Action<HttpClient> configureClient = null)
         {
             services.AddCoreServices();
 
@@ -45,9 +51,12 @@ public static IServiceCollection AddMapBoxServices(this IServiceCollection servi
                 services.AddSingleton<IMapBoxKeyContainer>(new MapBoxKeyContainer(string.Empty));
             }
 
-            services.AddHttpClient<IMapBoxGeocoding, MapBoxGeocoding>();
+            return services.AddHttpClient<IMapBoxGeocoding, MapBoxGeocoding>(configureClient ?? DefaultHttpClientConfiguration);
+        }
 
-            return services;
+        private static void DefaultHttpClientConfiguration(HttpClient client)
+        {
+            // No-op
         }
     }
 }
diff --git a/src/Geo.MapBox/Services/MapBoxGeocoding.cs b/src/Geo.MapBox/Services/MapBoxGeocoding.cs
index a051c72..ae6bf59 100644
--- a/src/Geo.MapBox/Services/MapBoxGeocoding.cs
+++ b/src/Geo.MapBox/Services/MapBoxGeocoding.cs
@@ -42,7 +42,7 @@ public class MapBoxGeocoding : ClientExecutor, IMapBoxGeocoding
         /// Initializes a new instance of the <see cref="MapBoxGeocoding"/> class.
         /// </summary>
         /// <param name="client">A <see cref="HttpClient"/> used for placing calls to the here Geocoding API.</param>
-        /// <param name="keyContainer">A <see cref="IMapBoxKeyContainer"/> used for fetching the here key.</param>
+        /// <param name="keyContainer">An <see cref="IMapBoxKeyContainer"/> used for fetching the here key.</param>
         /// <param name="exceptionProvider">An <see cref="IGeoNETExceptionProvider"/> used to provide exceptions based on an exception type.</param>
         /// <param name="resourceStringProviderFactory">An <see cref="IGeoNETResourceStringProviderFactory"/> used to create a resource string provider for log or exception messages.</param>
         /// <param name="loggerFactory">An <see cref="ILoggerFactory"/> used to create a logger used for logging information.</param>
diff --git a/src/Geo.MapQuest/DependencyInjection/ServiceCollectionExtensions.cs b/src/Geo.MapQuest/DependencyInjection/ServiceCollectionExtensions.cs
index c6b7b57..ac5ed02 100644
--- a/src/Geo.MapQuest/DependencyInjection/ServiceCollectionExtensions.cs
+++ b/src/Geo.MapQuest/DependencyInjection/ServiceCollectionExtensions.cs
@@ -6,6 +6,7 @@
 namespace Geo.MapQuest.DependencyInjection
 {
     using System;
+    using System.Net.Http;
     using Geo.Core.DependencyInjection;
     using Geo.MapQuest.Abstractions;
     using Geo.MapQuest.Models;
@@ -26,10 +27,15 @@ public static class ServiceCollectionExtensions
         /// </list>
         /// </para>
         /// </summary>
-        /// <param name="services">A <see cref="IServiceCollection"/> to add the MapQuest services to.</param>
+        /// <param name="services">An <see cref="IServiceCollection"/> to add the MapQuest services to.</param>
         /// <param name="optionsBuilder">A <see cref="Action{MapQuestOptionsBuilder}"/> with the options to add to the MapQuest configuration.</param>
-        /// <returns>A <see cref="IServiceCollection"/> with the added services.</returns>
-        public static IServiceCollection AddMapQuestServices(this IServiceCollection services, Action<MapQuestOptionsBuilder> optionsBuilder)
+        /// <param name="configureClient">Optional. A delegate that is used to configure the <see cref="HttpClient"/>.</param>
+        /// <returns>An <see cref="IHttpClientBuilder"/> to configure the http client.</returns>
+        /// <exception cref="ArgumentNullException">Thrown if <paramref name="services"/> is null.</exception>
+        public static IHttpClientBuilder AddMapQuestServices(
+            this IServiceCollection services,
+            Action<MapQuestOptionsBuilder> optionsBuilder,
+            Action<HttpClient> configureClient = null)
         {
             services.AddCoreServices();
 
@@ -47,9 +53,12 @@ public static IServiceCollection AddMapQuestServices(this IServiceCollection ser
                 services.AddSingleton<IMapQuestEndpoint>(new MapQuestEndpoint(false));
             }
 
-            services.AddHttpClient<IMapQuestGeocoding, MapQuestGeocoding>();
+            return services.AddHttpClient<IMapQuestGeocoding, MapQuestGeocoding>(configureClient ?? DefaultHttpClientConfiguration);
+        }
 
-            return services;
+        private static void DefaultHttpClientConfiguration(HttpClient client)
+        {
+            // No-op
         }
     }
 }
diff --git a/src/Geo.MapQuest/Services/MapQuestGeocoding.cs b/src/Geo.MapQuest/Services/MapQuestGeocoding.cs
index ed8084f..2729b17 100644
--- a/src/Geo.MapQuest/Services/MapQuestGeocoding.cs
+++ b/src/Geo.MapQuest/Services/MapQuestGeocoding.cs
@@ -39,8 +39,8 @@ public class MapQuestGeocoding : ClientExecutor, IMapQuestGeocoding
         /// Initializes a new instance of the <see cref="MapQuestGeocoding"/> class.
         /// </summary>
         /// <param name="client">A <see cref="HttpClient"/> used for placing calls to the MapQuest Geocoding API.</param>
-        /// <param name="keyContainer">A <see cref="IMapQuestKeyContainer"/> used for fetching the MapQuest key.</param>
-        /// <param name="endpoint">A <see cref="IMapQuestEndpoint"/> used for fetching which MapQuest endpoint to use.</param>
+        /// <param name="keyContainer">An <see cref="IMapQuestKeyContainer"/> used for fetching the MapQuest key.</param>
+        /// <param name="endpoint">An <see cref="IMapQuestEndpoint"/> used for fetching which MapQuest endpoint to use.</param>
         /// <param name="exceptionProvider">An <see cref="IGeoNETExceptionProvider"/> used to provide exceptions based on an exception type.</param>
         /// <param name="resourceStringProviderFactory">An <see cref="IGeoNETResourceStringProviderFactory"/> used to create a resource string provider for log or exception messages.</param>
         /// <param name="loggerFactory">An <see cref="ILoggerFactory"/> used to create a logger used for logging information.</param>
diff --git a/src/Source.props b/src/Source.props
index 7e58f1c..369be80 100644
--- a/src/Source.props
+++ b/src/Source.props
@@ -6,7 +6,13 @@
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' != 'net6.0'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="5.0.0" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="5.0.0" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
diff --git a/test/Geo.ArcGIS.Tests/DependencyInjection/ServiceCollectionExtensionsTests.cs b/test/Geo.ArcGIS.Tests/DependencyInjection/ServiceCollectionExtensionsTests.cs
new file mode 100644
index 0000000..1a6f136
--- /dev/null
+++ b/test/Geo.ArcGIS.Tests/DependencyInjection/ServiceCollectionExtensionsTests.cs
@@ -0,0 +1,74 @@
+// <copyright file="ServiceCollectionExtensionsTests.cs" company="Geo.NET">
+// Copyright (c) Geo.NET.
+// Licensed under the MIT license. See the LICENSE file in the solution root for full license information.
+// </copyright>
+
+namespace Geo.ArcGIS.Tests.DependencyInjection
+{
+    using System;
+    using System.Net.Http;
+    using FluentAssertions;
+    using Geo.ArcGIS.Abstractions;
+    using Geo.ArcGIS.DependencyInjection;
+    using Microsoft.Extensions.DependencyInjection;
+    using Xunit;
+
+    /// <summary>
+    /// Unit tests for the <see cref="ServiceCollectionExtensions"/> class.
+    /// </summary>
+    public class ServiceCollectionExtensionsTests
+    {
+        [Fact]
+        public void AddArcGISServices_WithValidCall_ConfiguresAllServices()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+
+            // Act
+            services.AddArcGISServices(options => options.UseClientCredentials("abc", "123"));
+
+            // Assert
+            var provider = services.BuildServiceProvider();
+
+            provider.GetRequiredService<IArcGISCredentialsContainer>().Should().NotBeNull();
+            provider.GetRequiredService<IArcGISTokenRetrevial>().Should().NotBeNull();
+            provider.GetRequiredService<IArcGISTokenContainer>().Should().NotBeNull();
+            provider.GetRequiredService<IArcGISGeocoding>().Should().NotBeNull();
+        }
+
+        [Fact]
+        public void AddArcGISServices_WithNullOptions_ConfiguresAllServices()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+
+            // Act
+            services.AddArcGISServices(null);
+
+            // Assert
+            var provider = services.BuildServiceProvider();
+
+            provider.GetRequiredService<IArcGISCredentialsContainer>().Should().NotBeNull();
+            provider.GetRequiredService<IArcGISTokenRetrevial>().Should().NotBeNull();
+            provider.GetRequiredService<IArcGISTokenContainer>().Should().NotBeNull();
+            provider.GetRequiredService<IArcGISGeocoding>().Should().NotBeNull();
+        }
+
+        [Fact]
+        public void AddArcGISServices_WithClientConfiguration_ConfiguresHttpClientAllServices()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+
+            // Act
+            services.AddArcGISServices(
+                options => options.UseClientCredentials("abc", "123"),
+                client => client.Timeout = TimeSpan.FromSeconds(1));
+
+            // Assert
+            var provider = services.BuildServiceProvider();
+            var client = provider.GetRequiredService<IHttpClientFactory>().CreateClient("IArcGISGeocoding");
+            client.Timeout.Should().Be(TimeSpan.FromSeconds(1));
+        }
+    }
+}
diff --git a/test/Geo.ArcGIS.Tests/GlobalSuppressions.cs b/test/Geo.ArcGIS.Tests/GlobalSuppressions.cs
new file mode 100644
index 0000000..ba5a3c3
--- /dev/null
+++ b/test/Geo.ArcGIS.Tests/GlobalSuppressions.cs
@@ -0,0 +1,13 @@
+// <copyright file="GlobalSuppressions.cs" company="Geo.NET">
+// Copyright (c) Geo.NET.
+// Licensed under the MIT license. See the LICENSE file in the solution root for full license information.
+// </copyright>
+
+// This file is used by Code Analysis to maintain SuppressMessage
+// attributes that are applied to this project.
+// Project-level suppressions either have no target or are given
+// a specific target and scoped to a namespace, type, member, etc.
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("Naming", "CA1707:Identifiers should not contain underscores", Justification = "Using Microsoft recommended unit test naming", Scope = "namespaceanddescendants", Target = "~N:Geo.ArcGIS.Tests")]
+[assembly: SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1600:Elements should be documented", Justification = "The name of the test should explain the test", Scope = "namespaceanddescendants", Target = "~N:Geo.ArcGIS.Tests")]
diff --git a/test/Geo.ArcGIS.Tests/TestData/CultureTestData.cs b/test/Geo.ArcGIS.Tests/TestData/CultureTestData.cs
index 4069b52..0503119 100644
--- a/test/Geo.ArcGIS.Tests/TestData/CultureTestData.cs
+++ b/test/Geo.ArcGIS.Tests/TestData/CultureTestData.cs
@@ -17,7 +17,7 @@ public class CultureTestData : IEnumerable<object[]>
         /// <summary>
         /// Gets the enumerator for the test data.
         /// </summary>
-        /// <returns>A <see cref="IEnumerator{T}"/> of <see cref="object"/>[].</returns>
+        /// <returns>An <see cref="IEnumerator{T}"/> of <see cref="object"/>[].</returns>
         public IEnumerator<object[]> GetEnumerator()
         {
             var cultures = CultureInfo.GetCultures(CultureTypes.AllCultures);
@@ -30,7 +30,7 @@ public IEnumerator<object[]> GetEnumerator()
         /// <summary>
         /// Gets the enumerator for the test data.
         /// </summary>
-        /// <returns>A <see cref="IEnumerator"/>.</returns>
+        /// <returns>An <see cref="IEnumerator"/>.</returns>
         IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
     }
 }
diff --git a/test/Geo.Bing.Tests/DependencyInjection/ServiceCollectionExtensionsTests.cs b/test/Geo.Bing.Tests/DependencyInjection/ServiceCollectionExtensionsTests.cs
new file mode 100644
index 0000000..aabe188
--- /dev/null
+++ b/test/Geo.Bing.Tests/DependencyInjection/ServiceCollectionExtensionsTests.cs
@@ -0,0 +1,70 @@
+// <copyright file="ServiceCollectionExtensionsTests.cs" company="Geo.NET">
+// Copyright (c) Geo.NET.
+// Licensed under the MIT license. See the LICENSE file in the solution root for full license information.
+// </copyright>
+
+namespace Geo.Bing.Tests.DependencyInjection
+{
+    using System;
+    using System.Net.Http;
+    using FluentAssertions;
+    using Geo.Bing.Abstractions;
+    using Geo.Bing.DependencyInjection;
+    using Microsoft.Extensions.DependencyInjection;
+    using Xunit;
+
+    /// <summary>
+    /// Unit tests for the <see cref="ServiceCollectionExtensions"/> class.
+    /// </summary>
+    public class ServiceCollectionExtensionsTests
+    {
+        [Fact]
+        public void AddBingServices_WithValidCall_ConfiguresAllServices()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+
+            // Act
+            services.AddBingServices(options => options.UseKey("abc"));
+
+            // Assert
+            var provider = services.BuildServiceProvider();
+
+            provider.GetRequiredService<IBingKeyContainer>().Should().NotBeNull();
+            provider.GetRequiredService<IBingGeocoding>().Should().NotBeNull();
+        }
+
+        [Fact]
+        public void AddBingServices_WithNullOptions_ConfiguresAllServices()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+
+            // Act
+            services.AddBingServices(null);
+
+            // Assert
+            var provider = services.BuildServiceProvider();
+
+            provider.GetRequiredService<IBingKeyContainer>().Should().NotBeNull();
+            provider.GetRequiredService<IBingGeocoding>().Should().NotBeNull();
+        }
+
+        [Fact]
+        public void AddBingServices_WithClientConfiguration_ConfiguresHttpClientAllServices()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+
+            // Act
+            services.AddBingServices(
+                options => options.UseKey("abc"),
+                client => client.Timeout = TimeSpan.FromSeconds(2));
+
+            // Assert
+            var provider = services.BuildServiceProvider();
+            var client = provider.GetRequiredService<IHttpClientFactory>().CreateClient("IBingGeocoding");
+            client.Timeout.Should().Be(TimeSpan.FromSeconds(2));
+        }
+    }
+}
diff --git a/test/Geo.Bing.Tests/GlobalSuppressions.cs b/test/Geo.Bing.Tests/GlobalSuppressions.cs
new file mode 100644
index 0000000..ec285d2
--- /dev/null
+++ b/test/Geo.Bing.Tests/GlobalSuppressions.cs
@@ -0,0 +1,13 @@
+// <copyright file="GlobalSuppressions.cs" company="Geo.NET">
+// Copyright (c) Geo.NET.
+// Licensed under the MIT license. See the LICENSE file in the solution root for full license information.
+// </copyright>
+
+// This file is used by Code Analysis to maintain SuppressMessage
+// attributes that are applied to this project.
+// Project-level suppressions either have no target or are given
+// a specific target and scoped to a namespace, type, member, etc.
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("Naming", "CA1707:Identifiers should not contain underscores", Justification = "Using Microsoft recommended unit test naming", Scope = "namespaceanddescendants", Target = "~N:Geo.Bing.Tests")]
+[assembly: SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1600:Elements should be documented", Justification = "The name of the test should explain the test", Scope = "namespaceanddescendants", Target = "~N:Geo.Bing.Tests")]
diff --git a/test/Geo.Bing.Tests/TestData/CultureTestData.cs b/test/Geo.Bing.Tests/TestData/CultureTestData.cs
index ac02e02..a8059bc 100644
--- a/test/Geo.Bing.Tests/TestData/CultureTestData.cs
+++ b/test/Geo.Bing.Tests/TestData/CultureTestData.cs
@@ -17,7 +17,7 @@ public class CultureTestData : IEnumerable<object[]>
         /// <summary>
         /// Gets the enumerator for the test data.
         /// </summary>
-        /// <returns>A <see cref="IEnumerator{T}"/> of <see cref="object"/>[].</returns>
+        /// <returns>An <see cref="IEnumerator{T}"/> of <see cref="object"/>[].</returns>
         public IEnumerator<object[]> GetEnumerator()
         {
             var cultures = CultureInfo.GetCultures(CultureTypes.AllCultures);
@@ -30,7 +30,7 @@ public IEnumerator<object[]> GetEnumerator()
         /// <summary>
         /// Gets the enumerator for the test data.
         /// </summary>
-        /// <returns>A <see cref="IEnumerator"/>.</returns>
+        /// <returns>An <see cref="IEnumerator"/>.</returns>
         IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
     }
 }
diff --git a/test/Geo.Core.Tests/ClientExecutorShould.cs b/test/Geo.Core.Tests/ClientExecutorShould.cs
index 5fd2707..db88395 100644
--- a/test/Geo.Core.Tests/ClientExecutorShould.cs
+++ b/test/Geo.Core.Tests/ClientExecutorShould.cs
@@ -145,7 +145,7 @@ public void ThrowExceptionOnNullUri()
 
             sut.Invoking(x => x.CallAsync<TestClass>(new Uri("http://test.com/ArgumentNullException")))
                 .Should()
-                .Throw<ArgumentNullException>()
+                .ThrowAsync<ArgumentNullException>()
                 .WithMessage("Value cannot be null. (Parameter 'requestUri')");
         }
 
@@ -159,7 +159,7 @@ public void ThrowExceptionOnInvalidUri()
 
             sut.Invoking(x => x.CallAsync<TestClass>(new Uri("http://test.com/InvalidOperationException")))
                 .Should()
-                .Throw<InvalidOperationException>()
+                .ThrowAsync<InvalidOperationException>()
                 .WithMessage("requestUri");
         }
 
@@ -173,7 +173,7 @@ public void ThrowExceptionOnHttpFailure()
 
             sut.Invoking(x => x.CallAsync<TestClass>(new Uri("http://test.com/HttpRequestException")))
                 .Should()
-                .Throw<HttpRequestException>()
+                .ThrowAsync<HttpRequestException>()
                 .WithMessage("Exception of type 'System.Net.Http.HttpRequestException' was thrown.");
         }
 
@@ -187,7 +187,7 @@ public void ThrowExceptionOnCancelledRequest()
 
             sut.Invoking(x => x.CallAsync<TestClass>(new Uri("http://test.com/TaskCanceledException")))
                 .Should()
-                .Throw<TaskCanceledException>();
+                .ThrowAsync<TaskCanceledException>();
         }
 
         /// <summary>
@@ -200,7 +200,7 @@ public void ThrowExceptionOnInvalidJson1()
 
             sut.Invoking(x => x.CallAsync<TestClass>(new Uri("http://test.com/JsonReaderException")))
                 .Should()
-                .Throw<JsonReaderException>();
+                .ThrowAsync<JsonReaderException>();
         }
 
         /// <summary>
@@ -213,7 +213,7 @@ public void ThrowExceptionOnInvalidJson2()
 
             sut.Invoking(x => x.CallAsync<TestClass>(new Uri("http://test.com/JsonSerializationException")))
                 .Should()
-                .Throw<JsonSerializationException>();
+                .ThrowAsync<JsonSerializationException>();
         }
 
         /// <summary>
@@ -248,13 +248,13 @@ public async Task SuccesfullyReturnObject()
         /// Checks an exception is thrown when null is passed for the uri.
         /// </summary>
         [Fact]
-        public void ThrowWrappedExceptionOnNullUri()
+        public async Task ThrowWrappedExceptionOnNullUri()
         {
             var sut = new TestClientExecutor(_httpClient, _exceptionProvider, _resourceStringProviderFactory);
 
-            sut.Invoking(x => x.CallAsync<TestClass, TestException>(new Uri("http://test.com/ArgumentNullException"), ApiName))
+            (await sut.Invoking(x => x.CallAsync<TestClass, TestException>(new Uri("http://test.com/ArgumentNullException"), ApiName))
                 .Should()
-                .Throw<TestException>()
+                .ThrowAsync<TestException>())
                 .WithInnerException<ArgumentNullException>();
         }
 
@@ -262,13 +262,13 @@ public void ThrowWrappedExceptionOnNullUri()
         /// Checks an exception is thrown an invalid uri is passed in.
         /// </summary>
         [Fact]
-        public void ThrowWrappedExceptionOnInvalidUri()
+        public async Task ThrowWrappedExceptionOnInvalidUri()
         {
             var sut = new TestClientExecutor(_httpClient, _exceptionProvider, _resourceStringProviderFactory);
 
-            sut.Invoking(x => x.CallAsync<TestClass, TestException>(new Uri("http://test.com/InvalidOperationException"), ApiName))
+            (await sut.Invoking(x => x.CallAsync<TestClass, TestException>(new Uri("http://test.com/InvalidOperationException"), ApiName))
                 .Should()
-                .Throw<TestException>()
+                .ThrowAsync<TestException>())
                 .WithInnerException<InvalidOperationException>();
         }
 
@@ -276,13 +276,13 @@ public void ThrowWrappedExceptionOnInvalidUri()
         /// Checks an exception is thrown on an http failure.
         /// </summary>
         [Fact]
-        public void ThrowWrappedExceptionOnHttpFailure()
+        public async Task ThrowWrappedExceptionOnHttpFailure()
         {
             var sut = new TestClientExecutor(_httpClient, _exceptionProvider, _resourceStringProviderFactory);
 
-            sut.Invoking(x => x.CallAsync<TestClass, TestException>(new Uri("http://test.com/HttpRequestException"), ApiName))
+            (await sut.Invoking(x => x.CallAsync<TestClass, TestException>(new Uri("http://test.com/HttpRequestException"), ApiName))
                 .Should()
-                .Throw<TestException>()
+                .ThrowAsync<TestException>())
                 .WithInnerException<HttpRequestException>();
         }
 
@@ -290,13 +290,13 @@ public void ThrowWrappedExceptionOnHttpFailure()
         /// Checks an exception is thrown when the task is cancelled.
         /// </summary>
         [Fact]
-        public void ThrowWrappedExceptionOnCancelledRequest()
+        public async Task ThrowWrappedExceptionOnCancelledRequest()
         {
             var sut = new TestClientExecutor(_httpClient, _exceptionProvider, _resourceStringProviderFactory);
 
-            sut.Invoking(x => x.CallAsync<TestClass, TestException>(new Uri("http://test.com/TaskCanceledException"), ApiName))
+            (await sut.Invoking(x => x.CallAsync<TestClass, TestException>(new Uri("http://test.com/TaskCanceledException"), ApiName))
                 .Should()
-                .Throw<TestException>()
+                .ThrowAsync<TestException>())
                 .WithInnerException<TaskCanceledException>();
         }
 
@@ -304,13 +304,13 @@ public void ThrowWrappedExceptionOnCancelledRequest()
         /// Checks an exception is thrown when the returned json is invalid.
         /// </summary>
         [Fact]
-        public void ThrowWrappedExceptionOnInvalidJson1()
+        public async Task ThrowWrappedExceptionOnInvalidJson1()
         {
             var sut = new TestClientExecutor(_httpClient, _exceptionProvider, _resourceStringProviderFactory);
 
-            sut.Invoking(x => x.CallAsync<TestClass, TestException>(new Uri("http://test.com/JsonReaderException"), ApiName))
+            (await sut.Invoking(x => x.CallAsync<TestClass, TestException>(new Uri("http://test.com/JsonReaderException"), ApiName))
                 .Should()
-                .Throw<TestException>()
+                .ThrowAsync<TestException>())
                 .WithInnerException<JsonReaderException>();
         }
 
@@ -318,13 +318,13 @@ public void ThrowWrappedExceptionOnInvalidJson1()
         /// Checks an exception is thrown when the returned json is invalid.
         /// </summary>
         [Fact]
-        public void ThrowWrappedExceptionOnInvalidJson2()
+        public async Task ThrowWrappedExceptionOnInvalidJson2()
         {
             var sut = new TestClientExecutor(_httpClient, _exceptionProvider, _resourceStringProviderFactory);
 
-            sut.Invoking(x => x.CallAsync<TestClass, TestException>(new Uri("http://test.com/JsonSerializationException"), ApiName))
+            (await sut.Invoking(x => x.CallAsync<TestClass, TestException>(new Uri("http://test.com/JsonSerializationException"), ApiName))
                 .Should()
-                .Throw<TestException>()
+                .ThrowAsync<TestException>())
                 .WithInnerException<JsonSerializationException>();
         }
 
@@ -338,7 +338,7 @@ public void ThrowWrappedExceptionOnErrorJson()
 
             sut.Invoking(x => x.CallAsync<TestClass, TestException>(new Uri("http://test.com/Failure"), ApiName))
                 .Should()
-                .Throw<TestException>()
+                .ThrowAsync<TestException>()
                 .Where(x =>
                     x.Data.Count == 3 &&
                     x.Data["responseBody"].ToString() == "{'Message':'Access denied'}" &&
diff --git a/test/Geo.Google.Tests/DependencyInjection/ServiceCollectionExtensionsTests.cs b/test/Geo.Google.Tests/DependencyInjection/ServiceCollectionExtensionsTests.cs
new file mode 100644
index 0000000..9fc93c4
--- /dev/null
+++ b/test/Geo.Google.Tests/DependencyInjection/ServiceCollectionExtensionsTests.cs
@@ -0,0 +1,70 @@
+// <copyright file="ServiceCollectionExtensionsTests.cs" company="Geo.NET">
+// Copyright (c) Geo.NET.
+// Licensed under the MIT license. See the LICENSE file in the solution root for full license information.
+// </copyright>
+
+namespace Geo.Google.Tests.DependencyInjection
+{
+    using System;
+    using System.Net.Http;
+    using FluentAssertions;
+    using Geo.Google.Abstractions;
+    using Geo.Google.DependencyInjection;
+    using Microsoft.Extensions.DependencyInjection;
+    using Xunit;
+
+    /// <summary>
+    /// Unit tests for the <see cref="ServiceCollectionExtensions"/> class.
+    /// </summary>
+    public class ServiceCollectionExtensionsTests
+    {
+        [Fact]
+        public void AddGoogleServices_WithValidCall_ConfiguresAllServices()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+
+            // Act
+            services.AddGoogleServices(options => options.UseKey("abc"));
+
+            // Assert
+            var provider = services.BuildServiceProvider();
+
+            provider.GetRequiredService<IGoogleKeyContainer>().Should().NotBeNull();
+            provider.GetRequiredService<IGoogleGeocoding>().Should().NotBeNull();
+        }
+
+        [Fact]
+        public void AddGoogleServices_WithNullOptions_ConfiguresAllServices()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+
+            // Act
+            services.AddGoogleServices(null);
+
+            // Assert
+            var provider = services.BuildServiceProvider();
+
+            provider.GetRequiredService<IGoogleKeyContainer>().Should().NotBeNull();
+            provider.GetRequiredService<IGoogleGeocoding>().Should().NotBeNull();
+        }
+
+        [Fact]
+        public void AddGoogleServices_WithClientConfiguration_ConfiguresHttpClientAllServices()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+
+            // Act
+            services.AddGoogleServices(
+                options => options.UseKey("abc"),
+                client => client.Timeout = TimeSpan.FromSeconds(3));
+
+            // Assert
+            var provider = services.BuildServiceProvider();
+            var client = provider.GetRequiredService<IHttpClientFactory>().CreateClient("IGoogleGeocoding");
+            client.Timeout.Should().Be(TimeSpan.FromSeconds(3));
+        }
+    }
+}
diff --git a/test/Geo.Google.Tests/GlobalSuppressions.cs b/test/Geo.Google.Tests/GlobalSuppressions.cs
new file mode 100644
index 0000000..ee6850d
--- /dev/null
+++ b/test/Geo.Google.Tests/GlobalSuppressions.cs
@@ -0,0 +1,13 @@
+// <copyright file="GlobalSuppressions.cs" company="Geo.NET">
+// Copyright (c) Geo.NET.
+// Licensed under the MIT license. See the LICENSE file in the solution root for full license information.
+// </copyright>
+
+// This file is used by Code Analysis to maintain SuppressMessage
+// attributes that are applied to this project.
+// Project-level suppressions either have no target or are given
+// a specific target and scoped to a namespace, type, member, etc.
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("Naming", "CA1707:Identifiers should not contain underscores", Justification = "Using Microsoft recommended unit test naming", Scope = "namespaceanddescendants", Target = "~N:Geo.Google.Tests")]
+[assembly: SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1600:Elements should be documented", Justification = "The name of the test should explain the test", Scope = "namespaceanddescendants", Target = "~N:Geo.Google.Tests")]
diff --git a/test/Geo.Google.Tests/TestData/CultureTestData.cs b/test/Geo.Google.Tests/TestData/CultureTestData.cs
index 8963b78..057791b 100644
--- a/test/Geo.Google.Tests/TestData/CultureTestData.cs
+++ b/test/Geo.Google.Tests/TestData/CultureTestData.cs
@@ -17,7 +17,7 @@ public class CultureTestData : IEnumerable<object[]>
         /// <summary>
         /// Gets the enumerator for the test data.
         /// </summary>
-        /// <returns>A <see cref="IEnumerator{T}"/> of <see cref="object"/>[].</returns>
+        /// <returns>An <see cref="IEnumerator{T}"/> of <see cref="object"/>[].</returns>
         public IEnumerator<object[]> GetEnumerator()
         {
             var cultures = CultureInfo.GetCultures(CultureTypes.AllCultures);
@@ -30,7 +30,7 @@ public IEnumerator<object[]> GetEnumerator()
         /// <summary>
         /// Gets the enumerator for the test data.
         /// </summary>
-        /// <returns>A <see cref="IEnumerator"/>.</returns>
+        /// <returns>An <see cref="IEnumerator"/>.</returns>
         IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
     }
 }
diff --git a/test/Geo.Here.Tests/DependencyInjection/ServiceCollectionExtensionsTests.cs b/test/Geo.Here.Tests/DependencyInjection/ServiceCollectionExtensionsTests.cs
new file mode 100644
index 0000000..701a351
--- /dev/null
+++ b/test/Geo.Here.Tests/DependencyInjection/ServiceCollectionExtensionsTests.cs
@@ -0,0 +1,70 @@
+// <copyright file="ServiceCollectionExtensionsTests.cs" company="Geo.NET">
+// Copyright (c) Geo.NET.
+// Licensed under the MIT license. See the LICENSE file in the solution root for full license information.
+// </copyright>
+
+namespace Geo.Here.Tests.DependencyInjection
+{
+    using System;
+    using System.Net.Http;
+    using FluentAssertions;
+    using Geo.Here.Abstractions;
+    using Geo.Here.DependencyInjection;
+    using Microsoft.Extensions.DependencyInjection;
+    using Xunit;
+
+    /// <summary>
+    /// Unit tests for the <see cref="ServiceCollectionExtensions"/> class.
+    /// </summary>
+    public class ServiceCollectionExtensionsTests
+    {
+        [Fact]
+        public void AddHereServices_WithValidCall_ConfiguresAllServices()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+
+            // Act
+            services.AddHereServices(options => options.UseKey("abc"));
+
+            // Assert
+            var provider = services.BuildServiceProvider();
+
+            provider.GetRequiredService<IHereKeyContainer>().Should().NotBeNull();
+            provider.GetRequiredService<IHereGeocoding>().Should().NotBeNull();
+        }
+
+        [Fact]
+        public void AddHereServices_WithNullOptions_ConfiguresAllServices()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+
+            // Act
+            services.AddHereServices(null);
+
+            // Assert
+            var provider = services.BuildServiceProvider();
+
+            provider.GetRequiredService<IHereKeyContainer>().Should().NotBeNull();
+            provider.GetRequiredService<IHereGeocoding>().Should().NotBeNull();
+        }
+
+        [Fact]
+        public void AddHereServices_WithClientConfiguration_ConfiguresHttpClientAllServices()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+
+            // Act
+            services.AddHereServices(
+                options => options.UseKey("abc"),
+                client => client.Timeout = TimeSpan.FromSeconds(4));
+
+            // Assert
+            var provider = services.BuildServiceProvider();
+            var client = provider.GetRequiredService<IHttpClientFactory>().CreateClient("IHereGeocoding");
+            client.Timeout.Should().Be(TimeSpan.FromSeconds(4));
+        }
+    }
+}
diff --git a/test/Geo.Here.Tests/GlobalSuppressions.cs b/test/Geo.Here.Tests/GlobalSuppressions.cs
new file mode 100644
index 0000000..b26ae3d
--- /dev/null
+++ b/test/Geo.Here.Tests/GlobalSuppressions.cs
@@ -0,0 +1,13 @@
+// <copyright file="GlobalSuppressions.cs" company="Geo.NET">
+// Copyright (c) Geo.NET.
+// Licensed under the MIT license. See the LICENSE file in the solution root for full license information.
+// </copyright>
+
+// This file is used by Code Analysis to maintain SuppressMessage
+// attributes that are applied to this project.
+// Project-level suppressions either have no target or are given
+// a specific target and scoped to a namespace, type, member, etc.
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("Naming", "CA1707:Identifiers should not contain underscores", Justification = "Using Microsoft recommended unit test naming", Scope = "namespaceanddescendants", Target = "~N:Geo.Here.Tests")]
+[assembly: SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1600:Elements should be documented", Justification = "The name of the test should explain the test", Scope = "namespaceanddescendants", Target = "~N:Geo.Here.Tests")]
diff --git a/test/Geo.Here.Tests/TestData/CultureTestData.cs b/test/Geo.Here.Tests/TestData/CultureTestData.cs
index ff866ac..d33a47d 100644
--- a/test/Geo.Here.Tests/TestData/CultureTestData.cs
+++ b/test/Geo.Here.Tests/TestData/CultureTestData.cs
@@ -17,7 +17,7 @@ public class CultureTestData : IEnumerable<object[]>
         /// <summary>
         /// Gets the enumerator for the test data.
         /// </summary>
-        /// <returns>A <see cref="IEnumerator{T}"/> of <see cref="object"/>[].</returns>
+        /// <returns>An <see cref="IEnumerator{T}"/> of <see cref="object"/>[].</returns>
         public IEnumerator<object[]> GetEnumerator()
         {
             var cultures = CultureInfo.GetCultures(CultureTypes.AllCultures);
@@ -30,7 +30,7 @@ public IEnumerator<object[]> GetEnumerator()
         /// <summary>
         /// Gets the enumerator for the test data.
         /// </summary>
-        /// <returns>A <see cref="IEnumerator"/>.</returns>
+        /// <returns>An <see cref="IEnumerator"/>.</returns>
         IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
     }
 }
diff --git a/test/Geo.MapBox.Tests/DependencyInjection/ServiceCollectionExtensionsTests.cs b/test/Geo.MapBox.Tests/DependencyInjection/ServiceCollectionExtensionsTests.cs
new file mode 100644
index 0000000..f0bafee
--- /dev/null
+++ b/test/Geo.MapBox.Tests/DependencyInjection/ServiceCollectionExtensionsTests.cs
@@ -0,0 +1,70 @@
+// <copyright file="ServiceCollectionExtensionsTests.cs" company="Geo.NET">
+// Copyright (c) Geo.NET.
+// Licensed under the MIT license. See the LICENSE file in the solution root for full license information.
+// </copyright>
+
+namespace Geo.MapBox.Tests.DependencyInjection
+{
+    using System;
+    using System.Net.Http;
+    using FluentAssertions;
+    using Geo.MapBox.Abstractions;
+    using Geo.MapBox.DependencyInjection;
+    using Microsoft.Extensions.DependencyInjection;
+    using Xunit;
+
+    /// <summary>
+    /// Unit tests for the <see cref="ServiceCollectionExtensions"/> class.
+    /// </summary>
+    public class ServiceCollectionExtensionsTests
+    {
+        [Fact]
+        public void AddMapBoxServices_WithValidCall_ConfiguresAllServices()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+
+            // Act
+            services.AddMapBoxServices(options => options.UseKey("abc"));
+
+            // Assert
+            var provider = services.BuildServiceProvider();
+
+            provider.GetRequiredService<IMapBoxKeyContainer>().Should().NotBeNull();
+            provider.GetRequiredService<IMapBoxGeocoding>().Should().NotBeNull();
+        }
+
+        [Fact]
+        public void AddMapBoxServices_WithNullOptions_ConfiguresAllServices()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+
+            // Act
+            services.AddMapBoxServices(null);
+
+            // Assert
+            var provider = services.BuildServiceProvider();
+
+            provider.GetRequiredService<IMapBoxKeyContainer>().Should().NotBeNull();
+            provider.GetRequiredService<IMapBoxGeocoding>().Should().NotBeNull();
+        }
+
+        [Fact]
+        public void AddMapBoxServices_WithClientConfiguration_ConfiguresHttpClientAllServices()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+
+            // Act
+            services.AddMapBoxServices(
+                options => options.UseKey("abc"),
+                client => client.Timeout = TimeSpan.FromSeconds(5));
+
+            // Assert
+            var provider = services.BuildServiceProvider();
+            var client = provider.GetRequiredService<IHttpClientFactory>().CreateClient("IMapBoxGeocoding");
+            client.Timeout.Should().Be(TimeSpan.FromSeconds(5));
+        }
+    }
+}
diff --git a/test/Geo.MapBox.Tests/GlobalSuppressions.cs b/test/Geo.MapBox.Tests/GlobalSuppressions.cs
new file mode 100644
index 0000000..3b6781e
--- /dev/null
+++ b/test/Geo.MapBox.Tests/GlobalSuppressions.cs
@@ -0,0 +1,13 @@
+// <copyright file="GlobalSuppressions.cs" company="Geo.NET">
+// Copyright (c) Geo.NET.
+// Licensed under the MIT license. See the LICENSE file in the solution root for full license information.
+// </copyright>
+
+// This file is used by Code Analysis to maintain SuppressMessage
+// attributes that are applied to this project.
+// Project-level suppressions either have no target or are given
+// a specific target and scoped to a namespace, type, member, etc.
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("Naming", "CA1707:Identifiers should not contain underscores", Justification = "Using Microsoft recommended unit test naming", Scope = "namespaceanddescendants", Target = "~N:Geo.MapBox.Tests")]
+[assembly: SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1600:Elements should be documented", Justification = "The name of the test should explain the test", Scope = "namespaceanddescendants", Target = "~N:Geo.MapBox.Tests")]
diff --git a/test/Geo.MapBox.Tests/TestData/CultureTestData.cs b/test/Geo.MapBox.Tests/TestData/CultureTestData.cs
index 4871789..c622e80 100644
--- a/test/Geo.MapBox.Tests/TestData/CultureTestData.cs
+++ b/test/Geo.MapBox.Tests/TestData/CultureTestData.cs
@@ -17,7 +17,7 @@ public class CultureTestData : IEnumerable<object[]>
         /// <summary>
         /// Gets the enumerator for the test data.
         /// </summary>
-        /// <returns>A <see cref="IEnumerator{T}"/> of <see cref="object"/>[].</returns>
+        /// <returns>An <see cref="IEnumerator{T}"/> of <see cref="object"/>[].</returns>
         public IEnumerator<object[]> GetEnumerator()
         {
             var cultures = CultureInfo.GetCultures(CultureTypes.AllCultures);
@@ -30,7 +30,7 @@ public IEnumerator<object[]> GetEnumerator()
         /// <summary>
         /// Gets the enumerator for the test data.
         /// </summary>
-        /// <returns>A <see cref="IEnumerator"/>.</returns>
+        /// <returns>An <see cref="IEnumerator"/>.</returns>
         IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
     }
 }
diff --git a/test/Geo.MapQuest.Tests/DependencyInjection/ServiceCollectionExtensionsTests.cs b/test/Geo.MapQuest.Tests/DependencyInjection/ServiceCollectionExtensionsTests.cs
new file mode 100644
index 0000000..69d10a3
--- /dev/null
+++ b/test/Geo.MapQuest.Tests/DependencyInjection/ServiceCollectionExtensionsTests.cs
@@ -0,0 +1,72 @@
+// <copyright file="ServiceCollectionExtensionsTests.cs" company="Geo.NET">
+// Copyright (c) Geo.NET.
+// Licensed under the MIT license. See the LICENSE file in the solution root for full license information.
+// </copyright>
+
+namespace Geo.MapQuest.Tests.DependencyInjection
+{
+    using System;
+    using System.Net.Http;
+    using FluentAssertions;
+    using Geo.MapQuest.Abstractions;
+    using Geo.MapQuest.DependencyInjection;
+    using Microsoft.Extensions.DependencyInjection;
+    using Xunit;
+
+    /// <summary>
+    /// Unit tests for the <see cref="ServiceCollectionExtensions"/> class.
+    /// </summary>
+    public class ServiceCollectionExtensionsTests
+    {
+        [Fact]
+        public void AddMapQuestServices_WithValidCall_ConfiguresAllServices()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+
+            // Act
+            services.AddMapQuestServices(options => options.UseKey("abc"));
+
+            // Assert
+            var provider = services.BuildServiceProvider();
+
+            provider.GetRequiredService<IMapQuestKeyContainer>().Should().NotBeNull();
+            provider.GetRequiredService<IMapQuestEndpoint>().Should().NotBeNull();
+            provider.GetRequiredService<IMapQuestGeocoding>().Should().NotBeNull();
+        }
+
+        [Fact]
+        public void AddMapQuestServices_WithNullOptions_ConfiguresAllServices()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+
+            // Act
+            services.AddMapQuestServices(null);
+
+            // Assert
+            var provider = services.BuildServiceProvider();
+
+            provider.GetRequiredService<IMapQuestKeyContainer>().Should().NotBeNull();
+            provider.GetRequiredService<IMapQuestEndpoint>().Should().NotBeNull();
+            provider.GetRequiredService<IMapQuestGeocoding>().Should().NotBeNull();
+        }
+
+        [Fact]
+        public void AddMapQuestServices_WithClientConfiguration_ConfiguresHttpClientAllServices()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+
+            // Act
+            services.AddMapQuestServices(
+                options => options.UseKey("abc"),
+                client => client.Timeout = TimeSpan.FromSeconds(6));
+
+            // Assert
+            var provider = services.BuildServiceProvider();
+            var client = provider.GetRequiredService<IHttpClientFactory>().CreateClient("IMapQuestGeocoding");
+            client.Timeout.Should().Be(TimeSpan.FromSeconds(6));
+        }
+    }
+}
diff --git a/test/Geo.MapQuest.Tests/GlobalSuppressions.cs b/test/Geo.MapQuest.Tests/GlobalSuppressions.cs
new file mode 100644
index 0000000..fbafb98
--- /dev/null
+++ b/test/Geo.MapQuest.Tests/GlobalSuppressions.cs
@@ -0,0 +1,13 @@
+// <copyright file="GlobalSuppressions.cs" company="Geo.NET">
+// Copyright (c) Geo.NET.
+// Licensed under the MIT license. See the LICENSE file in the solution root for full license information.
+// </copyright>
+
+// This file is used by Code Analysis to maintain SuppressMessage
+// attributes that are applied to this project.
+// Project-level suppressions either have no target or are given
+// a specific target and scoped to a namespace, type, member, etc.
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("Naming", "CA1707:Identifiers should not contain underscores", Justification = "Using Microsoft recommended unit test naming", Scope = "namespaceanddescendants", Target = "~N:Geo.MapQuest.Tests")]
+[assembly: SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1600:Elements should be documented", Justification = "The name of the test should explain the test", Scope = "namespaceanddescendants", Target = "~N:Geo.MapQuest.Tests")]
diff --git a/test/Geo.MapQuest.Tests/TestData/CultureTestData.cs b/test/Geo.MapQuest.Tests/TestData/CultureTestData.cs
index e6bcb1c..69e6e1e 100644
--- a/test/Geo.MapQuest.Tests/TestData/CultureTestData.cs
+++ b/test/Geo.MapQuest.Tests/TestData/CultureTestData.cs
@@ -17,7 +17,7 @@ public class CultureTestData : IEnumerable<object[]>
         /// <summary>
         /// Gets the enumerator for the test data.
         /// </summary>
-        /// <returns>A <see cref="IEnumerator{T}"/> of <see cref="object"/>[].</returns>
+        /// <returns>An <see cref="IEnumerator{T}"/> of <see cref="object"/>[].</returns>
         public IEnumerator<object[]> GetEnumerator()
         {
             var cultures = CultureInfo.GetCultures(CultureTypes.AllCultures);
@@ -30,7 +30,7 @@ public IEnumerator<object[]> GetEnumerator()
         /// <summary>
         /// Gets the enumerator for the test data.
         /// </summary>
-        /// <returns>A <see cref="IEnumerator"/>.</returns>
+        /// <returns>An <see cref="IEnumerator"/>.</returns>
         IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
     }
 }
diff --git a/test/Tests.with.xUnit.props b/test/Tests.with.xUnit.props
index d990ea2..86d6e41 100644
--- a/test/Tests.with.xUnit.props
+++ b/test/Tests.with.xUnit.props
@@ -1,15 +1,15 @@
 <Project>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="5.10.3" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
-    <PackageReference Include="Moq" Version="4.15.2" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+    <PackageReference Include="coverlet.collector" Version="3.2.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="1.3.0">
+    <PackageReference Include="FluentAssertions" Version="6.10.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
+    <PackageReference Include="Moq" Version="4.18.4" />
+    <PackageReference Include="xunit" Version="2.4.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>