diff --git a/autopush/tests/test_web_validation.py b/autopush/tests/test_web_validation.py
index a7ba3a72..0ae68b06 100644
--- a/autopush/tests/test_web_validation.py
+++ b/autopush/tests/test_web_validation.py
@@ -326,7 +326,7 @@ def test_no_headers(self):
             public_key="",
         )
         schema.context["settings"].router.get_uaid.return_value = dict(
-            router_type="webpush",
+            router_type="gcm",
         )
         data = self._make_test_data(body="asdfasdf")
 
@@ -422,7 +422,7 @@ def test_invalid_header_combo(self):
             public_key="",
         )
         schema.context["settings"].router.get_uaid.return_value = dict(
-            router_type="webpush",
+            router_type="gcm",
         )
         info = self._make_test_data(
             headers={
@@ -445,7 +445,7 @@ def test_invalid_header_combo_04(self):
             public_key="",
         )
         schema.context["settings"].router.get_uaid.return_value = dict(
-            router_type="webpush",
+            router_type="gcm",
         )
         info = self._make_test_data(
             headers={
@@ -471,7 +471,7 @@ def test_missing_encryption_salt(self):
             public_key="",
         )
         schema.context["settings"].router.get_uaid.return_value = dict(
-            router_type="webpush",
+            router_type="gcm",
         )
         info = self._make_test_data(
             headers={
@@ -495,7 +495,7 @@ def test_missing_encryption_salt_04(self):
             public_key="",
         )
         schema.context["settings"].router.get_uaid.return_value = dict(
-            router_type="webpush",
+            router_type="gcm",
         )
         info = self._make_test_data(
             headers={
@@ -519,7 +519,7 @@ def test_missing_encryption_key_dh(self):
             public_key="",
         )
         schema.context["settings"].router.get_uaid.return_value = dict(
-            router_type="webpush",
+            router_type="gcm",
         )
         info = self._make_test_data(
             headers={
@@ -634,7 +634,7 @@ def test_invalid_dh_value_for_01_crypto(self):
             public_key="",
         )
         schema.context["settings"].router.get_uaid.return_value = dict(
-            router_type="webpush",
+            router_type="gcm",
         )
 
         padded_value = "asdfjiasljdf==="
@@ -691,7 +691,7 @@ def test_invalid_topic(self):
             public_key="",
         )
         schema.context["settings"].router.get_uaid.return_value = dict(
-            router_type="webpush",
+            router_type="gcm",
             uaid=dummy_uaid,
         )
 
diff --git a/autopush/web/base.py b/autopush/web/base.py
index 73c7de95..bd1558e2 100644
--- a/autopush/web/base.py
+++ b/autopush/web/base.py
@@ -68,7 +68,7 @@ def _call_func(self, result, func, request_handler, *args, **kwargs):
             return func(request_handler, *args, **kwargs)
 
     def _track_validation_timing(self, result, request_handler, start_time):
-        # type: (Any, BaseWebHandler, float) -> None
+        # type: (Any, BaseWebHandler, float) -> Any
         """Track the validation timing"""
         request_handler._timings["validation_time"] = time.time() - start_time
         return result