diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
index 245c3bb..6d15be3 100644
--- a/.github/workflows/unit_tests.yml
+++ b/.github/workflows/unit_tests.yml
@@ -42,6 +42,13 @@ jobs:
           AV_API_KEY: ${{secrets.alpha_vantage_key}}
           OWM_KEY: ${{secrets.open_weather_map_key}}
           GENERIC_CONTROLLER_CONFIG: ${{secrets.generic_controller_config}}
+
+      - name: Test Client
+        run: |
+          pytest tests/test_client.py --doctest-modules --junitxml=tests/client-test-results.xml
+        env:
+          MAP_MAKER_KEY: ${{secrets.map_maker_key}}
+
       - name: Test Cached API
         run: |
           pytest tests/test_cached_api.py --doctest-modules --junitxml=tests/cached-api-test-results.xml
@@ -81,13 +88,13 @@ jobs:
       - name: Test Map Maker API
         run: |
           pytest tests/test_map_maker_api.py --doctest-modules --junitxml=tests/map-maker-api-test-results.xml
+        env:
+          MAP_MAKER_KEY: ${{secrets.map_maker_key}}
       - name: Upload Map Maker API test results
         uses: actions/upload-artifact@v2
         with:
           name: map-maker-api-test-results
           path: tests/map-maker-api-test-results.xml
-        env:
-          MAP_MAKER_KEY: ${{secrets.map_maker_key}}
 
       - name: Test Generic API
         run: |
diff --git a/neon_api_proxy/client/__init__.py b/neon_api_proxy/client/__init__.py
index bcbddc0..306763b 100644
--- a/neon_api_proxy/client/__init__.py
+++ b/neon_api_proxy/client/__init__.py
@@ -41,6 +41,7 @@ def __str__(self):
     ALPHA_VANTAGE = "alpha_vantage"
     OPEN_WEATHER_MAP = "open_weather_map"
     WOLFRAM_ALPHA = "wolfram_alpha"
+    MAP_MAKER = "map_maker"
     FINANCIAL_MODELING_PREP = "financial_modeling_prep"
     NOT_IMPLEMENTED = "not_implemented"
     TEST_API = "api_test_endpoint"