From e2c5de703be45746bacaea4136f24440ff5a291c Mon Sep 17 00:00:00 2001
From: Max Nanis
Date: Mon, 24 Aug 2026 12:35:35 -0700
Subject: Ruff std replacements

---
 tests/models/innovate/test_question.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'tests/models/innovate')

diff --git a/tests/models/innovate/test_question.py b/tests/models/innovate/test_question.py
index 330f919..b0c2964 100644
--- a/tests/models/innovate/test_question.py
+++ b/tests/models/innovate/test_question.py
@@ -1,15 +1,15 @@
 from generalresearch.models import Source
 from generalresearch.models.innovate.question import (
     InnovateQuestion,
-    InnovateQuestionType,
     InnovateQuestionOption,
+    InnovateQuestionType,
 )
 from generalresearch.models.thl.profiling.upk_question import (
-    UpkQuestionSelectorTE,
     UpkQuestion,
+    UpkQuestionChoice,
     UpkQuestionSelectorMC,
+    UpkQuestionSelectorTE,
     UpkQuestionType,
-    UpkQuestionChoice,
 )
 
 
-- 
cgit v1.2.3


From cf239865ce440e1a71ee2360514eaeb018620ac9 Mon Sep 17 00:00:00 2001
From: Max Nanis
Date: Wed, 26 Aug 2026 16:46:45 -0700
Subject: Ruff afternoon!

---
 generalresearch/models/network/nmap/execute.py     |   2 +-
 generalresearch/models/thl/soft_pair.py            |   3 +-
 generalresearch/models/thl/survey/condition.py     |  11 +-
 test_utils/managers/conftest.py                    |   2 +-
 test_utils/models/thl/conftest.py                  | 162 +++++++++++++++++++++
 test_utils/precision/__init__.py                   |   0
 test_utils/precision/conftest.py                   | 129 ++++++++++++++++
 test_utils/spectrum/conftest.py                    |  58 +++++++-
 tests/conftest.py                                  |   3 +
 tests/models/innovate/test_question.py             |   2 +
 .../models/legacy/test_offerwall_parse_response.py |   2 +
 tests/models/legacy/test_profiling_questions.py    |   6 +-
 .../models/legacy/test_user_question_answer_in.py  |  54 +++----
 tests/models/morning/test.py                       |   2 +
 tests/models/network/test_mtr.py                   |   5 +-
 tests/models/network/test_nmap.py                  |  11 +-
 tests/models/network/test_nmap_parser.py           |  12 +-
 tests/models/network/test_rdns.py                  |   2 +
 tests/models/precision/__init__.py                 | 115 ---------------
 tests/models/precision/test_survey.py              |  42 +++---
 tests/models/prodege/test_survey_participation.py  |  17 +--
 tests/models/spectrum/test_question.py             |   5 +
 tests/models/spectrum/test_survey.py               |  48 +++---
 tests/models/spectrum/test_survey_manager.py       | 103 +++++--------
 tests/models/test_currency.py                      |   2 +
 tests/models/test_device.py                        |   8 +-
 tests/models/test_finance.py                       |  30 ++--
 tests/models/thl/question/test_question_info.py    | 137 +----------------
 tests/models/thl/question/test_user_info.py        |  29 +---
 tests/models/thl/test_adjustments.py               |  58 +++++---
 tests/models/thl/test_bucket.py                    |   8 +-
 tests/models/thl/test_buyer.py                     |   2 +
 tests/models/thl/test_contest/test_contest.py      |   2 +
 .../thl/test_contest/test_leaderboard_contest.py   |  27 +++-
 .../models/thl/test_contest/test_raffle_contest.py |  39 ++++-
 tests/models/thl/test_ledger.py                    |   2 +
 tests/models/thl/test_marketplace_condition.py     |  38 +----
 tests/models/thl/test_payout.py                    |   4 +-
 tests/models/thl/test_payout_format.py             |   2 +
 tests/models/thl/test_product.py                   |  86 ++++++-----
 tests/models/thl/test_product_userwalletconfig.py  |   8 +-
 tests/models/thl/test_soft_pair.py                 |  10 +-
 tests/models/thl/test_upkquestion.py               |  78 ++++------
 tests/models/thl/test_user.py                      |  76 +++-------
 tests/models/thl/test_user_iphistory.py            |   2 +
 tests/models/thl/test_user_metadata.py             |   2 +
 tests/models/thl/test_user_streak.py               |   2 +
 tests/models/thl/test_wall.py                      |   2 +
 tests/models/thl/test_wall_session.py              |   2 +
 tests/wall_status_codes/test_analyze.py            |   2 +
 tests/wxet/models/test_definitions.py              |  37 ++---
 tests/wxet/models/test_finish_type.py              |   2 +
 52 files changed, 785 insertions(+), 708 deletions(-)
 create mode 100644 test_utils/precision/__init__.py
 create mode 100644 test_utils/precision/conftest.py

(limited to 'tests/models/innovate')

diff --git a/generalresearch/models/network/nmap/execute.py b/generalresearch/models/network/nmap/execute.py
index 8a73307..6c05c89 100644
--- a/generalresearch/models/network/nmap/execute.py
+++ b/generalresearch/models/network/nmap/execute.py
@@ -19,7 +19,7 @@ def execute_nmap(
     enable_advanced: bool = True,
     timing: int = 4,
     scan_group_id: UUIDStr | None = None,
-):
+) -> NmapRun:
     config = NmapRunCommand(
         options=NmapRunCommandOptions(
             top_ports=top_ports,
diff --git a/generalresearch/models/thl/soft_pair.py b/generalresearch/models/thl/soft_pair.py
index 6ff1165..f3b2b6f 100644
--- a/generalresearch/models/thl/soft_pair.py
+++ b/generalresearch/models/thl/soft_pair.py
@@ -4,6 +4,7 @@ from dataclasses import dataclass
 from enum import Enum
 
 from generalresearch.models import Source
+from generalresearch.models.dynata.survey import DynataCondition
 from generalresearch.models.thl.survey.condition import (
     MarketplaceCondition,
 )
@@ -34,7 +35,7 @@ class SoftPairResult:
     pair_type: SoftPairResultType
     source: Source
     survey_id: str
-    conditions: set[MarketplaceCondition] | None = None
+    conditions: set[MarketplaceCondition | DynataCondition] | None = None
 
     @property
     def survey_sid(self) -> str:
diff --git a/generalresearch/models/thl/survey/condition.py b/generalresearch/models/thl/survey/condition.py
index a85073c..514ee64 100644
--- a/generalresearch/models/thl/survey/condition.py
+++ b/generalresearch/models/thl/survey/condition.py
@@ -248,7 +248,7 @@ class MarketplaceCondition(BaseModel, ABC):
         return d
 
     @staticmethod
-    def is_numeric_including_inf(s) -> bool:
+    def is_numeric_including_inf(s: Any) -> bool:
         try:
             float(s)
             return True
@@ -263,10 +263,9 @@ class MarketplaceCondition(BaseModel, ABC):
         # Fancy repr that only shows the first and last 3 values if there are more than 6.
         repr_args = list(self.__repr_args__())
         for n, (k, v) in enumerate(repr_args):
-            if k == "values":
-                if v and len(v) > 6:
-                    v = v[:3] + ["…"] + v[-3:]
-                    repr_args[n] = ("values", v)
+            if k == "values" and v and len(v) > 6:
+                v = v[:3] + ["…"] + v[-3:]
+                repr_args[n] = ("values", v)
         join_str = ", "
         repr_str = join_str.join(
             repr(v) if a is None else f"{a}={v!r}" for a, v in repr_args
@@ -334,5 +333,5 @@ class MarketplaceCondition(BaseModel, ABC):
             except ValueError:
                 return None
             values = self.values_ranges
-            passes = any([start <= x <= end for start, end in values for x in answer])
+            passes = any(start <= x <= end for start, end in values for x in answer)
             return not passes if self.negate else passes
diff --git a/test_utils/managers/conftest.py b/test_utils/managers/conftest.py
index e5d6015..b03a646 100644
--- a/test_utils/managers/conftest.py
+++ b/test_utils/managers/conftest.py
@@ -195,7 +195,7 @@ def setup_cashoutmethod_db(
 
 
 @pytest.fixture(scope="session")
-def spectrum_manager(spectrum_rw: SqlHelper) -> SpectrumSurveyManager:
+def spectrum_survey_manager(spectrum_rw: SqlHelper) -> SpectrumSurveyManager:
     from generalresearch.managers.spectrum.survey import (
         SpectrumSurveyManager,
     )
diff --git a/test_utils/models/thl/conftest.py b/test_utils/models/thl/conftest.py
index 5b21c6b..907306d 100644
--- a/test_utils/models/thl/conftest.py
+++ b/test_utils/models/thl/conftest.py
@@ -433,3 +433,165 @@ def auditlog_factory(audit_log_manager: AuditLogManager):
         )
 
     return _inner
+
+
+@pytest.fixture(scope="session")
+def profiling_info_json() -> str:
+    return (
+        '[{"property_label": "hispanic", "cardinality": "*", "prop_type": "i", "country_iso": "us", '
+        '"property_id": "05170ae296ab49178a075cab2a2073a6", "item_id": "7911ec1468b146ee870951f8ae9cbac1", '
+        '"item_label": "panamanian", "gold_standard": 1, "options": [{"id": "c358c11e72c74fa2880358f1d4be85ab", '
+        '"label": "not_hispanic"}, {"id": "b1d6c475770849bc8e0200054975dc9c", "label": "yes_hispanic"}, '
+        '{"id": "bd1eb44495d84b029e107c188003c2bd", "label": "other_hispanic"}, '
+        '{"id": "f290ad5e75bf4f4ea94dc847f57c1bd3", "label": "mexican"}, '
+        '{"id": "49f50f2801bd415ea353063bfc02d252", "label": "puerto_rican"}, '
+        '{"id": "dcbe005e522f4b10928773926601f8bf", "label": "cuban"}, '
+        '{"id": "467ef8ddb7ac4edb88ba9ef817cbb7e9", "label": "salvadoran"}, '
+        '{"id": "3c98e7250707403cba2f4dc7b877c963", "label": "dominican"}, '
+        '{"id": "981ee77f6d6742609825ef54fea824a8", "label": "guatemalan"}, '
+        '{"id": "81c8057b809245a7ae1b8a867ea6c91e", "label": "colombian"}, '
+        '{"id": "513656d5f9e249fa955c3b527d483b93", "label": "honduran"}, '
+        '{"id": "afc8cddd0c7b4581bea24ccd64db3446", "label": "ecuadorian"}, '
+        '{"id": "61f34b36e80747a89d85e1eb17536f84", "label": "argentinian"}, '
+        '{"id": "5330cfa681d44aa8ade3a6d0ea198e44", "label": "peruvian"}, '
+        '{"id": "e7bceaffd76e486596205d8545019448", "label": "nicaraguan"}, '
+        '{"id": "b7bbb2ebf8424714962e6c4f43275985", "label": "spanish"}, '
+        '{"id": "8bf539785e7a487892a2f97e52b1932d", "label": "venezuelan"}, '
+        '{"id": "7911ec1468b146ee870951f8ae9cbac1", "label": "panamanian"}], "category": [{"id": '
+        '"4fd8381d5a1c4409ab007ca254ced084", "label": "Demographic", "path": "/Demographic", '
+        '"adwords_vertical_id": null}]}, {"property_label": "ethnic_group", "cardinality": "*", "prop_type": '
+        '"i", "country_iso": "us", "property_id": "15070958225d4132b7f6674fcfc979f6", "item_id": '
+        '"64b7114cf08143949e3bcc3d00a5d8a0", "item_label": "other_ethnicity", "gold_standard": 1, "options": [{'
+        '"id": "a72e97f4055e4014a22bee4632cbf573", "label": "caucasians"}, '
+        '{"id": "4760353bc0654e46a928ba697b102735", "label": "black_or_african_american"}, '
+        '{"id": "20ff0a2969fa4656bbda5c3e0874e63b", "label": "asian"}, '
+        '{"id": "107e0a79e6b94b74926c44e70faf3793", "label": "native_hawaiian_or_other_pacific_islander"}, '
+        '{"id": "900fa12691d5458c8665bf468f1c98c1", "label": "native_americans"}, '
+        '{"id": "64b7114cf08143949e3bcc3d00a5d8a0", "label": "other_ethnicity"}], "category": [{"id": '
+        '"4fd8381d5a1c4409ab007ca254ced084", "label": "Demographic", "path": "/Demographic", '
+        '"adwords_vertical_id": null}]}, {"property_label": "educational_attainment", "cardinality": "?", '
+        '"prop_type": "i", "country_iso": "us", "property_id": "2637783d4b2b4075b93e2a156e16e1d8", "item_id": '
+        '"934e7b81d6744a1baa31bbc51f0965d5", "item_label": "other_education", "gold_standard": 1, "options": [{'
+        '"id": "df35ef9e474b4bf9af520aa86630202d", "label": "3rd_grade_completion"}, '
+        '{"id": "83763370a1064bd5ba76d1b68c4b8a23", "label": "8th_grade_completion"}, '
+        '{"id": "f0c25a0670c340bc9250099dcce50957", "label": "not_high_school_graduate"}, '
+        '{"id": "02ff74c872bd458983a83847e1a9f8fd", "label": "high_school_completion"}, '
+        '{"id": "ba8beb807d56441f8fea9b490ed7561c", "label": "vocational_program_completion"}, '
+        '{"id": "65373a5f348a410c923e079ddbb58e9b", "label": "some_college_completion"}, '
+        '{"id": "2d15d96df85d4cc7b6f58911fdc8d5e2", "label": "associate_academic_degree_completion"}, '
+        '{"id": "497b1fedec464151b063cd5367643ffa", "label": "bachelors_degree_completion"}, '
+        '{"id": "295133068ac84424ae75e973dc9f2a78", "label": "some_graduate_completion"}, '
+        '{"id": "e64f874faeff4062a5aa72ac483b4b9f", "label": "masters_degree_completion"}, '
+        '{"id": "cbaec19a636d476385fb8e7842b044f5", "label": "doctorate_degree_completion"}, '
+        '{"id": "934e7b81d6744a1baa31bbc51f0965d5", "label": "other_education"}], "category": [{"id": '
+        '"4fd8381d5a1c4409ab007ca254ced084", "label": "Demographic", "path": "/Demographic", '
+        '"adwords_vertical_id": null}]}, {"property_label": "household_spoken_language", "cardinality": "*", '
+        '"prop_type": "i", "country_iso": "us", "property_id": "5a844571073d482a96853a0594859a51", "item_id": '
+        '"62b39c1de141422896ad4ab3c4318209", "item_label": "dut", "gold_standard": 1, "options": [{"id": '
+        '"f65cd57b79d14f0f8460761ce41ec173", "label": "ara"}, {"id": "6d49de1f8f394216821310abd29392d9", '
+        '"label": "zho"}, {"id": "be6dc23c2bf34c3f81e96ddace22800d", "label": "eng"}, '
+        '{"id": "ddc81f28752d47a3b1c1f3b8b01a9b07", "label": "fre"}, {"id": "2dbb67b29bd34e0eb630b1b8385542ca", '
+        '"label": "ger"}, {"id": "a747f96952fc4b9d97edeeee5120091b", "label": "hat"}, '
+        '{"id": "7144b04a3219433baac86273677551fa", "label": "hin"}, {"id": "e07ff3e82c7149eaab7ea2b39ee6a6dc", '
+        '"label": "ita"}, {"id": "b681eff81975432ebfb9f5cc22dedaa3", "label": "jpn"}, '
+        '{"id": "5cb20440a8f64c9ca62fb49c1e80cdef", "label": "kor"}, {"id": "171c4b77d4204bc6ac0c2b81e38a10ff", '
+        '"label": "pan"}, {"id": "8c3ec18e6b6c4a55a00dd6052e8e84fb", "label": "pol"}, '
+        '{"id": "3ce074d81d384dd5b96f1fb48f87bf01", "label": "por"}, {"id": "6138dc951990458fa88a666f6ddd907b", '
+        '"label": "rus"}, {"id": "e66e5ecc07df4ebaa546e0b436f034bd", "label": "spa"}, '
+        '{"id": "5a981b3d2f0d402a96dd2d0392ec2fcb", "label": "tgl"}, {"id": "b446251bd211403487806c4d0a904981", '
+        '"label": "vie"}, {"id": "92fb3ee337374e2db875fb23f52eed46", "label": "xxx"}, '
+        '{"id": "8b1f590f12f24cc1924d7bdcbe82081e", "label": "ind"}, {"id": "bf3f4be556a34ff4b836420149fd2037", '
+        '"label": "tur"}, {"id": "87ca815c43ba4e7f98cbca98821aa508", "label": "zul"}, '
+        '{"id": "0adbf915a7a64d67a87bb3ce5d39ca54", "label": "may"}, {"id": "62b39c1de141422896ad4ab3c4318209", '
+        '"label": "dut"}], "category": [{"id": "4fd8381d5a1c4409ab007ca254ced084", "label": "Demographic", '
+        '"path": "/Demographic", "adwords_vertical_id": null}]}, {"property_label": "gender", "cardinality": '
+        '"?", "prop_type": "i", "country_iso": "us", "property_id": "73175402104741549f21de2071556cd7", '
+        '"item_id": "093593e316344cd3a0ac73669fca8048", "item_label": "other_gender", "gold_standard": 1, '
+        '"options": [{"id": "b9fc5ea07f3a4252a792fd4a49e7b52b", "label": "male"}, '
+        '{"id": "9fdb8e5e18474a0b84a0262c21e17b56", "label": "female"}, '
+        '{"id": "093593e316344cd3a0ac73669fca8048", "label": "other_gender"}], "category": [{"id": '
+        '"4fd8381d5a1c4409ab007ca254ced084", "label": "Demographic", "path": "/Demographic", '
+        '"adwords_vertical_id": null}]}, {"property_label": "age_in_years", "cardinality": "?", "prop_type": '
+        '"n", "country_iso": "us", "property_id": "94f7379437874076b345d76642d4ce6d", "item_id": null, '
+        '"item_label": null, "gold_standard": 1, "category": [{"id": "4fd8381d5a1c4409ab007ca254ced084", '
+        '"label": "Demographic", "path": "/Demographic", "adwords_vertical_id": null}]}, {"property_label": '
+        '"children_age_gender", "cardinality": "*", "prop_type": "i", "country_iso": "us", "property_id": '
+        '"e926142fcea94b9cbbe13dc7891e1e7f", "item_id": "b7b8074e95334b008e8958ccb0a204f1", "item_label": '
+        '"female_18", "gold_standard": 1, "options": [{"id": "16a6448ec24c48d4993d78ebee33f9b4", '
+        '"label": "male_under_1"}, {"id": "809c04cb2e3b4a3bbd8077ab62cdc220", "label": "female_under_1"}, '
+        '{"id": "295e05bb6a0843bc998890b24c99841e", "label": "no_children"}, '
+        '{"id": "142cb948d98c4ae8b0ef2ef10978e023", "label": "male_0"}, '
+        '{"id": "5a5c1b0e9abc48a98b3bc5f817d6e9d0", "label": "male_1"}, '
+        '{"id": "286b1a9afb884bdfb676dbb855479d1e", "label": "male_2"}, '
+        '{"id": "942ca3cda699453093df8cbabb890607", "label": "male_3"}, '
+        '{"id": "995818d432f643ec8dd17e0809b24b56", "label": "male_4"}, '
+        '{"id": "f38f8b57f25f4cdea0f270297a1e7a5c", "label": "male_5"}, '
+        '{"id": "975df709e6d140d1a470db35023c432d", "label": "male_6"}, '
+        '{"id": "f60bd89bbe0f4e92b90bccbc500467c2", "label": "male_7"}, '
+        '{"id": "6714ceb3ed5042c0b605f00b06814207", "label": "male_8"}, '
+        '{"id": "c03c2f8271d443cf9df380e84b4dea4c", "label": "male_9"}, '
+        '{"id": "11690ee0f5a54cb794f7ddd010d74fa2", "label": "male_10"}, '
+        '{"id": "17bef9a9d14b4197b2c5609fa94b0642", "label": "male_11"}, '
+        '{"id": "e79c8338fe28454f89ccc78daf6f409a", "label": "male_12"}, '
+        '{"id": "3a4f87acb3fa41f4ae08dfe2858238c1", "label": "male_13"}, '
+        '{"id": "36ffb79d8b7840a7a8cb8d63bbc8df59", "label": "male_14"}, '
+        '{"id": "1401a508f9664347aee927f6ec5b0a40", "label": "male_15"}, '
+        '{"id": "6e0943c5ec4a4f75869eb195e3eafa50", "label": "male_16"}, '
+        '{"id": "47d4b27b7b5242758a9fff13d3d324cf", "label": "male_17"}, '
+        '{"id": "9ce886459dd44c9395eb77e1386ab181", "label": "female_0"}, '
+        '{"id": "6499ccbf990d4be5b686aec1c7353fd8", "label": "female_1"}, '
+        '{"id": "d85ceaa39f6d492abfc8da49acfd14f2", "label": "female_2"}, '
+        '{"id": "18edb45c138e451d8cb428aefbb80f9c", "label": "female_3"}, '
+        '{"id": "bac6f006ed9f4ccf85f48e91e99fdfd1", "label": "female_4"}, '
+        '{"id": "5a6a1a8ad00c4ce8be52dcb267b034ff", "label": "female_5"}, '
+        '{"id": "6bff0acbf6364c94ad89507bcd5f4f45", "label": "female_6"}, '
+        '{"id": "d0d56a0a6b6f4516a366a2ce139b4411", "label": "female_7"}, '
+        '{"id": "bda6028468044b659843e2bef4db2175", "label": "female_8"}, '
+        '{"id": "dbb6d50325464032b456357b1a6e5e9c", "label": "female_9"}, '
+        '{"id": "b87a93d7dc1348edac5e771684d63fb8", "label": "female_10"}, '
+        '{"id": "11449d0d98f14e27ba47de40b18921d7", "label": "female_11"}, '
+        '{"id": "16156501e97b4263962cbbb743840292", "label": "female_12"}, '
+        '{"id": "04ee971c89a345cc8141a45bce96050c", "label": "female_13"}, '
+        '{"id": "e818d310bfbc4faba4355e5d2ed49d4f", "label": "female_14"}, '
+        '{"id": "440d25e078924ba0973163153c417ed6", "label": "female_15"}, '
+        '{"id": "78ff804cc9b441c5a524bd91e3d1f8bf", "label": "female_16"}, '
+        '{"id": "4b04d804d7d84786b2b1c22e4ed440f5", "label": "female_17"}, '
+        '{"id": "28bc848cd3ff44c3893c76bfc9bc0c4e", "label": "male_18"}, '
+        '{"id": "b7b8074e95334b008e8958ccb0a204f1", "label": "female_18"}], "category": [{"id": '
+        '"e18ba6e9d51e482cbb19acf2e6f505ce", "label": "Parenting", "path": "/People & Society/Family & '
+        'Relationships/Family/Parenting", "adwords_vertical_id": "58"}]}, {"property_label": "home_postal_code", '
+        '"cardinality": "?", "prop_type": "x", "country_iso": "us", "property_id": '
+        '"f3b32ebe78014fbeb1ed6ff77d6338bf", "item_id": null, "item_label": null, "gold_standard": 1, '
+        '"category": [{"id": "4fd8381d5a1c4409ab007ca254ced084", "label": "Demographic", "path": "/Demographic", '
+        '"adwords_vertical_id": null}]}, {"property_label": "household_income", "cardinality": "?", "prop_type": '
+        '"n", "country_iso": "us", "property_id": "ff5b1d4501d5478f98de8c90ef996ac1", "item_id": null, '
+        '"item_label": null, "gold_standard": 1, "category": [{"id": "4fd8381d5a1c4409ab007ca254ced084", '
+        '"label": "Demographic", "path": "/Demographic", "adwords_vertical_id": null}]}]'
+    )
+
+
+@pytest.fixture(scope="session")
+def profiling_user_info_json() -> str:
+    return (
+        '{"user_profile_knowledge": [], "marketplace_profile_knowledge": [{"source": "d", "question_id": '
+        '"1", "answer": ["1"], "created": "2023-11-07T16:41:05.234096Z"}, {"source": "pr", '
+        '"question_id": "3", "answer": ["1"], "created": "2023-11-07T16:41:05.234096Z"}, {"source": '
+        '"h", "question_id": "60", "answer": ["58"], "created": "2023-11-07T16:41:05.234096Z"}, '
+        '{"source": "c", "question_id": "43", "answer": ["1"], "created": "2023-11-07T16:41:05.234096Z"}, '
+        '{"source": "s", "question_id": "211", "answer": ["111"], "created": '
+        '"2023-11-07T16:41:05.234096Z"}, {"source": "s", "question_id": "1843", "answer": ["111"], '
+        '"created": "2023-11-07T16:41:05.234096Z"}, {"source": "h", "question_id": "13959", "answer": ['
+        '"244155"], "created": "2023-11-07T16:41:05.234096Z"}, {"source": "c", "question_id": "33092", '
+        '"answer": ["1"], "created": "2023-11-07T16:41:05.234096Z"}, {"source": "c", "question_id": "gender", '
+        '"answer": ["10682"], "created": "2023-11-07T16:41:05.234096Z"}, {"source": "e", "question_id": '
+        '"gender", "answer": ["male"], "created": "2023-11-07T16:41:05.234096Z"}, {"source": "f", '
+        '"question_id": "gender", "answer": ["male"], "created": "2023-11-07T16:41:05.234096Z"}, {"source": '
+        '"i", "question_id": "gender", "answer": ["1"], "created": "2023-11-07T16:41:05.234096Z"}, '
+        '{"source": "c", "question_id": "137510", "answer": ["1"], "created": "2023-11-07T16:41:05.234096Z"}, '
+        '{"source": "m", "question_id": "gender", "answer": ["1"], "created": '
+        '"2023-11-07T16:41:05.234096Z"}, {"source": "o", "question_id": "gender", "answer": ["male"], '
+        '"created": "2023-11-07T16:41:05.234096Z"}, {"source": "c", "question_id": "gender_plus", "answer": ['
+        '"7657644"], "created": "2023-11-07T16:41:05.234096Z"}, {"source": "i", "question_id": '
+        '"gender_plus", "answer": ["1"], "created": "2023-11-07T16:41:05.234096Z"}, {"source": "c", '
+        '"question_id": "income_level", "answer": ["9071"], "created": "2023-11-07T16:41:05.234096Z"}]}'
+    )
diff --git a/test_utils/precision/__init__.py b/test_utils/precision/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/test_utils/precision/conftest.py b/test_utils/precision/conftest.py
new file mode 100644
index 0000000..7acfe6a
--- /dev/null
+++ b/test_utils/precision/conftest.py
@@ -0,0 +1,129 @@
+from typing import Any
+
+import pytest
+
+
+@pytest.fixture(scope="session")
+def precision_survey_json() -> dict[str, Any]:
+    return {
+        "cpi": "1.44",
+        "country_isos": "ca",
+        "language_isos": "eng",
+        "country_iso": "ca",
+        "language_iso": "eng",
+        "buyer_id": "7047",
+        "bid_loi": 1200,
+        "bid_ir": 0.45,
+        "source": "e",
+        "used_question_ids": ["age", "country_iso", "gender", "gender_1"],
+        "survey_id": "0000",
+        "group_id": "633473",
+        "status": "open",
+        "name": "beauty survey",
+        "survey_guid": "c7f375c5077d4c6c8209ff0b539d7183",
+        "category_id": "-1",
+        "global_conversion": None,
+        "desired_count": 96,
+        "achieved_count": 0,
+        "allowed_devices": "1,2,3",
+        "entry_link": "https://www.opinionetwork.com/survey/entry.aspx?mid=[%MID%]&project=633473&key=%%key%%",
+        "excluded_surveys": "470358,633286",
+        "quotas": [
+            {
+                "name": "25-34,Male,Quebec",
+                "id": "2324110",
+                "guid": "23b5760d24994bc08de451b3e62e77c7",
+                "status": "open",
+                "desired_count": 48,
+                "achieved_count": 0,
+                "termination_count": 0,
+                "overquota_count": 0,
+                "condition_hashes": ["b41e1a3", "bc89ee8", "4124366", "9f32c61"],
+            },
+            {
+                "name": "25-34,Female,Quebec",
+                "id": "2324111",
+                "guid": "0706f1a88d7e4f11ad847c03012e68d2",
+                "status": "open",
+                "desired_count": 48,
+                "achieved_count": 0,
+                "termination_count": 4,
+                "overquota_count": 0,
+                "condition_hashes": ["b41e1a3", "0cdc304", "500af2c", "9f32c61"],
+            },
+        ],
+        "conditions": {
+            "b41e1a3": {
+                "logical_operator": "OR",
+                "value_type": 1,
+                "negate": False,
+                "question_id": "country_iso",
+                "values": ["ca"],
+                "criterion_hash": "b41e1a3",
+                "value_len": 1,
+                "sizeof": 2,
+            },
+            "bc89ee8": {
+                "logical_operator": "OR",
+                "value_type": 1,
+                "negate": False,
+                "question_id": "gender",
+                "values": ["male"],
+                "criterion_hash": "bc89ee8",
+                "value_len": 1,
+                "sizeof": 4,
+            },
+            "4124366": {
+                "logical_operator": "OR",
+                "value_type": 1,
+                "negate": False,
+                "question_id": "gender_1",
+                "values": ["male"],
+                "criterion_hash": "4124366",
+                "value_len": 1,
+                "sizeof": 4,
+            },
+            "9f32c61": {
+                "logical_operator": "OR",
+                "value_type": 1,
+                "negate": False,
+                "question_id": "age",
+                "values": ["25", "26", "27", "28", "29", "30", "31", "32", "33", "34"],
+                "criterion_hash": "9f32c61",
+                "value_len": 10,
+                "sizeof": 20,
+            },
+            "0cdc304": {
+                "logical_operator": "OR",
+                "value_type": 1,
+                "negate": False,
+                "question_id": "gender",
+                "values": ["female"],
+                "criterion_hash": "0cdc304",
+                "value_len": 1,
+                "sizeof": 6,
+            },
+            "500af2c": {
+                "logical_operator": "OR",
+                "value_type": 1,
+                "negate": False,
+                "question_id": "gender_1",
+                "values": ["female"],
+                "criterion_hash": "500af2c",
+                "value_len": 1,
+                "sizeof": 6,
+            },
+        },
+        "expected_end_date": "2024-06-28T10:40:33.000000Z",
+        "created": None,
+        "updated": None,
+        "is_live": True,
+        "all_hashes": [
+            "0cdc304",
+            "b41e1a3",
+            "9f32c61",
+            "bc89ee8",
+            "4124366",
+            "500af2c",
+        ],
+    }
diff --git a/test_utils/spectrum/conftest.py b/test_utils/spectrum/conftest.py
index eb2e289..d186a5b 100644
--- a/test_utils/spectrum/conftest.py
+++ b/test_utils/spectrum/conftest.py
@@ -1,7 +1,10 @@
+from __future__ import annotations
+
 import logging
 import time
 from datetime import UTC, datetime
-from typing import TYPE_CHECKING
+from decimal import Decimal
+from typing import TYPE_CHECKING, Any
 
 import pytest
 
@@ -83,3 +86,56 @@ def setup_spectrum_surveys(
     conn.commit()
     # Wait a second to make sure the spectrum-grpc pulls these from the db into global-vars
     time.sleep(1)
+
+
+@pytest.fixture(scope="session")
+def spectrum_api_survey_json() -> dict[str, Any]:
+    return {
+        "survey_id": 29333264,
+        "survey_name": "#29333264",
+        "survey_status": 22,
+        "field_end_date": datetime(2024, 5, 23, 18, 18, 31, tzinfo=UTC),
+        "category": "Exciting New",
+        "category_code": 232,
+        "crtd_on": datetime(2024, 5, 20, 17, 48, 13, tzinfo=UTC),
+        "mod_on": datetime(2024, 5, 20, 18, 18, 31, tzinfo=UTC),
+        "soft_launch": False,
+        "click_balancing": 0,
+        "price_type": 1,
+        "pii": False,
+        "buyer_message": "",
+        "buyer_id": 4726,
+        "incl_excl": 0,
+        "cpi": Decimal("1.20"),
+        "last_complete_date": None,
+        "project_last_complete_date": None,
+        "quotas": [
+            {
+                "quota_id": "c2bc961e-4f26-4223-b409-ebe9165cfdf5",
+                "quantities": {"currently_open": 491, "remaining": 495, "achieved": 0},
+                "criteria": [
+                    {
+                        "qualification_code": 214,
+                        "range_sets": [{"units": 311, "to": 64, "from": 18}],
+                    }
+                ],
+            }
+        ],
+        "qualifications": [
+            {
+                "range_sets": [{"units": 311, "to": 64, "from": 18}],
+                "qualification_code": 212,
+            },
+            {"condition_codes": ["111", "117", "112"], "qualification_code": 1202},
+        ],
+        "country_iso": "fr",
+        "language_iso": "fre",
+        "bid_ir": 0.4,
+        "bid_loi": 600,
+        "overall_ir": None,
+        "overall_loi": None,
+        "last_block_ir": None,
+        "last_block_loi": None,
+        "survey_exclusions": set(),
+        "exclusion_period": 0,
+    }
diff --git a/tests/conftest.py b/tests/conftest.py
index 6748592..4777e15 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -23,4 +23,7 @@ pytest_plugins = [
     "test_utils.models.network.conftest",
     "test_utils.models.thl.conftest",
     "test_utils.models.upk.conftest",
+    # -- Marketplaces
+    "test_utils.precision.conftest",
+    "test_utils.spectrum.conftest",
 ]
diff --git a/tests/models/innovate/test_question.py b/tests/models/innovate/test_question.py
index b0c2964..b206177 100644
--- a/tests/models/innovate/test_question.py
+++ b/tests/models/innovate/test_question.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from generalresearch.models import Source
 from generalresearch.models.innovate.question import (
     InnovateQuestion,
diff --git a/tests/models/legacy/test_offerwall_parse_response.py b/tests/models/legacy/test_offerwall_parse_response.py
index b1c96ad..56ba077 100644
--- a/tests/models/legacy/test_offerwall_parse_response.py
+++ b/tests/models/legacy/test_offerwall_parse_response.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import json
 
 from generalresearch.models import Source
diff --git a/tests/models/legacy/test_profiling_questions.py b/tests/models/legacy/test_profiling_questions.py
index 1afaa6b..6f781ae 100644
--- a/tests/models/legacy/test_profiling_questions.py
+++ b/tests/models/legacy/test_profiling_questions.py
@@ -1,7 +1,11 @@
+from __future__ import annotations
+
+from generalresearch.models.legacy.questions import UpkQuestionResponse
+
+
 class TestUpkQuestionResponse:
 
     def test_init(self):
-        from generalresearch.models.legacy.questions import UpkQuestionResponse
 
         s = (
             '{"status": "success", "count": 7, "questions": [{"selector": "SL", "validation": {"patterns": [{'
diff --git a/tests/models/legacy/test_user_question_answer_in.py b/tests/models/legacy/test_user_question_answer_in.py
index 313862c..3fdaa05 100644
--- a/tests/models/legacy/test_user_question_answer_in.py
+++ b/tests/models/legacy/test_user_question_answer_in.py
@@ -1,9 +1,22 @@
+from __future__ import annotations
+
 import json
+from collections.abc import Callable
+from datetime import datetime
 from decimal import Decimal
 from uuid import uuid4
 
 import pytest
 
+from generalresearch.managers.thl.user_manager.user_manager import UserManager
+from generalresearch.models import Source
+from generalresearch.models.legacy.questions import (
+    UserQuestionAnswers,
+)
+from generalresearch.models.thl.product import Product
+from generalresearch.models.thl.session import Session, Wall
+from generalresearch.models.thl.user import User
+
 
 class TestUserQuestionAnswers:
     """This is for the GRS POST submission that may contain multiple
@@ -15,21 +28,11 @@ class TestUserQuestionAnswers:
 
     def test_json_init(
         self,
-        product_manager: ProductManager,
-        user_manager,
-        session_manager,
-        wall_manager,
         user_factory: Callable[..., User],
         product: Product,
-        session_factory,
-        utc_hour_ago,
+        session_factory: Callable[..., Session],
+        utc_hour_ago: datetime,
     ):
-        from generalresearch.models import Source
-        from generalresearch.models.legacy.questions import (
-            UserQuestionAnswers,
-        )
-        from generalresearch.models.thl.session import Session, Wall
-        from generalresearch.models.thl.user import User
 
         u: User = user_factory(product=product)
 
@@ -61,14 +64,7 @@ class TestUserQuestionAnswers:
 
     def test_simple_validation_errors(
         self,
-        product_manager: ProductManager,
-        user_manager,
-        session_manager,
-        wall_manager,
     ):
-        from generalresearch.models.legacy.questions import (
-            UserQuestionAnswers,
-        )
 
         with pytest.raises(ValueError):
             UserQuestionAnswers.model_validate(
@@ -118,7 +114,7 @@ class TestUserQuestionAnswers:
 
         with pytest.raises(ValueError):
             answers = [
-                {"question_id": uuid4().hex, "answer": ["a"]} for i in range(101)
+                {"question_id": uuid4().hex, "answer": ["a"]} for _ in range(101)
             ]
             UserQuestionAnswers.model_validate(
                 {
@@ -143,9 +139,6 @@ class TestUserQuestionAnswers:
         # TODO: depending on if or how many of these types of errors actually
         #   occur, we could get fancy and just drop one of them. I don't
         #   think this is worth exploring yet unless we see if it's a problem.
-        from generalresearch.models.legacy.questions import (
-            UserQuestionAnswers,
-        )
 
         consistent_qid = uuid4().hex
         with pytest.raises(ValueError) as cm:
@@ -165,11 +158,11 @@ class TestUserQuestionAnswers:
 
     def test_allow_answer_failures_silent(
         self,
-        user_manager,
+        user_manager: UserManager,
         product: Product,
         user_factory: Callable[..., User],
-        utc_hour_ago,
-        session_factory,
+        utc_hour_ago: datetime,
+        session_factory: Callable[..., Session],
     ):
         """
         There are many instances where suppliers may be submitting answers
@@ -177,11 +170,6 @@ class TestUserQuestionAnswers:
         that one QuestionAnswerIn without "loosing" any of the other
         QuestionAnswerIn items that they provided.
         """
-        from generalresearch.models.legacy.questions import (
-            UserQuestionAnswers,
-        )
-        from generalresearch.models.thl.session import Session, Wall
-        from generalresearch.models.thl.user import User
 
         u: User = user_factory(product=product)
 
@@ -286,7 +274,7 @@ class TestUserQuestionAnswerIn:
             UserQuestionAnswerIn,
         )
 
-        answer = [uuid4().hex[:6] for i in range(11)]
+        answer = [uuid4().hex[:6] for _ in range(11)]
         with pytest.raises(ValueError) as cm:
             UserQuestionAnswerIn.model_validate(
                 {"question_id": uuid4().hex, "answer": answer}
@@ -298,7 +286,7 @@ class TestUserQuestionAnswerIn:
             UserQuestionAnswerIn,
         )
 
-        answer = ["aaa" for i in range(5)]
+        answer = ["aaa" for _ in range(5)]
         with pytest.raises(ValueError):
             UserQuestionAnswerIn.model_validate(
                 {"question_id": uuid4().hex, "answer": answer}
diff --git a/tests/models/morning/test.py b/tests/models/morning/test.py
index 7474766..c1141fb 100644
--- a/tests/models/morning/test.py
+++ b/tests/models/morning/test.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from datetime import UTC, datetime
 
 from generalresearch.models.morning.question import MorningQuestion
diff --git a/tests/models/network/test_mtr.py b/tests/models/network/test_mtr.py
index 840a773..7f8a736 100644
--- a/tests/models/network/test_mtr.py
+++ b/tests/models/network/test_mtr.py
@@ -1,12 +1,15 @@
+from __future__ import annotations
+
 import faker
 
+from generalresearch.managers.network.tool_run import ToolRunManager
 from generalresearch.models.network.mtr.execute import execute_mtr
 from generalresearch.models.network.tool_run import ToolClass, ToolName
 
 fake = faker.Faker()
 
 
-def test_execute_mtr(toolrun_manager):
+def test_execute_mtr(toolrun_manager: ToolRunManager):
     ip = "65.19.129.53"
 
     run = execute_mtr(ip=ip, report_cycles=3)
diff --git a/tests/models/network/test_nmap.py b/tests/models/network/test_nmap.py
index a135a13..5e9f4d0 100644
--- a/tests/models/network/test_nmap.py
+++ b/tests/models/network/test_nmap.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import subprocess
 
 import faker
@@ -5,8 +7,8 @@ import faker
 from generalresearch.managers.network.tool_run import ToolRunManager
 from generalresearch.models.network.definitions import IPProtocol
 from generalresearch.models.network.nmap.execute import execute_nmap
-from generalresearch.models.network.nmap.result import PortState
-from generalresearch.models.network.tool_run import ToolClass, ToolName
+from generalresearch.models.network.nmap.result import NmapResult, PortState
+from generalresearch.models.network.tool_run import NmapRun, Status, ToolClass, ToolName
 
 fake = faker.Faker()
 
@@ -18,10 +20,13 @@ def resolve(host: str):
 def test_execute_nmap_scanme(toolrun_manager: ToolRunManager):
     ip = resolve("scanme.nmap.org")
 
-    run = execute_nmap(ip=ip, top_ports=None, ports="20-30", enable_advanced=False)
+    run: NmapRun = execute_nmap(
+        ip=ip, top_ports=None, ports="20-30", enable_advanced=False
+    )
     assert run.tool_name == ToolName.NMAP
     assert run.tool_class == ToolClass.PORT_SCAN
     assert run.ip == ip
+    assert isinstance(run.parsed, NmapResult)
     result = run.parsed
 
     port22 = result._port_index[(IPProtocol.TCP, 22)]
diff --git a/tests/models/network/test_nmap_parser.py b/tests/models/network/test_nmap_parser.py
index 7822380..473a63f 100644
--- a/tests/models/network/test_nmap_parser.py
+++ b/tests/models/network/test_nmap_parser.py
@@ -1,8 +1,14 @@
+from __future__ import annotations
+
 import os
 
 import pytest
 
 from generalresearch.models.network.nmap.parser import parse_nmap_xml
+from generalresearch.models.network.nmap.result import (
+    NmapResult,
+    NmapTrace,
+)
 
 
 @pytest.fixture
@@ -13,9 +19,11 @@ def nmap_raw_output_2(request) -> str:
     return data
 
 
-def test_nmap_xml_parser(nmap_raw_output, nmap_raw_output_2):
-    n = parse_nmap_xml(nmap_raw_output)
+def test_nmap_xml_parser(nmap_raw_output: str, nmap_raw_output_2: str):
+    n: NmapResult = parse_nmap_xml(nmap_raw_output)
     assert n.tcp_open_ports == [61232]
+
+    assert isinstance(n.trace, NmapTrace)
     assert len(n.trace.hops) == 18
 
     n = parse_nmap_xml(nmap_raw_output_2)
diff --git a/tests/models/network/test_rdns.py b/tests/models/network/test_rdns.py
index 5c3b024..1a15a28 100644
--- a/tests/models/network/test_rdns.py
+++ b/tests/models/network/test_rdns.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import faker
 
 from generalresearch.managers.network.tool_run import ToolRunManager
diff --git a/tests/models/precision/__init__.py b/tests/models/precision/__init__.py
index 8006fa3..e69de29 100644
--- a/tests/models/precision/__init__.py
+++ b/tests/models/precision/__init__.py
@@ -1,115 +0,0 @@
-survey_json = {
-    "cpi": "1.44",
-    "country_isos": "ca",
-    "language_isos": "eng",
-    "country_iso": "ca",
-    "language_iso": "eng",
-    "buyer_id": "7047",
-    "bid_loi": 1200,
-    "bid_ir": 0.45,
-    "source": "e",
-    "used_question_ids": ["age", "country_iso", "gender", "gender_1"],
-    "survey_id": "0000",
-    "group_id": "633473",
-    "status": "open",
-    "name": "beauty survey",
-    "survey_guid": "c7f375c5077d4c6c8209ff0b539d7183",
-    "category_id": "-1",
-    "global_conversion": None,
-    "desired_count": 96,
-    "achieved_count": 0,
-    "allowed_devices": "1,2,3",
-    "entry_link": "https://www.opinionetwork.com/survey/entry.aspx?mid=[%MID%]&project=633473&key=%%key%%",
-    "excluded_surveys": "470358,633286",
-    "quotas": [
-        {
-            "name": "25-34,Male,Quebec",
-            "id": "2324110",
-            "guid": "23b5760d24994bc08de451b3e62e77c7",
-            "status": "open",
-            "desired_count": 48,
-            "achieved_count": 0,
-            "termination_count": 0,
-            "overquota_count": 0,
-            "condition_hashes": ["b41e1a3", "bc89ee8", "4124366", "9f32c61"],
-        },
-        {
-            "name": "25-34,Female,Quebec",
-            "id": "2324111",
-            "guid": "0706f1a88d7e4f11ad847c03012e68d2",
-            "status": "open",
-            "desired_count": 48,
-            "achieved_count": 0,
-            "termination_count": 4,
-            "overquota_count": 0,
-            "condition_hashes": ["b41e1a3", "0cdc304", "500af2c", "9f32c61"],
-        },
-    ],
-    "conditions": {
-        "b41e1a3": {
-            "logical_operator": "OR",
-            "value_type": 1,
-            "negate": False,
-            "question_id": "country_iso",
-            "values": ["ca"],
-            "criterion_hash": "b41e1a3",
-            "value_len": 1,
-            "sizeof": 2,
-        },
-        "bc89ee8": {
-            "logical_operator": "OR",
-            "value_type": 1,
-            "negate": False,
-            "question_id": "gender",
-            "values": ["male"],
-            "criterion_hash": "bc89ee8",
-            "value_len": 1,
-            "sizeof": 4,
-        },
-        "4124366": {
-            "logical_operator": "OR",
-            "value_type": 1,
-            "negate": False,
-            "question_id": "gender_1",
-            "values": ["male"],
-            "criterion_hash": "4124366",
-            "value_len": 1,
-            "sizeof": 4,
-        },
-        "9f32c61": {
-            "logical_operator": "OR",
-            "value_type": 1,
-            "negate": False,
-            "question_id": "age",
-            "values": ["25", "26", "27", "28", "29", "30", "31", "32", "33", "34"],
-            "criterion_hash": "9f32c61",
-            "value_len": 10,
-            "sizeof": 20,
-        },
-        "0cdc304": {
-            "logical_operator": "OR",
-            "value_type": 1,
-            "negate": False,
-            "question_id": "gender",
-            "values": ["female"],
-            "criterion_hash": "0cdc304",
-            "value_len": 1,
-            "sizeof": 6,
-        },
-        "500af2c": {
-            "logical_operator": "OR",
-            "value_type": 1,
-            "negate": False,
-            "question_id": "gender_1",
-            "values": ["female"],
-            "criterion_hash": "500af2c",
-            "value_len": 1,
-            "sizeof": 6,
-        },
-    },
-    "expected_end_date": "2024-06-28T10:40:33.000000Z",
-    "created": None,
-    "updated": None,
-    "is_live": True,
-    "all_hashes": ["0cdc304", "b41e1a3", "9f32c61", "bc89ee8", "4124366", "500af2c"],
-}
diff --git a/tests/models/precision/test_survey.py b/tests/models/precision/test_survey.py
index ff2d6d1..4d671f2 100644
--- a/tests/models/precision/test_survey.py
+++ b/tests/models/precision/test_survey.py
@@ -1,10 +1,15 @@
-class TestPrecisionQuota:
+from __future__ import annotations
+
+from typing import Any
+
+from generalresearch.models.precision import PrecisionStatus
+from generalresearch.models.precision.survey import PrecisionSurvey
 
-    def test_quota_passes(self):
-        from generalresearch.models.precision.survey import PrecisionSurvey
-        from tests.models.precision import survey_json
 
-        s = PrecisionSurvey.model_validate(survey_json)
+class TestPrecisionQuota:
+
+    def test_quota_passes(self, precision_survey_json: dict[str, Any]):
+        s = PrecisionSurvey.model_validate(precision_survey_json)
         q = s.quotas[0]
         ce = {k: True for k in ["b41e1a3", "bc89ee8", "4124366", "9f32c61"]}
         assert q.matches(ce)
@@ -16,12 +21,9 @@ class TestPrecisionQuota:
         assert not q.matches(ce)
         assert not q.matches({})
 
-    def test_quota_passes_closed(self):
-        from generalresearch.models.precision import PrecisionStatus
-        from generalresearch.models.precision.survey import PrecisionSurvey
-        from tests.models.precision import survey_json
+    def test_quota_passes_closed(self, precision_survey_json: dict[str, Any]):
 
-        s = PrecisionSurvey.model_validate(survey_json)
+        s = PrecisionSurvey.model_validate(precision_survey_json)
         q = s.quotas[0]
         q.status = PrecisionStatus.CLOSED
         ce = {k: True for k in ["b41e1a3", "bc89ee8", "4124366", "9f32c61"]}
@@ -32,20 +34,15 @@ class TestPrecisionQuota:
 
 class TestPrecisionSurvey:
 
-    def test_passes(self):
-        from generalresearch.models.precision.survey import PrecisionSurvey
-        from tests.models.precision import survey_json
+    def test_passes(self, precision_survey_json: dict[str, Any]):
 
-        s = PrecisionSurvey.model_validate(survey_json)
+        s = PrecisionSurvey.model_validate(precision_survey_json)
         ce = {k: True for k in ["b41e1a3", "bc89ee8", "4124366", "9f32c61"]}
         assert s.determine_eligibility(ce)
 
-    def test_elig_closed_quota(self):
-        from generalresearch.models.precision import PrecisionStatus
-        from generalresearch.models.precision.survey import PrecisionSurvey
-        from tests.models.precision import survey_json
+    def test_elig_closed_quota(self, precision_survey_json: dict[str, Any]):
 
-        s = PrecisionSurvey.model_validate(survey_json)
+        s = PrecisionSurvey.model_validate(precision_survey_json)
         ce = {k: True for k in ["b41e1a3", "bc89ee8", "4124366", "9f32c61"]}
         q = s.quotas[0]
         q.status = PrecisionStatus.CLOSED
@@ -57,12 +54,9 @@ class TestPrecisionSurvey:
         # Now me match an open quota and dont match the closed quota, so we should be eligible
         assert s.determine_eligibility(ce)
 
-    def test_passes_sp(self):
-        from generalresearch.models.precision import PrecisionStatus
-        from generalresearch.models.precision.survey import PrecisionSurvey
-        from tests.models.precision import survey_json
+    def test_passes_sp(self, precision_survey_json: dict[str, Any]):
 
-        s = PrecisionSurvey.model_validate(survey_json)
+        s = PrecisionSurvey.model_validate(precision_survey_json)
         ce = {k: True for k in ["b41e1a3", "bc89ee8", "4124366", "9f32c61"]}
         passes, hashes = s.determine_eligibility_soft(ce)
 
diff --git a/tests/models/prodege/test_survey_participation.py b/tests/models/prodege/test_survey_participation.py
index e1ba9ab..10ce884 100644
--- a/tests/models/prodege/test_survey_participation.py
+++ b/tests/models/prodege/test_survey_participation.py
@@ -1,14 +1,17 @@
+from __future__ import annotations
+
 from datetime import UTC, datetime, timedelta
 
+from generalresearch.models.prodege import ProdegePastParticipationType
+from generalresearch.models.prodege.survey import (
+    ProdegePastParticipation,
+    ProdegeUserPastParticipation,
+)
+
 
 class TestProdegeParticipation:
 
     def test_exclude(self):
-        from generalresearch.models.prodege import ProdegePastParticipationType
-        from generalresearch.models.prodege.survey import (
-            ProdegePastParticipation,
-            ProdegeUserPastParticipation,
-        )
 
         now = datetime.now(tz=UTC)
         pp = ProdegePastParticipation.from_api(
@@ -84,10 +87,6 @@ class TestProdegeParticipation:
         assert not pp.is_eligible(upps)
 
     def test_include(self):
-        from generalresearch.models.prodege.survey import (
-            ProdegePastParticipation,
-            ProdegeUserPastParticipation,
-        )
 
         now = datetime.now(tz=UTC)
         pp = ProdegePastParticipation.from_api(
diff --git a/tests/models/spectrum/test_question.py b/tests/models/spectrum/test_question.py
index 57d260d..a44286d 100644
--- a/tests/models/spectrum/test_question.py
+++ b/tests/models/spectrum/test_question.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from datetime import UTC, datetime
 
 from generalresearch.models import Source
@@ -32,6 +34,7 @@ class TestSpectrumQuestion:
             "mod_on": 1706557247467,
         }
         q = SpectrumQuestion.from_api(example_1, "us", "eng")
+        assert isinstance(q, SpectrumQuestion)
 
         expected_q = SpectrumQuestion(
             question_id="213",
@@ -72,6 +75,8 @@ class TestSpectrumQuestion:
             "mod_on": 1706557249817,
         }
         q = SpectrumQuestion.from_api(example_2, "us", "eng")
+        assert isinstance(q, SpectrumQuestion)
+
         expected_q = SpectrumQuestion(
             question_id="211",
             country_iso="us",
diff --git a/tests/models/spectrum/test_survey.py b/tests/models/spectrum/test_survey.py
index 7365c7e..7ddd407 100644
--- a/tests/models/spectrum/test_survey.py
+++ b/tests/models/spectrum/test_survey.py
@@ -1,15 +1,25 @@
+from __future__ import annotations
+
 from datetime import UTC, datetime
 from decimal import Decimal
 
+from generalresearch.models import (
+    LogicalOperator,
+    Source,
+    TaskCalculationType,
+)
+from generalresearch.models.spectrum import SpectrumStatus
+from generalresearch.models.spectrum.survey import (
+    SpectrumCondition,
+    SpectrumQuota,
+    SpectrumSurvey,
+)
+from generalresearch.models.thl.survey.condition import ConditionValueType
+
 
 class TestSpectrumCondition:
 
     def test_condition_create(self):
-        from generalresearch.models import LogicalOperator
-        from generalresearch.models.spectrum.survey import (
-            SpectrumCondition,
-        )
-        from generalresearch.models.thl.survey.condition import ConditionValueType
 
         c = SpectrumCondition.from_api(
             {
@@ -64,10 +74,6 @@ class TestSpectrumCondition:
 class TestSpectrumQuota:
 
     def test_quota_create(self):
-        from generalresearch.models.spectrum.survey import (
-            SpectrumCondition,
-            SpectrumQuota,
-        )
 
         d = {
             "quota_id": "a846b545-4449-4d76-93a2-f8ebdf6e711e",
@@ -84,9 +90,6 @@ class TestSpectrumQuota:
         assert q.is_open
 
     def test_quota_passes(self):
-        from generalresearch.models.spectrum.survey import (
-            SpectrumQuota,
-        )
 
         q = SpectrumQuota(remaining_count=57, condition_hashes=["a"])
         assert q.passes({"a": True})
@@ -103,9 +106,6 @@ class TestSpectrumQuota:
         assert not q.passes({"a": True})
 
     def test_quota_passes_soft(self):
-        from generalresearch.models.spectrum.survey import (
-            SpectrumQuota,
-        )
 
         q = SpectrumQuota(remaining_count=57, condition_hashes=["a", "b", "c"])
         # Pass if we match all
@@ -122,18 +122,6 @@ class TestSpectrumQuota:
 
 class TestSpectrumSurvey:
     def test_survey_create(self):
-        from generalresearch.models import (
-            LogicalOperator,
-            Source,
-            TaskCalculationType,
-        )
-        from generalresearch.models.spectrum import SpectrumStatus
-        from generalresearch.models.spectrum.survey import (
-            SpectrumCondition,
-            SpectrumQuota,
-            SpectrumSurvey,
-        )
-        from generalresearch.models.thl.survey.condition import ConditionValueType
 
         # Note: d is the raw response after calling SpectrumAPI.preprocess_survey() on it!
         d = {
@@ -202,6 +190,8 @@ class TestSpectrumSurvey:
             "exclusion_period": 0,
         }
         s = SpectrumSurvey.from_api(d)
+        assert isinstance(s, SpectrumSurvey)
+
         expected_survey = SpectrumSurvey(
             cpi=Decimal("1.20000"),
             country_isos=["fr"],
@@ -303,6 +293,8 @@ class TestSpectrumSurvey:
             "exclusion_period": 0,
         }
         s = SpectrumSurvey.from_api(d)
+        assert isinstance(s, SpectrumSurvey)
+
         assert {"212", "1202", "214"} == s.used_question_ids
         assert s.is_live
         assert s.is_open
@@ -345,6 +337,8 @@ class TestSpectrumSurvey:
             "exclusion_period": 0,
         }
         s = SpectrumSurvey.from_api(d)
+        assert isinstance(s, SpectrumSurvey)
+
         s.qualifications = ["a", "b", "c"]
         s.quotas = [
             SpectrumQuota(remaining_count=10, condition_hashes=["a", "b"]),
diff --git a/tests/models/spectrum/test_survey_manager.py b/tests/models/spectrum/test_survey_manager.py
index ce26c44..11dc01f 100644
--- a/tests/models/spectrum/test_survey_manager.py
+++ b/tests/models/spectrum/test_survey_manager.py
@@ -1,69 +1,32 @@
-import copy
+from __future__ import annotations
+
 import logging
 from datetime import UTC, datetime
 from decimal import Decimal
+from typing import Any
 
 from pymysql import IntegrityError
 
-logger = logging.getLogger()
+from generalresearch.config import is_debug
+from generalresearch.managers.spectrum.survey import (
+    SpectrumSurveyManager,
+)
+from generalresearch.sql_helper import SqlHelper
 
-example_survey_api_response = {
-    "survey_id": 29333264,
-    "survey_name": "#29333264",
-    "survey_status": 22,
-    "field_end_date": datetime(2024, 5, 23, 18, 18, 31, tzinfo=UTC),
-    "category": "Exciting New",
-    "category_code": 232,
-    "crtd_on": datetime(2024, 5, 20, 17, 48, 13, tzinfo=UTC),
-    "mod_on": datetime(2024, 5, 20, 18, 18, 31, tzinfo=UTC),
-    "soft_launch": False,
-    "click_balancing": 0,
-    "price_type": 1,
-    "pii": False,
-    "buyer_message": "",
-    "buyer_id": 4726,
-    "incl_excl": 0,
-    "cpi": Decimal("1.20"),
-    "last_complete_date": None,
-    "project_last_complete_date": None,
-    "quotas": [
-        {
-            "quota_id": "c2bc961e-4f26-4223-b409-ebe9165cfdf5",
-            "quantities": {"currently_open": 491, "remaining": 495, "achieved": 0},
-            "criteria": [
-                {
-                    "qualification_code": 214,
-                    "range_sets": [{"units": 311, "to": 64, "from": 18}],
-                }
-            ],
-        }
-    ],
-    "qualifications": [
-        {
-            "range_sets": [{"units": 311, "to": 64, "from": 18}],
-            "qualification_code": 212,
-        },
-        {"condition_codes": ["111", "117", "112"], "qualification_code": 1202},
-    ],
-    "country_iso": "fr",
-    "language_iso": "fre",
-    "bid_ir": 0.4,
-    "bid_loi": 600,
-    "overall_ir": None,
-    "overall_loi": None,
-    "last_block_ir": None,
-    "last_block_loi": None,
-    "survey_exclusions": set(),
-    "exclusion_period": 0,
-}
+logger = logging.getLogger()
 
 
 class TestSpectrumSurvey:
 
-    def test_survey_create(self, settings, spectrum_manager, spectrum_rw):
+    def test_survey_create(
+        self,
+        spectrum_survey_manager: SpectrumSurveyManager,
+        spectrum_rw: SqlHelper,
+        spectrum_api_survey_json: dict[str, Any],
+    ):
         from generalresearch.models.spectrum.survey import SpectrumSurvey
 
-        assert settings.debug, "CRITICAL: Do not run this on production."
+        assert is_debug(), "CRITICAL: Do not run this on production."
 
         now = datetime.now(tz=UTC)
         spectrum_rw.execute_sql_query(
@@ -73,24 +36,29 @@ class TestSpectrumSurvey:
             commit=True,
         )
 
-        d = example_survey_api_response.copy()
-        s = SpectrumSurvey.from_api(d)
-        spectrum_manager.create(s)
+        s = SpectrumSurvey.from_api(spectrum_api_survey_json)
+        assert isinstance(s, SpectrumSurvey)
+        spectrum_survey_manager.create(s)
 
-        surveys = spectrum_manager.get_survey_library(updated_since=now)
+        surveys = spectrum_survey_manager.get_survey_library(updated_since=now)
         assert len(surveys) == 1
         assert "29333264" == surveys[0].survey_id
         assert s.is_unchanged(surveys[0])
 
         try:
-            spectrum_manager.create(s)
+            spectrum_survey_manager.create(s)
         except IntegrityError as e:
             print(e.args)
 
-    def test_survey_update(self, settings, spectrum_manager, spectrum_rw):
+    def test_survey_update(
+        self,
+        spectrum_survey_manager: SpectrumSurveyManager,
+        spectrum_rw: SqlHelper,
+        spectrum_api_survey_json: dict[str, Any],
+    ):
         from generalresearch.models.spectrum.survey import SpectrumSurvey
 
-        assert settings.debug, "CRITICAL: Do not run this on production."
+        assert is_debug(), "CRITICAL: Do not run this on production."
 
         now = datetime.now(tz=UTC)
         spectrum_rw.execute_sql_query(
@@ -100,14 +68,13 @@ class TestSpectrumSurvey:
             """,
             commit=True,
         )
-        d = copy.deepcopy(example_survey_api_response)
-        s = SpectrumSurvey.from_api(d)
-        print(s)
+        s = SpectrumSurvey.from_api(spectrum_api_survey_json)
+        assert isinstance(s, SpectrumSurvey)
 
-        spectrum_manager.create(s)
+        spectrum_survey_manager.create(s)
         s.cpi = Decimal("0.50")
-        spectrum_manager.update([s])
-        surveys = spectrum_manager.get_survey_library(updated_since=now)
+        spectrum_survey_manager.update([s])
+        surveys = spectrum_survey_manager.get_survey_library(updated_since=now)
         assert len(surveys) == 1
         assert "29333264" == surveys[0].survey_id
         assert Decimal("0.50") == surveys[0].cpi
@@ -122,8 +89,8 @@ class TestSpectrumSurvey:
         s.bid_loi = None
         s.overall_loi = 1000
         s.last_block_loi = 1000
-        spectrum_manager.update([s])
-        surveys = spectrum_manager.get_survey_library(updated_since=now)
+        spectrum_survey_manager.update([s])
+        surveys = spectrum_survey_manager.get_survey_library(updated_since=now)
         assert 600 == surveys[0].bid_loi
         assert 1000 == surveys[0].overall_loi
         assert 1000 == surveys[0].last_block_loi
diff --git a/tests/models/test_currency.py b/tests/models/test_currency.py
index 9bc2216..e946126 100644
--- a/tests/models/test_currency.py
+++ b/tests/models/test_currency.py
@@ -3,6 +3,8 @@ functionality is the same, but pasting here so the tests are in the
 correct spot...
 """
 
+from __future__ import annotations
+
 from decimal import Decimal
 from random import randint
 
diff --git a/tests/models/test_device.py b/tests/models/test_device.py
index bf72c81..8e1251a 100644
--- a/tests/models/test_device.py
+++ b/tests/models/test_device.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 iphone_ua_string = (
     "Mozilla/5.0 (iPhone; CPU iPhone OS 5_1 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) "
     "Version/5.1 Mobile/9B179 Safari/7534.48.3"
@@ -13,10 +15,12 @@ chromebook_ua_string = (
 )
 
 
+from generalresearch.models import DeviceType
+from generalresearch.models.device import parse_device_from_useragent
+
+
 class TestDeviceUA:
     def test_device_ua(self):
-        from generalresearch.models import DeviceType
-        from generalresearch.models.device import parse_device_from_useragent
 
         assert parse_device_from_useragent(iphone_ua_string) == DeviceType.MOBILE
         assert parse_device_from_useragent(ipad_ua_string) == DeviceType.TABLET
diff --git a/tests/models/test_finance.py b/tests/models/test_finance.py
index f84d0b6..72f4f4d 100644
--- a/tests/models/test_finance.py
+++ b/tests/models/test_finance.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from collections.abc import Callable
 from datetime import UTC, datetime, timedelta
 from itertools import product as iter_product
@@ -25,14 +27,13 @@ from generalresearch.models.thl.finance import (
     POPFinancial,
     ProductBalances,
 )
+from generalresearch.models.thl.ledger import LedgerAccount
 from generalresearch.models.thl.product import Product
 from generalresearch.models.thl.session import Session
 from generalresearch.models.thl.user import User
+from generalresearch.pg_helper import PostgresConfig
 from test_utils.incite.collections.conftest import ledger_collection
 from test_utils.incite.mergers.conftest import pop_ledger_merge
-from test_utils.managers.ledger.conftest import (
-    session_with_tx_factory: Callable[..., None],
-)
 
 fake = Faker()
 
@@ -210,6 +211,8 @@ class TestProductBalanceInitialize:
         # Confirm the @property computed fields show up in openapi. I don't
         #   know how to do that yet... so this is check to confirm they're
         #   known computed fields for now
+
+        assert isinstance(instance, ProductBalances)
         computed_fields = list(instance.model_computed_fields.keys())
         assert "payout" in computed_fields
         assert "adjustment" in computed_fields
@@ -665,17 +668,18 @@ class TestProductFinanceData:
 
     def test_base(
         self,
-        product: product: Product,
+        product: Product,
         user_factory: Callable[..., User],
         start: datetime,
         duration: timedelta,
-        thl_lm: ThlLedgerManager,
+        thl_ledger_manager: ThlLedgerManager,
+        session_with_tx_factory: Callable[..., None],
     ):
 
         # -- Build & Setup
         # assert ledger_collection.start is None
         # assert ledger_collection.offset is None
-        u: User = user_factory(product=product: Product, created=ledger_collection.start)
+        u: User = user_factory(product=product, created=ledger_collection.start)
 
         for item in ledger_collection.items:
 
@@ -699,7 +703,7 @@ class TestProductFinanceData:
         item_finishes.sort(reverse=True)
 
         # --
-        account = thl_lm.get_account_or_create_bp_wallet(product=u.product)
+        account = thl_ledger_manager.get_account_or_create_bp_wallet(product=u.product)
 
         ddf = pop_ledger_merge.ddf(
             force_rr_latest=False,
@@ -748,7 +752,7 @@ class TestPOPFinancialData:
         ledger_collection: LedgerDFCollection,
         pop_ledger_merge: PopLedgerMerge,
         user_factory: Callable[..., User],
-        product: product: Product,
+        product: Product,
         start: datetime,
         duration: timedelta,
         create_main_accounts: Callable[..., None],
@@ -791,7 +795,7 @@ class TestPOPFinancialData:
         last_item_finish = item_finishes[0]
 
         accounts = []
-        for user in users:
+        for _ in users:
             account = thl_lm.get_account_or_create_bp_wallet(product=u.product)
             accounts.append(account)
         account_ids = [a.uuid for a in accounts]
@@ -808,6 +812,7 @@ class TestPOPFinancialData:
                 ("time_idx", "<", last_item_finish),
             ],
         )
+
         df: pd.DataFrame = client_no_amm.compute(collections=ddf, sync=True)
 
         df = df.groupby([pd.Grouper(key="time_idx", freq="D"), "account_id"]).sum()
@@ -846,16 +851,15 @@ class TestBusinessBalanceData:
         ledger_collection: LedgerDFCollection,
         pop_ledger_merge: PopLedgerMerge,
         user_factory: Callable[..., User],
-        product: product: Product,
+        product: Product,
         create_main_accounts: Callable[..., None],
         thl_lm: ThlLedgerManager,
         thl_web_rr: PostgresConfig,
         delete_df_collection: Callable[..., None],
         delete_ledger_db: Callable[..., None],
         session_with_tx_factory: Callable[..., Session],
-        rm_ledger_collection,
+        rm_ledger_collection: Callable[..., None],
     ):
-        from generalresearch.models.thl.ledger import LedgerAccount
 
         delete_ledger_db()
         create_main_accounts()
@@ -863,7 +867,7 @@ class TestBusinessBalanceData:
         rm_ledger_collection()
 
         for _ in range(5):
-            u: User = user_factory(product=product: Product, created=ledger_collection.start)
+            u: User = user_factory(product=product, created=ledger_collection.start)
 
             for item in ledger_collection.items:
                 item_time = fake.date_time_between(
diff --git a/tests/models/thl/question/test_question_info.py b/tests/models/thl/question/test_question_info.py
index b619fc3..af8d2b9 100644
--- a/tests/models/thl/question/test_question_info.py
+++ b/tests/models/thl/question/test_question_info.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from generalresearch.models.thl.profiling.upk_property import (
     ProfilingInfo,
     UpkProperty,
@@ -6,140 +8,9 @@ from generalresearch.models.thl.profiling.upk_property import (
 
 class TestQuestionInfo:
 
-    def test_init(self):
+    def test_init(self, profiling_info_json: str):
 
-        s = (
-            '[{"property_label": "hispanic", "cardinality": "*", "prop_type": "i", "country_iso": "us", '
-            '"property_id": "05170ae296ab49178a075cab2a2073a6", "item_id": "7911ec1468b146ee870951f8ae9cbac1", '
-            '"item_label": "panamanian", "gold_standard": 1, "options": [{"id": "c358c11e72c74fa2880358f1d4be85ab", '
-            '"label": "not_hispanic"}, {"id": "b1d6c475770849bc8e0200054975dc9c", "label": "yes_hispanic"}, '
-            '{"id": "bd1eb44495d84b029e107c188003c2bd", "label": "other_hispanic"}, '
-            '{"id": "f290ad5e75bf4f4ea94dc847f57c1bd3", "label": "mexican"}, '
-            '{"id": "49f50f2801bd415ea353063bfc02d252", "label": "puerto_rican"}, '
-            '{"id": "dcbe005e522f4b10928773926601f8bf", "label": "cuban"}, '
-            '{"id": "467ef8ddb7ac4edb88ba9ef817cbb7e9", "label": "salvadoran"}, '
-            '{"id": "3c98e7250707403cba2f4dc7b877c963", "label": "dominican"}, '
-            '{"id": "981ee77f6d6742609825ef54fea824a8", "label": "guatemalan"}, '
-            '{"id": "81c8057b809245a7ae1b8a867ea6c91e", "label": "colombian"}, '
-            '{"id": "513656d5f9e249fa955c3b527d483b93", "label": "honduran"}, '
-            '{"id": "afc8cddd0c7b4581bea24ccd64db3446", "label": "ecuadorian"}, '
-            '{"id": "61f34b36e80747a89d85e1eb17536f84", "label": "argentinian"}, '
-            '{"id": "5330cfa681d44aa8ade3a6d0ea198e44", "label": "peruvian"}, '
-            '{"id": "e7bceaffd76e486596205d8545019448", "label": "nicaraguan"}, '
-            '{"id": "b7bbb2ebf8424714962e6c4f43275985", "label": "spanish"}, '
-            '{"id": "8bf539785e7a487892a2f97e52b1932d", "label": "venezuelan"}, '
-            '{"id": "7911ec1468b146ee870951f8ae9cbac1", "label": "panamanian"}], "category": [{"id": '
-            '"4fd8381d5a1c4409ab007ca254ced084", "label": "Demographic", "path": "/Demographic", '
-            '"adwords_vertical_id": null}]}, {"property_label": "ethnic_group", "cardinality": "*", "prop_type": '
-            '"i", "country_iso": "us", "property_id": "15070958225d4132b7f6674fcfc979f6", "item_id": '
-            '"64b7114cf08143949e3bcc3d00a5d8a0", "item_label": "other_ethnicity", "gold_standard": 1, "options": [{'
-            '"id": "a72e97f4055e4014a22bee4632cbf573", "label": "caucasians"}, '
-            '{"id": "4760353bc0654e46a928ba697b102735", "label": "black_or_african_american"}, '
-            '{"id": "20ff0a2969fa4656bbda5c3e0874e63b", "label": "asian"}, '
-            '{"id": "107e0a79e6b94b74926c44e70faf3793", "label": "native_hawaiian_or_other_pacific_islander"}, '
-            '{"id": "900fa12691d5458c8665bf468f1c98c1", "label": "native_americans"}, '
-            '{"id": "64b7114cf08143949e3bcc3d00a5d8a0", "label": "other_ethnicity"}], "category": [{"id": '
-            '"4fd8381d5a1c4409ab007ca254ced084", "label": "Demographic", "path": "/Demographic", '
-            '"adwords_vertical_id": null}]}, {"property_label": "educational_attainment", "cardinality": "?", '
-            '"prop_type": "i", "country_iso": "us", "property_id": "2637783d4b2b4075b93e2a156e16e1d8", "item_id": '
-            '"934e7b81d6744a1baa31bbc51f0965d5", "item_label": "other_education", "gold_standard": 1, "options": [{'
-            '"id": "df35ef9e474b4bf9af520aa86630202d", "label": "3rd_grade_completion"}, '
-            '{"id": "83763370a1064bd5ba76d1b68c4b8a23", "label": "8th_grade_completion"}, '
-            '{"id": "f0c25a0670c340bc9250099dcce50957", "label": "not_high_school_graduate"}, '
-            '{"id": "02ff74c872bd458983a83847e1a9f8fd", "label": "high_school_completion"}, '
-            '{"id": "ba8beb807d56441f8fea9b490ed7561c", "label": "vocational_program_completion"}, '
-            '{"id": "65373a5f348a410c923e079ddbb58e9b", "label": "some_college_completion"}, '
-            '{"id": "2d15d96df85d4cc7b6f58911fdc8d5e2", "label": "associate_academic_degree_completion"}, '
-            '{"id": "497b1fedec464151b063cd5367643ffa", "label": "bachelors_degree_completion"}, '
-            '{"id": "295133068ac84424ae75e973dc9f2a78", "label": "some_graduate_completion"}, '
-            '{"id": "e64f874faeff4062a5aa72ac483b4b9f", "label": "masters_degree_completion"}, '
-            '{"id": "cbaec19a636d476385fb8e7842b044f5", "label": "doctorate_degree_completion"}, '
-            '{"id": "934e7b81d6744a1baa31bbc51f0965d5", "label": "other_education"}], "category": [{"id": '
-            '"4fd8381d5a1c4409ab007ca254ced084", "label": "Demographic", "path": "/Demographic", '
-            '"adwords_vertical_id": null}]}, {"property_label": "household_spoken_language", "cardinality": "*", '
-            '"prop_type": "i", "country_iso": "us", "property_id": "5a844571073d482a96853a0594859a51", "item_id": '
-            '"62b39c1de141422896ad4ab3c4318209", "item_label": "dut", "gold_standard": 1, "options": [{"id": '
-            '"f65cd57b79d14f0f8460761ce41ec173", "label": "ara"}, {"id": "6d49de1f8f394216821310abd29392d9", '
-            '"label": "zho"}, {"id": "be6dc23c2bf34c3f81e96ddace22800d", "label": "eng"}, '
-            '{"id": "ddc81f28752d47a3b1c1f3b8b01a9b07", "label": "fre"}, {"id": "2dbb67b29bd34e0eb630b1b8385542ca", '
-            '"label": "ger"}, {"id": "a747f96952fc4b9d97edeeee5120091b", "label": "hat"}, '
-            '{"id": "7144b04a3219433baac86273677551fa", "label": "hin"}, {"id": "e07ff3e82c7149eaab7ea2b39ee6a6dc", '
-            '"label": "ita"}, {"id": "b681eff81975432ebfb9f5cc22dedaa3", "label": "jpn"}, '
-            '{"id": "5cb20440a8f64c9ca62fb49c1e80cdef", "label": "kor"}, {"id": "171c4b77d4204bc6ac0c2b81e38a10ff", '
-            '"label": "pan"}, {"id": "8c3ec18e6b6c4a55a00dd6052e8e84fb", "label": "pol"}, '
-            '{"id": "3ce074d81d384dd5b96f1fb48f87bf01", "label": "por"}, {"id": "6138dc951990458fa88a666f6ddd907b", '
-            '"label": "rus"}, {"id": "e66e5ecc07df4ebaa546e0b436f034bd", "label": "spa"}, '
-            '{"id": "5a981b3d2f0d402a96dd2d0392ec2fcb", "label": "tgl"}, {"id": "b446251bd211403487806c4d0a904981", '
-            '"label": "vie"}, {"id": "92fb3ee337374e2db875fb23f52eed46", "label": "xxx"}, '
-            '{"id": "8b1f590f12f24cc1924d7bdcbe82081e", "label": "ind"}, {"id": "bf3f4be556a34ff4b836420149fd2037", '
-            '"label": "tur"}, {"id": "87ca815c43ba4e7f98cbca98821aa508", "label": "zul"}, '
-            '{"id": "0adbf915a7a64d67a87bb3ce5d39ca54", "label": "may"}, {"id": "62b39c1de141422896ad4ab3c4318209", '
-            '"label": "dut"}], "category": [{"id": "4fd8381d5a1c4409ab007ca254ced084", "label": "Demographic", '
-            '"path": "/Demographic", "adwords_vertical_id": null}]}, {"property_label": "gender", "cardinality": '
-            '"?", "prop_type": "i", "country_iso": "us", "property_id": "73175402104741549f21de2071556cd7", '
-            '"item_id": "093593e316344cd3a0ac73669fca8048", "item_label": "other_gender", "gold_standard": 1, '
-            '"options": [{"id": "b9fc5ea07f3a4252a792fd4a49e7b52b", "label": "male"}, '
-            '{"id": "9fdb8e5e18474a0b84a0262c21e17b56", "label": "female"}, '
-            '{"id": "093593e316344cd3a0ac73669fca8048", "label": "other_gender"}], "category": [{"id": '
-            '"4fd8381d5a1c4409ab007ca254ced084", "label": "Demographic", "path": "/Demographic", '
-            '"adwords_vertical_id": null}]}, {"property_label": "age_in_years", "cardinality": "?", "prop_type": '
-            '"n", "country_iso": "us", "property_id": "94f7379437874076b345d76642d4ce6d", "item_id": null, '
-            '"item_label": null, "gold_standard": 1, "category": [{"id": "4fd8381d5a1c4409ab007ca254ced084", '
-            '"label": "Demographic", "path": "/Demographic", "adwords_vertical_id": null}]}, {"property_label": '
-            '"children_age_gender", "cardinality": "*", "prop_type": "i", "country_iso": "us", "property_id": '
-            '"e926142fcea94b9cbbe13dc7891e1e7f", "item_id": "b7b8074e95334b008e8958ccb0a204f1", "item_label": '
-            '"female_18", "gold_standard": 1, "options": [{"id": "16a6448ec24c48d4993d78ebee33f9b4", '
-            '"label": "male_under_1"}, {"id": "809c04cb2e3b4a3bbd8077ab62cdc220", "label": "female_under_1"}, '
-            '{"id": "295e05bb6a0843bc998890b24c99841e", "label": "no_children"}, '
-            '{"id": "142cb948d98c4ae8b0ef2ef10978e023", "label": "male_0"}, '
-            '{"id": "5a5c1b0e9abc48a98b3bc5f817d6e9d0", "label": "male_1"}, '
-            '{"id": "286b1a9afb884bdfb676dbb855479d1e", "label": "male_2"}, '
-            '{"id": "942ca3cda699453093df8cbabb890607", "label": "male_3"}, '
-            '{"id": "995818d432f643ec8dd17e0809b24b56", "label": "male_4"}, '
-            '{"id": "f38f8b57f25f4cdea0f270297a1e7a5c", "label": "male_5"}, '
-            '{"id": "975df709e6d140d1a470db35023c432d", "label": "male_6"}, '
-            '{"id": "f60bd89bbe0f4e92b90bccbc500467c2", "label": "male_7"}, '
-            '{"id": "6714ceb3ed5042c0b605f00b06814207", "label": "male_8"}, '
-            '{"id": "c03c2f8271d443cf9df380e84b4dea4c", "label": "male_9"}, '
-            '{"id": "11690ee0f5a54cb794f7ddd010d74fa2", "label": "male_10"}, '
-            '{"id": "17bef9a9d14b4197b2c5609fa94b0642", "label": "male_11"}, '
-            '{"id": "e79c8338fe28454f89ccc78daf6f409a", "label": "male_12"}, '
-            '{"id": "3a4f87acb3fa41f4ae08dfe2858238c1", "label": "male_13"}, '
-            '{"id": "36ffb79d8b7840a7a8cb8d63bbc8df59", "label": "male_14"}, '
-            '{"id": "1401a508f9664347aee927f6ec5b0a40", "label": "male_15"}, '
-            '{"id": "6e0943c5ec4a4f75869eb195e3eafa50", "label": "male_16"}, '
-            '{"id": "47d4b27b7b5242758a9fff13d3d324cf", "label": "male_17"}, '
-            '{"id": "9ce886459dd44c9395eb77e1386ab181", "label": "female_0"}, '
-            '{"id": "6499ccbf990d4be5b686aec1c7353fd8", "label": "female_1"}, '
-            '{"id": "d85ceaa39f6d492abfc8da49acfd14f2", "label": "female_2"}, '
-            '{"id": "18edb45c138e451d8cb428aefbb80f9c", "label": "female_3"}, '
-            '{"id": "bac6f006ed9f4ccf85f48e91e99fdfd1", "label": "female_4"}, '
-            '{"id": "5a6a1a8ad00c4ce8be52dcb267b034ff", "label": "female_5"}, '
-            '{"id": "6bff0acbf6364c94ad89507bcd5f4f45", "label": "female_6"}, '
-            '{"id": "d0d56a0a6b6f4516a366a2ce139b4411", "label": "female_7"}, '
-            '{"id": "bda6028468044b659843e2bef4db2175", "label": "female_8"}, '
-            '{"id": "dbb6d50325464032b456357b1a6e5e9c", "label": "female_9"}, '
-            '{"id": "b87a93d7dc1348edac5e771684d63fb8", "label": "female_10"}, '
-            '{"id": "11449d0d98f14e27ba47de40b18921d7", "label": "female_11"}, '
-            '{"id": "16156501e97b4263962cbbb743840292", "label": "female_12"}, '
-            '{"id": "04ee971c89a345cc8141a45bce96050c", "label": "female_13"}, '
-            '{"id": "e818d310bfbc4faba4355e5d2ed49d4f", "label": "female_14"}, '
-            '{"id": "440d25e078924ba0973163153c417ed6", "label": "female_15"}, '
-            '{"id": "78ff804cc9b441c5a524bd91e3d1f8bf", "label": "female_16"}, '
-            '{"id": "4b04d804d7d84786b2b1c22e4ed440f5", "label": "female_17"}, '
-            '{"id": "28bc848cd3ff44c3893c76bfc9bc0c4e", "label": "male_18"}, '
-            '{"id": "b7b8074e95334b008e8958ccb0a204f1", "label": "female_18"}], "category": [{"id": '
-            '"e18ba6e9d51e482cbb19acf2e6f505ce", "label": "Parenting", "path": "/People & Society/Family & '
-            'Relationships/Family/Parenting", "adwords_vertical_id": "58"}]}, {"property_label": "home_postal_code", '
-            '"cardinality": "?", "prop_type": "x", "country_iso": "us", "property_id": '
-            '"f3b32ebe78014fbeb1ed6ff77d6338bf", "item_id": null, "item_label": null, "gold_standard": 1, '
-            '"category": [{"id": "4fd8381d5a1c4409ab007ca254ced084", "label": "Demographic", "path": "/Demographic", '
-            '"adwords_vertical_id": null}]}, {"property_label": "household_income", "cardinality": "?", "prop_type": '
-            '"n", "country_iso": "us", "property_id": "ff5b1d4501d5478f98de8c90ef996ac1", "item_id": null, '
-            '"item_label": null, "gold_standard": 1, "category": [{"id": "4fd8381d5a1c4409ab007ca254ced084", '
-            '"label": "Demographic", "path": "/Demographic", "adwords_vertical_id": null}]}]'
-        )
-        instance_list = ProfilingInfo.validate_json(s)
+        instance_list = ProfilingInfo.validate_json(profiling_info_json)
 
         assert isinstance(instance_list, list)
         for i in instance_list:
diff --git a/tests/models/thl/question/test_user_info.py b/tests/models/thl/question/test_user_info.py
index 0bbbc78..5410d35 100644
--- a/tests/models/thl/question/test_user_info.py
+++ b/tests/models/thl/question/test_user_info.py
@@ -1,32 +1,11 @@
+from __future__ import annotations
+
 from generalresearch.models.thl.profiling.user_info import UserInfo
 
 
 class TestUserInfo:
 
-    def test_init(self):
+    def test_init(self, profiling_user_info_json: str):
 
-        s = (
-            '{"user_profile_knowledge": [], "marketplace_profile_knowledge": [{"source": "d", "question_id": '
-            '"1", "answer": ["1"], "created": "2023-11-07T16:41:05.234096Z"}, {"source": "pr", '
-            '"question_id": "3", "answer": ["1"], "created": "2023-11-07T16:41:05.234096Z"}, {"source": '
-            '"h", "question_id": "60", "answer": ["58"], "created": "2023-11-07T16:41:05.234096Z"}, '
-            '{"source": "c", "question_id": "43", "answer": ["1"], "created": "2023-11-07T16:41:05.234096Z"}, '
-            '{"source": "s", "question_id": "211", "answer": ["111"], "created": '
-            '"2023-11-07T16:41:05.234096Z"}, {"source": "s", "question_id": "1843", "answer": ["111"], '
-            '"created": "2023-11-07T16:41:05.234096Z"}, {"source": "h", "question_id": "13959", "answer": ['
-            '"244155"], "created": "2023-11-07T16:41:05.234096Z"}, {"source": "c", "question_id": "33092", '
-            '"answer": ["1"], "created": "2023-11-07T16:41:05.234096Z"}, {"source": "c", "question_id": "gender", '
-            '"answer": ["10682"], "created": "2023-11-07T16:41:05.234096Z"}, {"source": "e", "question_id": '
-            '"gender", "answer": ["male"], "created": "2023-11-07T16:41:05.234096Z"}, {"source": "f", '
-            '"question_id": "gender", "answer": ["male"], "created": "2023-11-07T16:41:05.234096Z"}, {"source": '
-            '"i", "question_id": "gender", "answer": ["1"], "created": "2023-11-07T16:41:05.234096Z"}, '
-            '{"source": "c", "question_id": "137510", "answer": ["1"], "created": "2023-11-07T16:41:05.234096Z"}, '
-            '{"source": "m", "question_id": "gender", "answer": ["1"], "created": '
-            '"2023-11-07T16:41:05.234096Z"}, {"source": "o", "question_id": "gender", "answer": ["male"], '
-            '"created": "2023-11-07T16:41:05.234096Z"}, {"source": "c", "question_id": "gender_plus", "answer": ['
-            '"7657644"], "created": "2023-11-07T16:41:05.234096Z"}, {"source": "i", "question_id": '
-            '"gender_plus", "answer": ["1"], "created": "2023-11-07T16:41:05.234096Z"}, {"source": "c", '
-            '"question_id": "income_level", "answer": ["9071"], "created": "2023-11-07T16:41:05.234096Z"}]}'
-        )
-        instance = UserInfo.model_validate_json(s)
+        instance = UserInfo.model_validate_json(profiling_user_info_json)
         assert isinstance(instance, UserInfo)
diff --git a/tests/models/thl/test_adjustments.py b/tests/models/thl/test_adjustments.py
index 91e5316..c5b3f6b 100644
--- a/tests/models/thl/test_adjustments.py
+++ b/tests/models/thl/test_adjustments.py
@@ -1,9 +1,13 @@
+from __future__ import annotations
+
 from collections.abc import Callable
 from datetime import UTC, datetime, timedelta
 from decimal import Decimal
 
 import pytest
 
+from generalresearch.managers.thl.session import SessionManager
+from generalresearch.managers.thl.wall import WallManager
 from generalresearch.models import Source
 from generalresearch.models.thl.product import Product
 from generalresearch.models.thl.session import (
@@ -30,7 +34,7 @@ class TestProductAdjustments:
 
     @pytest.mark.parametrize("payout", [".6", "1", "1.8", "2", "500.0000"])
     def test_determine_bp_payment_no_rounding(
-        self, product_factory: Callable[..., Product], payout
+        self, product_factory: Callable[..., Product], payout: str
     ):
         p1 = product_factory(commission_pct=Decimal("0.05"))
         res = p1.determine_bp_payment(thl_net=Decimal(payout))
@@ -39,7 +43,7 @@ class TestProductAdjustments:
 
     @pytest.mark.parametrize("payout", [".01", ".05", ".5"])
     def test_determine_bp_payment_rounding(
-        self, product_factory: Callable[..., Product], payout
+        self, product_factory: Callable[..., Product], payout: str
     ):
         p1 = product_factory(commission_pct=Decimal("0.05"))
         res = p1.determine_bp_payment(thl_net=Decimal(payout))
@@ -73,7 +77,10 @@ class TestSessionAdjustments:
 class TestAdjustments:
 
     def test_finish_with_status(
-        self, session_factory: Callable[..., Session], user: User, session_manager
+        self,
+        session_factory: Callable[..., Session],
+        user: User,
+        session_manager: SessionManager,
     ):
         # Completed Session with 2 wall events
         s1 = session_factory(
@@ -85,6 +92,7 @@ class TestAdjustments:
         )
 
         status, status_code_1 = s1.determine_session_status()
+        assert isinstance(user.product, Product)
         payout = user.product.determine_bp_payment(Decimal(1))
         session_manager.finish_with_status(
             session=s1,
@@ -97,7 +105,10 @@ class TestAdjustments:
         assert Decimal("0.95") == payout
 
     def test_never_adjusted(
-        self, session_factory: Callable[..., Session], user: User, session_manager
+        self,
+        session_factory: Callable[..., Session],
+        user: User,
+        session_manager: SessionManager,
     ):
         s1 = session_factory(
             user=user,
@@ -130,8 +141,8 @@ class TestAdjustments:
         self,
         session_factory: Callable[..., Session],
         user: User,
-        session_manager,
-        wall_manager,
+        session_manager: SessionManager,
+        wall_manager: WallManager,
     ):
         # Completed Session with 2 wall events
         s1 = session_factory(
@@ -174,13 +185,14 @@ class TestAdjustments:
 
         # Because the Product doesn't have the Wallet mode enabled, the
         #   user_payout fields should always be None
+        assert isinstance(user.product, Product)
         assert not user.product.user_wallet_config.enabled
         assert s1.adjusted_user_payout is None
 
     def test_adjustment_session_values(
         self,
-        wall_manager,
-        session_manager,
+        wall_manager: WallManager,
+        session_manager: SessionManager,
         session_factory: Callable[..., Session],
         user: User,
     ):
@@ -218,13 +230,14 @@ class TestAdjustments:
 
         # Because the Product doesn't have the Wallet mode enabled, the
         #   user_payout fields should always be None
+        assert isinstance(user.product, Product)
         assert not user.product.user_wallet_config.enabled
         assert s1.adjusted_user_payout is None
 
     def test_double_adjustment_session_values(
         self,
-        wall_manager,
-        session_manager,
+        wall_manager: WallManager,
+        session_manager: SessionManager,
         session_factory: Callable[..., Session],
         user: User,
     ):
@@ -276,8 +289,8 @@ class TestAdjustments:
 
     def test_double_adjustment_sm_vs_db_values(
         self,
-        wall_manager,
-        session_manager,
+        wall_manager: WallManager,
+        session_manager: SessionManager,
         session_factory: Callable[..., Session],
         user: User,
     ):
@@ -343,8 +356,8 @@ class TestAdjustments:
 
     def test_double_adjustment_double_completes(
         self,
-        wall_manager,
-        session_manager,
+        wall_manager: WallManager,
+        session_manager: SessionManager,
         session_factory: Callable[..., Session],
         user: User,
     ):
@@ -419,8 +432,8 @@ class TestAdjustments:
         self,
         session_factory: Callable[..., Session],
         user: User,
-        session_manager,
-        wall_manager,
+        session_manager: SessionManager,
+        wall_manager: WallManager,
         utc_hour_ago: datetime,
     ):
         s1 = session_factory(
@@ -435,6 +448,7 @@ class TestAdjustments:
         assert status == Status.COMPLETE
 
         thl_net = Decimal(sum(w.cpi for w in s1.wall_events if w.is_visible_complete()))
+        assert isinstance(user.product, Product)
         payout = user.product.determine_bp_payment(thl_net=thl_net)
 
         session_manager.finish_with_status(
@@ -459,7 +473,7 @@ class TestAdjustments:
         assert Status.FAIL == new_status
         assert Decimal(0) == new_payout
 
-        assert isinstance(user.product: Product, Product)
+        assert isinstance(user.product, Product)
         assert not user.product.user_wallet_config.enabled
         assert new_user_payout is None
 
@@ -560,6 +574,7 @@ class TestAdjustments:
         new_status, new_payout, new_user_payout = s1.determine_new_status_and_payouts()
         assert Status.COMPLETE == new_status
         assert Decimal("0.95") == new_payout
+        assert isinstance(user.product, Product)
         assert not user.product.user_wallet_config.enabled
         # assert Decimal("0.48") == new_user_payout
         assert new_user_payout is None
@@ -588,6 +603,7 @@ class TestAdjustments:
 
         status, status_code_1 = s1.determine_session_status()
         thl_net = Decimal(sum(w.cpi for w in s1.wall_events if w.is_visible_complete()))
+        assert isinstance(user.product, Product)
         payout = user.product.determine_bp_payment(thl_net=thl_net)
         s1.update(
             status=status,
@@ -624,7 +640,10 @@ class TestAdjustments:
         assert s1.adjusted_user_payout is None
 
     def test_complete_to_fail_to_complete_adj1(
-        self, user, session_factory, utc_hour_ago
+        self,
+        user: User,
+        session_factory: Callable[..., Session],
+        utc_hour_ago: datetime,
     ):
         # Same as test_complete_to_fail_to_complete_adj but in opposite order
         s1 = session_factory(
@@ -640,6 +659,7 @@ class TestAdjustments:
 
         status, status_code_1 = s1.determine_session_status()
         thl_net = Decimal(sum(w.cpi for w in s1.wall_events if w.is_visible_complete()))
+        assert isinstance(user.product, Product)
         payout = user.product.determine_bp_payment(thl_net)
         s1.update(
             status=status,
@@ -658,6 +678,7 @@ class TestAdjustments:
         s1.adjust_status()
         assert SessionAdjustedStatus.ADJUSTED_TO_FAIL == s1.adjusted_status
         assert Decimal(0) == s1.adjusted_payout
+        assert isinstance(user.product, Product)
         assert not user.product.user_wallet_config.enabled
         # assert Decimal(0) == s.adjusted_user_payout
         assert s1.adjusted_user_payout is None
@@ -702,6 +723,7 @@ class TestAdjustments:
         s1.adjust_status()
         assert SessionAdjustedStatus.ADJUSTED_TO_COMPLETE == s1.adjusted_status
         assert Decimal("1.90") == s1.adjusted_payout
+        assert isinstance(user.product, Product)
         assert not user.product.user_wallet_config.enabled
         # assert Decimal("0.95") == s1.adjusted_user_payout
         assert s1.adjusted_user_payout is None
diff --git a/tests/models/thl/test_bucket.py b/tests/models/thl/test_bucket.py
index 0aa5843..8d2f728 100644
--- a/tests/models/thl/test_bucket.py
+++ b/tests/models/thl/test_bucket.py
@@ -1,14 +1,17 @@
+from __future__ import annotations
+
 from datetime import timedelta
 from decimal import Decimal
 
 import pytest
 from pydantic import ValidationError
 
+from generalresearch.models.legacy.bucket import Bucket
+
 
 class TestBucket:
 
     def test_raises_payout(self):
-        from generalresearch.models.legacy.bucket import Bucket
 
         with pytest.raises(expected_exception=ValidationError) as e:
             Bucket(user_payout_min=123)
@@ -27,7 +30,6 @@ class TestBucket:
         assert "user_payout_min should be <= user_payout_max" in str(e.value)
 
     def test_raises_loi(self):
-        from generalresearch.models.legacy.bucket import Bucket
 
         with pytest.raises(expected_exception=ValidationError) as e:
             Bucket(loi_min=123)
@@ -63,7 +65,6 @@ class TestBucket:
         assert "loi_q1 should be <= loi_q2" in str(e.value)
 
     def test_parse_1(self):
-        from generalresearch.models.legacy.bucket import Bucket
 
         b1 = Bucket.parse_from_offerwall({"payout": {"min": 123}})
         b_exp = Bucket(
@@ -180,7 +181,6 @@ class TestBucket:
         assert b_exp == b4
 
     def test_parse_3(self):
-        from generalresearch.models.legacy.bucket import Bucket
 
         b1 = Bucket.parse_from_offerwall({"payout": 123})
         b_exp = Bucket(
diff --git a/tests/models/thl/test_buyer.py b/tests/models/thl/test_buyer.py
index eebb828..02093e2 100644
--- a/tests/models/thl/test_buyer.py
+++ b/tests/models/thl/test_buyer.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from generalresearch.models import Source
 from generalresearch.models.thl.survey.buyer import BuyerCountryStat
 
diff --git a/tests/models/thl/test_contest/test_contest.py b/tests/models/thl/test_contest/test_contest.py
index acb501c..e1053f4 100644
--- a/tests/models/thl/test_contest/test_contest.py
+++ b/tests/models/thl/test_contest/test_contest.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from collections.abc import Callable
 
 import pytest
diff --git a/tests/models/thl/test_contest/test_leaderboard_contest.py b/tests/models/thl/test_contest/test_leaderboard_contest.py
index 5bab060..99cfb37 100644
--- a/tests/models/thl/test_contest/test_leaderboard_contest.py
+++ b/tests/models/thl/test_contest/test_leaderboard_contest.py
@@ -1,10 +1,14 @@
+from __future__ import annotations
+
 from datetime import UTC
 from uuid import uuid4
 
 import pytest
+from redis import Redis
 
 from generalresearch.currency import USDCent
 from generalresearch.managers.leaderboard.manager import LeaderboardManager
+from generalresearch.managers.thl.user_manager.user_manager import UserManager
 from generalresearch.models.thl.contest import ContestPrize
 from generalresearch.models.thl.contest.definitions import (
     ContestPrizeKind,
@@ -18,6 +22,7 @@ from generalresearch.models.thl.contest.utils import (
 )
 from generalresearch.models.thl.leaderboard import LeaderboardRow
 from generalresearch.models.thl.product import Product
+from generalresearch.models.thl.user import User
 from tests.models.thl.test_contest.test_contest import TestContest
 
 
@@ -25,7 +30,7 @@ class TestLeaderboardContest(TestContest):
 
     @pytest.fixture
     def leaderboard_contest(
-        self, product: product: Product, thl_redis, user_manager
+        self, product: Product, thl_redis: Redis, user_manager: UserManager
     ) -> LeaderboardContest:
         board_key = f"leaderboard:{product.uuid}:us:weekly:2025-05-26:complete_count"
 
@@ -63,7 +68,13 @@ class TestLeaderboardContest(TestContest):
         c._user_manager = user_manager
         return c
 
-    def test_init(self, leaderboard_contest, thl_redis, user_1, user_2):
+    def test_init(
+        self,
+        leaderboard_contest: LeaderboardContest,
+        thl_redis: Redis,
+        user_1: User,
+        user_2: User,
+    ):
         model = leaderboard_contest.leaderboard_model
         assert leaderboard_contest.end_condition.ends_at is not None
 
@@ -83,7 +94,14 @@ class TestLeaderboardContest(TestContest):
         lb = leaderboard_contest.get_leaderboard()
         print(lb)
 
-    def test_win(self, leaderboard_contest, thl_redis, user_1, user_2, user_3):
+    def test_win(
+        self,
+        leaderboard_contest: LeaderboardContest,
+        thl_redis: Redis,
+        user_1: User,
+        user_2: User,
+        user_3: User,
+    ):
         model = leaderboard_contest.leaderboard_model
         lbm = LeaderboardManager(
             redis_client=thl_redis,
@@ -102,10 +120,13 @@ class TestLeaderboardContest(TestContest):
         lbm.hit_complete_count(product_user_id=user_3.product_user_id)
 
         leaderboard_contest.end_contest()
+        assert isinstance(leaderboard_contest.all_winners, list)
         assert len(leaderboard_contest.all_winners) == 3
 
         # Prizes are $15, $10, $5. user 2 and 3 ties for 2nd place, so they split (10 + 5)
         assert leaderboard_contest.all_winners[0].awarded_cash_amount == USDCent(15_00)
+
+        assert isinstance(leaderboard_contest.all_winners[0].user, User)
         assert (
             leaderboard_contest.all_winners[0].user.product_user_id
             == user_1.product_user_id
diff --git a/tests/models/thl/test_contest/test_raffle_contest.py b/tests/models/thl/test_contest/test_raffle_contest.py
index f85ba75..8812cb3 100644
--- a/tests/models/thl/test_contest/test_raffle_contest.py
+++ b/tests/models/thl/test_contest/test_raffle_contest.py
@@ -1,4 +1,7 @@
+from __future__ import annotations
+
 from collections import Counter
+from datetime import datetime
 from uuid import uuid4
 
 import pytest
@@ -19,6 +22,7 @@ from generalresearch.models.thl.contest.definitions import (
 )
 from generalresearch.models.thl.contest.raffle import RaffleContest
 from generalresearch.models.thl.product import Product
+from generalresearch.models.thl.user import User
 from tests.models.thl.test_contest.test_contest import TestContest
 
 
@@ -42,7 +46,9 @@ class TestRaffleContest(TestContest):
         )
 
     @pytest.fixture(scope="function")
-    def ended_raffle_contest(self, raffle_contest, utc_now) -> RaffleContest:
+    def ended_raffle_contest(
+        self, raffle_contest: RaffleContest, utc_now: datetime
+    ) -> RaffleContest:
         # Fake ending the contest
         raffle_contest = raffle_contest.model_copy()
         raffle_contest.update(
@@ -55,7 +61,7 @@ class TestRaffleContest(TestContest):
 
 class TestRaffleContestUserView(TestRaffleContest):
 
-    def test_user_view(self, raffle_contest, user):
+    def test_user_view(self, raffle_contest: RaffleContest, user: User):
         from generalresearch.models.thl.contest.raffle import RaffleUserView
 
         data = {
@@ -78,7 +84,7 @@ class TestRaffleContestUserView(TestRaffleContest):
         assert res["current_win_probability"] == approx(0.0099, rel=0.001)
         assert res["projected_win_probability"] == approx(0.0099, rel=0.001)
 
-    def test_win_pct(self, raffle_contest, user):
+    def test_win_pct(self, raffle_contest: RaffleContest, user: User):
         from generalresearch.models.thl.contest.raffle import RaffleUserView
 
         data = {
@@ -124,7 +130,9 @@ class TestRaffleContestUserView(TestRaffleContest):
 
 class TestRaffleContestWinners(TestRaffleContest):
 
-    def test_winners_1_prize(self, ended_raffle_contest, user_1, user_2, user_3):
+    def test_winners_1_prize(
+        self, ended_raffle_contest, user_1: User, user_2: User, user_3: User
+    ):
         ended_raffle_contest.entries = [
             ContestEntry(
                 user=user_1,
@@ -160,7 +168,13 @@ class TestRaffleContestWinners(TestRaffleContest):
         assert c[user_2.user_id] == approx(10000 * 2 / 6, rel=0.1)
         assert c[user_3.user_id] == approx(10000 * 3 / 6, rel=0.1)
 
-    def test_winners_2_prizes(self, ended_raffle_contest, user_1, user_2, user_3):
+    def test_winners_2_prizes(
+        self,
+        ended_raffle_contest: RaffleContest,
+        user_1: User,
+        user_2: User,
+        user_3: User,
+    ):
         ended_raffle_contest.prizes.append(
             ContestPrize(
                 name="iPod 64GB Black",
@@ -193,7 +207,9 @@ class TestRaffleContestWinners(TestRaffleContest):
         # Same user
         assert all(w.user.user_id == user_1.user_id for w in winners)
 
-    def test_winners_2_prizes_1_entry(self, ended_raffle_contest, user_3):
+    def test_winners_2_prizes_1_entry(
+        self, ended_raffle_contest: RaffleContest, user_3: User
+    ):
         ended_raffle_contest.prizes = [
             ContestPrize(
                 name="iPod 64GB White",
@@ -218,7 +234,9 @@ class TestRaffleContestWinners(TestRaffleContest):
         winners = ended_raffle_contest.select_winners()
         assert len(winners) == 1
 
-    def test_winners_2_prizes_1_entry_2_pennies(self, ended_raffle_contest, user_3):
+    def test_winners_2_prizes_1_entry_2_pennies(
+        self, ended_raffle_contest: RaffleContest, user_3: User
+    ):
         ended_raffle_contest.prizes = [
             ContestPrize(
                 name="iPod 64GB White",
@@ -243,7 +261,12 @@ class TestRaffleContestWinners(TestRaffleContest):
         assert len(winners) == 2
 
     def test_winners_3_prizes_3_entries(
-        self, ended_raffle_contest, product: Product, user_1, user_2, user_3
+        self,
+        ended_raffle_contest: RaffleContest,
+        product: Product,
+        user_1: User,
+        user_2: User,
+        user_3: User,
     ):
         ended_raffle_contest.prizes = [
             ContestPrize(
diff --git a/tests/models/thl/test_ledger.py b/tests/models/thl/test_ledger.py
index 7066180..7c48dbd 100644
--- a/tests/models/thl/test_ledger.py
+++ b/tests/models/thl/test_ledger.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from datetime import UTC, datetime
 from uuid import uuid4
 
diff --git a/tests/models/thl/test_marketplace_condition.py b/tests/models/thl/test_marketplace_condition.py
index 8a4b25c..1dd25e8 100644
--- a/tests/models/thl/test_marketplace_condition.py
+++ b/tests/models/thl/test_marketplace_condition.py
@@ -1,15 +1,18 @@
+from __future__ import annotations
+
 import pytest
 from pydantic import ValidationError
 
+from generalresearch.models import LogicalOperator
+from generalresearch.models.thl.survey.condition import (
+    ConditionValueType,
+    MarketplaceCondition,
+)
+
 
 class TestMarketplaceCondition:
 
     def test_list_or(self):
-        from generalresearch.models import LogicalOperator
-        from generalresearch.models.thl.survey.condition import (
-            ConditionValueType,
-            MarketplaceCondition,
-        )
 
         user_qas = {"q1": {"a2"}}
         c = MarketplaceCondition(
@@ -46,11 +49,6 @@ class TestMarketplaceCondition:
         assert c.evaluate_criterion(user_qas) is None
 
     def test_list_or_negate(self):
-        from generalresearch.models import LogicalOperator
-        from generalresearch.models.thl.survey.condition import (
-            ConditionValueType,
-            MarketplaceCondition,
-        )
 
         user_qas = {"q1": {"a2"}}
         c = MarketplaceCondition(
@@ -87,11 +85,6 @@ class TestMarketplaceCondition:
         assert c.evaluate_criterion(user_qas) is None
 
     def test_list_and(self):
-        from generalresearch.models import LogicalOperator
-        from generalresearch.models.thl.survey.condition import (
-            ConditionValueType,
-            MarketplaceCondition,
-        )
 
         user_qas = {"q1": {"a1", "a2"}}
         c = MarketplaceCondition(
@@ -178,11 +171,6 @@ class TestMarketplaceCondition:
         assert c.evaluate_criterion(user_qas) is None
 
     def test_ranges(self):
-        from generalresearch.models import LogicalOperator
-        from generalresearch.models.thl.survey.condition import (
-            ConditionValueType,
-            MarketplaceCondition,
-        )
 
         user_qas = {"q1": {"2", "50"}}
         c = MarketplaceCondition(
@@ -245,12 +233,6 @@ class TestMarketplaceCondition:
             )
 
     def test_ranges_to_list(self):
-        from generalresearch.models import LogicalOperator
-        from generalresearch.models.thl.survey.condition import (
-            ConditionValueType,
-            MarketplaceCondition,
-        )
-
         user_qas = {"q1": {"2", "50"}}
         MarketplaceCondition._CONVERT_LIST_TO_RANGE = ["q1"]
         c = MarketplaceCondition(
@@ -309,10 +291,6 @@ class TestMarketplaceCondition:
         assert not c.evaluate_criterion({"q1": {"50"}})
 
     def test_answered(self):
-        from generalresearch.models.thl.survey.condition import (
-            ConditionValueType,
-            MarketplaceCondition,
-        )
 
         user_qas = {"q1": {"a2"}}
         c = MarketplaceCondition(
diff --git a/tests/models/thl/test_payout.py b/tests/models/thl/test_payout.py
index dd0065c..daf1bd7 100644
--- a/tests/models/thl/test_payout.py
+++ b/tests/models/thl/test_payout.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from uuid import uuid4
 
 import pytest
@@ -5,7 +7,7 @@ from pydantic import ValidationError
 
 from generalresearch.currency import USDCent
 from generalresearch.models.gr import Team
-from generalresearch.models.gr.business import business: Business, BusinessAddress, BusinessType
+from generalresearch.models.gr.business import Business, BusinessAddress, BusinessType
 from generalresearch.models.thl.payout import (
     BrokerageProductPayoutEvent,
     BusinessPayoutEvent,
diff --git a/tests/models/thl/test_payout_format.py b/tests/models/thl/test_payout_format.py
index 83fde25..fe7aea5 100644
--- a/tests/models/thl/test_payout_format.py
+++ b/tests/models/thl/test_payout_format.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import pytest
 from pydantic import BaseModel
 
diff --git a/tests/models/thl/test_product.py b/tests/models/thl/test_product.py
index b7ee654..adf276d 100644
--- a/tests/models/thl/test_product.py
+++ b/tests/models/thl/test_product.py
@@ -13,22 +13,26 @@ from pydantic import ValidationError
 
 from generalresearch.currency import USDCent
 from generalresearch.incite.base import GRLDatasets
+from generalresearch.incite.collections.thl_web import LedgerDFCollection
 from generalresearch.incite.mergers.pop_ledger import PopLedgerMerge
 from generalresearch.managers.thl.ledger_manager.thl_ledger import (
     ThlLedgerManager,
 )
+from generalresearch.managers.thl.payout import PayoutEventManager
 from generalresearch.managers.thl.product import ProductManager
 from generalresearch.models import Source
 from generalresearch.models.gr.business import Business
 from generalresearch.models.thl.finance import ProductBalances
-from generalresearch.models.thl.product import (
+from generalresearch.models.thl.payout import (
     BrokerageProductPayoutEvent,
+)
+from generalresearch.models.thl.product import (
     BrokerageProductPayoutEventManager,
     IntegrationMode,
     PayoutConfig,
     PayoutTransformation,
     PayoutTransformationPercentArgs,
-    product: Product,
+    Product,
     ProfilingConfig,
     SourceConfig,
     SourcesConfig,
@@ -37,6 +41,7 @@ from generalresearch.models.thl.product import (
 )
 from generalresearch.models.thl.session import Session
 from generalresearch.models.thl.user import User
+from generalresearch.redis_helper import RedisConfig
 
 
 class TestProduct:
@@ -156,6 +161,11 @@ class TestProduct:
         assert (
             "payout_transformation_percent" == p.payout_config.payout_transformation.f
         )
+
+        assert isinstance(
+            p.payout_config.payout_transformation.kwargs,
+            PayoutTransformationPercentArgs,
+        )
         assert 0.5 == p.payout_config.payout_transformation.kwargs.pct
         assert (
             Decimal("0.10") == p.payout_config.payout_transformation.kwargs.min_payout
@@ -287,10 +297,10 @@ class TestProduct:
         p.profiling_config = ProfilingConfig(max_questions=1)
         assert p.profiling_config.max_questions == 1
 
-    def test_bp_account(self, product: Product, thl_lm):
+    def test_bp_account(self, product: Product, thl_ledger_manager: ThlLedgerManager):
         assert product.bp_account is None
 
-        product.prefetch_bp_account(thl_lm=thl_lm)
+        product.prefetch_bp_account(thl_lm=thl_ledger_manager)
 
         from generalresearch.models.thl.ledger import LedgerAccount
 
@@ -391,7 +401,7 @@ class TestGlobalProduct:
         random_product = uuid4().hex
         random_team = uuid4().hex
         res = instance.sources_config.get_policies_for(
-            product_id=random_product: Product, team_id=random_team
+            product_id=random_product, team_id=random_team
         )
         assert res == s.global_scoped_policies_dict
 
@@ -598,7 +608,7 @@ class TestProductFinancials:
 
     def test_balance(
         self,
-        business: business: Business,
+        business: Business,
         product_factory: Callable[..., Product],
         user_factory: Callable[..., User],
         mnt_filepath: GRLDatasets,
@@ -610,7 +620,7 @@ class TestProductFinancials:
         delete_ledger_db: Callable[..., None],
         create_main_accounts: Callable[..., None],
         client_no_amm: DaskClient,
-        ledger_collection,
+        ledger_collection: LedgerDFCollection,
         pop_ledger_merge: PopLedgerMerge,
         delete_df_collection: Callable[..., None],
     ):
@@ -781,20 +791,20 @@ class TestProductBalance:
 
     def test_inconsistent(
         self,
-        product: product: Product,
+        product: Product,
         mnt_filepath: GRLDatasets,
         thl_lm: ThlLedgerManager,
         client_no_amm: DaskClient,
         delete_ledger_db: Callable[..., None],
         create_main_accounts: Callable[..., None],
         delete_df_collection: Callable[..., None],
-        ledger_collection,
+        ledger_collection: LedgerDFCollection,
         user_factory: Callable[..., User],
         session_with_tx_factory: Callable[..., Session],
-        pop_ledger_merge,
+        pop_ledger_merge: PopLedgerMerge,
         start: datetime,
-        bp_payout_factory,
-        payout_event_manager,
+        bp_payout_factory: Callable[..., BrokerageProductPayoutEvent],
+        payout_event_manager: PayoutEventManager,
     ):
         # Now let's load it up and actually test some things
         delete_ledger_db()
@@ -815,7 +825,7 @@ class TestProductBalance:
         # 2. Payout and build Parquets 2nd time
         payout_event_manager.set_account_lookup_table(thl_lm=thl_lm)
         bp_payout_factory(
-            product=product: Product,
+            product=product,
             amount=USDCent(71),
             ext_ref_id=uuid4().hex,
             created=start + timedelta(days=1, minutes=1),
@@ -833,20 +843,20 @@ class TestProductBalance:
 
     def test_not_inconsistent(
         self,
-        product: product: Product,
+        product: Product,
         mnt_filepath: GRLDatasets,
         thl_lm: ThlLedgerManager,
         client_no_amm: DaskClient,
         delete_ledger_db: Callable[..., None],
         create_main_accounts: Callable[..., None],
         delete_df_collection: Callable[..., None],
-        ledger_collection,
+        ledger_collection: LedgerDFCollection,
         user_factory: Callable[..., User],
         session_with_tx_factory: Callable[..., None],
         pop_ledger_merge: PopLedgerMerge,
         start: datetime,
-        bp_payout_factory,
-        payout_event_manager,
+        bp_payout_factory: Callable[..., BrokerageProductPayoutEvent],
+        payout_event_manager: PayoutEventManager,
     ):
         # This is very similar to the test_complete_payout_pq_inconsistent
         #   test, however this time we're only going to assign the payout
@@ -874,7 +884,7 @@ class TestProductBalance:
         #    so it hasn't already been archived
         payout_event_manager.set_account_lookup_table(thl_lm=thl_lm)
         bp_payout_factory(
-            product=product: Product,
+            product=product,
             amount=USDCent(71),
             ext_ref_id=uuid4().hex,
             created=datetime.now(tz=UTC),
@@ -904,14 +914,14 @@ class TestProductPOPFinancial:
 
     def test_base(
         self,
-        product: product: Product,
+        product: Product,
         mnt_filepath: GRLDatasets,
         thl_lm: ThlLedgerManager,
         client_no_amm: DaskClient,
         delete_ledger_db: Callable[..., None],
         create_main_accounts: Callable[..., None],
         delete_df_collection: Callable[..., None],
-        ledger_collection,
+        ledger_collection: LedgerDFCollection,
         user_factory: Callable[..., User],
         session_with_tx_factory: Callable[..., None],
         pop_ledger_merge: PopLedgerMerge,
@@ -977,16 +987,16 @@ class TestProductCache:
 
     def test_basic(
         self,
-        product: product: Product,
-        mnt_filepath,
-        thl_lm,
+        product: Product,
+        mnt_filepath: GRLDatasets,
+        thl_ledger_manager: ThlLedgerManager,
         client_no_amm: DaskClient,
         thl_redis_config: RedisConfig,
-        brokerage_product_payout_event_manager,
+        brokerage_product_payout_event_manager: BrokerageProductPayoutEventManager,
         delete_ledger_db: Callable[..., None],
         create_main_accounts: Callable[..., None],
         delete_df_collection: Callable[..., None],
-        ledger_collection,
+        ledger_collection: LedgerDFCollection,
         user_factory: Callable[..., User],
         session_with_tx_factory: Callable[..., None],
         pop_ledger_merge: PopLedgerMerge,
@@ -1007,7 +1017,7 @@ class TestProductCache:
                 ds=mnt_filepath,
                 client=client_no_amm,
                 bp_pem=brokerage_product_payout_event_manager,
-                redis_config=thl_redis_config: RedisConfig,
+                redis_config=thl_redis_config,
             )
 
         from generalresearch.models.thl.product import Product
@@ -1029,7 +1039,7 @@ class TestProductCache:
             ds=mnt_filepath,
             client=client_no_amm,
             bp_pem=brokerage_product_payout_event_manager,
-            redis_config=thl_redis_config: RedisConfig,
+            redis_config=thl_redis_config,
         )
 
         # Fetch from cache and assert the instance loaded from redis
@@ -1048,23 +1058,23 @@ class TestProductCache:
 
     def test_neg_balance_cache(
         self,
-        product: product: Product,
+        product: Product,
         mnt_filepath: GRLDatasets,
-        thl_lm,
+        thl_ledger_manager: ThlLedgerManager,
         client_no_amm: DaskClient,
         thl_redis_config: RedisConfig,
-        brokerage_product_payout_event_manager,
+        brokerage_product_payout_event_manager: BrokerageProductPayoutEventManager,
         delete_ledger_db: Callable[..., None],
         create_main_accounts: Callable[..., None],
         delete_df_collection: Callable[..., None],
-        ledger_collection,
+        ledger_collection: LedgerDFCollection,
         user_factory: Callable[..., User],
         session_with_tx_factory: Callable[..., None],
         pop_ledger_merge: PopLedgerMerge,
         start: datetime,
-        bp_payout_factory,
-        payout_event_manager,
-        adj_to_fail_with_tx_factory,
+        bp_payout_factory: Callable[..., BrokerageProductPayoutEvent],
+        payout_event_manager: PayoutEventManager,
+        adj_to_fail_with_tx_factory: Callable[..., None],
     ):
         # Now let's load it up and actually test some things
         delete_ledger_db()
@@ -1083,9 +1093,9 @@ class TestProductCache:
         )
 
         # 2. Payout
-        payout_event_manager.set_account_lookup_table(thl_lm=thl_lm)
+        payout_event_manager.set_account_lookup_table(thl_lm=thl_ledger_manager)
         bp_payout_factory(
-            product=product: Product,
+            product=product,
             amount=USDCent(71),
             ext_ref_id=uuid4().hex,
             created=start + timedelta(days=1, minutes=1),
@@ -1104,11 +1114,11 @@ class TestProductCache:
         pop_ledger_merge.build(client=client_no_amm, ledger_coll=ledger_collection)
 
         product.set_cache(
-            thl_lm=thl_lm,
+            thl_lm=thl_ledger_manager,
             ds=mnt_filepath,
             client=client_no_amm,
             bp_pem=brokerage_product_payout_event_manager,
-            redis_config=thl_redis_config: RedisConfig,
+            redis_config=thl_redis_config,
         )
 
         # Fetch from cache and assert the instance loaded from redis
diff --git a/tests/models/thl/test_product_userwalletconfig.py b/tests/models/thl/test_product_userwalletconfig.py
index 4f6a6cc..b348981 100644
--- a/tests/models/thl/test_product_userwalletconfig.py
+++ b/tests/models/thl/test_product_userwalletconfig.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from itertools import groupby
 from random import shuffle as rshuffle
 
@@ -7,7 +9,7 @@ from generalresearch.models.thl.product import (
 from generalresearch.models.thl.wallet import PayoutType
 
 
-def all_equal(iterable):
+def all_equal(iterable: list[str]) -> bool:
     g = groupby(iterable)
     return next(g, True) and not next(g, False)
 
@@ -35,13 +37,13 @@ class TestProductUserWalletConfig:
         #   in the same order because they're the same
         assert isinstance(instance.model_dump_json(), str)
         res = []
-        for idx in range(100):
+        for _ in range(100):
             res.append(instance.model_dump_json())
         assert all_equal(res)
 
     def test_model_dump_payout_types(self):
         res = []
-        for idx in range(100):
+        for _ in range(100):
 
             # Generate a random order of PayoutTypes each time
             payout_types = [e for e in PayoutType]
diff --git a/tests/models/thl/test_soft_pair.py b/tests/models/thl/test_soft_pair.py
index 588847e..3cf835e 100644
--- a/tests/models/thl/test_soft_pair.py
+++ b/tests/models/thl/test_soft_pair.py
@@ -1,12 +1,14 @@
+from __future__ import annotations
+
 from generalresearch.models import Source
+from generalresearch.models.dynata.survey import (
+    ConditionValueType,
+    DynataCondition,
+)
 from generalresearch.models.thl.soft_pair import SoftPairResult, SoftPairResultType
 
 
 def test_model():
-    from generalresearch.models.dynata.survey import (
-        ConditionValueType,
-        DynataCondition,
-    )
 
     c1 = DynataCondition(
         question_id="1", value_type=ConditionValueType.LIST, values=["a", "b"]
diff --git a/tests/models/thl/test_upkquestion.py b/tests/models/thl/test_upkquestion.py
index 99d7871..719fcff 100644
--- a/tests/models/thl/test_upkquestion.py
+++ b/tests/models/thl/test_upkquestion.py
@@ -1,13 +1,30 @@
+from __future__ import annotations
+
 import pytest
 from pydantic import ValidationError
 
+from generalresearch.models.morning.question import (
+    MorningQuestion,
+    MorningQuestionType,
+)
+from generalresearch.models.thl.profiling.upk_question import (
+    PatternValidation,
+    UPKImportance,
+    UpkQuestion,
+    UpkQuestionChoice,
+    UpkQuestionConfigurationMC,
+    UpkQuestionConfigurationTE,
+    UpkQuestionSelectorMC,
+    UpkQuestionSelectorTE,
+    UpkQuestionType,
+    UpkQuestionValidation,
+    order_exclusive_options,
+)
+
 
 class TestUpkQuestion:
 
     def test_importance(self):
-        from generalresearch.models.thl.profiling.upk_question import (
-            UPKImportance,
-        )
 
         res = UPKImportance(task_score=1, task_count=None)
         assert isinstance(res, UPKImportance)
@@ -20,9 +37,6 @@ class TestUpkQuestion:
         assert "Input should be greater than or equal to 0" in str(e.value)
 
     def test_pattern(self):
-        from generalresearch.models.thl.profiling.upk_question import (
-            PatternValidation,
-        )
 
         s = PatternValidation(message="hi", pattern="x")
         with pytest.raises(ValidationError) as e:
@@ -30,13 +44,6 @@ class TestUpkQuestion:
         assert "Instance is frozen" in str(e.value)
 
     def test_mc(self):
-        from generalresearch.models.thl.profiling.upk_question import (
-            UpkQuestion,
-            UpkQuestionChoice,
-            UpkQuestionConfigurationMC,
-            UpkQuestionSelectorMC,
-            UpkQuestionType,
-        )
 
         q = UpkQuestion(
             id="601377a0d4c74529afc6293a8e5c3b5e",
@@ -126,14 +133,6 @@ class TestUpkQuestion:
         assert "Extra inputs are not permitted" in str(e.value)
 
     def test_te(self):
-        from generalresearch.models.thl.profiling.upk_question import (
-            PatternValidation,
-            UpkQuestion,
-            UpkQuestionConfigurationTE,
-            UpkQuestionSelectorTE,
-            UpkQuestionType,
-            UpkQuestionValidation,
-        )
 
         q = UpkQuestion(
             id="601377a0d4c74529afc6293a8e5c3b5e",
@@ -152,9 +151,6 @@ class TestUpkQuestion:
         assert q.choices is None
 
     def test_deserialization(self):
-        from generalresearch.models.thl.profiling.upk_question import (
-            UpkQuestion,
-        )
 
         q = UpkQuestion.model_validate(
             {
@@ -195,16 +191,18 @@ class TestUpkQuestion:
         assert q == UpkQuestion.model_validate(q.model_dump(mode="json"))
 
     def test_from_morning(self):
-        from generalresearch.models.morning.question import (
-            MorningQuestion,
-            MorningQuestionType,
-        )
 
         q = MorningQuestion(
-            id="gender", country_iso="us", language_iso="eng", name="Gender", text="What is your gender?", type="s", options=[
-                    {"id": "1", "text": "yes", "order": 1},
-                    {"id": "2", "text": "no", "order": 2},
-                ]
+            id="gender",
+            country_iso="us",
+            language_iso="eng",
+            name="Gender",
+            text="What is your gender?",
+            type="s",
+            options=[
+                {"id": "1", "text": "yes", "order": 1},
+                {"id": "2", "text": "no", "order": 2},
+            ],
         )
         q.to_upk_question()
         q = MorningQuestion(
@@ -218,13 +216,6 @@ class TestUpkQuestion:
         q.to_upk_question()
 
     def test_order(self):
-        from generalresearch.models.thl.profiling.upk_question import (
-            UpkQuestion,
-            UpkQuestionChoice,
-            UpkQuestionSelectorMC,
-            UpkQuestionType,
-            order_exclusive_options,
-        )
 
         q = UpkQuestion(
             country_iso="us",
@@ -258,9 +249,6 @@ class TestUpkQuestion:
 
 class TestUpkQuestionValidateAnswer:
     def test_validate_answer_SA(self):
-        from generalresearch.models.thl.profiling.upk_question import (
-            UpkQuestion,
-        )
 
         question = UpkQuestion.model_validate(
             {
@@ -296,9 +284,6 @@ class TestUpkQuestionValidateAnswer:
         )
 
     def test_validate_answer_MA(self):
-        from generalresearch.models.thl.profiling.upk_question import (
-            UpkQuestion,
-        )
 
         question = UpkQuestion.model_validate(
             {
@@ -368,9 +353,6 @@ class TestUpkQuestionValidateAnswer:
         )
 
     def test_validate_answer_TE(self):
-        from generalresearch.models.thl.profiling.upk_question import (
-            UpkQuestion,
-        )
 
         question = UpkQuestion.model_validate(
             {
diff --git a/tests/models/thl/test_user.py b/tests/models/thl/test_user.py
index 0b8634a..9c4b548 100644
--- a/tests/models/thl/test_user.py
+++ b/tests/models/thl/test_user.py
@@ -1,4 +1,7 @@
+from __future__ import annotations
+
 import json
+from collections.abc import Callable
 from datetime import UTC, datetime, timedelta, timezone
 from decimal import Decimal
 from random import choice as rand_choice
@@ -8,18 +11,21 @@ from uuid import uuid4
 import pytest
 from pydantic import ValidationError
 
+from generalresearch.managers.thl.ledger_manager.thl_ledger import ThlLedgerManager
+from generalresearch.managers.thl.userhealth import AuditLogManager
+from generalresearch.models.thl.product import Product
+from generalresearch.models.thl.user import User
+
 
 class TestUserUserID:
 
     def test_valid(self):
-        from generalresearch.models.thl.user import User
 
         val = randint(1, 2**30)
         user = User(user_id=val)
         assert user.user_id == val
 
     def test_type(self):
-        from generalresearch.models.thl.user import User
 
         # It will cast str to int
         assert User(user_id="1").user_id == 1
@@ -44,7 +50,6 @@ class TestUserUserID:
         assert "Input should be a valid integer," in str(cm.value)
 
     def test_zero(self):
-        from generalresearch.models.thl.user import User
 
         with pytest.raises(expected_exception=ValidationError) as cm:
             User(user_id=0)
@@ -52,7 +57,6 @@ class TestUserUserID:
         assert "Input should be greater than 0" in str(cm.value)
 
     def test_negative(self):
-        from generalresearch.models.thl.user import User
 
         with pytest.raises(expected_exception=ValidationError) as cm:
             User(user_id=-1)
@@ -60,7 +64,6 @@ class TestUserUserID:
         assert "Input should be greater than 0" in str(cm.value)
 
     def test_too_big(self):
-        from generalresearch.models.thl.user import User
 
         val = 2**31
         with pytest.raises(expected_exception=ValidationError) as cm:
@@ -69,7 +72,6 @@ class TestUserUserID:
         assert "Input should be less than 2147483648" in str(cm.value)
 
     def test_identifiable(self):
-        from generalresearch.models.thl.user import User
 
         val = randint(1, 2**30)
         user = User(user_id=val)
@@ -80,7 +82,6 @@ class TestUserProductID:
     user_id = randint(1, 2**30)
 
     def test_valid(self):
-        from generalresearch.models.thl.user import User
 
         product_id = uuid4().hex
 
@@ -89,7 +90,6 @@ class TestUserProductID:
         assert user.product_id == product_id
 
     def test_type(self):
-        from generalresearch.models.thl.user import User
 
         with pytest.raises(expected_exception=ValueError) as cm:
             User(user_id=self.user_id, product_id=0)
@@ -102,7 +102,6 @@ class TestUserProductID:
         assert "Input should be a valid string" in str(cm.value)
 
     def test_empty(self):
-        from generalresearch.models.thl.user import User
 
         with pytest.raises(expected_exception=ValueError) as cm:
             User(user_id=self.user_id, product_id="")
@@ -110,7 +109,6 @@ class TestUserProductID:
         assert "String should have at least 32 characters" in str(cm.value)
 
     def test_invalid_len(self):
-        from generalresearch.models.thl.user import User
 
         # Valid uuid4s are 32 char long
         product_id = uuid4().hex[:31]
@@ -133,7 +131,6 @@ class TestUserProductID:
         assert "String should have at most 32 characters" in str(cm.value)
 
     def test_invalid_uuid(self):
-        from generalresearch.models.thl.user import User
 
         # Modify the UUID to break it
         product_id = uuid4().hex[:31] + "x"
@@ -144,7 +141,6 @@ class TestUserProductID:
         assert "Invalid UUID" in str(cm.value)
 
     def test_invalid_hex_form(self):
-        from generalresearch.models.thl.user import User
 
         # Sure not in hex form, but it'll get caught for being the
         # wrong length before anything else
@@ -157,7 +153,6 @@ class TestUserProductID:
     def test_identifiable(self):
         """Can't create a User with only a product_id because it also
         needs to the product_user_id"""
-        from generalresearch.models.thl.user import User
 
         product_id = uuid4().hex
         with pytest.raises(expected_exception=ValueError) as cm:
@@ -172,10 +167,9 @@ class TestUserProductUserID:
     def randomword(self, length: int = 50):
         # Raw so nothing is escaped to add additional backslashes
         _bpuid_allowed = r"0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!#$%&()*+,-.:;<=>?@[]^_{|}~"
-        return "".join(rand_choice(_bpuid_allowed) for i in range(length))
+        return "".join(rand_choice(_bpuid_allowed) for _ in range(length))
 
     def test_valid(self):
-        from generalresearch.models.thl.user import User
 
         product_user_id = uuid4().hex[:12]
         user = User(user_id=self.user_id, product_user_id=product_user_id)
@@ -184,7 +178,6 @@ class TestUserProductUserID:
         assert user.product_user_id == product_user_id
 
     def test_type(self):
-        from generalresearch.models.thl.user import User
 
         with pytest.raises(expected_exception=ValueError) as cm:
             User(user_id=self.user_id, product_user_id=0)
@@ -202,7 +195,6 @@ class TestUserProductUserID:
         assert "Input should be a valid string" in str(cm.value)
 
     def test_empty(self):
-        from generalresearch.models.thl.user import User
 
         with pytest.raises(expected_exception=ValueError) as cm:
             User(user_id=self.user_id, product_user_id="")
@@ -210,7 +202,6 @@ class TestUserProductUserID:
         assert "String should have at least 3 characters" in str(cm.value)
 
     def test_invalid_len(self):
-        from generalresearch.models.thl.user import User
 
         product_user_id = self.randomword(251)
         with pytest.raises(expected_exception=ValueError) as cm:
@@ -225,7 +216,6 @@ class TestUserProductUserID:
         assert "String should have at least 3 characters" in str(cm.value)
 
     def test_invalid_chars_space(self):
-        from generalresearch.models.thl.user import User
 
         product_user_id = f"{self.randomword(50)} {self.randomword(50)}"
         with pytest.raises(expected_exception=ValueError) as cm:
@@ -234,7 +224,6 @@ class TestUserProductUserID:
         assert "String cannot contain spaces" in str(cm.value)
 
     def test_invalid_chars_slash(self):
-        from generalresearch.models.thl.user import User
 
         product_user_id = rf"{self.randomword(50)}\{self.randomword(50)}"
         with pytest.raises(expected_exception=ValueError) as cm:
@@ -253,7 +242,6 @@ class TestUserProductUserID:
         I wanted a test that made sure the regex was hit. I do not know
         how we want to provide with the level of specific String checks
         we do in here for specific error messages."""
-        from generalresearch.models.thl.user import User
 
         product_user_id = f"{self.randomword(50)}`{self.randomword(50)}"
         with pytest.raises(expected_exception=ValueError) as cm:
@@ -275,7 +263,6 @@ class TestUserProductUserID:
     def test_identifiable(self):
         """Can't create a User with only a product_user_id because it also
         needs to the product_id"""
-        from generalresearch.models.thl.user import User
 
         product_user_id = uuid4().hex
         with pytest.raises(ValueError) as cm:
@@ -288,7 +275,6 @@ class TestUserUUID:
     user_id = randint(1, 2**30)
 
     def test_valid(self):
-        from generalresearch.models.thl.user import User
 
         uuid_pk = uuid4().hex
 
@@ -297,7 +283,6 @@ class TestUserUUID:
         assert user.uuid == uuid_pk
 
     def test_type(self):
-        from generalresearch.models.thl.user import User
 
         with pytest.raises(ValueError) as cm:
             User(user_id=self.user_id, uuid=0)
@@ -315,7 +300,6 @@ class TestUserUUID:
         assert "Input should be a valid string" in str(cm.value)
 
     def test_empty(self):
-        from generalresearch.models.thl.user import User
 
         with pytest.raises(ValueError) as cm:
             User(user_id=self.user_id, uuid="")
@@ -323,7 +307,6 @@ class TestUserUUID:
         assert "String should have at least 32 characters" in str(cm.value)
 
     def test_invalid_len(self):
-        from generalresearch.models.thl.user import User
 
         # Valid uuid4s are 32 char long
         uuid_pk = uuid4().hex[:31]
@@ -341,7 +324,6 @@ class TestUserUUID:
         assert "String should have at most 32 characters" in str(cm.value)
 
     def test_invalid_uuid(self):
-        from generalresearch.models.thl.user import User
 
         # Modify the UUID to break it
         uuid_pk = uuid4().hex[:31] + "x"
@@ -352,7 +334,6 @@ class TestUserUUID:
         assert "Invalid UUID" in str(cm.value)
 
     def test_invalid_hex_form(self):
-        from generalresearch.models.thl.user import User
 
         # Sure not in hex form, but it'll get caught for being the
         # wrong length before anything else
@@ -369,7 +350,6 @@ class TestUserUUID:
         assert "Invalid UUID" in str(cm.value)
 
     def test_identifiable(self):
-        from generalresearch.models.thl.user import User
 
         user_uuid = uuid4().hex
         user = User(uuid=user_uuid)
@@ -380,7 +360,6 @@ class TestUserCreated:
     user_id = randint(1, 2**30)
 
     def test_valid(self):
-        from generalresearch.models.thl.user import User
 
         user = User(user_id=self.user_id)
         dt = datetime.now(tz=UTC)
@@ -389,7 +368,6 @@ class TestUserCreated:
         assert user.created == dt
 
     def test_tz_naive_throws_init(self):
-        from generalresearch.models.thl.user import User
 
         with pytest.raises(ValueError) as cm:
             User(user_id=self.user_id, created=datetime.now(tz=None))  # noqa
@@ -397,7 +375,6 @@ class TestUserCreated:
         assert "Input should have timezone info" in str(cm.value)
 
     def test_tz_naive_throws_setter(self):
-        from generalresearch.models.thl.user import User
 
         user = User(user_id=self.user_id)
         with pytest.raises(ValueError) as cm:
@@ -406,7 +383,6 @@ class TestUserCreated:
         assert "Input should have timezone info" in str(cm.value)
 
     def test_tz_utc(self):
-        from generalresearch.models.thl.user import User
 
         with pytest.raises(ValueError) as cm:
             User(
@@ -417,7 +393,6 @@ class TestUserCreated:
         assert "Timezone is not UTC" in str(cm.value)
 
     def test_not_in_future(self):
-        from generalresearch.models.thl.user import User
 
         the_future = datetime.now(tz=UTC) + timedelta(minutes=1)
         with pytest.raises(ValueError) as cm:
@@ -426,7 +401,6 @@ class TestUserCreated:
         assert "Input is in the future" in str(cm.value)
 
     def test_after_anno_domini(self):
-        from generalresearch.models.thl.user import User
 
         before_ad = datetime(year=2015, month=1, day=1, tzinfo=UTC) + timedelta(
             minutes=1
@@ -441,7 +415,6 @@ class TestUserLastSeen:
     user_id = randint(1, 2**30)
 
     def test_valid(self):
-        from generalresearch.models.thl.user import User
 
         user = User(user_id=self.user_id)
         dt = datetime.now(tz=UTC)
@@ -450,7 +423,6 @@ class TestUserLastSeen:
         assert user.last_seen == dt
 
     def test_tz_naive_throws_init(self):
-        from generalresearch.models.thl.user import User
 
         with pytest.raises(ValueError) as cm:
             User(user_id=self.user_id, last_seen=datetime.now(tz=None))  # noqa
@@ -458,7 +430,6 @@ class TestUserLastSeen:
         assert "Input should have timezone info" in str(cm.value)
 
     def test_tz_naive_throws_setter(self):
-        from generalresearch.models.thl.user import User
 
         user = User(user_id=self.user_id)
         with pytest.raises(ValueError) as cm:
@@ -467,7 +438,6 @@ class TestUserLastSeen:
         assert "Input should have timezone info" in str(cm.value)
 
     def test_tz_utc(self):
-        from generalresearch.models.thl.user import User
 
         with pytest.raises(ValueError) as cm:
             User(
@@ -478,7 +448,6 @@ class TestUserLastSeen:
         assert "Timezone is not UTC" in str(cm.value)
 
     def test_not_in_future(self):
-        from generalresearch.models.thl.user import User
 
         the_future = datetime.now(tz=UTC) + timedelta(minutes=1)
         with pytest.raises(ValueError) as cm:
@@ -487,7 +456,6 @@ class TestUserLastSeen:
         assert "Input is in the future" in str(cm.value)
 
     def test_after_anno_domini(self):
-        from generalresearch.models.thl.user import User
 
         before_ad = datetime(year=2015, month=1, day=1, tzinfo=UTC) + timedelta(
             minutes=1
@@ -502,7 +470,6 @@ class TestUserBlocked:
     user_id = randint(1, 2**30)
 
     def test_valid(self):
-        from generalresearch.models.thl.user import User
 
         user = User(user_id=self.user_id, blocked=True)
         assert user.blocked
@@ -510,7 +477,6 @@ class TestUserBlocked:
     def test_str_casting(self):
         """We don't want any of these to work, and that's why
         we set strict=True on the column"""
-        from generalresearch.models.thl.user import User
 
         with pytest.raises(ValueError) as cm:
             User(user_id=self.user_id, blocked="true")
@@ -547,7 +513,6 @@ class TestUserTiming:
     user_id = randint(1, 2**30)
 
     def test_valid(self):
-        from generalresearch.models.thl.user import User
 
         created = datetime.now(tz=UTC) - timedelta(minutes=60)
         last_seen = datetime.now(tz=UTC) - timedelta(minutes=59)
@@ -557,7 +522,6 @@ class TestUserTiming:
         assert user.last_seen == last_seen
 
     def test_created_first(self):
-        from generalresearch.models.thl.user import User
 
         created = datetime.now(tz=UTC) - timedelta(minutes=60)
         last_seen = datetime.now(tz=UTC) - timedelta(minutes=59)
@@ -572,7 +536,6 @@ class TestUserModelVerification:
     """Tests that may be dependent on more than 1 attribute"""
 
     def test_identifiable(self):
-        from generalresearch.models.thl.user import User
 
         product_id = uuid4().hex
         product_user_id = uuid4().hex
@@ -580,7 +543,6 @@ class TestUserModelVerification:
         assert user.is_identifiable
 
     def test_valid_helper(self):
-        from generalresearch.models.thl.user import User
 
         user_bool = User.is_valid_ubp(
             product_id=uuid4().hex, product_user_id=uuid4().hex
@@ -594,7 +556,6 @@ class TestUserModelVerification:
 class TestUserSerialization:
 
     def test_basic_json(self):
-        from generalresearch.models.thl.user import User
 
         product_id = uuid4().hex
         product_user_id = uuid4().hex
@@ -615,7 +576,6 @@ class TestUserSerialization:
         assert d.get("created").endswith("Z")
 
     def test_basic_dict(self):
-        from generalresearch.models.thl.user import User
 
         product_id = uuid4().hex
         product_user_id = uuid4().hex
@@ -633,10 +593,11 @@ class TestUserSerialization:
         assert not d.get("blocked")
 
         assert d.get("product") is None
-        assert d.get("created").tzinfo == UTC
+        created = d.get("created")
+        assert isinstance(created, datetime)
+        assert created.tzinfo == UTC
 
     def test_from_json(self):
-        from generalresearch.models.thl.user import User
 
         product_id = uuid4().hex
         product_user_id = uuid4().hex
@@ -651,12 +612,13 @@ class TestUserSerialization:
         u = User.model_validate_json(user.to_json())
         assert u.product_id == product_id
         assert u.product is None
+        assert isinstance(u.created, datetime)
         assert u.created.tzinfo == UTC
 
 
 class TestUserMethods:
 
-    def test_audit_log(self, user, audit_log_manager):
+    def test_audit_log(self, user: User, audit_log_manager: AuditLogManager):
         assert user.audit_log is None
         user.prefetch_audit_log(audit_log_manager=audit_log_manager)
         assert user.audit_log == []
@@ -668,21 +630,21 @@ class TestUserMethods:
     def test_transactions(
         self,
         user_factory: Callable[..., User],
-        thl_lm,
+        thl_ledger_manager: ThlLedgerManager,
         session_with_tx_factory: Callable[..., None],
-        product_user_wallet_yes,
+        product_user_wallet_yes: Product,
     ):
         u1 = user_factory(product=product_user_wallet_yes)
 
         assert u1.transactions is None
-        u1.prefetch_transactions(thl_lm=thl_lm)
+        u1.prefetch_transactions(thl_lm=thl_ledger_manager)
         assert u1.transactions == []
 
         session_with_tx_factory(user=u1)
 
-        u1.prefetch_transactions(thl_lm=thl_lm)
+        u1.prefetch_transactions(thl_lm=thl_ledger_manager)
         assert len(u1.transactions) == 1
 
     @pytest.mark.skip(reason="TODO")
-    def test_location_history(self, user):
+    def test_location_history(self, user: User):
         assert user.location_history is None
diff --git a/tests/models/thl/test_user_iphistory.py b/tests/models/thl/test_user_iphistory.py
index d6ade9d..b8a0be3 100644
--- a/tests/models/thl/test_user_iphistory.py
+++ b/tests/models/thl/test_user_iphistory.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from datetime import UTC, datetime, timedelta
 
 from generalresearch.models.thl.user_iphistory import (
diff --git a/tests/models/thl/test_user_metadata.py b/tests/models/thl/test_user_metadata.py
index 3d851dc..a7b479d 100644
--- a/tests/models/thl/test_user_metadata.py
+++ b/tests/models/thl/test_user_metadata.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import pytest
 
 from generalresearch.models import MAX_INT32
diff --git a/tests/models/thl/test_user_streak.py b/tests/models/thl/test_user_streak.py
index 26c5e25..8300474 100644
--- a/tests/models/thl/test_user_streak.py
+++ b/tests/models/thl/test_user_streak.py
@@ -71,6 +71,7 @@ def test_user_streak_remaining():
     )
     print(f"{now.isoformat()=}, {end_of_today.isoformat()=}")
     expected = (end_of_today - now).total_seconds()
+    assert isinstance(us.time_remaining_in_period, timedelta)
     assert us.time_remaining_in_period.total_seconds() == pytest.approx(expected, abs=1)
 
 
@@ -92,5 +93,6 @@ def test_user_streak_remaining_month():
     ).replace(day=1)
     print(f"{now.isoformat()=}, {end_of_month.isoformat()=}")
     expected = (end_of_month - now).total_seconds()
+    assert isinstance(us.time_remaining_in_period, timedelta)
     assert us.time_remaining_in_period.total_seconds() == pytest.approx(expected, abs=1)
     print(us.time_remaining_in_period)
diff --git a/tests/models/thl/test_wall.py b/tests/models/thl/test_wall.py
index 88914ac..58e9825 100644
--- a/tests/models/thl/test_wall.py
+++ b/tests/models/thl/test_wall.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from datetime import UTC, datetime, timedelta
 from decimal import Decimal
 from uuid import uuid4
diff --git a/tests/models/thl/test_wall_session.py b/tests/models/thl/test_wall_session.py
index b39ad31..48b89ea 100644
--- a/tests/models/thl/test_wall_session.py
+++ b/tests/models/thl/test_wall_session.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from datetime import UTC, datetime, timedelta
 from decimal import Decimal
 
diff --git a/tests/wall_status_codes/test_analyze.py b/tests/wall_status_codes/test_analyze.py
index fa53dbb..e36ca3d 100644
--- a/tests/wall_status_codes/test_analyze.py
+++ b/tests/wall_status_codes/test_analyze.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from generalresearch.models.thl.definitions import Status, StatusCode1
 from generalresearch.wall_status_codes import innovate
 
diff --git a/tests/wxet/models/test_definitions.py b/tests/wxet/models/test_definitions.py
index 543b9f1..a3616dd 100644
--- a/tests/wxet/models/test_definitions.py
+++ b/tests/wxet/models/test_definitions.py
@@ -1,12 +1,18 @@
+from __future__ import annotations
+
 import pytest
 
+from generalresearch.wxet.models.definitions import (
+    WXETStatus,
+    WXETStatusCode1,
+    WXETStatusCode2,
+    check_wxet_status_consistent,
+)
+
 
 class TestWXETStatusCode1:
 
     def test_is_pre_task_entry_fail_pre(self):
-        from generalresearch.wxet.models.definitions import (
-            WXETStatusCode1,
-        )
 
         assert WXETStatusCode1.UNKNOWN.is_pre_task_entry_fail
         assert WXETStatusCode1.WXET_FAIL.is_pre_task_entry_fail
@@ -32,12 +38,6 @@ class TestCheckWXETStatusConsistent:
 
     def test_completes(self):
 
-        from generalresearch.wxet.models.definitions import (
-            WXETStatus,
-            WXETStatusCode1,
-            check_wxet_status_consistent,
-        )
-
         with pytest.raises(AssertionError) as cm:
             check_wxet_status_consistent(
                 status=WXETStatus.COMPLETE,
@@ -52,12 +52,6 @@ class TestCheckWXETStatusConsistent:
 
     def test_abandon(self):
 
-        from generalresearch.wxet.models.definitions import (
-            WXETStatus,
-            WXETStatusCode1,
-            check_wxet_status_consistent,
-        )
-
         with pytest.raises(AssertionError) as cm:
             check_wxet_status_consistent(
                 status=WXETStatus.ABANDON,
@@ -71,12 +65,6 @@ class TestCheckWXETStatusConsistent:
 
     def test_fail(self):
 
-        from generalresearch.wxet.models.definitions import (
-            WXETStatus,
-            WXETStatusCode1,
-            check_wxet_status_consistent,
-        )
-
         for sc1 in [
             WXETStatusCode1.COMPLETE,
             WXETStatusCode1.WXET_ABANDON,
@@ -95,13 +83,6 @@ class TestCheckWXETStatusConsistent:
         StatusCode1.WXET_FAIL
         """
 
-        from generalresearch.wxet.models.definitions import (
-            WXETStatus,
-            WXETStatusCode1,
-            WXETStatusCode2,
-            check_wxet_status_consistent,
-        )
-
         for sc2 in WXETStatusCode2:
             with pytest.raises(AssertionError) as cm:
                 check_wxet_status_consistent(
diff --git a/tests/wxet/models/test_finish_type.py b/tests/wxet/models/test_finish_type.py
index 7bdeea7..afa3c76 100644
--- a/tests/wxet/models/test_finish_type.py
+++ b/tests/wxet/models/test_finish_type.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import pytest
 
 from generalresearch.wxet.models.definitions import WXETStatus, WXETStatusCode1
-- 
cgit v1.2.3


From 89ed44f466dc9a93d6f85931fb6eea0e9cbd27f6 Mon Sep 17 00:00:00 2001
From: Max Nanis
Date: Tue, 1 Sep 2026 10:43:29 -0700
Subject: working through circular imports, removing __init__ loaded Types /
 Definitions

---
 generalresearch/grliq/managers/event_plotter.py    |   5 +-
 generalresearch/grliq/managers/forensic_events.py  |   8 +-
 generalresearch/grliq/managers/forensic_results.py |   8 +-
 generalresearch/grliq/managers/forensic_summary.py |  16 +--
 .../mergers/foundations/enriched_task_adjust.py    |   2 +-
 .../schemas/mergers/foundations/enriched_wall.py   |   2 +-
 .../incite/schemas/mergers/ym_wall_summary.py      |   2 +-
 generalresearch/incite/schemas/thl_web.py          |   2 +-
 generalresearch/managers/cint/user_pid.py          |   2 +-
 generalresearch/managers/dynata/user_pid.py        |   2 +-
 generalresearch/managers/events.py                 |   2 +-
 generalresearch/managers/innovate/user_pid.py      |   2 +-
 generalresearch/managers/marketplace/user_pid.py   |   2 +-
 generalresearch/managers/morning/user_pid.py       |   2 +-
 generalresearch/managers/network/label.py          |   6 +-
 generalresearch/managers/precision/user_pid.py     |   2 +-
 generalresearch/managers/prodege/user_pid.py       |   2 +-
 generalresearch/managers/repdata/user_pid.py       |   2 +-
 generalresearch/managers/sago/user_pid.py          |   2 +-
 generalresearch/managers/spectrum/user_pid.py      |   2 +-
 generalresearch/managers/thl/buyer.py              |   2 +-
 generalresearch/managers/thl/cashout_method.py     |   2 +-
 generalresearch/managers/thl/contest_manager.py    |   4 +-
 .../managers/thl/ledger_manager/ledger.py          |   2 +-
 .../managers/thl/ledger_manager/thl_ledger.py      |   2 +-
 generalresearch/managers/thl/payout.py             |   2 +-
 generalresearch/managers/thl/session.py            |   4 +-
 generalresearch/managers/thl/survey.py             |   2 +-
 generalresearch/managers/thl/task_adjustment.py    |   2 +-
 generalresearch/managers/thl/wall.py               |   4 +-
 generalresearch/managers/thl/wallet/__init__.py    |   2 +-
 generalresearch/managers/utils.py                  |  16 +++
 generalresearch/models/cint/question.py            |   2 +-
 generalresearch/models/cint/survey.py              |   2 +-
 generalresearch/models/custom_types.py             |   2 +-
 generalresearch/models/definitions.py              | 114 +++++++++++++++++++++
 generalresearch/models/device.py                   |   2 +-
 generalresearch/models/dynata/question.py          |   2 +-
 generalresearch/models/dynata/survey.py            |   4 +-
 generalresearch/models/dynata/task_collection.py   |   2 +-
 generalresearch/models/events.py                   |   2 +-
 generalresearch/models/gr/business.py              |  22 ++--
 generalresearch/models/innovate/question.py        |   2 +-
 generalresearch/models/innovate/survey.py          |   8 +-
 generalresearch/models/legacy/bucket.py            |   2 +-
 generalresearch/models/legacy/questions.py         |   2 +-
 generalresearch/models/lucid/question.py           |   2 +-
 generalresearch/models/lucid/survey.py             |   2 +-
 generalresearch/models/morning/question.py         |   2 +-
 generalresearch/models/morning/survey.py           |   2 +-
 generalresearch/models/pollfish/question.py        |   2 +-
 generalresearch/models/precision/question.py       |   2 +-
 generalresearch/models/precision/survey.py         |   2 +-
 generalresearch/models/prodege/question.py         |   2 +-
 generalresearch/models/prodege/survey.py           |   6 +-
 generalresearch/models/repdata/question.py         |   2 +-
 generalresearch/models/repdata/survey.py           |   2 +-
 generalresearch/models/repdata/task_collection.py  |   2 +-
 generalresearch/models/sago/question.py            |   2 +-
 generalresearch/models/sago/survey.py              |   2 +-
 generalresearch/models/spectrum/question.py        |   2 +-
 generalresearch/models/spectrum/survey.py          |   2 +-
 generalresearch/models/spectrum/task_collection.py |   2 +-
 generalresearch/models/thl/__init__.py             |   4 +-
 generalresearch/models/thl/category.py             |   5 +-
 .../models/thl/contest/contest_entry.py            |  13 +--
 generalresearch/models/thl/contest/raffle.py       |   4 +-
 generalresearch/models/thl/finance.py              |  15 +--
 generalresearch/models/thl/ledger.py               |   2 +-
 generalresearch/models/thl/offerwall/__init__.py   |   2 +-
 generalresearch/models/thl/offerwall/base.py       |   2 +-
 generalresearch/models/thl/offerwall/cache.py      |   2 +-
 generalresearch/models/thl/payout.py               |   2 +-
 generalresearch/models/thl/product.py              |   4 +-
 .../models/thl/profiling/marketplace.py            |   4 +-
 .../models/thl/profiling/upk_question.py           |   8 +-
 .../models/thl/profiling/upk_question_answer.py    |   2 +-
 generalresearch/models/thl/profiling/user_info.py  |   2 +-
 .../models/thl/profiling/user_question_answer.py   |   8 +-
 generalresearch/models/thl/session.py              |   4 +-
 generalresearch/models/thl/soft_pair.py            |   2 +-
 generalresearch/models/thl/survey/__init__.py      |   2 +-
 generalresearch/models/thl/survey/buyer.py         |   2 +-
 generalresearch/models/thl/survey/condition.py     |   2 +-
 generalresearch/models/thl/survey/model.py         |   2 +-
 generalresearch/models/thl/survey/penalty.py       |   2 +-
 generalresearch/models/thl/task_adjustment.py      |   4 +-
 generalresearch/models/thl/user.py                 |   4 +-
 generalresearch/models/thl/user_profile.py         |   2 +-
 generalresearch/models/thl/user_quality_event.py   |   2 +-
 generalresearch/models/thl/user_streak.py          |   2 +-
 .../models/thl/wallet/cashout_method.py            |   4 +-
 generalresearch/models/thl/wallet/definitions.py   |  87 ++++++++++++++++
 generalresearch/models/thl/wallet/payout.py        |   2 +-
 generalresearch/schemas/survey_stats.py            |   2 +-
 generalresearch/wall_status_codes/__init__.py      |   2 +-
 test_utils/conftest.py                             |  17 +--
 test_utils/grliq/conftest.py                       |  12 ++-
 test_utils/incite/collections/conftest.py          |   4 +-
 test_utils/incite/mergers/conftest.py              |  55 +++++-----
 test_utils/managers/cashout_methods.py             |   2 +-
 test_utils/managers/conftest.py                    |  55 +++++-----
 test_utils/managers/contest/conftest.py            |   6 +-
 test_utils/managers/gr/conftest.py                 |   7 +-
 test_utils/managers/ledger/conftest.py             |  14 ++-
 test_utils/managers/thl/conftest.py                |  51 ++++-----
 test_utils/managers/upk/conftest.py                |   9 +-
 test_utils/models/conftest.py                      |   4 +-
 test_utils/models/contest/conftest.py              |  29 +++---
 test_utils/models/gr/conftest.py                   |  38 +++----
 test_utils/models/ledger/conftest.py               |   4 +-
 test_utils/models/network/conftest.py              |   5 +-
 test_utils/models/thl/conftest.py                  |  80 ++++++++-------
 test_utils/models/upk/conftest.py                  |   3 +-
 test_utils/spectrum/conftest.py                    |   8 +-
 .../incite/collections/test_df_collection_base.py  |   2 +-
 .../collections/test_df_collection_item_base.py    |   5 +-
 .../collections/test_df_collection_item_thl_web.py |  20 ++--
 .../test_df_collection_thl_marketplaces.py         |   9 +-
 .../collections/test_df_collection_thl_web.py      |   2 +-
 .../mergers/foundations/test_enriched_session.py   |  31 +++---
 .../foundations/test_enriched_task_adjust.py       |  30 +++---
 .../mergers/foundations/test_enriched_wall.py      |  29 +++---
 .../mergers/foundations/test_user_id_product.py    |   9 +-
 tests/incite/mergers/test_merge_collection.py      |   7 +-
 tests/incite/mergers/test_merge_collection_item.py |  13 ++-
 tests/incite/mergers/test_pop_ledger.py            |  21 ++--
 tests/incite/mergers/test_ym_survey_merge.py       |  24 +++--
 tests/incite/test_collection_base.py               |   6 +-
 tests/incite/test_collection_base_item.py          |   6 +-
 tests/managers/gr/test_business.py                 |  19 ++--
 tests/managers/gr/test_team.py                     |  15 +--
 tests/managers/leaderboard.py                      |   5 +-
 tests/managers/network/test_label.py               |  17 ++-
 tests/managers/test_events.py                      |  12 ++-
 tests/managers/test_lucid.py                       |   6 +-
 tests/managers/thl/test_buyer.py                   |   7 +-
 tests/managers/thl/test_cashout_method.py          |  19 ++--
 tests/managers/thl/test_category.py                |   7 +-
 .../managers/thl/test_contest/test_leaderboard.py  |  19 ++--
 tests/managers/thl/test_contest/test_milestone.py  |  20 ++--
 tests/managers/thl/test_contest/test_raffle.py     |  21 ++--
 tests/managers/thl/test_harmonized_uqa.py          |   7 +-
 tests/managers/thl/test_ipinfo.py                  |   7 +-
 tests/managers/thl/test_ledger/test_lm_accounts.py |  10 +-
 tests/managers/thl/test_ledger/test_lm_tx.py       |   7 +-
 .../managers/thl/test_ledger/test_lm_tx_entries.py |  10 +-
 tests/managers/thl/test_ledger/test_lm_tx_locks.py |  15 +--
 .../thl/test_ledger/test_lm_tx_metadata.py         |  11 +-
 .../thl/test_ledger/test_thl_lm_accounts.py        |  15 +--
 .../thl/test_ledger/test_thl_lm_bp_payout.py       |  22 ++--
 tests/managers/thl/test_ledger/test_thl_lm_tx.py   |  28 +++--
 .../test_ledger/test_thl_lm_tx__user_payouts.py    |  13 ++-
 tests/managers/thl/test_ledger/test_thl_pem.py     |  21 ++--
 tests/managers/thl/test_ledger/test_user_txs.py    |  19 ++--
 tests/managers/thl/test_ledger/test_wallet.py      |   9 +-
 tests/managers/thl/test_payout.py                  |  53 +++++-----
 tests/managers/thl/test_product.py                 |   9 +-
 tests/managers/thl/test_product_prod.py            |   5 +-
 tests/managers/thl/test_profiling/test_question.py |   7 +-
 tests/managers/thl/test_profiling/test_schema.py   |   9 +-
 tests/managers/thl/test_profiling/test_user_upk.py |   6 +-
 tests/managers/thl/test_session_manager.py         |  15 +--
 tests/managers/thl/test_survey.py                  |  18 ++--
 tests/managers/thl/test_survey_penalty.py          |   7 +-
 tests/managers/thl/test_task_adjustment.py         |  21 ++--
 tests/managers/thl/test_task_status.py             |  18 ++--
 tests/managers/thl/test_user_manager/test_base.py  |  18 ++--
 tests/managers/thl/test_user_manager/test_mysql.py |  11 +-
 tests/managers/thl/test_user_manager/test_redis.py |  10 +-
 .../thl/test_user_manager/test_user_fetch.py       |   8 +-
 .../thl/test_user_manager/test_user_metadata.py    |  13 ++-
 tests/managers/thl/test_user_streak.py             |  11 +-
 tests/managers/thl/test_userhealth.py              |  19 +++-
 tests/managers/thl/test_wall_manager.py            |  13 ++-
 tests/models/custom_types/test_aware_datetime.py   |   4 +-
 tests/models/custom_types/test_dsn.py              |   4 +-
 tests/models/custom_types/test_uuid_str.py         |   4 +-
 tests/models/dynata/test_survey.py                 |   3 +
 tests/models/gr/test_authentication.py             |  14 ++-
 tests/models/gr/test_base.py                       |   4 +-
 tests/models/gr/test_business.py                   |  40 ++++----
 tests/models/gr/test_team.py                       |  38 ++++---
 tests/models/innovate/test_question.py             |   2 +-
 .../models/legacy/test_offerwall_parse_response.py |   2 +-
 .../models/legacy/test_user_question_answer_in.py  |   9 +-
 tests/models/network/test_mtr.py                   |   6 +-
 tests/models/network/test_nmap.py                  |   8 +-
 tests/models/network/test_nmap_parser.py           |   9 +-
 tests/models/network/test_rdns.py                  |   6 +-
 tests/models/spectrum/test_question.py             |   2 +-
 tests/models/spectrum/test_survey.py               |   2 +-
 tests/models/spectrum/test_survey_manager.py       |  12 ++-
 tests/models/test_device.py                        |   2 +-
 tests/models/test_finance.py                       |  19 ++--
 tests/models/thl/test_adjustments.py               |  17 +--
 tests/models/thl/test_buyer.py                     |   2 +-
 tests/models/thl/test_contest/test_contest.py      |   6 +-
 .../thl/test_contest/test_leaderboard_contest.py   |   7 +-
 .../models/thl/test_contest/test_raffle_contest.py |   7 +-
 tests/models/thl/test_marketplace_condition.py     |   6 +-
 tests/models/thl/test_payout.py                    |   8 +-
 tests/models/thl/test_payout_format.py             |   8 +-
 tests/models/thl/test_product.py                   |  37 ++++---
 tests/models/thl/test_product_userwalletconfig.py  |   2 +-
 tests/models/thl/test_soft_pair.py                 |   2 +-
 tests/models/thl/test_user.py                      |   9 +-
 tests/models/thl/test_user_metadata.py             |   2 +-
 tests/models/thl/test_wall.py                      |   2 +-
 tests/models/thl/test_wall_session.py              |   2 +-
 tests/test_postgres.py                             |   5 +-
 211 files changed, 1318 insertions(+), 772 deletions(-)
 create mode 100644 generalresearch/managers/utils.py
 create mode 100644 generalresearch/models/definitions.py
 create mode 100644 generalresearch/models/thl/wallet/definitions.py

(limited to 'tests/models/innovate')

diff --git a/generalresearch/grliq/managers/event_plotter.py b/generalresearch/grliq/managers/event_plotter.py
index 94b70ef..61cc52c 100644
--- a/generalresearch/grliq/managers/event_plotter.py
+++ b/generalresearch/grliq/managers/event_plotter.py
@@ -1,12 +1,15 @@
 import html
 import webbrowser
+from typing import TYPE_CHECKING
 
 import numpy as np
 from more_itertools import windowed
 from scipy.spatial.distance import euclidean
 
 from generalresearch.grliq.managers.colormap import turbo_colormap_data
-from generalresearch.grliq.models.events import KeyboardEvent, MouseEvent
+
+if TYPE_CHECKING:
+    from generalresearch.grliq.models.events import KeyboardEvent, MouseEvent
 
 
 def make_events_svg(
diff --git a/generalresearch/grliq/managers/forensic_events.py b/generalresearch/grliq/managers/forensic_events.py
index 93da481..a97a9c2 100644
--- a/generalresearch/grliq/managers/forensic_events.py
+++ b/generalresearch/grliq/managers/forensic_events.py
@@ -1,7 +1,7 @@
 import json
 from collections.abc import Collection
 from datetime import datetime
-from typing import Any
+from typing import TYPE_CHECKING, Any
 from uuid import uuid4
 
 from psycopg import sql
@@ -14,8 +14,10 @@ from generalresearch.grliq.models.events import (
     PointerMove,
     TimingData,
 )
-from generalresearch.models.custom_types import UUIDStr
-from generalresearch.pg_helper import PostgresConfig
+
+if TYPE_CHECKING:
+    from generalresearch.models.custom_types import UUIDStr
+    from generalresearch.pg_helper import PostgresConfig
 
 
 class GrlIqEventManager:
diff --git a/generalresearch/grliq/managers/forensic_results.py b/generalresearch/grliq/managers/forensic_results.py
index 158e582..93b1cdc 100644
--- a/generalresearch/grliq/managers/forensic_results.py
+++ b/generalresearch/grliq/managers/forensic_results.py
@@ -1,14 +1,16 @@
 from collections.abc import Collection
 from datetime import datetime
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 from generalresearch.grliq.models.forensic_result import (
     GrlIqForensicCategoryResult,
     Phase,
 )
 from generalresearch.grliq.models.useragents import GrlUserAgent
-from generalresearch.models.thl.user import User
-from generalresearch.pg_helper import PostgresConfig
+
+if TYPE_CHECKING:
+    from generalresearch.models.thl.user import User
+    from generalresearch.pg_helper import PostgresConfig
 
 
 class GrlIqCategoryResultsReader:
diff --git a/generalresearch/grliq/managers/forensic_summary.py b/generalresearch/grliq/managers/forensic_summary.py
index b86e1f5..c222075 100644
--- a/generalresearch/grliq/managers/forensic_summary.py
+++ b/generalresearch/grliq/managers/forensic_summary.py
@@ -3,14 +3,10 @@ from __future__ import annotations
 import statistics
 from collections import defaultdict
 from datetime import UTC, datetime, timedelta
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 import numpy as np
 
-from generalresearch.grliq.managers.forensic_data import GrlIqDataManager
-from generalresearch.grliq.managers.forensic_events import (
-    GrlIqEventManager,
-)
 from generalresearch.grliq.models.forensic_result import (
     GrlIqCheckerResults,
     GrlIqForensicCategoryResult,
@@ -22,8 +18,14 @@ from generalresearch.grliq.models.forensic_summary import (
     TimingDataCountrySummary,
     UserForensicSummary,
 )
-from generalresearch.models.thl.user import User
-from generalresearch.redis_helper import RedisConfig
+
+if TYPE_CHECKING:
+    from generalresearch.grliq.managers.forensic_data import GrlIqDataManager
+    from generalresearch.grliq.managers.forensic_events import (
+        GrlIqEventManager,
+    )
+    from generalresearch.models.thl.user import User
+    from generalresearch.redis_helper import RedisConfig
 
 
 def calculate_category_summary(
diff --git a/generalresearch/incite/schemas/mergers/foundations/enriched_task_adjust.py b/generalresearch/incite/schemas/mergers/foundations/enriched_task_adjust.py
index ead42d9..ac9a35a 100644
--- a/generalresearch/incite/schemas/mergers/foundations/enriched_task_adjust.py
+++ b/generalresearch/incite/schemas/mergers/foundations/enriched_task_adjust.py
@@ -4,7 +4,7 @@ from pandera.pandas import Check, Column, DataFrameSchema, Index
 from generalresearch.incite.schemas import ARCHIVE_AFTER, ORDER_KEY
 from generalresearch.incite.schemas.thl_web import THLTaskAdjustmentSchema
 from generalresearch.locales import Localelator
-from generalresearch.models import DeviceType, Source
+from generalresearch.models.definitions import DeviceType, Source
 from generalresearch.models.thl.definitions import (
     WallAdjustedStatus,
 )
diff --git a/generalresearch/incite/schemas/mergers/foundations/enriched_wall.py b/generalresearch/incite/schemas/mergers/foundations/enriched_wall.py
index 1443f28..71d0eab 100644
--- a/generalresearch/incite/schemas/mergers/foundations/enriched_wall.py
+++ b/generalresearch/incite/schemas/mergers/foundations/enriched_wall.py
@@ -5,7 +5,7 @@ from pandera.pandas import Check, Column, DataFrameSchema, Index
 
 from generalresearch.incite.schemas import ARCHIVE_AFTER, PARTITION_ON
 from generalresearch.locales import Localelator
-from generalresearch.models import DeviceType, Source
+from generalresearch.models.definitions import DeviceType, Source
 from generalresearch.models.thl.definitions import (
     ReportValue,
     Status,
diff --git a/generalresearch/incite/schemas/mergers/ym_wall_summary.py b/generalresearch/incite/schemas/mergers/ym_wall_summary.py
index 16cfc2f..737b925 100644
--- a/generalresearch/incite/schemas/mergers/ym_wall_summary.py
+++ b/generalresearch/incite/schemas/mergers/ym_wall_summary.py
@@ -6,7 +6,7 @@ from pandera.pandas import Check, Column, DataFrameSchema, Index
 
 from generalresearch.incite.schemas import ARCHIVE_AFTER
 from generalresearch.locales import Localelator
-from generalresearch.models import Source
+from generalresearch.models.definitions import Source
 
 COUNTRY_ISOS: set[str] = Localelator().get_all_countries()
 kosovo = "xk"
diff --git a/generalresearch/incite/schemas/thl_web.py b/generalresearch/incite/schemas/thl_web.py
index 30c7076..36ee8e9 100644
--- a/generalresearch/incite/schemas/thl_web.py
+++ b/generalresearch/incite/schemas/thl_web.py
@@ -6,7 +6,7 @@ from pandera.pandas import Check, Column, DataFrameSchema, Index, MultiIndex
 
 from generalresearch.incite.schemas import ARCHIVE_AFTER, ORDER_KEY
 from generalresearch.locales import Localelator
-from generalresearch.models import DeviceType, Source
+from generalresearch.models.definitions import DeviceType, Source
 from generalresearch.models.thl.definitions import (
     ReportValue,
     SessionAdjustedStatus,
diff --git a/generalresearch/managers/cint/user_pid.py b/generalresearch/managers/cint/user_pid.py
index 4f749a0..0265823 100644
--- a/generalresearch/managers/cint/user_pid.py
+++ b/generalresearch/managers/cint/user_pid.py
@@ -1,5 +1,5 @@
 from generalresearch.managers.marketplace.user_pid import UserPidManager
-from generalresearch.models import Source
+from generalresearch.models.definitions import Source
 
 
 class CintUserPidManager(UserPidManager):
diff --git a/generalresearch/managers/dynata/user_pid.py b/generalresearch/managers/dynata/user_pid.py
index aefed34..67ff968 100644
--- a/generalresearch/managers/dynata/user_pid.py
+++ b/generalresearch/managers/dynata/user_pid.py
@@ -1,5 +1,5 @@
 from generalresearch.managers.marketplace.user_pid import UserPidManager
-from generalresearch.models import Source
+from generalresearch.models.definitions import Source
 
 
 class DynataUserPidManager(UserPidManager):
diff --git a/generalresearch/managers/events.py b/generalresearch/managers/events.py
index c43a020..30cec0c 100644
--- a/generalresearch/managers/events.py
+++ b/generalresearch/managers/events.py
@@ -12,7 +12,7 @@ from redis.client import PubSub, Redis
 
 from generalresearch.incite.base import LOG
 from generalresearch.managers.base import RedisManager
-from generalresearch.models import Source
+from generalresearch.models.definitions import Source
 from generalresearch.models.events import (
     AggregateBySource,
     EventEnvelope,
diff --git a/generalresearch/managers/innovate/user_pid.py b/generalresearch/managers/innovate/user_pid.py
index 100b0ca..7544c89 100644
--- a/generalresearch/managers/innovate/user_pid.py
+++ b/generalresearch/managers/innovate/user_pid.py
@@ -1,5 +1,5 @@
 from generalresearch.managers.marketplace.user_pid import UserPidManager
-from generalresearch.models import Source
+from generalresearch.models.definitions import Source
 
 
 class InnovateUserPidManager(UserPidManager):
diff --git a/generalresearch/managers/marketplace/user_pid.py b/generalresearch/managers/marketplace/user_pid.py
index fe24d38..00dae8a 100644
--- a/generalresearch/managers/marketplace/user_pid.py
+++ b/generalresearch/managers/marketplace/user_pid.py
@@ -6,7 +6,7 @@ from typing import TYPE_CHECKING
 from uuid import UUID
 
 from generalresearch.managers.base import SqlManager
-from generalresearch.models import Source
+from generalresearch.models.definitions import Source
 
 if TYPE_CHECKING:
     from generalresearch.sql_helper import SqlHelper
diff --git a/generalresearch/managers/morning/user_pid.py b/generalresearch/managers/morning/user_pid.py
index 78de3bd..5896734 100644
--- a/generalresearch/managers/morning/user_pid.py
+++ b/generalresearch/managers/morning/user_pid.py
@@ -1,5 +1,5 @@
 from generalresearch.managers.marketplace.user_pid import UserPidManager
-from generalresearch.models import Source
+from generalresearch.models.definitions import Source
 
 
 class MorningUserPidManager(UserPidManager):
diff --git a/generalresearch/managers/network/label.py b/generalresearch/managers/network/label.py
index cec59ad..aed5ff6 100644
--- a/generalresearch/managers/network/label.py
+++ b/generalresearch/managers/network/label.py
@@ -5,11 +5,12 @@ from datetime import UTC, datetime, timedelta
 from typing import TYPE_CHECKING
 
 from psycopg import sql
-from pydantic import IPvAnyNetwork, TypeAdapter
+from pydantic import TypeAdapter
 
 from generalresearch.managers.base import PostgresManager
 from generalresearch.models.custom_types import (
-    AwareDatetimeISO,
+    IPvAnyAddressStr,
+    IPvAnyNetwork,
     IPvAnyNetworkStr,
 )
 from generalresearch.models.network.label import IPLabel
@@ -17,7 +18,6 @@ from generalresearch.models.network.label import IPLabel
 if TYPE_CHECKING:
     from generalresearch.models.custom_types import (
         AwareDatetimeISO,
-        IPvAnyNetworkStr,
     )
     from generalresearch.models.network.label import IPLabelKind, IPLabelSource
 
diff --git a/generalresearch/managers/precision/user_pid.py b/generalresearch/managers/precision/user_pid.py
index 50e97e6..ed2d58d 100644
--- a/generalresearch/managers/precision/user_pid.py
+++ b/generalresearch/managers/precision/user_pid.py
@@ -1,5 +1,5 @@
 from generalresearch.managers.marketplace.user_pid import UserPidManager
-from generalresearch.models import Source
+from generalresearch.models.definitions import Source
 
 
 class PrecisionUserPidManager(UserPidManager):
diff --git a/generalresearch/managers/prodege/user_pid.py b/generalresearch/managers/prodege/user_pid.py
index 7c92e28..c18c109 100644
--- a/generalresearch/managers/prodege/user_pid.py
+++ b/generalresearch/managers/prodege/user_pid.py
@@ -1,5 +1,5 @@
 from generalresearch.managers.marketplace.user_pid import UserPidManager
-from generalresearch.models import Source
+from generalresearch.models.definitions import Source
 
 
 class ProdegeUserPidManager(UserPidManager):
diff --git a/generalresearch/managers/repdata/user_pid.py b/generalresearch/managers/repdata/user_pid.py
index 9d53897..5fdeccf 100644
--- a/generalresearch/managers/repdata/user_pid.py
+++ b/generalresearch/managers/repdata/user_pid.py
@@ -1,5 +1,5 @@
 from generalresearch.managers.marketplace.user_pid import UserPidManager
-from generalresearch.models import Source
+from generalresearch.models.definitions import Source
 
 
 class RepdataUserPidManager(UserPidManager):
diff --git a/generalresearch/managers/sago/user_pid.py b/generalresearch/managers/sago/user_pid.py
index 311abb7..b7ce771 100644
--- a/generalresearch/managers/sago/user_pid.py
+++ b/generalresearch/managers/sago/user_pid.py
@@ -1,5 +1,5 @@
 from generalresearch.managers.marketplace.user_pid import UserPidManager
-from generalresearch.models import Source
+from generalresearch.models.definitions import Source
 
 
 class SagoUserPidManager(UserPidManager):
diff --git a/generalresearch/managers/spectrum/user_pid.py b/generalresearch/managers/spectrum/user_pid.py
index 495e73c..980c28d 100644
--- a/generalresearch/managers/spectrum/user_pid.py
+++ b/generalresearch/managers/spectrum/user_pid.py
@@ -1,5 +1,5 @@
 from generalresearch.managers.marketplace.user_pid import UserPidManager
-from generalresearch.models import Source
+from generalresearch.models.definitions import Source
 
 
 class SpectrumUserPidManager(UserPidManager):
diff --git a/generalresearch/managers/thl/buyer.py b/generalresearch/managers/thl/buyer.py
index 1e20e2f..38214c6 100644
--- a/generalresearch/managers/thl/buyer.py
+++ b/generalresearch/managers/thl/buyer.py
@@ -8,7 +8,7 @@ from generalresearch.managers.base import Permission, PostgresManager
 from generalresearch.models.thl.survey.buyer import Buyer
 
 if TYPE_CHECKING:
-    from generalresearch.models import Source
+    from generalresearch.models.definitions import Source
     from generalresearch.pg_helper import PostgresConfig
 
 
diff --git a/generalresearch/managers/thl/cashout_method.py b/generalresearch/managers/thl/cashout_method.py
index e701da3..c12c920 100644
--- a/generalresearch/managers/thl/cashout_method.py
+++ b/generalresearch/managers/thl/cashout_method.py
@@ -9,10 +9,10 @@ from uuid import UUID, uuid4
 from pydantic import NonNegativeInt
 
 from generalresearch.managers.base import PostgresManager
-from generalresearch.models.thl.wallet import PayoutType
 from generalresearch.models.thl.wallet.cashout_method import (
     CashoutMethod,
 )
+from generalresearch.models.thl.wallet.definitions import PayoutType
 
 if TYPE_CHECKING:
     from generalresearch.models.thl.user import User
diff --git a/generalresearch/managers/thl/contest_manager.py b/generalresearch/managers/thl/contest_manager.py
index 3f85d31..68b2cf0 100644
--- a/generalresearch/managers/thl/contest_manager.py
+++ b/generalresearch/managers/thl/contest_manager.py
@@ -14,7 +14,9 @@ from generalresearch.models.thl.contest import (
     ContestPrize,
     ContestWinner,
 )
+from generalresearch.models.thl.contest.contest_entry import ContestEntry
 from generalresearch.models.thl.contest.definitions import (
+    ContestEntryType,
     ContestStatus,
     ContestType,
 )
@@ -35,8 +37,6 @@ from generalresearch.models.thl.contest.milestone import (
     MilestoneUserView,
 )
 from generalresearch.models.thl.contest.raffle import (
-    ContestEntry,
-    ContestEntryType,
     RaffleContest,
     RaffleUserView,
 )
diff --git a/generalresearch/managers/thl/ledger_manager/ledger.py b/generalresearch/managers/thl/ledger_manager/ledger.py
index 6cb4b28..f2455d4 100644
--- a/generalresearch/managers/thl/ledger_manager/ledger.py
+++ b/generalresearch/managers/thl/ledger_manager/ledger.py
@@ -13,7 +13,6 @@ from pydantic import AwareDatetime, NonNegativeInt, PositiveInt
 from redis.exceptions import LockError, LockNotOwnedError
 
 from generalresearch.currency import LedgerCurrency
-from generalresearch.managers import parse_order_by
 from generalresearch.managers.base import (
     Permission,
     PostgresManager,
@@ -28,6 +27,7 @@ from generalresearch.managers.thl.ledger_manager.exceptions import (
     LedgerTransactionFlagAlreadyExistsError,
     LedgerTransactionReleaseLockError,
 )
+from generalresearch.managers.utils import parse_order_by
 from generalresearch.models.custom_types import check_valid_uuid
 from generalresearch.models.thl.ledger import (
     LedgerAccount,
diff --git a/generalresearch/managers/thl/ledger_manager/thl_ledger.py b/generalresearch/managers/thl/ledger_manager/thl_ledger.py
index 7aed619..bd27acf 100644
--- a/generalresearch/managers/thl/ledger_manager/thl_ledger.py
+++ b/generalresearch/managers/thl/ledger_manager/thl_ledger.py
@@ -52,7 +52,7 @@ from generalresearch.models.thl.ledger import (
 )
 from generalresearch.models.thl.product import Product
 from generalresearch.models.thl.session import Status
-from generalresearch.models.thl.wallet import PayoutType
+from generalresearch.models.thl.wallet.definitions import PayoutType
 
 if TYPE_CHECKING:
     from generalresearch.models.custom_types import UUIDStr
diff --git a/generalresearch/managers/thl/payout.py b/generalresearch/managers/thl/payout.py
index 2914ba4..1749783 100644
--- a/generalresearch/managers/thl/payout.py
+++ b/generalresearch/managers/thl/payout.py
@@ -31,11 +31,11 @@ from generalresearch.models.thl.payout import (
     PayoutEvent,
     UserPayoutEvent,
 )
-from generalresearch.models.thl.wallet import PayoutType
 from generalresearch.models.thl.wallet.cashout_method import (
     CashMailOrderData,
     CashoutRequestInfo,
 )
+from generalresearch.models.thl.wallet.definitions import PayoutType
 
 if TYPE_CHECKING:
     from generalresearch.managers.thl.ledger_manager.thl_ledger import (
diff --git a/generalresearch/managers/thl/session.py b/generalresearch/managers/thl/session.py
index 7f17252..41d3893 100644
--- a/generalresearch/managers/thl/session.py
+++ b/generalresearch/managers/thl/session.py
@@ -10,12 +10,12 @@ from faker import Faker
 from psycopg import sql
 from pydantic import NonNegativeInt, PositiveInt
 
-from generalresearch.managers import parse_order_by
 from generalresearch.managers.base import (
     Permission,
     PostgresManager,
 )
 from generalresearch.managers.thl.product import ProductManager
+from generalresearch.managers.utils import parse_order_by
 from generalresearch.models.legacy.bucket import Bucket
 from generalresearch.models.thl.session import (
     Session,
@@ -28,8 +28,8 @@ from generalresearch.models.thl.task_status import (
 from generalresearch.models.thl.user import User
 
 if TYPE_CHECKING:
-    from generalresearch.models import DeviceType
     from generalresearch.models.custom_types import UUIDStr
+    from generalresearch.models.definitions import DeviceType
     from generalresearch.models.thl.definitions import (
         SessionStatusCode2,
         Status,
diff --git a/generalresearch/managers/thl/survey.py b/generalresearch/managers/thl/survey.py
index eacb345..92777e5 100644
--- a/generalresearch/managers/thl/survey.py
+++ b/generalresearch/managers/thl/survey.py
@@ -13,7 +13,7 @@ from pydantic import NonNegativeInt
 from generalresearch.managers.base import Permission, PostgresManager
 from generalresearch.managers.thl.buyer import BuyerManager
 from generalresearch.managers.thl.category import CategoryManager
-from generalresearch.models import Source
+from generalresearch.models.definitions import Source
 from generalresearch.models.thl.survey.model import (
     Survey,
     SurveyStat,
diff --git a/generalresearch/managers/thl/task_adjustment.py b/generalresearch/managers/thl/task_adjustment.py
index e3f382d..d0d83cb 100644
--- a/generalresearch/managers/thl/task_adjustment.py
+++ b/generalresearch/managers/thl/task_adjustment.py
@@ -6,12 +6,12 @@ from decimal import Decimal
 from functools import cached_property
 from typing import TYPE_CHECKING
 
-from generalresearch.managers import parse_order_by
 from generalresearch.managers.base import (
     PostgresManager,
 )
 from generalresearch.managers.thl.session import SessionManager
 from generalresearch.managers.thl.wall import WallManager
+from generalresearch.managers.utils import parse_order_by
 from generalresearch.models.thl.definitions import (
     Status,
     WallAdjustedStatus,
diff --git a/generalresearch/managers/thl/wall.py b/generalresearch/managers/thl/wall.py
index b9dc94d..83697f5 100644
--- a/generalresearch/managers/thl/wall.py
+++ b/generalresearch/managers/thl/wall.py
@@ -14,12 +14,12 @@ from psycopg import sql
 from psycopg.rows import dict_row
 from pydantic import AwareDatetime, PositiveInt
 
-from generalresearch.managers import parse_order_by
 from generalresearch.managers.base import (
     PostgresManager,
     PostgresManagerWithRedis,
 )
-from generalresearch.models import Source
+from generalresearch.managers.utils import parse_order_by
+from generalresearch.models.definitions import Source
 from generalresearch.models.thl.definitions import (
     WallAdjustedStatus,
 )
diff --git a/generalresearch/managers/thl/wallet/__init__.py b/generalresearch/managers/thl/wallet/__init__.py
index 457483f..f805872 100644
--- a/generalresearch/managers/thl/wallet/__init__.py
+++ b/generalresearch/managers/thl/wallet/__init__.py
@@ -6,7 +6,7 @@ from generalresearch.managers.thl.wallet.approve import (
     approve_paypal_order,
 )
 from generalresearch.models.thl.definitions import PayoutStatus
-from generalresearch.models.thl.wallet import PayoutType
+from generalresearch.models.thl.wallet.definitions import PayoutType
 
 if TYPE_CHECKING:
     from generalresearch.managers.thl.ledger_manager.thl_ledger import (
diff --git a/generalresearch/managers/utils.py b/generalresearch/managers/utils.py
new file mode 100644
index 0000000..bc745fd
--- /dev/null
+++ b/generalresearch/managers/utils.py
@@ -0,0 +1,16 @@
+def parse_order_by(order_by_str: str) -> str:
+    """
+    Converts django-rest-framework ordering str to mysql clause
+    :param order_by_str: e.g. 'created,-name'
+    :return: mysql clause e.g. ORDER BY created ASC, name DESC
+    """
+    fields = order_by_str.split(",")
+
+    order_clause = []
+    for field in fields:
+        if field.startswith("-"):
+            order_clause.append(f"{field[1:]} DESC")
+        else:
+            order_clause.append(f"{field} ASC")
+
+    return "ORDER BY " + ", ".join(order_clause)
diff --git a/generalresearch/models/cint/question.py b/generalresearch/models/cint/question.py
index 44efd13..ab46653 100644
--- a/generalresearch/models/cint/question.py
+++ b/generalresearch/models/cint/question.py
@@ -8,7 +8,7 @@ from uuid import UUID
 
 from pydantic import BaseModel, Field, field_validator, model_validator
 
-from generalresearch.models import Source, string_utils
+from generalresearch.models.definitions import Source, string_utils
 from generalresearch.models.thl.profiling.marketplace import (
     MarketplaceQuestion,
     MarketplaceUserQuestionAnswer,
diff --git a/generalresearch/models/cint/survey.py b/generalresearch/models/cint/survey.py
index 8c8f882..ebba09e 100644
--- a/generalresearch/models/cint/survey.py
+++ b/generalresearch/models/cint/survey.py
@@ -18,7 +18,7 @@ from pydantic import (
 )
 
 from generalresearch.locales import Localelator
-from generalresearch.models import Source, TaskCalculationType
+from generalresearch.models.definitions import Source, TaskCalculationType
 from generalresearch.models.thl.demographics import Gender
 from generalresearch.models.thl.survey import MarketplaceTask
 from generalresearch.models.thl.survey.condition import (
diff --git a/generalresearch/models/custom_types.py b/generalresearch/models/custom_types.py
index 5e4db3e..680a99c 100644
--- a/generalresearch/models/custom_types.py
+++ b/generalresearch/models/custom_types.py
@@ -20,7 +20,7 @@ from pydantic.functional_validators import AfterValidator, BeforeValidator
 from pydantic.networks import IPvAnyNetwork, UrlConstraints
 from pydantic_core import MultiHostHost, Url
 
-from generalresearch.models import DeviceType, Source
+from generalresearch.models.definitions import DeviceType, Source
 
 HOSTNAME_REGEX = re.compile(
     r"^[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(\.[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$"
diff --git a/generalresearch/models/definitions.py b/generalresearch/models/definitions.py
new file mode 100644
index 0000000..c0348d7
--- /dev/null
+++ b/generalresearch/models/definitions.py
@@ -0,0 +1,114 @@
+from __future__ import annotations
+
+from enum import IntEnum, StrEnum
+
+from generalresearch.utils.enum import ReprEnumMeta
+
+
+class Source(StrEnum, metaclass=ReprEnumMeta):
+    # The external marketplace, or the source of the survey / work.
+    #   Max length of the value is 2.
+    GRS = "g"
+    CINT = "c"
+    DALIA = "a"  # deprecated
+    DYNATA = "d"
+    ETX = "et"
+    FULL_CIRCLE = "f"
+    INNOVATE = "i"
+    LUCID = "l"
+    MORNING_CONSULT = "m"
+    OPEN_LABS = "n"
+    POLLFISH = "o"
+    PRECISION = "e"
+    PRODEGE_USER = "r"  # deprecated
+    PRODEGE = "pr"  # using 'r' for vendor_wall
+    PULLEY = "p"  # deprecated
+    REPDATA = "rd"  # using 'q' for vendor_wall
+    SAGO = "h"
+    SPECTRUM = "s"
+    TESTING = "t"  # Used internally for testing
+    TESTING2 = "u"  # Used internally for testing
+    WXET = "w"
+
+
+class DebitKey(IntEnum, metaclass=ReprEnumMeta):
+    # The debit key for marketplaces
+    CINT = 8
+    DALIA = 9
+    DYNATA = 6
+    # ETX = None
+    FULL_CIRCLE = 15
+    INNOVATE = 7
+    LUCID = 0
+    MORNING_CONSULT = 12
+    # OPEN_LABS = None
+    POLLFISH = 13
+    PRECISION = 14
+    PRODEGE = 11
+    SAGO = 10
+    SPECTRUM = 5
+    # WXET = None
+
+
+class DeviceType(IntEnum, metaclass=ReprEnumMeta):
+    UNKNOWN = 0
+    MOBILE = 1
+    DESKTOP = 2
+    TABLET = 3
+
+
+class LogicalOperator(StrEnum, metaclass=ReprEnumMeta):
+    OR = "OR"
+    AND = "AND"
+    # There is currently no use case for NOT. See MarketplaceCondition.explain_not
+    NOT = "NOT"
+
+
+class TaskStatus(StrEnum, metaclass=ReprEnumMeta):
+    # A survey is live if it is open and, given all conditions are met, is
+    # possible to send in traffic. All other statuses are just variants of
+    # NOT Live (not accepting traffic)
+    LIVE = "LIVE"
+
+    # This is a generic NOT Live status. A marketplace may use other more
+    # specific statuses but in practice they don't matter because all we care
+    # about is if the task is LIVE.
+    NOT_LIVE = "NOT_LIVE"
+
+    # We need a status to mark if a survey we thought was live does not come
+    # back from the API, we'll mark it as NOT_FOUND.
+    NOT_FOUND = "NOT_FOUND"
+
+
+class TaskCalculationType(StrEnum):
+    COMPLETES = "COMPLETES"
+    STARTS = "STARTS"
+
+    @classmethod
+    def from_api(cls, v: str) -> TaskCalculationType:
+        return {
+            "complete": cls.COMPLETES,
+            "completes": cls.COMPLETES,
+            "survey start": cls.STARTS,
+            "survey starts": cls.STARTS,
+            "start": cls.STARTS,
+            "prescreens": cls.STARTS,
+            "prescreen": cls.STARTS,
+        }[v.lower()]
+
+    @classmethod
+    def prodege_from_api(cls, v: int) -> TaskCalculationType:
+        return {1: cls.COMPLETES, 2: cls.STARTS}[v]
+
+    @classmethod
+    def innovate_from_api(cls, v: int) -> TaskCalculationType:
+        return {0: cls.COMPLETES, 1: cls.STARTS}[v]
+
+
+class URLQueryKey(StrEnum, metaclass=ReprEnumMeta):
+    PRODUCT_ID = "39057c8b"
+    PRODUCT_USER_ID = "c184efc0"
+    SESSION_ID = "0bb50182"
+
+
+MAX_INT32 = 2**31
diff --git a/generalresearch/models/device.py b/generalresearch/models/device.py
index cc15eee..432c897 100644
--- a/generalresearch/models/device.py
+++ b/generalresearch/models/device.py
@@ -1,6 +1,6 @@
 from user_agents import parse as parse_ua
 
-from generalresearch.models import DeviceType
+from generalresearch.models.definitions import DeviceType
 
 
 def parse_device_from_useragent(user_agent: str) -> DeviceType:
diff --git a/generalresearch/models/dynata/question.py b/generalresearch/models/dynata/question.py
index 1ed560a..60c7366 100644
--- a/generalresearch/models/dynata/question.py
+++ b/generalresearch/models/dynata/question.py
@@ -11,7 +11,7 @@ from typing import TYPE_CHECKING, Any, Literal
 
 from pydantic import BaseModel, Field, PositiveInt, field_validator, model_validator
 
-from generalresearch.models import MAX_INT32, Source
+from generalresearch.models.definitions import MAX_INT32, Source
 from generalresearch.models.thl.profiling.marketplace import MarketplaceQuestion
 
 if TYPE_CHECKING:
diff --git a/generalresearch/models/dynata/survey.py b/generalresearch/models/dynata/survey.py
index 70e3659..4174d31 100644
--- a/generalresearch/models/dynata/survey.py
+++ b/generalresearch/models/dynata/survey.py
@@ -19,7 +19,7 @@ from pydantic import (
 )
 
 from generalresearch.locales import Localelator
-from generalresearch.models import Source
+from generalresearch.models.definitions import Source
 from generalresearch.models.dynata import DynataStatus
 from generalresearch.models.thl.demographics import (
     Gender,
@@ -31,7 +31,6 @@ from generalresearch.models.thl.survey.condition import (
 )
 
 if TYPE_CHECKING:
-    from generalresearch.models import TaskCalculationType
     from generalresearch.models.custom_types import (
         AlphaNumStr,
         AlphaNumStrSet,
@@ -39,6 +38,7 @@ if TYPE_CHECKING:
         CoercedStr,
         DeviceTypes,
     )
+    from generalresearch.models.definitions import TaskCalculationType
 
 logging.basicConfig()
 logger = logging.getLogger()
diff --git a/generalresearch/models/dynata/task_collection.py b/generalresearch/models/dynata/task_collection.py
index 94868bb..c6cdc19 100644
--- a/generalresearch/models/dynata/task_collection.py
+++ b/generalresearch/models/dynata/task_collection.py
@@ -6,7 +6,7 @@ import pandas as pd
 from pandera.pandas import Check, Column, DataFrameSchema, Index
 
 from generalresearch.locales import Localelator
-from generalresearch.models import TaskCalculationType
+from generalresearch.models.definitions import TaskCalculationType
 from generalresearch.models.dynata import DynataStatus
 from generalresearch.models.thl.survey.task_collection import (
     TaskCollection,
diff --git a/generalresearch/models/events.py b/generalresearch/models/events.py
index 8d059f9..34f6be8 100644
--- a/generalresearch/models/events.py
+++ b/generalresearch/models/events.py
@@ -14,12 +14,12 @@ from pydantic import (
 )
 
 if TYPE_CHECKING:
-    from generalresearch.models import Source
     from generalresearch.models.custom_types import (
         AwareDatetimeISO,
         CountryISOLike,
         UUIDStr,
     )
+    from generalresearch.models.definitions import Source
     from generalresearch.models.thl.definitions import (
         SessionStatusCode2,
         Status,
diff --git a/generalresearch/models/gr/business.py b/generalresearch/models/gr/business.py
index 146d690..e11c54d 100644
--- a/generalresearch/models/gr/business.py
+++ b/generalresearch/models/gr/business.py
@@ -11,7 +11,7 @@ from uuid import uuid4
 
 import pandas as pd
 import pyarrow as pa
-from dask.distributed import Client
+from dask.distributed import Client as DaskClient
 from psycopg.cursor import Cursor
 from psycopg.rows import dict_row
 from pydantic import BaseModel, ConfigDict, Field, PositiveInt, ValidationError
@@ -24,6 +24,11 @@ from generalresearch.incite.schemas.mergers.pop_ledger import (
     numerical_col_names,
 )
 from generalresearch.models.admin.request import ReportRequest, ReportType
+from generalresearch.models.custom_types import (
+    AwareDatetime,
+    UUIDStr,
+    UUIDStrCoerce,
+)
 from generalresearch.models.gr.team import Team
 from generalresearch.models.thl.finance import BusinessBalances, POPFinancial
 from generalresearch.models.thl.ledger import OrderBy
@@ -32,11 +37,6 @@ from generalresearch.utils.enum import ReprEnumMeta
 
 if TYPE_CHECKING:
     from generalresearch.incite.mergers.pop_ledger import PopLedgerMerge
-    from generalresearch.models.custom_types import (
-        AwareDatetime,
-        UUIDStr,
-        UUIDStrCoerce,
-    )
     from generalresearch.models.thl.ledger import LedgerAccount
     from generalresearch.models.thl.payout import BusinessPayoutEvent
     from generalresearch.pg_helper import PostgresConfig
@@ -354,7 +354,7 @@ class Business(BaseModel):
         thl_pg_config: PostgresConfig,
         lm: LedgerManager,
         ds: GRLDatasets,
-        client: Client,
+        client: DaskClient,
         pop_ledger: PopLedgerMerge | None = None,
         at_timestamp: AwareDatetime | None = None,
     ) -> None:
@@ -464,7 +464,7 @@ class Business(BaseModel):
         thl_pg_config: PostgresConfig,
         thl_lm: ThlLedgerManager,
         ds: GRLDatasets,
-        client: Client,
+        client: DaskClient,
         pop_ledger: PopLedgerMerge | None = None,
     ) -> None:
         """This is very similar to the Product POP Financial endpoint; however,
@@ -518,7 +518,7 @@ class Business(BaseModel):
         self,
         thl_pg_config: PostgresConfig,
         ds: GRLDatasets,
-        client: Client,
+        client: DaskClient,
         mnt_gr_api: Path,
         enriched_session: EnrichedSessionMerge | None = None,
     ) -> None:
@@ -561,7 +561,7 @@ class Business(BaseModel):
         self,
         thl_pg_config: PostgresConfig,
         ds: GRLDatasets,
-        client: Client,
+        client: DaskClient,
         mnt_gr_api: Path,
         enriched_wall: EnrichedWallMerge | None = None,
     ) -> None:
@@ -633,7 +633,7 @@ class Business(BaseModel):
         pg_config: PostgresConfig,
         thl_web_rr: PostgresConfig,
         redis_config: RedisConfig,
-        client: Client,
+        client: DaskClient,
         ds: GRLDatasets,
         lm: LedgerManager,
         thl_lm: ThlLedgerManager,
diff --git a/generalresearch/models/innovate/question.py b/generalresearch/models/innovate/question.py
index fc89524..6423399 100644
--- a/generalresearch/models/innovate/question.py
+++ b/generalresearch/models/innovate/question.py
@@ -8,7 +8,7 @@ from typing import TYPE_CHECKING, Any, Literal
 
 from pydantic import BaseModel, Field, ValidationError, field_validator, model_validator
 
-from generalresearch.models import Source
+from generalresearch.models.definitions import Source
 from generalresearch.models.thl.profiling.marketplace import (
     MarketplaceQuestion,
     MarketplaceUserQuestionAnswer,
diff --git a/generalresearch/models/innovate/survey.py b/generalresearch/models/innovate/survey.py
index 60921df..e718dda 100644
--- a/generalresearch/models/innovate/survey.py
+++ b/generalresearch/models/innovate/survey.py
@@ -24,7 +24,7 @@ from pydantic import (
 )
 
 from generalresearch.locales import Localelator
-from generalresearch.models import (
+from generalresearch.models.definitions import (
     LogicalOperator,
     Source,
 )
@@ -41,15 +41,15 @@ from generalresearch.models.thl.survey.condition import (
 )
 
 if TYPE_CHECKING:
-    from generalresearch.models import (
-        TaskCalculationType,
-    )
     from generalresearch.models.custom_types import (
         AlphaNumStrSet,
         AwareDatetimeISO,
         CoercedStr,
         DeviceTypes,
     )
+    from generalresearch.models.definitions import (
+        TaskCalculationType,
+    )
     from generalresearch.models.innovate.question import InnovateQuestionID
 
 logging.basicConfig()
diff --git a/generalresearch/models/legacy/bucket.py b/generalresearch/models/legacy/bucket.py
index f20a769..5f53b89 100644
--- a/generalresearch/models/legacy/bucket.py
+++ b/generalresearch/models/legacy/bucket.py
@@ -15,7 +15,7 @@ from pydantic import (
     model_validator,
 )
 
-from generalresearch.models import Source
+from generalresearch.models.definitions import Source
 from generalresearch.models.thl.stats import StatisticalSummary
 
 if TYPE_CHECKING:
diff --git a/generalresearch/models/legacy/questions.py b/generalresearch/models/legacy/questions.py
index bebd28f..c333804 100644
--- a/generalresearch/models/legacy/questions.py
+++ b/generalresearch/models/legacy/questions.py
@@ -219,7 +219,7 @@ class UserQuestionAnswers(BaseModel):
         self.user = res
 
     def prefetch_wall(self, wm: WallManager) -> None:
-        from generalresearch.models import Source
+        from generalresearch.models.definitions import Source
 
         res: Wall | None = wm.get_from_uuid_if_exists(wall_uuid=self.session_id)
 
diff --git a/generalresearch/models/lucid/question.py b/generalresearch/models/lucid/question.py
index 98f535b..c1b9e52 100644
--- a/generalresearch/models/lucid/question.py
+++ b/generalresearch/models/lucid/question.py
@@ -6,7 +6,7 @@ from typing import TYPE_CHECKING, Any, Literal, Self
 
 from pydantic import BaseModel, Field, field_validator, model_validator
 
-from generalresearch.models import Source
+from generalresearch.models.definitions import Source
 from generalresearch.models.thl.profiling.marketplace import (
     MarketplaceQuestion,
 )
diff --git a/generalresearch/models/lucid/survey.py b/generalresearch/models/lucid/survey.py
index 0f03e31..a04e529 100644
--- a/generalresearch/models/lucid/survey.py
+++ b/generalresearch/models/lucid/survey.py
@@ -4,7 +4,7 @@ from typing import TYPE_CHECKING, Any, Self
 
 from pydantic import BaseModel, ConfigDict, Field, NonNegativeInt
 
-from generalresearch.models import Source
+from generalresearch.models.definitions import Source
 from generalresearch.models.thl.survey.condition import (
     ConditionValueType,
     MarketplaceCondition,
diff --git a/generalresearch/models/morning/question.py b/generalresearch/models/morning/question.py
index 748fcc6..909992f 100644
--- a/generalresearch/models/morning/question.py
+++ b/generalresearch/models/morning/question.py
@@ -6,7 +6,7 @@ from uuid import UUID
 from pydantic import BaseModel, Field, field_validator, model_validator
 
 from generalresearch.locales import Localelator
-from generalresearch.models import Source
+from generalresearch.models.definitions import Source
 from generalresearch.models.thl.profiling.marketplace import (
     MarketplaceQuestion,
     MarketplaceUserQuestionAnswer,
diff --git a/generalresearch/models/morning/survey.py b/generalresearch/models/morning/survey.py
index 1e217f6..25accb6 100644
--- a/generalresearch/models/morning/survey.py
+++ b/generalresearch/models/morning/survey.py
@@ -25,7 +25,7 @@ from pydantic import (
 )
 
 from generalresearch.locales import Localelator
-from generalresearch.models import Source
+from generalresearch.models.definitions import Source
 from generalresearch.models.morning import MorningStatus
 from generalresearch.models.thl.demographics import Gender
 from generalresearch.models.thl.survey import MarketplaceTask
diff --git a/generalresearch/models/pollfish/question.py b/generalresearch/models/pollfish/question.py
index 3b658fd..f0c733c 100644
--- a/generalresearch/models/pollfish/question.py
+++ b/generalresearch/models/pollfish/question.py
@@ -8,7 +8,7 @@ from typing import TYPE_CHECKING, Any, Literal, Self
 
 from pydantic import BaseModel, Field, model_validator
 
-from generalresearch.models import Source
+from generalresearch.models.definitions import Source
 from generalresearch.models.thl.profiling.marketplace import MarketplaceQuestion
 
 if TYPE_CHECKING:
diff --git a/generalresearch/models/precision/question.py b/generalresearch/models/precision/question.py
index ba17361..6ed6bbd 100644
--- a/generalresearch/models/precision/question.py
+++ b/generalresearch/models/precision/question.py
@@ -8,7 +8,7 @@ from typing import TYPE_CHECKING, Any, Literal
 
 from pydantic import BaseModel, Field, ValidationError, field_validator, model_validator
 
-from generalresearch.models import Source, string_utils
+from generalresearch.models.definitions import Source, string_utils
 from generalresearch.models.thl.profiling.marketplace import (
     MarketplaceQuestion,
     MarketplaceUserQuestionAnswer,
diff --git a/generalresearch/models/precision/survey.py b/generalresearch/models/precision/survey.py
index fa30882..a9e34e6 100644
--- a/generalresearch/models/precision/survey.py
+++ b/generalresearch/models/precision/survey.py
@@ -15,7 +15,7 @@ from pydantic import (
     model_validator,
 )
 
-from generalresearch.models import Source
+from generalresearch.models.definitions import Source
 from generalresearch.models.precision import PrecisionStatus
 from generalresearch.models.thl.demographics import Gender
 from generalresearch.models.thl.survey import MarketplaceTask
diff --git a/generalresearch/models/prodege/question.py b/generalresearch/models/prodege/question.py
index c43b51a..b963785 100644
--- a/generalresearch/models/prodege/question.py
+++ b/generalresearch/models/prodege/question.py
@@ -18,7 +18,7 @@ from pydantic import (
 )
 
 from generalresearch.locales import Localelator
-from generalresearch.models import MAX_INT32, Source
+from generalresearch.models.definitions import MAX_INT32, Source
 from generalresearch.models.thl.profiling.marketplace import MarketplaceQuestion
 
 if TYPE_CHECKING:
diff --git a/generalresearch/models/prodege/survey.py b/generalresearch/models/prodege/survey.py
index 7e56a9c..e3c765e 100644
--- a/generalresearch/models/prodege/survey.py
+++ b/generalresearch/models/prodege/survey.py
@@ -20,7 +20,11 @@ from pydantic import (
 )
 
 from generalresearch.locales import Localelator
-from generalresearch.models import LogicalOperator, Source, TaskCalculationType
+from generalresearch.models.definitions import (
+    LogicalOperator,
+    Source,
+    TaskCalculationType,
+)
 from generalresearch.models.prodege import (
     ProdegePastParticipationType,
     ProdegeStatus,
diff --git a/generalresearch/models/repdata/question.py b/generalresearch/models/repdata/question.py
index 8cb1fa7..a578741 100644
--- a/generalresearch/models/repdata/question.py
+++ b/generalresearch/models/repdata/question.py
@@ -17,7 +17,7 @@ from pydantic import (
     model_validator,
 )
 
-from generalresearch.models import MAX_INT32, Source
+from generalresearch.models.definitions import MAX_INT32, Source
 from generalresearch.models.thl.profiling.marketplace import MarketplaceQuestion
 
 if TYPE_CHECKING:
diff --git a/generalresearch/models/repdata/survey.py b/generalresearch/models/repdata/survey.py
index cea61ed..fc1b649 100644
--- a/generalresearch/models/repdata/survey.py
+++ b/generalresearch/models/repdata/survey.py
@@ -21,7 +21,7 @@ from pydantic import (
 
 from generalresearch.grpc import timestamp_from_datetime
 from generalresearch.locales import Localelator
-from generalresearch.models import (
+from generalresearch.models.definitions import (
     DeviceType,
     LogicalOperator,
     Source,
diff --git a/generalresearch/models/repdata/task_collection.py b/generalresearch/models/repdata/task_collection.py
index 04d79bd..f2cb63b 100644
--- a/generalresearch/models/repdata/task_collection.py
+++ b/generalresearch/models/repdata/task_collection.py
@@ -6,7 +6,7 @@ import pandas as pd
 from pandera.pandas import Check, Column, DataFrameSchema, Index
 
 from generalresearch.locales import Localelator
-from generalresearch.models import TaskCalculationType
+from generalresearch.models.definitions import TaskCalculationType
 from generalresearch.models.repdata import RepDataStatus
 from generalresearch.models.thl.survey.task_collection import (
     TaskCollection,
diff --git a/generalresearch/models/sago/question.py b/generalresearch/models/sago/question.py
index cf9ea19..bb51d31 100644
--- a/generalresearch/models/sago/question.py
+++ b/generalresearch/models/sago/question.py
@@ -18,7 +18,7 @@ from pydantic import (
     model_validator,
 )
 
-from generalresearch.models import MAX_INT32, Source, string_utils
+from generalresearch.models.definitions import MAX_INT32, Source, string_utils
 from generalresearch.models.thl.profiling.marketplace import MarketplaceQuestion
 
 if TYPE_CHECKING:
diff --git a/generalresearch/models/sago/survey.py b/generalresearch/models/sago/survey.py
index c2f886a..c9bf431 100644
--- a/generalresearch/models/sago/survey.py
+++ b/generalresearch/models/sago/survey.py
@@ -18,7 +18,7 @@ from pydantic import (
 )
 
 from generalresearch.locales import Localelator
-from generalresearch.models import LogicalOperator, Source
+from generalresearch.models.definitions import LogicalOperator, Source
 from generalresearch.models.sago import SagoStatus
 from generalresearch.models.thl.demographics import Gender
 from generalresearch.models.thl.survey import MarketplaceTask
diff --git a/generalresearch/models/spectrum/question.py b/generalresearch/models/spectrum/question.py
index 89fbeb3..9c9bfa0 100644
--- a/generalresearch/models/spectrum/question.py
+++ b/generalresearch/models/spectrum/question.py
@@ -18,7 +18,7 @@ from pydantic import (
     model_validator,
 )
 
-from generalresearch.models import MAX_INT32, Source, string_utils
+from generalresearch.models.definitions import MAX_INT32, Source, string_utils
 from generalresearch.models.thl.profiling.marketplace import (
     MarketplaceQuestion,
 )
diff --git a/generalresearch/models/spectrum/survey.py b/generalresearch/models/spectrum/survey.py
index 4daa00b..a02c510 100644
--- a/generalresearch/models/spectrum/survey.py
+++ b/generalresearch/models/spectrum/survey.py
@@ -10,7 +10,7 @@ from more_itertools import flatten
 from pydantic import BaseModel, ConfigDict, Field, computed_field, model_validator
 
 from generalresearch.locales import Localelator
-from generalresearch.models import Source, TaskCalculationType
+from generalresearch.models.definitions import Source, TaskCalculationType
 from generalresearch.models.spectrum import SpectrumStatus
 from generalresearch.models.thl.demographics import Gender
 from generalresearch.models.thl.survey import MarketplaceTask
diff --git a/generalresearch/models/spectrum/task_collection.py b/generalresearch/models/spectrum/task_collection.py
index d909292..8e49434 100644
--- a/generalresearch/models/spectrum/task_collection.py
+++ b/generalresearch/models/spectrum/task_collection.py
@@ -6,7 +6,7 @@ import pandas as pd
 from pandera.pandas import Check, Column, DataFrameSchema, Index
 
 from generalresearch.locales import Localelator
-from generalresearch.models import TaskCalculationType
+from generalresearch.models.definitions import TaskCalculationType
 from generalresearch.models.spectrum import SpectrumStatus
 from generalresearch.models.thl.survey.task_collection import (
     TaskCollection,
diff --git a/generalresearch/models/thl/__init__.py b/generalresearch/models/thl/__init__.py
index cb04b29..7f2b8a9 100644
--- a/generalresearch/models/thl/__init__.py
+++ b/generalresearch/models/thl/__init__.py
@@ -8,7 +8,7 @@ from decimal import Decimal
 #     BrokerageProductPayoutEvent,
 #     PayoutEvent,
 # )
-# from generalresearch.models.thl.product import Product
+from generalresearch.models.thl.product import Product
 
 # _ = (
 #     Product,
@@ -18,7 +18,7 @@ from decimal import Decimal
 #     POPFinancial,
 # )
 
-# Product.model_rebuild()
+Product.model_rebuild()
 # PayoutEvent.model_rebuild()
 # BrokerageProductPayoutEvent.model_rebuild()
 
diff --git a/generalresearch/models/thl/category.py b/generalresearch/models/thl/category.py
index 32841a5..ebfc840 100644
--- a/generalresearch/models/thl/category.py
+++ b/generalresearch/models/thl/category.py
@@ -1,12 +1,11 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Self
+from typing import Any, Self
 from uuid import uuid4
 
 from pydantic import BaseModel, Field, PositiveInt, model_validator
 
-if TYPE_CHECKING:
-    from generalresearch.models.custom_types import UUIDStr
+from generalresearch.models.custom_types import UUIDStr
 
 
 class Category(BaseModel, frozen=True):
diff --git a/generalresearch/models/thl/contest/contest_entry.py b/generalresearch/models/thl/contest/contest_entry.py
index a57b2df..17b288b 100644
--- a/generalresearch/models/thl/contest/contest_entry.py
+++ b/generalresearch/models/thl/contest/contest_entry.py
@@ -12,10 +12,12 @@ from pydantic import (
 )
 
 from generalresearch.currency import USDCent
+from generalresearch.models.thl.contest.definitions import (
+    ContestEntryType,
+)
 
 if TYPE_CHECKING:
     from generalresearch.models.custom_types import AwareDatetimeISO, UUIDStr
-    from generalresearch.models.thl.contest.definitions import ContestEntryType
     from generalresearch.models.thl.user import User
 
 
@@ -59,10 +61,7 @@ class ContestEntry(BaseModel):
 
     @model_validator(mode="before")
     @classmethod
-    def validate_amount_type(cls, data: dict) -> dict:
-        from generalresearch.models.thl.contest.definitions import (
-            ContestEntryType,
-        )
+    def validate_amount_type(cls, data: dict[str, Any]) -> dict[str, Any]:
 
         amount = data.get("amount")
         entry_type = data.get("entry_type")
@@ -71,6 +70,7 @@ class ContestEntry(BaseModel):
             assert isinstance(amount, int) and not isinstance(
                 amount, USDCent
             ), "amount must be int in ContestEntryType.COUNT"
+
         elif entry_type == ContestEntryType.CASH:
             # This may be coming from the DB, in which case it is an int.
             data["amount"] = USDCent(data["amount"])
@@ -79,9 +79,6 @@ class ContestEntry(BaseModel):
 
     @computed_field()
     def amount_str(self) -> str:
-        from generalresearch.models.thl.contest.definitions import (
-            ContestEntryType,
-        )
 
         if self.entry_type == ContestEntryType.COUNT:
             return str(self.amount)
diff --git a/generalresearch/models/thl/contest/raffle.py b/generalresearch/models/thl/contest/raffle.py
index b944740..21bc481 100644
--- a/generalresearch/models/thl/contest/raffle.py
+++ b/generalresearch/models/thl/contest/raffle.py
@@ -26,11 +26,9 @@ from generalresearch.models.thl.contest.contest import (
     ContestBase,
     ContestUserView,
 )
-from generalresearch.models.thl.contest.contest_entry import (
-    ContestEntryType,
-)
 from generalresearch.models.thl.contest.definitions import (
     ContestEndReason,
+    ContestEntryType,
     ContestPrizeKind,
     ContestStatus,
     ContestType,
diff --git a/generalresearch/models/thl/finance.py b/generalresearch/models/thl/finance.py
index 4b750da..9e7d2c3 100644
--- a/generalresearch/models/thl/finance.py
+++ b/generalresearch/models/thl/finance.py
@@ -27,8 +27,9 @@ adjustment_example = random.randint(-1_000, 50 * 100)
 
 if TYPE_CHECKING:
     from generalresearch.currency import USDCent
+    from generalresearch.managers.thl.product import ProductManager
     from generalresearch.models.thl.ledger import LedgerAccount
-    from generalresearch.pg_helper import PostgresConfig
+    from generalresearch.models.thl.product import Product
 
 
 class AdjustmentType(BaseModel):
@@ -516,7 +517,7 @@ class ProductBalances(BaseModel):
         if isinstance(input_data, pd.Series):
             return ProductBalances.model_validate(input_data.to_dict())
 
-        elif isinstance(input_data, pd.DataFrame):
+        else:
             assert isinstance(input_data.index, pd.DatetimeIndex), "Invalid input data"
 
             # The pop merge is grouped by 1min intervals. Therefore, if we take
@@ -529,9 +530,6 @@ class ProductBalances(BaseModel):
             pb.last_event = pq_last_event_close.to_pydatetime()
             return pb
 
-        else:
-            raise NotImplementedError("Can't handle this input")
-
     def __str__(self) -> str:
         return (
             f"Product: {self.product_id or '—'}\n"
@@ -834,19 +832,17 @@ class BusinessBalances(BaseModel):
     def from_pandas(
         input_data: pd.DataFrame,
         accounts: list[LedgerAccount],
-        thl_pg_config: PostgresConfig,
+        product_manager: ProductManager,
     ) -> BusinessBalances:
         LOG.debug(f"BusinessBalances.from_pandas(input_data={input_data.shape})")
 
         from generalresearch.incite.schemas.mergers.pop_ledger import (
             numerical_col_names,
         )
-        from generalresearch.managers.thl.product import ProductManager
         from generalresearch.models.thl.ledger import (
             AccountType,
             Direction,
         )
-        from generalresearch.models.thl.product import Product
 
         # Validate the input accounts
         assert len(accounts) > 0, "Must provide accounts"
@@ -872,8 +868,7 @@ class BusinessBalances(BaseModel):
         # Sort the ProductBalances so that they're always in a consistent
         #   sorted order.
 
-        pm = ProductManager(pg_config=thl_pg_config)
-        products: list[Product] = pm.get_by_uuids(
+        products: list[Product] = product_manager.get_by_uuids(
             product_uuids=[pb.product_id for pb in product_balances]
         )
         sorted_products_uuids = [
diff --git a/generalresearch/models/thl/ledger.py b/generalresearch/models/thl/ledger.py
index c38e83b..fbfb6bb 100644
--- a/generalresearch/models/thl/ledger.py
+++ b/generalresearch/models/thl/ledger.py
@@ -354,7 +354,7 @@ class LedgerTransaction(BaseModel):
     def to_user_tx(
         self, user_account: LedgerAccount, product_id: str, payout_format: str
     ):
-        from generalresearch.models.thl.wallet import PayoutType
+        from generalresearch.models.thl.wallet.definitions import PayoutType
 
         d = self.model_dump(include={"created"})
         d["tx_type"] = self.metadata.get("tx_type")
diff --git a/generalresearch/models/thl/offerwall/__init__.py b/generalresearch/models/thl/offerwall/__init__.py
index 0c3d51d..599cc1d 100644
--- a/generalresearch/models/thl/offerwall/__init__.py
+++ b/generalresearch/models/thl/offerwall/__init__.py
@@ -14,8 +14,8 @@ from pydantic import (
     model_validator,
 )
 
-from generalresearch.models import Source
 from generalresearch.models.custom_types import IPvAnyAddressStr
+from generalresearch.models.definitions import Source
 from generalresearch.models.thl.locales import (
     CountryISO,
     LanguageISO,
diff --git a/generalresearch/models/thl/offerwall/base.py b/generalresearch/models/thl/offerwall/base.py
index 1d41ef2..fb0bc77 100644
--- a/generalresearch/models/thl/offerwall/base.py
+++ b/generalresearch/models/thl/offerwall/base.py
@@ -19,7 +19,7 @@ from pydantic import (
     model_validator,
 )
 
-from generalresearch.models import Source
+from generalresearch.models.definitions import Source
 from generalresearch.models.legacy.bucket import (
     Bucket as LegacyBucket,
 )
diff --git a/generalresearch/models/thl/offerwall/cache.py b/generalresearch/models/thl/offerwall/cache.py
index aa18014..2a733c9 100644
--- a/generalresearch/models/thl/offerwall/cache.py
+++ b/generalresearch/models/thl/offerwall/cache.py
@@ -6,8 +6,8 @@ from typing import TYPE_CHECKING, Any
 from pydantic import BaseModel, Field
 
 if TYPE_CHECKING:
-    from generalresearch.models import Source
     from generalresearch.models.custom_types import AwareDatetimeISO, UUIDStr
+    from generalresearch.models.definitions import Source
     from generalresearch.models.thl.offerwall import OfferWallRequest
     from generalresearch.models.thl.offerwall.base import (
         OfferwallBase,
diff --git a/generalresearch/models/thl/payout.py b/generalresearch/models/thl/payout.py
index 9902af3..128723b 100644
--- a/generalresearch/models/thl/payout.py
+++ b/generalresearch/models/thl/payout.py
@@ -18,7 +18,7 @@ from pydantic.json_schema import SkipJsonSchema
 
 from generalresearch.currency import USDCent
 from generalresearch.models.thl.definitions import PayoutStatus
-from generalresearch.models.thl.wallet import PayoutType
+from generalresearch.models.thl.wallet.definitions import PayoutType
 
 if TYPE_CHECKING:
     from generalresearch.models.custom_types import (
diff --git a/generalresearch/models/thl/product.py b/generalresearch/models/thl/product.py
index 988b72d..346a98b 100644
--- a/generalresearch/models/thl/product.py
+++ b/generalresearch/models/thl/product.py
@@ -38,13 +38,13 @@ from pydantic.json_schema import SkipJsonSchema
 
 from generalresearch.currency import USDCent
 from generalresearch.decorators import LOG
-from generalresearch.models import Source
 from generalresearch.models.custom_types import (
     AwareDatetimeISO,
     CountryISOLike,
     HttpsUrlStr,
     UUIDStr,
 )
+from generalresearch.models.definitions import Source
 from generalresearch.models.thl.finance import (
     POPFinancial,
     ProductBalances,
@@ -63,7 +63,7 @@ from generalresearch.models.thl.payout_format import (
     examples as payout_format_examples,
 )
 from generalresearch.models.thl.supplier_tag import SupplierTag
-from generalresearch.models.thl.wallet import PayoutType
+from generalresearch.models.thl.wallet.definitions import PayoutType
 from generalresearch.models.utils import decimal_to_usd_cents
 from generalresearch.redis_helper import RedisConfig
 
diff --git a/generalresearch/models/thl/profiling/marketplace.py b/generalresearch/models/thl/profiling/marketplace.py
index 0c1e39b..23501e3 100644
--- a/generalresearch/models/thl/profiling/marketplace.py
+++ b/generalresearch/models/thl/profiling/marketplace.py
@@ -7,16 +7,16 @@ from typing import TYPE_CHECKING, Any
 
 from pydantic import BaseModel, ConfigDict, Field, PositiveInt, computed_field
 
-from generalresearch.models import MAX_INT32
+from generalresearch.models.definitions import MAX_INT32
 
 if TYPE_CHECKING:
-    from generalresearch.models import Source
     from generalresearch.models.custom_types import (
         AwareDatetimeISO,
         CountryISOLike,
         LanguageISOLike,
         UUIDStr,
     )
+    from generalresearch.models.definitions import Source
     from generalresearch.models.thl.locales import CountryISO, LanguageISO
 
 
diff --git a/generalresearch/models/thl/profiling/upk_question.py b/generalresearch/models/thl/profiling/upk_question.py
index a73683c..9c7383a 100644
--- a/generalresearch/models/thl/profiling/upk_question.py
+++ b/generalresearch/models/thl/profiling/upk_question.py
@@ -5,7 +5,7 @@ import json
 import re
 from enum import StrEnum
 from functools import cached_property
-from typing import TYPE_CHECKING, Annotated, Any, Literal
+from typing import Annotated, Any, Literal
 
 from pydantic import (
     BaseModel,
@@ -17,12 +17,10 @@ from pydantic import (
     model_validator,
 )
 
-from generalresearch.models import Source
+from generalresearch.models.custom_types import UUIDStr
+from generalresearch.models.definitions import Source
 from generalresearch.models.thl.category import Category
 
-if TYPE_CHECKING:
-    from generalresearch.models.custom_types import UUIDStr
-
 
 class UPKImportance(BaseModel):
     task_count: int | None = Field(
diff --git a/generalresearch/models/thl/profiling/upk_question_answer.py b/generalresearch/models/thl/profiling/upk_question_answer.py
index 41895b1..4d07970 100644
--- a/generalresearch/models/thl/profiling/upk_question_answer.py
+++ b/generalresearch/models/thl/profiling/upk_question_answer.py
@@ -13,7 +13,7 @@ from pydantic import (
     model_validator,
 )
 
-from generalresearch.models import MAX_INT32
+from generalresearch.models.definitions import MAX_INT32
 from generalresearch.models.thl.profiling.upk_property import (
     Cardinality,
     PropertyType,
diff --git a/generalresearch/models/thl/profiling/user_info.py b/generalresearch/models/thl/profiling/user_info.py
index c82e2d2..40b4b17 100644
--- a/generalresearch/models/thl/profiling/user_info.py
+++ b/generalresearch/models/thl/profiling/user_info.py
@@ -6,8 +6,8 @@ from pydantic import BaseModel, ConfigDict, Field
 from pydantic.json_schema import SkipJsonSchema
 
 if TYPE_CHECKING:
-    from generalresearch.models import Source
     from generalresearch.models.custom_types import AwareDatetimeISO
+    from generalresearch.models.definitions import Source
     from generalresearch.models.thl.profiling.user_question_answer import (
         MarketplaceResearchProfileQuestion,
     )
diff --git a/generalresearch/models/thl/profiling/user_question_answer.py b/generalresearch/models/thl/profiling/user_question_answer.py
index b1868b3..a7c2194 100644
--- a/generalresearch/models/thl/profiling/user_question_answer.py
+++ b/generalresearch/models/thl/profiling/user_question_answer.py
@@ -14,12 +14,12 @@ from pydantic import (
     model_validator,
 )
 
-from generalresearch.models import MAX_INT32
+from generalresearch.models.custom_types import AwareDatetimeISO, UUIDStr
+from generalresearch.models.definitions import MAX_INT32
+from generalresearch.models.thl.locales import CountryISO, LanguageISO
 
 if TYPE_CHECKING:
-    from generalresearch.models import Source
-    from generalresearch.models.custom_types import AwareDatetimeISO, UUIDStr
-    from generalresearch.models.thl.locales import CountryISO, LanguageISO
+    from generalresearch.models.definitions import Source
     from generalresearch.models.thl.profiling.upk_question import UpkQuestion
 
 
diff --git a/generalresearch/models/thl/session.py b/generalresearch/models/thl/session.py
index 871e5c4..404cff7 100644
--- a/generalresearch/models/thl/session.py
+++ b/generalresearch/models/thl/session.py
@@ -18,7 +18,7 @@ from pydantic import (
     model_validator,
 )
 
-from generalresearch.models import Source
+from generalresearch.models.definitions import Source
 from generalresearch.models.thl import (
     decimal_to_int_cents,
     int_cents_to_decimal,
@@ -37,13 +37,13 @@ if TYPE_CHECKING:
     from generalresearch.managers.thl.ledger_manager.thl_ledger import (
         ThlLedgerManager,
     )
-    from generalresearch.models import DeviceType
     from generalresearch.models.custom_types import (
         AwareDatetimeISO,
         EnumNameSerializer,
         IPvAnyAddressStr,
         UUIDStr,
     )
+    from generalresearch.models.definitions import DeviceType
     from generalresearch.models.legacy.bucket import Bucket
     from generalresearch.models.thl.definitions import (
         ReportValue,
diff --git a/generalresearch/models/thl/soft_pair.py b/generalresearch/models/thl/soft_pair.py
index 313d374..c0bf2dd 100644
--- a/generalresearch/models/thl/soft_pair.py
+++ b/generalresearch/models/thl/soft_pair.py
@@ -5,7 +5,7 @@ from enum import Enum
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
-    from generalresearch.models import Source
+    from generalresearch.models.definitions import Source
     from generalresearch.models.dynata.survey import DynataCondition
     from generalresearch.models.thl.survey.condition import (
         MarketplaceCondition,
diff --git a/generalresearch/models/thl/survey/__init__.py b/generalresearch/models/thl/survey/__init__.py
index d0f2b33..76f819e 100644
--- a/generalresearch/models/thl/survey/__init__.py
+++ b/generalresearch/models/thl/survey/__init__.py
@@ -18,7 +18,7 @@ from generalresearch.models.thl.survey.condition import (
 )
 
 if TYPE_CHECKING:
-    from generalresearch.models import Source
+    from generalresearch.models.definitions import Source
     from generalresearch.models.thl.locales import (
         CountryISO,
         CountryISOs,
diff --git a/generalresearch/models/thl/survey/buyer.py b/generalresearch/models/thl/survey/buyer.py
index 26846d3..ef309d1 100644
--- a/generalresearch/models/thl/survey/buyer.py
+++ b/generalresearch/models/thl/survey/buyer.py
@@ -16,7 +16,7 @@ from pydantic import (
 )
 from scipy.stats import beta as beta_dist
 
-from generalresearch.models import Source
+from generalresearch.models.definitions import Source
 
 if TYPE_CHECKING:
     from generalresearch.models.custom_types import (
diff --git a/generalresearch/models/thl/survey/condition.py b/generalresearch/models/thl/survey/condition.py
index 514ee64..90cf27b 100644
--- a/generalresearch/models/thl/survey/condition.py
+++ b/generalresearch/models/thl/survey/condition.py
@@ -17,7 +17,7 @@ from pydantic import (
     model_validator,
 )
 
-from generalresearch.models import LogicalOperator
+from generalresearch.models.definitions import LogicalOperator
 
 MarketplaceConditionHash = Annotated[
     str, StringConstraints(min_length=7, max_length=7, pattern=r"^[a-f0-9]+$")
diff --git a/generalresearch/models/thl/survey/model.py b/generalresearch/models/thl/survey/model.py
index 9fa3d8e..8986e4d 100644
--- a/generalresearch/models/thl/survey/model.py
+++ b/generalresearch/models/thl/survey/model.py
@@ -21,7 +21,6 @@ from generalresearch.models.thl.definitions import StatusCode1
 from generalresearch.models.thl.pagination import Page
 
 if TYPE_CHECKING:
-    from generalresearch.models import Source
     from generalresearch.models.custom_types import (
         AwareDatetimeISO,
         CountryISOLike,
@@ -29,6 +28,7 @@ if TYPE_CHECKING:
         PropertyCode,
         SurveyKey,
     )
+    from generalresearch.models.definitions import Source
     from generalresearch.models.thl.category import Category
     from generalresearch.models.thl.definitions import Status
 
diff --git a/generalresearch/models/thl/survey/penalty.py b/generalresearch/models/thl/survey/penalty.py
index 54edb94..25e07cf 100644
--- a/generalresearch/models/thl/survey/penalty.py
+++ b/generalresearch/models/thl/survey/penalty.py
@@ -7,11 +7,11 @@ from typing import TYPE_CHECKING, Annotated, Literal
 from pydantic import BaseModel, ConfigDict, Field, TypeAdapter
 
 if TYPE_CHECKING:
-    from generalresearch.models import Source
     from generalresearch.models.custom_types import (
         AwareDatetimeISO,
         UUIDStr,
     )
+    from generalresearch.models.definitions import Source
 
 
 class SurveyPenalty(BaseModel, abc.ABC):
diff --git a/generalresearch/models/thl/task_adjustment.py b/generalresearch/models/thl/task_adjustment.py
index fa5592e..fee2007 100644
--- a/generalresearch/models/thl/task_adjustment.py
+++ b/generalresearch/models/thl/task_adjustment.py
@@ -7,14 +7,14 @@ from uuid import uuid4
 
 from pydantic import BaseModel, ConfigDict, Field, PositiveInt, model_validator
 
-from generalresearch.models import MAX_INT32
+from generalresearch.models.definitions import MAX_INT32
 from generalresearch.models.thl.definitions import (
     WallAdjustedStatus,
 )
 
 if TYPE_CHECKING:
-    from generalresearch.models import Source
     from generalresearch.models.custom_types import AwareDatetimeISO, UUIDStr
+    from generalresearch.models.definitions import Source
 
 
 class TaskAdjustmentEvent(BaseModel):
diff --git a/generalresearch/models/thl/user.py b/generalresearch/models/thl/user.py
index 302aa72..1f88dc6 100644
--- a/generalresearch/models/thl/user.py
+++ b/generalresearch/models/thl/user.py
@@ -20,7 +20,7 @@ from pydantic import (
 )
 from sentry_sdk import set_tag, set_user
 
-from generalresearch.models import MAX_INT32
+from generalresearch.models.definitions import MAX_INT32
 
 if TYPE_CHECKING:
     from generalresearch.managers.thl.ledger_manager.thl_ledger import (
@@ -253,7 +253,7 @@ class User(BaseModel):
 
         # # Delete from db.thl-marketplaces
         # We need DELETE credentials for all these...
-        # from generalresearch.models import Source
+        # from generalresearch.models.definitions import Source
         # mp_db_table = {
         #     Source.SPECTRUM: "`thl-spectrum`.`spectrum_marketresearchprofilequestion`",
         #     Source.INNOVATE: "`thl-innovate`.`innovate_marketresearchprofilequestion`",
diff --git a/generalresearch/models/thl/user_profile.py b/generalresearch/models/thl/user_profile.py
index 2dc19b7..c47c6f2 100644
--- a/generalresearch/models/thl/user_profile.py
+++ b/generalresearch/models/thl/user_profile.py
@@ -13,7 +13,7 @@ from pydantic import (
 )
 from pydantic.json_schema import SkipJsonSchema
 
-from generalresearch.models import MAX_INT32, Source
+from generalresearch.models.definitions import MAX_INT32, Source
 
 if TYPE_CHECKING:
     from generalresearch.models.custom_types import UUIDStr
diff --git a/generalresearch/models/thl/user_quality_event.py b/generalresearch/models/thl/user_quality_event.py
index 5438740..8c2e25f 100644
--- a/generalresearch/models/thl/user_quality_event.py
+++ b/generalresearch/models/thl/user_quality_event.py
@@ -7,7 +7,7 @@ from typing import TYPE_CHECKING, Literal
 
 from pydantic import BaseModel, Field, PositiveInt
 
-from generalresearch.models import MAX_INT32, Source
+from generalresearch.models.definitions import MAX_INT32, Source
 from generalresearch.utils.enum import ReprEnumMeta
 
 if TYPE_CHECKING:
diff --git a/generalresearch/models/thl/user_streak.py b/generalresearch/models/thl/user_streak.py
index 6cd853a..4c09d13 100644
--- a/generalresearch/models/thl/user_streak.py
+++ b/generalresearch/models/thl/user_streak.py
@@ -19,7 +19,7 @@ from pydantic import (
 from pydantic.json_schema import SkipJsonSchema
 
 from generalresearch.managers.leaderboard import country_timezone
-from generalresearch.models import MAX_INT32
+from generalresearch.models.definitions import MAX_INT32
 
 if TYPE_CHECKING:
     from generalresearch.models.thl.locales import CountryISO
diff --git a/generalresearch/models/thl/wallet/cashout_method.py b/generalresearch/models/thl/wallet/cashout_method.py
index 1db85e8..9383c36 100644
--- a/generalresearch/models/thl/wallet/cashout_method.py
+++ b/generalresearch/models/thl/wallet/cashout_method.py
@@ -19,7 +19,7 @@ from pydantic import (
 
 from generalresearch.models.legacy.api_status import StatusResponse
 from generalresearch.models.thl.definitions import PayoutStatus
-from generalresearch.models.thl.wallet import PayoutType
+from generalresearch.models.thl.wallet.definitions import PayoutType
 from generalresearch.utils.enum import ReprEnumMeta
 
 if TYPE_CHECKING:
@@ -31,7 +31,7 @@ if TYPE_CHECKING:
     )
     from generalresearch.models.thl.locales import CountryISO
     from generalresearch.models.thl.user import BPUIDStr, User
-    from generalresearch.models.thl.wallet import Currency
+    from generalresearch.models.thl.wallet.definitions import Currency
 
 logger = logging.getLogger()
 
diff --git a/generalresearch/models/thl/wallet/definitions.py b/generalresearch/models/thl/wallet/definitions.py
new file mode 100644
index 0000000..2d1eb8d
--- /dev/null
+++ b/generalresearch/models/thl/wallet/definitions.py
@@ -0,0 +1,87 @@
+from enum import StrEnum
+
+from generalresearch.utils.enum import ReprEnumMeta
+
+
+class PayoutType(StrEnum, metaclass=ReprEnumMeta):
+    """
+    The method in which the requested payout is delivered.
+    """
+
+    # The max size of the db field that holds this value is 14, so please
+    #     don't add new values longer than that!
+
+    # User is paid out to their personal PayPal email address
+    PAYPAL = "PAYPAL"
+    # User is paid out via a Tango Gift Card
+    TANGO = "TANGO"
+    # DWOLLA
+    DWOLLA = "DWOLLA"
+    # A payment is made to a bank account using ACH
+    ACH = "ACH"
+    # A payment is made to a bank account using ACH
+    WIRE = "WIRE"
+    # A payment is made in cash and mailed to the user.
+    CASH_IN_MAIL = "CASH_IN_MAIL"
+    # A payment is made as a prize with some monetary value
+    PRIZE = "PRIZE"
+
+    # This is used to designate either AMT_BONUS or AMT_HIT
+    AMT = "AMT"
+    # Amazon Mechanical Turk as a Bonus
+    AMT_BONUS = "AMT_BONUS"
+    # Amazon Mechanical Turk for a HIT
+    AMT_HIT = "AMT_ASSIGNMENT"
+    AMT_ASSIGNMENT = "AMT_ASSIGNMENT"
+
+
+class Currency(StrEnum):
+    # United States Dollar
+    USD = "USD"
+    # Canadian Dollar
+    CAD = "CAD"
+    # British Pound Sterling
+    GBP = "GBP"
+    # Euro
+    EUR = "EUR"
+    # Indian Rupee
+    INR = "INR"
+    # Australian Dollar
+    AUD = "AUD"
+    # Polish Zloty
+    PLN = "PLN"
+    # Swedish Krona
+    SEK = "SEK"
+    # Singapore Dollar
+    SGD = "SGD"
+    # Mexican Peso
+    MXN = "MXN"
+
+
+CURRENCY_FORMATTER = {
+    "USD": lambda x: f"${x / 100:,.2f}",
+    "CAD": lambda x: f"${x / 100:,.2f} CAD",
+    "GBP": lambda x: f"{x / 100:,.2f} £",
+    "EUR": lambda x: f"€{x / 100:,.2f}",
+    "INR": lambda x: f"₹{x / 100:,.2f}",
+    "AUD": lambda x: f"${x / 100:,.2f} AUD",
+    "PLN": lambda x: f"{x / 100:,.2f} zł",
+    "SEK": lambda x: f"{x / 100:,.2f} kr",
+    "SGD": lambda x: f"${x / 100:,.2f} SGD",
+    "MXN": lambda x: f"${x / 100:,.2f} MXN",
+}
+
+# The max value user can redeem in one go in foreign currencies. should be < $250
+#   in order to avoid exchange rate issues
+CURRENCY_MAX_VALUE = {
+    "USD": 250,
+    "CAD": 200,
+    "GBP": 100,
+    "EUR": 100,
+    "INR": 10000,
+    "AUD": 200,
+    "PLN": 500,
+    "SEK": 1000,
+    "SGD": 200,
+    "MXN": 4000,
+}
diff --git a/generalresearch/models/thl/wallet/payout.py b/generalresearch/models/thl/wallet/payout.py
index 7301b31..79c50e1 100644
--- a/generalresearch/models/thl/wallet/payout.py
+++ b/generalresearch/models/thl/wallet/payout.py
@@ -16,7 +16,7 @@ from pydantic import (
 
 from generalresearch.currency import USDCent
 from generalresearch.models.thl.definitions import PayoutStatus
-from generalresearch.models.thl.wallet import PayoutType
+from generalresearch.models.thl.wallet.definitions import PayoutType
 
 if TYPE_CHECKING:
     from generalresearch.models.custom_types import AwareDatetimeISO, UUIDStr
diff --git a/generalresearch/schemas/survey_stats.py b/generalresearch/schemas/survey_stats.py
index b3acf34..dd592d4 100644
--- a/generalresearch/schemas/survey_stats.py
+++ b/generalresearch/schemas/survey_stats.py
@@ -2,7 +2,7 @@ import pandas as pd
 from pandera.pandas import Check, Column, DataFrameSchema, Index
 
 from generalresearch.locales import Localelator
-from generalresearch.models import Source
+from generalresearch.models.definitions import Source
 
 COUNTRY_ISOS = Localelator().get_all_countries()
 kosovo = "xk"
diff --git a/generalresearch/wall_status_codes/__init__.py b/generalresearch/wall_status_codes/__init__.py
index 37f3960..cca1a19 100644
--- a/generalresearch/wall_status_codes/__init__.py
+++ b/generalresearch/wall_status_codes/__init__.py
@@ -1,6 +1,6 @@
 from typing import TYPE_CHECKING
 
-from generalresearch.models import Source
+from generalresearch.models.definitions import Source
 from generalresearch.models.thl.definitions import Status, StatusCode1
 from generalresearch.wall_status_codes import (
     cint,
diff --git a/test_utils/conftest.py b/test_utils/conftest.py
index f55fe11..397d98f 100644
--- a/test_utils/conftest.py
+++ b/test_utils/conftest.py
@@ -9,6 +9,7 @@ from collections.abc import Callable, Generator
 from datetime import UTC, datetime, timedelta
 from os.path import join as pjoin
 from pathlib import Path
+from typing import TYPE_CHECKING
 from uuid import uuid4
 
 import pytest
@@ -17,23 +18,13 @@ from dotenv import load_dotenv
 from pydantic import MariaDBDsn, PostgresDsn, TypeAdapter
 from pytest import TempPathFactory
 
-from generalresearch.config import GRLBaseSettings
 from generalresearch.currency import USDCent
 from generalresearch.models.custom_types import InternalHostname, PostgresDict
-from generalresearch.pg_helper import PostgresConfig
 from generalresearch.sql_helper import SqlHelper
 
-# -- redis notes from jenkins file
-# sh "redis-cli -u ${env.THL_REDIS} FLUSHDB"
-# sh "redis-cli -u ${env.GR_REDIS} FLUSHDB"
-
-# script {
-#     env.GR_REDIS_DB = new Random().nextInt(1024).toString()
-#     env.GR_REDIS = "redis://${env.REDIS}:6379/${env.GR_REDIS_DB}"
-#     echo "Using GR Redis: ${env.GR_REDIS}"
-#     if (sh(script: "redis-cli -u ${env.GR_REDIS} SET jenkins_lock 1 NX EX 3600", returnStdout: true).trim() != 'OK')
-#         error('Redis already locked... aborting.')
-# }
+if TYPE_CHECKING:
+    from generalresearch.config import GRLBaseSettings
+    from generalresearch.pg_helper import PostgresConfig
 
 
 @pytest.fixture(scope="session")
diff --git a/test_utils/grliq/conftest.py b/test_utils/grliq/conftest.py
index 891b73c..bb1a167 100644
--- a/test_utils/grliq/conftest.py
+++ b/test_utils/grliq/conftest.py
@@ -2,19 +2,15 @@ from __future__ import annotations
 
 from collections.abc import Callable
 from datetime import UTC, datetime, timedelta
-from typing import Any
+from typing import TYPE_CHECKING, Any
 from uuid import uuid4
 
 import pytest
 from pydantic import PostgresDsn
 
-from generalresearch.config import GRLBaseSettings
 from generalresearch.grliq.managers.forensic_data import (
     GrlIqDataManager,
 )
-from generalresearch.grliq.managers.forensic_events import (
-    GrlIqEventManager,
-)
 from generalresearch.grliq.managers.forensic_results import (
     GrlIqCategoryResultsReader,
 )
@@ -25,6 +21,12 @@ from generalresearch.grliq.models.forensic_result import (
 )
 from generalresearch.pg_helper import PostgresConfig
 
+if TYPE_CHECKING:
+    from generalresearch.config import GRLBaseSettings
+    from generalresearch.grliq.managers.forensic_events import (
+        GrlIqEventManager,
+    )
+
 # === Miscellaneous ===
 
 
diff --git a/test_utils/incite/collections/conftest.py b/test_utils/incite/collections/conftest.py
index 631bb7b..f490e14 100644
--- a/test_utils/incite/collections/conftest.py
+++ b/test_utils/incite/collections/conftest.py
@@ -6,12 +6,11 @@ from typing import TYPE_CHECKING
 
 import pytest
 
-from generalresearch.pg_helper import PostgresConfig
 from test_utils.conftest import clear_directory
 
 if TYPE_CHECKING:
     from generalresearch.incite.base import DFCollectionType, GRLDatasets
-    from generalresearch.incite.collections import DFCollection
+    from generalresearch.incite.collections.base import DFCollection
     from generalresearch.incite.collections.thl_web import (
         AuditLogDFCollection,
         LedgerDFCollection,
@@ -20,6 +19,7 @@ if TYPE_CHECKING:
         UserDFCollection,
         WallDFCollection,
     )
+    from generalresearch.pg_helper import PostgresConfig
 
 
 @pytest.fixture
diff --git a/test_utils/incite/mergers/conftest.py b/test_utils/incite/mergers/conftest.py
index 1f88804..4eb3f2d 100644
--- a/test_utils/incite/mergers/conftest.py
+++ b/test_utils/incite/mergers/conftest.py
@@ -2,37 +2,40 @@ from __future__ import annotations
 
 from collections.abc import Callable
 from datetime import datetime, timedelta
+from typing import TYPE_CHECKING
 
 import pytest
 
-from generalresearch.incite.base import GRLDatasets
-from generalresearch.incite.mergers.base import MergeType
-from generalresearch.incite.mergers.foundations.enriched_session import (
-    EnrichedSessionMerge,
-)
-from generalresearch.incite.mergers.foundations.enriched_task_adjust import (
-    EnrichedTaskAdjustMerge,
-)
-from generalresearch.incite.mergers.foundations.enriched_wall import (
-    EnrichedWallMerge,
-)
-from generalresearch.incite.mergers.foundations.user_id_product import (
-    UserIdProductMerge,
-)
-from generalresearch.incite.mergers.pop_ledger import (
-    PopLedgerMerge,
-    PopLedgerMergeItem,
-)
-from generalresearch.incite.mergers.ym_survey_wall import (
-    YMSurveyWallMerge,
-    YMSurveyWallMergeCollectionItem,
-)
-from generalresearch.incite.mergers.ym_wall_summary import (
-    YMWallSummaryMerge,
-    YMWallSummaryMergeItem,
-)
 from test_utils.conftest import clear_directory
 
+if TYPE_CHECKING:
+    from generalresearch.incite.base import GRLDatasets
+    from generalresearch.incite.mergers.base import MergeType
+    from generalresearch.incite.mergers.foundations.enriched_session import (
+        EnrichedSessionMerge,
+    )
+    from generalresearch.incite.mergers.foundations.enriched_task_adjust import (
+        EnrichedTaskAdjustMerge,
+    )
+    from generalresearch.incite.mergers.foundations.enriched_wall import (
+        EnrichedWallMerge,
+    )
+    from generalresearch.incite.mergers.foundations.user_id_product import (
+        UserIdProductMerge,
+    )
+    from generalresearch.incite.mergers.pop_ledger import (
+        PopLedgerMerge,
+        PopLedgerMergeItem,
+    )
+    from generalresearch.incite.mergers.ym_survey_wall import (
+        YMSurveyWallMerge,
+        YMSurveyWallMergeCollectionItem,
+    )
+    from generalresearch.incite.mergers.ym_wall_summary import (
+        YMWallSummaryMerge,
+        YMWallSummaryMergeItem,
+    )
+
 # --------------------------
 #      Merges
 # --------------------------
diff --git a/test_utils/managers/cashout_methods.py b/test_utils/managers/cashout_methods.py
index 238cdda..adf82f4 100644
--- a/test_utils/managers/cashout_methods.py
+++ b/test_utils/managers/cashout_methods.py
@@ -6,11 +6,11 @@ from uuid import uuid4
 
 import pytest
 
-from generalresearch.models.thl.wallet import Currency, PayoutType
 from generalresearch.models.thl.wallet.cashout_method import (
     CashoutMethod,
     TangoCashoutMethodData,
 )
+from generalresearch.models.thl.wallet.definitions import Currency, PayoutType
 
 
 @pytest.fixture(scope="session")
diff --git a/test_utils/managers/conftest.py b/test_utils/managers/conftest.py
index 9c6a1a7..ed771c7 100644
--- a/test_utils/managers/conftest.py
+++ b/test_utils/managers/conftest.py
@@ -1,41 +1,44 @@
 from __future__ import annotations
 
 from collections.abc import Callable
+from typing import TYPE_CHECKING
 
 import pytest
 
-from generalresearch.managers.gr.business import (
-    BusinessAddressManager,
-    BusinessBankAccountManager,
-    BusinessManager,
-)
-from generalresearch.managers.gr.team import (
-    MembershipManager,
-    TeamManager,
-)
-from generalresearch.managers.spectrum.survey import SpectrumSurveyManager
-from generalresearch.managers.thl.buyer import BuyerManager
 from generalresearch.managers.thl.cashout_method import (
     CashoutMethodManager,
 )
-from generalresearch.managers.thl.ipinfo import (
-    GeoIpInfoManager,
-    IPGeonameManager,
-    IPInformationManager,
-)
 from generalresearch.managers.thl.user_streak import (
     UserStreakManager,
 )
-from generalresearch.managers.thl.userhealth import (
-    AuditLogManager,
-    IPRecordManager,
-    UserIpHistoryManager,
-)
-from generalresearch.models import Source
-from generalresearch.models.thl.wallet.cashout_method import CashoutMethod
-from generalresearch.pg_helper import PostgresConfig
-from generalresearch.redis_helper import RedisConfig
-from generalresearch.sql_helper import SqlHelper
+from generalresearch.models.definitions import Source
+
+if TYPE_CHECKING:
+    from generalresearch.managers.gr.business import (
+        BusinessAddressManager,
+        BusinessBankAccountManager,
+        BusinessManager,
+    )
+    from generalresearch.managers.gr.team import (
+        MembershipManager,
+        TeamManager,
+    )
+    from generalresearch.managers.spectrum.survey import SpectrumSurveyManager
+    from generalresearch.managers.thl.buyer import BuyerManager
+    from generalresearch.managers.thl.ipinfo import (
+        GeoIpInfoManager,
+        IPGeonameManager,
+        IPInformationManager,
+    )
+    from generalresearch.managers.thl.userhealth import (
+        AuditLogManager,
+        IPRecordManager,
+        UserIpHistoryManager,
+    )
+    from generalresearch.models.thl.wallet.cashout_method import CashoutMethod
+    from generalresearch.pg_helper import PostgresConfig
+    from generalresearch.redis_helper import RedisConfig
+    from generalresearch.sql_helper import SqlHelper
 
 # === THL ===
 
diff --git a/test_utils/managers/contest/conftest.py b/test_utils/managers/contest/conftest.py
index a9375f6..b29cf18 100644
--- a/test_utils/managers/contest/conftest.py
+++ b/test_utils/managers/contest/conftest.py
@@ -1,10 +1,14 @@
 from __future__ import annotations
 
+from typing import TYPE_CHECKING
+
 import pytest
 
 from generalresearch.managers.base import Permission
 from generalresearch.managers.thl.contest_manager import ContestManager
-from generalresearch.pg_helper import PostgresConfig
+
+if TYPE_CHECKING:
+    from generalresearch.pg_helper import PostgresConfig
 
 
 @pytest.fixture(scope="session")
diff --git a/test_utils/managers/gr/conftest.py b/test_utils/managers/gr/conftest.py
index 40bd7b3..5392c69 100644
--- a/test_utils/managers/gr/conftest.py
+++ b/test_utils/managers/gr/conftest.py
@@ -3,6 +3,7 @@ from __future__ import annotations
 import subprocess
 from collections.abc import Callable, Generator
 from random import randint
+from typing import TYPE_CHECKING
 
 import pytest
 import redis
@@ -10,8 +11,6 @@ import redis.asyncio as redis_async
 from pydantic import PostgresDsn
 from redis import Redis
 
-from generalresearch.config import GRLBaseSettings
-from generalresearch.managers.gr.authentication import GRTokenManager, GRUserManager
 from generalresearch.managers.gr.business import (
     BusinessAddressManager,
     BusinessBankAccountManager,
@@ -20,6 +19,10 @@ from generalresearch.managers.gr.business import (
 from generalresearch.pg_helper import PostgresConfig
 from generalresearch.redis_helper import RedisConfig
 
+if TYPE_CHECKING:
+    from generalresearch.config import GRLBaseSettings
+    from generalresearch.managers.gr.authentication import GRTokenManager, GRUserManager
+
 
 # === Msc ===
 @pytest.fixture(scope="session")
diff --git a/test_utils/managers/ledger/conftest.py b/test_utils/managers/ledger/conftest.py
index ce8348e..c60ee1b 100644
--- a/test_utils/managers/ledger/conftest.py
+++ b/test_utils/managers/ledger/conftest.py
@@ -1,18 +1,24 @@
 from __future__ import annotations
 
+from typing import TYPE_CHECKING
+
 import pytest
 
 from generalresearch.managers.base import Permission
 from generalresearch.managers.thl.ledger_manager.ledger import (
-    LedgerAccountManager,
     LedgerManager,
-    LedgerTransactionManager,
 )
 from generalresearch.managers.thl.ledger_manager.thl_ledger import (
     ThlLedgerManager,
 )
-from generalresearch.pg_helper import PostgresConfig
-from generalresearch.redis_helper import RedisConfig
+
+if TYPE_CHECKING:
+    from generalresearch.managers.thl.ledger_manager.ledger import (
+        LedgerAccountManager,
+        LedgerTransactionManager,
+    )
+    from generalresearch.pg_helper import PostgresConfig
+    from generalresearch.redis_helper import RedisConfig
 
 # --- Ledger ---
 
diff --git a/test_utils/managers/thl/conftest.py b/test_utils/managers/thl/conftest.py
index d40b7d2..af3fd23 100644
--- a/test_utils/managers/thl/conftest.py
+++ b/test_utils/managers/thl/conftest.py
@@ -1,44 +1,47 @@
 from __future__ import annotations
 
 from collections.abc import Callable
+from typing import TYPE_CHECKING
 
 import pytest
 from pydantic import PostgresDsn
 
-from generalresearch.config import GRLBaseSettings
 from generalresearch.managers.base import Permission
-from generalresearch.managers.thl.buyer import BuyerManager
-from generalresearch.managers.thl.category import CategoryManager
-from generalresearch.managers.thl.payout import (
-    BrokerageProductPayoutEventManager,
-    BusinessPayoutEventManager,
-    PayoutEventManager,
-    UserPayoutEventManager,
-)
-from generalresearch.managers.thl.product import ProductManager
-from generalresearch.managers.thl.session import SessionManager
-from generalresearch.managers.thl.task_adjustment import (
-    TaskAdjustmentManager,
-)
 from generalresearch.managers.thl.user_manager.mysql_user_manager import (
     MysqlUserManager,
 )
 from generalresearch.managers.thl.user_manager.redis_user_manager import (
     RedisUserManager,
 )
-from generalresearch.managers.thl.user_manager.user_manager import (
-    UserManager,
-)
-from generalresearch.managers.thl.user_manager.user_metadata_manager import (
-    UserMetadataManager,
-)
-from generalresearch.managers.thl.wall import (
-    WallCacheManager,
-    WallManager,
-)
 from generalresearch.pg_helper import PostgresConfig
 from generalresearch.redis_helper import RedisConfig
 
+if TYPE_CHECKING:
+    from generalresearch.config import GRLBaseSettings
+    from generalresearch.managers.thl.buyer import BuyerManager
+    from generalresearch.managers.thl.category import CategoryManager
+    from generalresearch.managers.thl.payout import (
+        BrokerageProductPayoutEventManager,
+        BusinessPayoutEventManager,
+        PayoutEventManager,
+        UserPayoutEventManager,
+    )
+    from generalresearch.managers.thl.product import ProductManager
+    from generalresearch.managers.thl.session import SessionManager
+    from generalresearch.managers.thl.task_adjustment import (
+        TaskAdjustmentManager,
+    )
+    from generalresearch.managers.thl.user_manager.user_manager import (
+        UserManager,
+    )
+    from generalresearch.managers.thl.user_manager.user_metadata_manager import (
+        UserMetadataManager,
+    )
+    from generalresearch.managers.thl.wall import (
+        WallCacheManager,
+        WallManager,
+    )
+
 
 @pytest.fixture(scope="session")
 def thl_web_rr(django_db_factory: Callable[..., PostgresDsn]) -> PostgresConfig:
diff --git a/test_utils/managers/upk/conftest.py b/test_utils/managers/upk/conftest.py
index 7eabee1..f581278 100644
--- a/test_utils/managers/upk/conftest.py
+++ b/test_utils/managers/upk/conftest.py
@@ -1,4 +1,5 @@
 from collections.abc import Callable, Generator
+from typing import TYPE_CHECKING
 
 import pytest
 
@@ -12,9 +13,11 @@ from generalresearch.managers.thl.profiling.uqa import UQAManager
 from generalresearch.managers.thl.profiling.user_upk import (
     UserUpkManager,
 )
-from generalresearch.models.thl.user import User
-from generalresearch.pg_helper import PostgresConfig
-from generalresearch.redis_helper import RedisConfig
+
+if TYPE_CHECKING:
+    from generalresearch.models.thl.user import User
+    from generalresearch.pg_helper import PostgresConfig
+    from generalresearch.redis_helper import RedisConfig
 
 
 @pytest.fixture(scope="session")
diff --git a/test_utils/models/conftest.py b/test_utils/models/conftest.py
index 3a10ea3..089f2e6 100644
--- a/test_utils/models/conftest.py
+++ b/test_utils/models/conftest.py
@@ -12,13 +12,12 @@ import pytest
 from pydantic import AwareDatetime, PositiveInt
 from pytest import FixtureRequest as Request
 
-from generalresearch.models import Source
+from generalresearch.models.definitions import Source
 from generalresearch.models.thl.definitions import (
     WALL_ALLOWED_STATUS_STATUS_CODE,
     Status,
 )
 from generalresearch.models.thl.survey.model import Buyer, Survey
-from generalresearch.pg_helper import PostgresConfig
 
 if TYPE_CHECKING:
     from generalresearch.currency import USDCent
@@ -53,6 +52,7 @@ if TYPE_CHECKING:
     from generalresearch.models.thl.user import User
     from generalresearch.models.thl.user_iphistory import IPRecord
     from generalresearch.models.thl.userhealth import AuditLog, AuditLogLevel
+    from generalresearch.pg_helper import PostgresConfig
 
 # === THL ===
 
diff --git a/test_utils/models/contest/conftest.py b/test_utils/models/contest/conftest.py
index 84930b8..91425dc 100644
--- a/test_utils/models/contest/conftest.py
+++ b/test_utils/models/contest/conftest.py
@@ -3,36 +3,41 @@ from __future__ import annotations
 from collections.abc import Callable
 from datetime import UTC, datetime
 from decimal import Decimal
+from typing import TYPE_CHECKING
 from uuid import uuid4
 
 import pytest
 from pytest import FixtureRequest as Request
 
 from generalresearch.currency import USDCent
-from generalresearch.managers.thl.contest_manager import ContestManager
-from generalresearch.managers.thl.ledger_manager.thl_ledger import ThlLedgerManager
 from generalresearch.models.thl.contest import (
     ContestEndCondition,
     ContestPrize,
 )
-from generalresearch.models.thl.contest.contest import Contest
 from generalresearch.models.thl.contest.definitions import (
     ContestPrizeKind,
     ContestType,
 )
-from generalresearch.models.thl.contest.leaderboard import (
-    LeaderboardContestCreate,
-)
-from generalresearch.models.thl.contest.milestone import (
-    MilestoneContestCreate,
-)
 from generalresearch.models.thl.contest.raffle import (
     ContestEntryType,
-    RaffleContest,
     RaffleContestCreate,
 )
-from generalresearch.models.thl.product import Product
-from generalresearch.models.thl.user import User
+
+if TYPE_CHECKING:
+    from generalresearch.managers.thl.contest_manager import ContestManager
+    from generalresearch.managers.thl.ledger_manager.thl_ledger import ThlLedgerManager
+    from generalresearch.models.thl.contest.contest import Contest
+    from generalresearch.models.thl.contest.leaderboard import (
+        LeaderboardContestCreate,
+    )
+    from generalresearch.models.thl.contest.milestone import (
+        MilestoneContestCreate,
+    )
+    from generalresearch.models.thl.contest.raffle import (
+        RaffleContest,
+    )
+    from generalresearch.models.thl.product import Product
+    from generalresearch.models.thl.user import User
 
 # === Miscellaneous ===
 
diff --git a/test_utils/models/gr/conftest.py b/test_utils/models/gr/conftest.py
index b623255..6c1877a 100644
--- a/test_utils/models/gr/conftest.py
+++ b/test_utils/models/gr/conftest.py
@@ -2,30 +2,32 @@ from __future__ import annotations
 
 from collections.abc import Callable
 from random import randint
+from typing import TYPE_CHECKING
 from uuid import uuid4
 
 import pytest
 from pydantic import PositiveInt
 from pydantic_extra_types.phone_numbers import PhoneNumber
 
-from generalresearch.managers.gr.authentication import GRTokenManager, GRUserManager
-from generalresearch.managers.gr.business import (
-    BusinessAddressManager,
-    BusinessBankAccountManager,
-    BusinessManager,
-)
-from generalresearch.managers.gr.team import MembershipManager, TeamManager
-from generalresearch.models.custom_types import UUIDStr
-from generalresearch.models.gr.authentication import GRToken, GRUser
-from generalresearch.models.gr.business import (
-    Business,
-    BusinessAddress,
-    BusinessBankAccount,
-    TransferMethod,
-)
-from generalresearch.models.gr.team import Membership, Team
-from generalresearch.pg_helper import PostgresConfig
-from generalresearch.redis_helper import RedisConfig
+if TYPE_CHECKING:
+    from generalresearch.managers.gr.authentication import GRTokenManager, GRUserManager
+    from generalresearch.managers.gr.business import (
+        BusinessAddressManager,
+        BusinessBankAccountManager,
+        BusinessManager,
+    )
+    from generalresearch.managers.gr.team import MembershipManager, TeamManager
+    from generalresearch.models.custom_types import UUIDStr
+    from generalresearch.models.gr.authentication import GRToken, GRUser
+    from generalresearch.models.gr.business import (
+        Business,
+        BusinessAddress,
+        BusinessBankAccount,
+        TransferMethod,
+    )
+    from generalresearch.models.gr.team import Membership, Team
+    from generalresearch.pg_helper import PostgresConfig
+    from generalresearch.redis_helper import RedisConfig
 
 # --- Static ---
 
diff --git a/test_utils/models/ledger/conftest.py b/test_utils/models/ledger/conftest.py
index 1c1027c..8437c7f 100644
--- a/test_utils/models/ledger/conftest.py
+++ b/test_utils/models/ledger/conftest.py
@@ -11,7 +11,6 @@ import pytest
 from pytest import FixtureRequest as Request
 
 from generalresearch.currency import USDCent
-from generalresearch.managers.base import PostgresManager
 from test_utils.models.conftest import (
     payout_config,
     product_amt_true,
@@ -24,6 +23,9 @@ from test_utils.models.conftest import (
     wall_factory,
 )
 
+if TYPE_CHECKING:
+    from generalresearch.managers.base import PostgresManager
+
 _ = (
     user_factory,
     product_user_wallet_no,
diff --git a/test_utils/models/network/conftest.py b/test_utils/models/network/conftest.py
index 6ba37a3..4ff59ee 100644
--- a/test_utils/models/network/conftest.py
+++ b/test_utils/models/network/conftest.py
@@ -1,5 +1,6 @@
 import os
 from datetime import UTC, datetime, timedelta
+from typing import TYPE_CHECKING
 from uuid import uuid4
 
 import pytest
@@ -23,7 +24,9 @@ from generalresearch.models.network.tool_run_command import (
     RDNSRunCommand,
     RDNSRunCommandOptions,
 )
-from generalresearch.pg_helper import PostgresConfig
+
+if TYPE_CHECKING:
+    from generalresearch.pg_helper import PostgresConfig
 
 
 @pytest.fixture(scope="session")
diff --git a/test_utils/models/thl/conftest.py b/test_utils/models/thl/conftest.py
index fc57c73..3c77e27 100644
--- a/test_utils/models/thl/conftest.py
+++ b/test_utils/models/thl/conftest.py
@@ -5,7 +5,7 @@ from datetime import UTC, datetime
 from decimal import ROUND_DOWN, Decimal
 from random import choice as rand_choice
 from random import randint, random
-from typing import Any
+from typing import TYPE_CHECKING, Any
 from uuid import uuid4
 
 import faker
@@ -13,47 +13,53 @@ import pytest
 from grip_client.enums import AccessType
 from pydantic import PositiveInt
 
-from generalresearch.managers.thl.ipinfo import IPGeonameManager, IPInformationManager
-from generalresearch.managers.thl.payout import UserPayoutEventManager
-from generalresearch.managers.thl.product import ProductManager
-from generalresearch.managers.thl.session import SessionManager
-from generalresearch.managers.thl.user_manager.user_manager import UserManager
-from generalresearch.managers.thl.userhealth import AuditLogManager, IPRecordManager
-from generalresearch.managers.thl.wall import WallManager
-from generalresearch.models import DeviceType
-from generalresearch.models.custom_types import (
-    AwareDatetimeISO,
-    IPvAnyAddressStr,
-    UUIDStr,
-)
-from generalresearch.models.legacy.bucket import Bucket
-from generalresearch.models.thl.definitions import (
-    PayoutStatus,
-)
-from generalresearch.models.thl.ipinfo import IPGeoname, IPInformation
-from generalresearch.models.thl.payout import UserPayoutEvent
-from generalresearch.models.thl.product import (
-    PayoutConfig,
-    Product,
-    ProfilingConfig,
-    SessionConfig,
-    SourcesConfig,
-    SupplyConfig,
-    UserCreateConfig,
-    UserHealthConfig,
-    UserWalletConfig,
-)
+from generalresearch.models.thl.definitions import PayoutStatus
 from generalresearch.models.thl.session import (
-    Session,
     Source,
     Status,
-    Wall,
 )
 from generalresearch.models.thl.user import User
-from generalresearch.models.thl.user_iphistory import IPRecord
-from generalresearch.models.thl.userhealth import AuditLog, AuditLogLevel
-from generalresearch.models.thl.wallet import PayoutType
-from generalresearch.models.thl.wallet.cashout_method import CashMailOrderData
+from generalresearch.models.thl.userhealth import AuditLogLevel
+from generalresearch.models.thl.wallet.definitions import PayoutType
+
+if TYPE_CHECKING:
+    from generalresearch.managers.thl.ipinfo import (
+        IPGeonameManager,
+        IPInformationManager,
+    )
+    from generalresearch.managers.thl.payout import UserPayoutEventManager
+    from generalresearch.managers.thl.product import ProductManager
+    from generalresearch.managers.thl.session import SessionManager
+    from generalresearch.managers.thl.user_manager.user_manager import UserManager
+    from generalresearch.managers.thl.userhealth import AuditLogManager, IPRecordManager
+    from generalresearch.managers.thl.wall import WallManager
+    from generalresearch.models.custom_types import (
+        AwareDatetimeISO,
+        IPvAnyAddressStr,
+        UUIDStr,
+    )
+    from generalresearch.models.definitions import DeviceType
+    from generalresearch.models.legacy.bucket import Bucket
+    from generalresearch.models.thl.ipinfo import IPGeoname, IPInformation
+    from generalresearch.models.thl.payout import UserPayoutEvent
+    from generalresearch.models.thl.product import (
+        PayoutConfig,
+        Product,
+        ProfilingConfig,
+        SessionConfig,
+        SourcesConfig,
+        SupplyConfig,
+        UserCreateConfig,
+        UserHealthConfig,
+        UserWalletConfig,
+    )
+    from generalresearch.models.thl.session import (
+        Session,
+        Wall,
+    )
+    from generalresearch.models.thl.user_iphistory import IPRecord
+    from generalresearch.models.thl.userhealth import AuditLog
+    from generalresearch.models.thl.wallet.cashout_method import CashMailOrderData
 
 fake = faker.Faker()
 
diff --git a/test_utils/models/upk/conftest.py b/test_utils/models/upk/conftest.py
index ef77dd6..59266b2 100644
--- a/test_utils/models/upk/conftest.py
+++ b/test_utils/models/upk/conftest.py
@@ -9,10 +9,9 @@ from uuid import UUID
 import pandas as pd
 import pytest
 
-from generalresearch.pg_helper import PostgresConfig
-
 if TYPE_CHECKING:
     from generalresearch.managers.thl.category import CategoryManager
+    from generalresearch.pg_helper import PostgresConfig
 
 
 def insert_data_from_csv(
diff --git a/test_utils/spectrum/conftest.py b/test_utils/spectrum/conftest.py
index a8ce9d9..cc91cff 100644
--- a/test_utils/spectrum/conftest.py
+++ b/test_utils/spectrum/conftest.py
@@ -3,16 +3,15 @@ from __future__ import annotations
 import time
 from datetime import UTC, datetime
 from decimal import Decimal
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 import pytest
 
-from generalresearch.config import GRLBaseSettings
 from generalresearch.managers.spectrum.survey import (
     SpectrumCriteriaManager,
     SpectrumSurveyManager,
 )
-from generalresearch.models import (
+from generalresearch.models.definitions import (
     LogicalOperator,
 )
 from generalresearch.models.spectrum.survey import (
@@ -22,6 +21,9 @@ from generalresearch.models.spectrum.survey import (
 from generalresearch.models.thl.survey.condition import ConditionValueType
 from generalresearch.sql_helper import SqlHelper
 
+if TYPE_CHECKING:
+    from generalresearch.config import GRLBaseSettings
+
 
 @pytest.fixture(scope="session")
 def spectrum_rw(settings: GRLBaseSettings) -> SqlHelper:
diff --git a/tests/incite/collections/test_df_collection_base.py b/tests/incite/collections/test_df_collection_base.py
index c236700..e20b44b 100644
--- a/tests/incite/collections/test_df_collection_base.py
+++ b/tests/incite/collections/test_df_collection_base.py
@@ -9,10 +9,10 @@ from generalresearch.incite.collections import (
     DFCollection,
     DFCollectionType,
 )
-from generalresearch.pg_helper import PostgresConfig
 
 if TYPE_CHECKING:
     from generalresearch.incite.base import GRLDatasets
+    from generalresearch.pg_helper import PostgresConfig
 
 df_collection_types = [e for e in DFCollectionType if e is not DFCollectionType.TEST]
 
diff --git a/tests/incite/collections/test_df_collection_item_base.py b/tests/incite/collections/test_df_collection_item_base.py
index e0171c2..fd70bf0 100644
--- a/tests/incite/collections/test_df_collection_item_base.py
+++ b/tests/incite/collections/test_df_collection_item_base.py
@@ -5,15 +5,16 @@ from typing import TYPE_CHECKING
 
 import pytest
 
-from generalresearch.incite.collections import (
+from generalresearch.incite.collections.base import (
     DFCollection,
     DFCollectionItem,
     DFCollectionType,
 )
-from generalresearch.pg_helper import PostgresConfig
 
 if TYPE_CHECKING:
     from generalresearch.incite.base import GRLDatasets
+    from generalresearch.pg_helper import PostgresConfig
+
 
 df_collection_types = [e for e in DFCollectionType if e is not DFCollectionType.TEST]
 
diff --git a/tests/incite/collections/test_df_collection_item_thl_web.py b/tests/incite/collections/test_df_collection_item_thl_web.py
index 5f9a3f6..061c576 100644
--- a/tests/incite/collections/test_df_collection_item_thl_web.py
+++ b/tests/incite/collections/test_df_collection_item_thl_web.py
@@ -5,6 +5,7 @@ from datetime import UTC, datetime, timedelta
 from itertools import product as iter_product
 from os.path import join as pjoin
 from pathlib import Path, PurePath
+from typing import TYPE_CHECKING
 from uuid import uuid4
 
 import dask.dataframe as dd
@@ -21,19 +22,24 @@ from faker import Faker
 from pandera.pandas import DataFrameSchema
 from pydantic import FilePath
 
-from generalresearch.incite.base import CollectionItemBase, GRLDatasets
-from generalresearch.incite.collections import (
-    DFCollection,
-    DFCollectionItem,
+from generalresearch.incite.base import CollectionItemBase
+from generalresearch.incite.collections.base import (
     DFCollectionType,
 )
 from generalresearch.incite.schemas import ARCHIVE_AFTER
-from generalresearch.managers.thl.ledger_manager.thl_ledger import ThlLedgerManager
-from generalresearch.models.thl.product import Product
-from generalresearch.models.thl.user import User
 from generalresearch.pg_helper import PostgresConfig
 from generalresearch.sql_helper import PostgresDsn
 
+if TYPE_CHECKING:
+    from generalresearch.incite.base import GRLDatasets
+    from generalresearch.incite.collections.base import (
+        DFCollection,
+        DFCollectionItem,
+    )
+    from generalresearch.managers.thl.ledger_manager.thl_ledger import ThlLedgerManager
+    from generalresearch.models.thl.product import Product
+    from generalresearch.models.thl.user import User
+
 fake = Faker()
 
 df_collections = [
diff --git a/tests/incite/collections/test_df_collection_thl_marketplaces.py b/tests/incite/collections/test_df_collection_thl_marketplaces.py
index 6a7e5c9..6ad0cb4 100644
--- a/tests/incite/collections/test_df_collection_thl_marketplaces.py
+++ b/tests/incite/collections/test_df_collection_thl_marketplaces.py
@@ -1,18 +1,21 @@
 from datetime import UTC, datetime
 from itertools import product
+from typing import TYPE_CHECKING
 
 import pytest
 from pandera.pandas import Column, DataFrameSchema, Index
 
-from generalresearch.incite.base import GRLDatasets
-from generalresearch.incite.collections import DFCollection, DFCollectionType
+from generalresearch.incite.collections.base import DFCollection, DFCollectionType
 from generalresearch.incite.collections.thl_marketplaces import (
     InnovateSurveyHistoryCollection,
     MorningSurveyTimeseriesCollection,
     SagoSurveyHistoryCollection,
     SpectrumSurveyTimeseriesCollection,
 )
-from generalresearch.pg_helper import PostgresConfig
+
+if TYPE_CHECKING:
+    from generalresearch.incite.base import GRLDatasets
+    from generalresearch.pg_helper import PostgresConfig
 
 
 def combo_object():
diff --git a/tests/incite/collections/test_df_collection_thl_web.py b/tests/incite/collections/test_df_collection_thl_web.py
index 6d509bc..20d7187 100644
--- a/tests/incite/collections/test_df_collection_thl_web.py
+++ b/tests/incite/collections/test_df_collection_thl_web.py
@@ -9,7 +9,7 @@ import pandas as pd
 import pytest
 from pandera.pandas import DataFrameSchema
 
-from generalresearch.incite.collections import (
+from generalresearch.incite.collections.base import (
     DFCollection,
     DFCollectionType,
 )
diff --git a/tests/incite/mergers/foundations/test_enriched_session.py b/tests/incite/mergers/foundations/test_enriched_session.py
index 2a161e4..71b2442 100644
--- a/tests/incite/mergers/foundations/test_enriched_session.py
+++ b/tests/incite/mergers/foundations/test_enriched_session.py
@@ -4,29 +4,32 @@ from collections.abc import Callable
 from datetime import UTC, datetime, timedelta
 from decimal import Decimal
 from itertools import product
+from typing import TYPE_CHECKING
 
 import dask.dataframe as dd
 import pandas as pd
 import pytest
 from dask.distributed import Client as DaskClient
 
-from generalresearch.incite.collections.thl_web import (
-    SessionDFCollection,
-    WallDFCollection,
-)
-from generalresearch.incite.mergers.foundations.enriched_session import (
-    EnrichedSessionMerge,
-)
 from generalresearch.incite.schemas.admin_responses import (
     AdminPOPSessionSchema,
 )
-from generalresearch.models.admin.request import (
-    ReportRequest,
-)
-from generalresearch.models.thl.product import Product
-from generalresearch.models.thl.session import Session
-from generalresearch.models.thl.user import User
-from generalresearch.pg_helper import PostgresConfig
+
+if TYPE_CHECKING:
+    from generalresearch.incite.collections.thl_web import (
+        SessionDFCollection,
+        WallDFCollection,
+    )
+    from generalresearch.incite.mergers.foundations.enriched_session import (
+        EnrichedSessionMerge,
+    )
+    from generalresearch.models.admin.request import (
+        ReportRequest,
+    )
+    from generalresearch.models.thl.product import Product
+    from generalresearch.models.thl.session import Session
+    from generalresearch.models.thl.user import User
+    from generalresearch.pg_helper import PostgresConfig
 
 
 @pytest.mark.parametrize(
diff --git a/tests/incite/mergers/foundations/test_enriched_task_adjust.py b/tests/incite/mergers/foundations/test_enriched_task_adjust.py
index 0606b6f..877d22f 100644
--- a/tests/incite/mergers/foundations/test_enriched_task_adjust.py
+++ b/tests/incite/mergers/foundations/test_enriched_task_adjust.py
@@ -3,26 +3,28 @@ from __future__ import annotations
 from collections.abc import Callable
 from datetime import timedelta
 from itertools import product as iter_product
+from typing import TYPE_CHECKING
 
 import dask.dataframe as dd
 import pandas as pd
 import pytest
 from dask.distributed import Client as DaskClient
 
-from generalresearch.incite.collections.thl_web import (
-    SessionDFCollection,
-    TaskAdjustmentDFCollection,
-    WallDFCollection,
-)
-from generalresearch.incite.mergers.foundations.enriched_task_adjust import (
-    EnrichedTaskAdjustMerge,
-)
-from generalresearch.incite.mergers.foundations.enriched_wall import (
-    EnrichedWallMerge,
-)
-from generalresearch.models.thl.product import Product
-from generalresearch.models.thl.user import User
-from generalresearch.pg_helper import PostgresConfig
+if TYPE_CHECKING:
+    from generalresearch.incite.collections.thl_web import (
+        SessionDFCollection,
+        TaskAdjustmentDFCollection,
+        WallDFCollection,
+    )
+    from generalresearch.incite.mergers.foundations.enriched_task_adjust import (
+        EnrichedTaskAdjustMerge,
+    )
+    from generalresearch.incite.mergers.foundations.enriched_wall import (
+        EnrichedWallMerge,
+    )
+    from generalresearch.models.thl.product import Product
+    from generalresearch.models.thl.user import User
+    from generalresearch.pg_helper import PostgresConfig
 
 
 @pytest.mark.parametrize(
diff --git a/tests/incite/mergers/foundations/test_enriched_wall.py b/tests/incite/mergers/foundations/test_enriched_wall.py
index 0cb8f60..2b9afb8 100644
--- a/tests/incite/mergers/foundations/test_enriched_wall.py
+++ b/tests/incite/mergers/foundations/test_enriched_wall.py
@@ -2,27 +2,32 @@ from collections.abc import Callable
 from datetime import UTC, datetime, timedelta
 from decimal import Decimal
 from itertools import product as iter_product
+from typing import TYPE_CHECKING
 
 import dask.dataframe as dd
 import pandas as pd
 import pytest
 from dask.distributed import Client as DaskClient
 
-from generalresearch.incite.collections.thl_web import (
-    SessionDFCollection,
-    WallDFCollection,
-)
-
-# noinspection PyUnresolvedReferences
 from generalresearch.incite.mergers.foundations.enriched_wall import (
-    EnrichedWallMerge,
     EnrichedWallMergeItem,
 )
-from generalresearch.models.admin.request import ReportRequest
-from generalresearch.models.thl.product import Product
-from generalresearch.models.thl.session import Session
-from generalresearch.models.thl.user import User
-from generalresearch.pg_helper import PostgresConfig
+
+if TYPE_CHECKING:
+    from generalresearch.incite.collections.thl_web import (
+        SessionDFCollection,
+        WallDFCollection,
+    )
+
+    # noinspection PyUnresolvedReferences
+    from generalresearch.incite.mergers.foundations.enriched_wall import (
+        EnrichedWallMerge,
+    )
+    from generalresearch.models.admin.request import ReportRequest
+    from generalresearch.models.thl.product import Product
+    from generalresearch.models.thl.session import Session
+    from generalresearch.models.thl.user import User
+    from generalresearch.pg_helper import PostgresConfig
 
 
 @pytest.mark.parametrize(
diff --git a/tests/incite/mergers/foundations/test_user_id_product.py b/tests/incite/mergers/foundations/test_user_id_product.py
index 7367056..8c4b2f7 100644
--- a/tests/incite/mergers/foundations/test_user_id_product.py
+++ b/tests/incite/mergers/foundations/test_user_id_product.py
@@ -2,17 +2,22 @@ from __future__ import annotations
 
 from datetime import UTC, datetime, timedelta
 from itertools import product
+from typing import TYPE_CHECKING
 
 import pandas as pd
 import pytest
 from dask.distributed import Client as DaskClient
 
-# noinspection PyUnresolvedReferences
 from generalresearch.incite.mergers.foundations.user_id_product import (
-    UserIdProductMerge,
     UserIdProductMergeItem,
 )
 
+if TYPE_CHECKING:
+    # noinspection PyUnresolvedReferences
+    from generalresearch.incite.mergers.foundations.user_id_product import (
+        UserIdProductMerge,
+    )
+
 
 @pytest.mark.parametrize(
     argnames="offset, duration, start",
diff --git a/tests/incite/mergers/test_merge_collection.py b/tests/incite/mergers/test_merge_collection.py
index cf8315f..3f478bd 100644
--- a/tests/incite/mergers/test_merge_collection.py
+++ b/tests/incite/mergers/test_merge_collection.py
@@ -2,17 +2,20 @@ from __future__ import annotations
 
 from datetime import UTC, datetime, timedelta
 from itertools import product
+from typing import TYPE_CHECKING
 
 import pandas as pd
 import pytest
 from pandera.pandas import DataFrameSchema
 
-from generalresearch.incite.base import GRLDatasets
-from generalresearch.incite.mergers import (
+from generalresearch.incite.mergers.base import (
     MergeCollection,
     MergeType,
 )
 
+if TYPE_CHECKING:
+    from generalresearch.incite.base import GRLDatasets
+
 merge_types = [e for e in MergeType if e != MergeType.TEST]
 
 
diff --git a/tests/incite/mergers/test_merge_collection_item.py b/tests/incite/mergers/test_merge_collection_item.py
index 5ca2f6b..baf1bc4 100644
--- a/tests/incite/mergers/test_merge_collection_item.py
+++ b/tests/incite/mergers/test_merge_collection_item.py
@@ -3,14 +3,17 @@ from __future__ import annotations
 from datetime import timedelta
 from itertools import product
 from pathlib import PurePath
+from typing import TYPE_CHECKING
 
 import pytest
 
-from generalresearch.incite.mergers import (
-    MergeCollection,
-    MergeCollectionItem,
-    MergeType,
-)
+from generalresearch.incite.mergers.base import MergeType
+
+if TYPE_CHECKING:
+    from generalresearch.incite.mergers.base import (
+        MergeCollection,
+        MergeCollectionItem,
+    )
 
 
 @pytest.mark.parametrize(
diff --git a/tests/incite/mergers/test_pop_ledger.py b/tests/incite/mergers/test_pop_ledger.py
index 2146344..9ec188b 100644
--- a/tests/incite/mergers/test_pop_ledger.py
+++ b/tests/incite/mergers/test_pop_ledger.py
@@ -3,23 +3,26 @@ from __future__ import annotations
 from collections.abc import Callable
 from datetime import UTC, datetime, timedelta
 from itertools import product as iter_product
+from typing import TYPE_CHECKING
 
 import pandas as pd
 import pytest
 from dask.distributed import Client as DaskClient
 
-from generalresearch.incite.base import GRLDatasets
-from generalresearch.incite.collections.thl_web import (
-    LedgerDFCollection,
-    SessionDFCollection,
-)
-from generalresearch.incite.mergers.pop_ledger import PopLedgerMerge
 from generalresearch.incite.schemas.mergers.pop_ledger import (
     numerical_col_names,
 )
-from generalresearch.managers.thl.ledger_manager.thl_ledger import ThlLedgerManager
-from generalresearch.models.thl.product import Product
-from generalresearch.models.thl.user import User
+
+if TYPE_CHECKING:
+    from generalresearch.incite.base import GRLDatasets
+    from generalresearch.incite.collections.thl_web import (
+        LedgerDFCollection,
+        SessionDFCollection,
+    )
+    from generalresearch.incite.mergers.pop_ledger import PopLedgerMerge
+    from generalresearch.managers.thl.ledger_manager.thl_ledger import ThlLedgerManager
+    from generalresearch.models.thl.product import Product
+    from generalresearch.models.thl.user import User
 
 
 @pytest.mark.parametrize(
diff --git a/tests/incite/mergers/test_ym_survey_merge.py b/tests/incite/mergers/test_ym_survey_merge.py
index 8a4897b..d83a98c 100644
--- a/tests/incite/mergers/test_ym_survey_merge.py
+++ b/tests/incite/mergers/test_ym_survey_merge.py
@@ -3,22 +3,24 @@ from __future__ import annotations
 from collections.abc import Callable
 from datetime import UTC, datetime, timedelta
 from itertools import product
+from typing import TYPE_CHECKING
 
 import pandas as pd
 import pytest
 from dask.distributed import Client as DaskClient
 
-from generalresearch.incite.collections.thl_web import (
-    SessionDFCollection,
-    WallDFCollection,
-)
-from generalresearch.incite.mergers.foundations.enriched_session import (
-    EnrichedSessionMerge,
-)
-from generalresearch.incite.mergers.ym_survey_wall import YMSurveyWallMerge
-from generalresearch.models.thl.product import Product
-from generalresearch.models.thl.user import User
-from generalresearch.pg_helper import PostgresConfig
+if TYPE_CHECKING:
+    from generalresearch.incite.collections.thl_web import (
+        SessionDFCollection,
+        WallDFCollection,
+    )
+    from generalresearch.incite.mergers.foundations.enriched_session import (
+        EnrichedSessionMerge,
+    )
+    from generalresearch.incite.mergers.ym_survey_wall import YMSurveyWallMerge
+    from generalresearch.models.thl.product import Product
+    from generalresearch.models.thl.user import User
+    from generalresearch.pg_helper import PostgresConfig
 
 # noinspection PyUnresolvedReferences
 
diff --git a/tests/incite/test_collection_base.py b/tests/incite/test_collection_base.py
index 577eda9..1a664a2 100644
--- a/tests/incite/test_collection_base.py
+++ b/tests/incite/test_collection_base.py
@@ -4,6 +4,7 @@ from datetime import UTC, datetime, timedelta, timezone
 from os.path import exists as pexists
 from os.path import join as pjoin
 from pathlib import Path
+from typing import TYPE_CHECKING
 from uuid import uuid4
 
 import numpy as np
@@ -11,7 +12,10 @@ import pandas as pd
 import pytest
 from _pytest._code.code import ExceptionInfo
 
-from generalresearch.incite.base import CollectionBase, GRLDatasets
+from generalresearch.incite.base import CollectionBase
+
+if TYPE_CHECKING:
+    from generalresearch.incite.base import GRLDatasets
 
 AGO_15min = (datetime.now(tz=UTC) - timedelta(minutes=15)).replace(microsecond=0)
 AGO_1HR = (datetime.now(tz=UTC) - timedelta(hours=1)).replace(microsecond=0)
diff --git a/tests/incite/test_collection_base_item.py b/tests/incite/test_collection_base_item.py
index e09f54a..b9f1c26 100644
--- a/tests/incite/test_collection_base_item.py
+++ b/tests/incite/test_collection_base_item.py
@@ -3,6 +3,7 @@ from __future__ import annotations
 from datetime import UTC, datetime
 from os.path import join as pjoin
 from pathlib import Path
+from typing import TYPE_CHECKING
 from uuid import uuid4
 
 import dask.dataframe as dd
@@ -10,7 +11,10 @@ import pandas as pd
 import pytest
 from pydantic import ValidationError
 
-from generalresearch.incite.base import CollectionItemBase, GRLDatasets
+from generalresearch.incite.base import CollectionItemBase
+
+if TYPE_CHECKING:
+    from generalresearch.incite.base import GRLDatasets
 
 
 class TestCollectionItemBase:
diff --git a/tests/managers/gr/test_business.py b/tests/managers/gr/test_business.py
index ed141b1..1a5d4fa 100644
--- a/tests/managers/gr/test_business.py
+++ b/tests/managers/gr/test_business.py
@@ -1,21 +1,24 @@
+from typing import TYPE_CHECKING
 from uuid import uuid4
 
 import pytest
 
-from generalresearch.managers.gr.business import (
-    BusinessAddressManager,
-    BusinessBankAccountManager,
-    BusinessManager,
-)
-from generalresearch.managers.gr.team import MembershipManager, TeamManager
-from generalresearch.models.gr.authentication import GRUser
 from generalresearch.models.gr.business import (
     Business,
     BusinessAddress,
     BusinessBankAccount,
     TransferMethod,
 )
-from generalresearch.pg_helper import PostgresConfig
+
+if TYPE_CHECKING:
+    from generalresearch.managers.gr.business import (
+        BusinessAddressManager,
+        BusinessBankAccountManager,
+        BusinessManager,
+    )
+    from generalresearch.managers.gr.team import MembershipManager, TeamManager
+    from generalresearch.models.gr.authentication import GRUser
+    from generalresearch.pg_helper import PostgresConfig
 
 
 class TestBusinessBankAccountManager:
diff --git a/tests/managers/gr/test_team.py b/tests/managers/gr/test_team.py
index ae3e1bb..17e0470 100644
--- a/tests/managers/gr/test_team.py
+++ b/tests/managers/gr/test_team.py
@@ -1,15 +1,18 @@
 from __future__ import annotations
 
 from collections.abc import Callable
+from typing import TYPE_CHECKING
 from uuid import uuid4
 
-from generalresearch.managers.gr.authentication import GRUserManager
-from generalresearch.managers.gr.team import MembershipManager, TeamManager
-from generalresearch.models.gr.authentication import GRUser
 from generalresearch.models.gr.team import Membership, Team
-from generalresearch.models.thl.product import Product
-from generalresearch.pg_helper import PostgresConfig
-from generalresearch.redis_helper import RedisConfig
+
+if TYPE_CHECKING:
+    from generalresearch.managers.gr.authentication import GRUserManager
+    from generalresearch.managers.gr.team import MembershipManager, TeamManager
+    from generalresearch.models.gr.authentication import GRUser
+    from generalresearch.models.thl.product import Product
+    from generalresearch.pg_helper import PostgresConfig
+    from generalresearch.redis_helper import RedisConfig
 
 
 class TestMembershipManager:
diff --git a/tests/managers/leaderboard.py b/tests/managers/leaderboard.py
index d97714d..197477b 100644
--- a/tests/managers/leaderboard.py
+++ b/tests/managers/leaderboard.py
@@ -6,6 +6,7 @@ import zoneinfo
 from collections.abc import Callable
 from datetime import UTC, datetime
 from decimal import Decimal
+from typing import TYPE_CHECKING
 from uuid import uuid4
 
 import pytest
@@ -26,7 +27,9 @@ from generalresearch.models.thl.product import (
 )
 from generalresearch.models.thl.session import Session
 from generalresearch.models.thl.user import User
-from generalresearch.redis_helper import RedisConfig
+
+if TYPE_CHECKING:
+    from generalresearch.redis_helper import RedisConfig
 
 # random uuid for leaderboard tests
 product_id = uuid4().hex
diff --git a/tests/managers/network/test_label.py b/tests/managers/network/test_label.py
index 71efa95..abdd28f 100644
--- a/tests/managers/network/test_label.py
+++ b/tests/managers/network/test_label.py
@@ -1,11 +1,12 @@
 import ipaddress
+from datetime import datetime
+from typing import TYPE_CHECKING
 
 import faker
 import pytest
 from psycopg.errors import UniqueViolation
 from pydantic import ValidationError
 
-from generalresearch.managers.network.label import IPLabelManager
 from generalresearch.models.network.label import (
     IPLabel,
     IPLabelKind,
@@ -14,11 +15,14 @@ from generalresearch.models.network.label import (
 )
 from generalresearch.models.thl.ipinfo import normalize_ip
 
+if TYPE_CHECKING:
+    from generalresearch.managers.network.label import IPLabelManager
+
 fake = faker.Faker()
 
 
 @pytest.fixture
-def ip_label(utc_now) -> IPLabel:
+def ip_label(utc_now: datetime) -> IPLabel:
     ip = ipaddress.IPv6Network((fake.ipv6(), 64), strict=False)
     return IPLabel(
         label_kind=IPLabelKind.VPN,
@@ -31,7 +35,7 @@ def ip_label(utc_now) -> IPLabel:
     )
 
 
-def test_model(utc_now):
+def test_model(utc_now: datetime):
     ip = fake.ipv4_public()
     lbl = IPLabel(
         label_kind=IPLabelKind.VPN,
@@ -142,7 +146,7 @@ def test_filter_network(
     assert len(res) == 2
 
 
-def test_network(iplabel_manager: IPLabelManager, utc_now):
+def test_network(iplabel_manager: IPLabelManager, utc_now: datetime):
     # This is a fully-specific /128 ipv6 address.
     # e.g. '51b7:b38d:8717:6c5b:cd3e:f5c3:3aba:17d'
     ip = fake.ipv6()
@@ -174,7 +178,10 @@ def test_network(iplabel_manager: IPLabelManager, utc_now):
 
 
 def test_label_cidr_and_ipinfo(
-    iplabel_manager: IPLabelManager, ip_information_factory, ip_geoname, utc_now
+    iplabel_manager: IPLabelManager,
+    ip_information_factory,
+    ip_geoname,
+    utc_now: datetime,
 ):
     # We have network_iplabel.ip as a cidr col and
     # thl_ipinformation.ip as a inet col. Make sure we can join appropriately
diff --git a/tests/managers/test_events.py b/tests/managers/test_events.py
index cb32275..8745126 100644
--- a/tests/managers/test_events.py
+++ b/tests/managers/test_events.py
@@ -8,13 +8,13 @@ from datetime import UTC, datetime, timedelta
 from decimal import Decimal
 from functools import partial
 from math import floor
+from typing import TYPE_CHECKING
 from uuid import uuid4
 
 import pytest
 
-from generalresearch.managers.events import EventManager, EventSubscriber
-from generalresearch.managers.thl.product import ProductManager
-from generalresearch.models import Source
+from generalresearch.managers.events import EventSubscriber
+from generalresearch.models.definitions import Source
 from generalresearch.models.events import (
     AggregateBySource,
     EventType,
@@ -25,7 +25,11 @@ from generalresearch.models.legacy.bucket import Bucket
 from generalresearch.models.thl.definitions import Status, StatusCode1
 from generalresearch.models.thl.session import Session, Wall
 from generalresearch.models.thl.user import User
-from generalresearch.redis_helper import RedisConfig
+
+if TYPE_CHECKING:
+    from generalresearch.managers.events import EventManager
+    from generalresearch.managers.thl.product import ProductManager
+    from generalresearch.redis_helper import RedisConfig
 
 
 # We don't need anything in the db, so not using the db fixtures
diff --git a/tests/managers/test_lucid.py b/tests/managers/test_lucid.py
index 20dca22..6771a0c 100644
--- a/tests/managers/test_lucid.py
+++ b/tests/managers/test_lucid.py
@@ -1,9 +1,13 @@
 from __future__ import annotations
 
+from typing import TYPE_CHECKING
+
 import pytest
 
 from generalresearch.managers.lucid.profiling import get_profiling_library
-from generalresearch.pg_helper import PostgresConfig
+
+if TYPE_CHECKING:
+    from generalresearch.pg_helper import PostgresConfig
 
 qids = ["42", "43", "45", "97", "120", "639", "15297"]
 
diff --git a/tests/managers/thl/test_buyer.py b/tests/managers/thl/test_buyer.py
index 6776ab3..0ab2d52 100644
--- a/tests/managers/thl/test_buyer.py
+++ b/tests/managers/thl/test_buyer.py
@@ -1,9 +1,12 @@
 from __future__ import annotations
 
 from collections.abc import Callable
+from typing import TYPE_CHECKING
 
-from generalresearch.managers.thl.buyer import BuyerManager
-from generalresearch.models import Source
+from generalresearch.models.definitions import Source
+
+if TYPE_CHECKING:
+    from generalresearch.managers.thl.buyer import BuyerManager
 
 
 class TestBuyer:
diff --git a/tests/managers/thl/test_cashout_method.py b/tests/managers/thl/test_cashout_method.py
index ca85c6b..877d7b2 100644
--- a/tests/managers/thl/test_cashout_method.py
+++ b/tests/managers/thl/test_cashout_method.py
@@ -1,21 +1,26 @@
 from __future__ import annotations
 
 from collections.abc import Callable
+from typing import TYPE_CHECKING
 
 import pytest
 
-from generalresearch.config import GRLBaseSettings
-from generalresearch.managers.thl.cashout_method import (
-    CashoutMethodManager,
-)
-from generalresearch.models.thl.user import User
-from generalresearch.models.thl.wallet import PayoutType
 from generalresearch.models.thl.wallet.cashout_method import (
     CashMailCashoutMethodData,
-    CashoutMethod,
     PaypalCashoutMethodData,
     USDeliveryAddress,
 )
+from generalresearch.models.thl.wallet.definitions import PayoutType
+
+if TYPE_CHECKING:
+    from generalresearch.config import GRLBaseSettings
+    from generalresearch.managers.thl.cashout_method import (
+        CashoutMethodManager,
+    )
+    from generalresearch.models.thl.user import User
+    from generalresearch.models.thl.wallet.cashout_method import (
+        CashoutMethod,
+    )
 
 
 class TestTangoCashoutMethods:
diff --git a/tests/managers/thl/test_category.py b/tests/managers/thl/test_category.py
index ec52aae..4d00643 100644
--- a/tests/managers/thl/test_category.py
+++ b/tests/managers/thl/test_category.py
@@ -1,12 +1,15 @@
 from __future__ import annotations
 
 from collections.abc import Callable
+from typing import TYPE_CHECKING
 
 import pytest
 
-from generalresearch.managers.thl.category import CategoryManager
 from generalresearch.models.thl.category import Category
-from generalresearch.pg_helper import PostgresConfig
+
+if TYPE_CHECKING:
+    from generalresearch.managers.thl.category import CategoryManager
+    from generalresearch.pg_helper import PostgresConfig
 
 
 class TestCategory:
diff --git a/tests/managers/thl/test_contest/test_leaderboard.py b/tests/managers/thl/test_contest/test_leaderboard.py
index 3a63075..d80d512 100644
--- a/tests/managers/thl/test_contest/test_leaderboard.py
+++ b/tests/managers/thl/test_contest/test_leaderboard.py
@@ -1,23 +1,28 @@
 from __future__ import annotations
 
 from datetime import UTC, datetime, timedelta
+from typing import TYPE_CHECKING
 from zoneinfo import ZoneInfo
 
 from generalresearch.currency import USDCent
-from generalresearch.managers.thl.contest_manager import ContestManager
-from generalresearch.managers.thl.ledger_manager.thl_ledger import ThlLedgerManager
-from generalresearch.managers.thl.user_manager.user_manager import UserManager
 from generalresearch.models.thl.contest.definitions import (
     ContestEndReason,
     ContestStatus,
 )
 from generalresearch.models.thl.contest.leaderboard import (
     LeaderboardContest,
-    LeaderboardContestCreate,
 )
-from generalresearch.models.thl.product import Product
-from generalresearch.models.thl.user import User
-from generalresearch.redis_helper import RedisConfig
+
+if TYPE_CHECKING:
+    from generalresearch.managers.thl.contest_manager import ContestManager
+    from generalresearch.managers.thl.ledger_manager.thl_ledger import ThlLedgerManager
+    from generalresearch.managers.thl.user_manager.user_manager import UserManager
+    from generalresearch.models.thl.contest.leaderboard import (
+        LeaderboardContestCreate,
+    )
+    from generalresearch.models.thl.product import Product
+    from generalresearch.models.thl.user import User
+    from generalresearch.redis_helper import RedisConfig
 
 
 class TestLeaderboardContestCRUD:
diff --git a/tests/managers/thl/test_contest/test_milestone.py b/tests/managers/thl/test_contest/test_milestone.py
index e29ba4c..dbb2016 100644
--- a/tests/managers/thl/test_contest/test_milestone.py
+++ b/tests/managers/thl/test_contest/test_milestone.py
@@ -2,9 +2,8 @@ from __future__ import annotations
 
 from collections.abc import Callable
 from datetime import UTC, datetime
+from typing import TYPE_CHECKING
 
-from generalresearch.managers.thl.contest_manager import ContestManager
-from generalresearch.managers.thl.ledger_manager.thl_ledger import ThlLedgerManager
 from generalresearch.models.thl.contest.definitions import (
     ContestEndReason,
     ContestStatus,
@@ -12,12 +11,18 @@ from generalresearch.models.thl.contest.definitions import (
 from generalresearch.models.thl.contest.milestone import (
     ContestEntryTrigger,
     MilestoneContest,
-    MilestoneContestCreate,
     MilestoneUserView,
 )
-from generalresearch.models.thl.contest.raffle import RaffleContest
-from generalresearch.models.thl.product import Product
-from generalresearch.models.thl.user import User
+
+if TYPE_CHECKING:
+    from generalresearch.managers.thl.contest_manager import ContestManager
+    from generalresearch.managers.thl.ledger_manager.thl_ledger import ThlLedgerManager
+    from generalresearch.models.thl.contest.milestone import (
+        MilestoneContestCreate,
+    )
+    from generalresearch.models.thl.contest.raffle import RaffleContest
+    from generalresearch.models.thl.product import Product
+    from generalresearch.models.thl.user import User
 
 
 class TestMilestoneContest:
@@ -25,8 +30,6 @@ class TestMilestoneContest:
     def test_should_end(
         self,
         contest: MilestoneContest,
-        thl_ledger_manager: ThlLedgerManager,
-        contest_manager: ContestManager,
     ):
         # contest is active and has no entries
         should, msg = contest.should_end()
@@ -53,7 +56,6 @@ class TestMilestoneContestCRUD:
         self,
         contest_create: MilestoneContestCreate,
         product_user_wallet_yes: Product,
-        thl_ledger_manager: ThlLedgerManager,
         contest_manager: ContestManager,
     ):
         c = contest_manager.create(
diff --git a/tests/managers/thl/test_contest/test_raffle.py b/tests/managers/thl/test_contest/test_raffle.py
index 06d4676..7803952 100644
--- a/tests/managers/thl/test_contest/test_raffle.py
+++ b/tests/managers/thl/test_contest/test_raffle.py
@@ -2,19 +2,17 @@ from __future__ import annotations
 
 from collections.abc import Callable
 from datetime import UTC, datetime
+from typing import TYPE_CHECKING
 
 import pytest
 from pydantic import ValidationError
 from pytest import approx
 
 from generalresearch.currency import USDCent
-from generalresearch.managers.thl.contest_manager import ContestManager
 from generalresearch.managers.thl.ledger_manager.exceptions import (
     LedgerTransactionConditionFailedError,
 )
-from generalresearch.managers.thl.ledger_manager.thl_ledger import ThlLedgerManager
 from generalresearch.models.thl.contest import (
-    Contest,
     ContestEndCondition,
     ContestEntryRule,
     ContestPrize,
@@ -29,11 +27,20 @@ from generalresearch.models.thl.contest.raffle import (
     ContestEntry,
     ContestEntryType,
     RaffleContest,
-    RaffleContestCreate,
-    RaffleUserView,
 )
-from generalresearch.models.thl.product import Product
-from generalresearch.models.thl.user import User
+
+if TYPE_CHECKING:
+    from generalresearch.managers.thl.contest_manager import ContestManager
+    from generalresearch.managers.thl.ledger_manager.thl_ledger import ThlLedgerManager
+    from generalresearch.models.thl.contest import (
+        Contest,
+    )
+    from generalresearch.models.thl.contest.raffle import (
+        RaffleContestCreate,
+        RaffleUserView,
+    )
+    from generalresearch.models.thl.product import Product
+    from generalresearch.models.thl.user import User
 
 
 class TestRaffleContest:
diff --git a/tests/managers/thl/test_harmonized_uqa.py b/tests/managers/thl/test_harmonized_uqa.py
index 84eeb56..2fc0ff0 100644
--- a/tests/managers/thl/test_harmonized_uqa.py
+++ b/tests/managers/thl/test_harmonized_uqa.py
@@ -1,15 +1,18 @@
 from __future__ import annotations
 
 from datetime import UTC, datetime
+from typing import TYPE_CHECKING
 
 import pytest
 
-from generalresearch.managers.thl.profiling.uqa import UQAManager
 from generalresearch.models.thl.profiling.user_question_answer import (
     DUMMY_UQA,
     UserQuestionAnswer,
 )
-from generalresearch.models.thl.user import User
+
+if TYPE_CHECKING:
+    from generalresearch.managers.thl.profiling.uqa import UQAManager
+    from generalresearch.models.thl.user import User
 
 
 @pytest.mark.usefixtures("uqa_db_index", "upk_data", "uqa_manager_clear_cache")
diff --git a/tests/managers/thl/test_ipinfo.py b/tests/managers/thl/test_ipinfo.py
index 48b9efd..6954163 100644
--- a/tests/managers/thl/test_ipinfo.py
+++ b/tests/managers/thl/test_ipinfo.py
@@ -1,4 +1,5 @@
 from collections.abc import Callable
+from typing import TYPE_CHECKING
 
 import faker
 
@@ -12,8 +13,10 @@ from generalresearch.models.thl.ipinfo import (
     IPGeoname,
     IPInformation,
 )
-from generalresearch.pg_helper import PostgresConfig
-from generalresearch.redis_helper import RedisConfig
+
+if TYPE_CHECKING:
+    from generalresearch.pg_helper import PostgresConfig
+    from generalresearch.redis_helper import RedisConfig
 
 fake = faker.Faker()
 
diff --git a/tests/managers/thl/test_ledger/test_lm_accounts.py b/tests/managers/thl/test_ledger/test_lm_accounts.py
index 7b65b2d..f5ed883 100644
--- a/tests/managers/thl/test_ledger/test_lm_accounts.py
+++ b/tests/managers/thl/test_ledger/test_lm_accounts.py
@@ -2,6 +2,7 @@ from __future__ import annotations
 
 from itertools import product as iproduct
 from random import randint
+from typing import TYPE_CHECKING
 from uuid import uuid4
 
 import pytest
@@ -13,13 +14,18 @@ from generalresearch.managers.thl.ledger_manager.exceptions import (
     LedgerAccountDoesntExistError,
 )
 from generalresearch.managers.thl.ledger_manager.ledger import LedgerManager
-from generalresearch.models.custom_types import AccountType, Direction, UUIDStr
+from generalresearch.models.custom_types import AccountType, Direction
 from generalresearch.models.thl.ledger import (
     LedgerAccount,
     LedgerEntry,
-    LedgerTransaction,
 )
 
+if TYPE_CHECKING:
+    from generalresearch.models.custom_types import UUIDStr
+    from generalresearch.models.thl.ledger import (
+        LedgerTransaction,
+    )
+
 
 @pytest.mark.parametrize(
     argnames="currency, kind, acct_id",
diff --git a/tests/managers/thl/test_ledger/test_lm_tx.py b/tests/managers/thl/test_ledger/test_lm_tx.py
index ce609d6..445405e 100644
--- a/tests/managers/thl/test_ledger/test_lm_tx.py
+++ b/tests/managers/thl/test_ledger/test_lm_tx.py
@@ -2,6 +2,7 @@ from __future__ import annotations
 
 from decimal import Decimal
 from random import randint
+from typing import TYPE_CHECKING
 from uuid import uuid4
 
 import pytest
@@ -12,11 +13,15 @@ from generalresearch.managers.thl.ledger_manager.ledger import (
 )
 from generalresearch.models.thl.ledger import (
     Direction,
-    LedgerAccount,
     LedgerEntry,
     LedgerTransaction,
 )
 
+if TYPE_CHECKING:
+    from generalresearch.models.thl.ledger import (
+        LedgerAccount,
+    )
+
 
 class TestLedgerManagerCreateTx:
 
diff --git a/tests/managers/thl/test_ledger/test_lm_tx_entries.py b/tests/managers/thl/test_ledger/test_lm_tx_entries.py
index 9925b87..03c6e02 100644
--- a/tests/managers/thl/test_ledger/test_lm_tx_entries.py
+++ b/tests/managers/thl/test_ledger/test_lm_tx_entries.py
@@ -1,11 +1,17 @@
 from __future__ import annotations
 
-from generalresearch.managers.thl.ledger_manager.ledger import LedgerManager
+from typing import TYPE_CHECKING
+
 from generalresearch.models.thl.ledger import (
     LedgerEntry,
-    LedgerTransaction,
 )
 
+if TYPE_CHECKING:
+    from generalresearch.managers.thl.ledger_manager.ledger import LedgerManager
+    from generalresearch.models.thl.ledger import (
+        LedgerTransaction,
+    )
+
 
 class TestLedgerEntryManager:
 
diff --git a/tests/managers/thl/test_ledger/test_lm_tx_locks.py b/tests/managers/thl/test_ledger/test_lm_tx_locks.py
index e603632..9ecc1bc 100644
--- a/tests/managers/thl/test_ledger/test_lm_tx_locks.py
+++ b/tests/managers/thl/test_ledger/test_lm_tx_locks.py
@@ -5,10 +5,10 @@ from collections.abc import Callable, Generator
 from datetime import UTC, datetime, timedelta
 from decimal import Decimal
 from logging import LogCaptureFixture
+from typing import TYPE_CHECKING
 
 import pytest
 
-from generalresearch.currency import LedgerCurrency
 from generalresearch.managers.thl.ledger_manager.conditions import (
     generate_condition_mp_payment,
 )
@@ -17,11 +17,8 @@ from generalresearch.managers.thl.ledger_manager.exceptions import (
     LedgerTransactionCreateLockError,
     LedgerTransactionFlagAlreadyExistsError,
 )
-from generalresearch.managers.thl.ledger_manager.ledger import LedgerManager
-from generalresearch.managers.thl.ledger_manager.thl_ledger import ThlLedgerManager
-from generalresearch.models import Source
+from generalresearch.models.definitions import Source
 from generalresearch.models.thl.ledger import LedgerTransaction
-from generalresearch.models.thl.product import Product
 from generalresearch.models.thl.session import (
     Session,
     Status,
@@ -29,7 +26,13 @@ from generalresearch.models.thl.session import (
     Wall,
     WallAdjustedStatus,
 )
-from generalresearch.models.thl.user import User
+
+if TYPE_CHECKING:
+    from generalresearch.currency import LedgerCurrency
+    from generalresearch.managers.thl.ledger_manager.ledger import LedgerManager
+    from generalresearch.managers.thl.ledger_manager.thl_ledger import ThlLedgerManager
+    from generalresearch.models.thl.product import Product
+    from generalresearch.models.thl.user import User
 
 logger = logging.getLogger("LedgerManager")
 
diff --git a/tests/managers/thl/test_ledger/test_lm_tx_metadata.py b/tests/managers/thl/test_ledger/test_lm_tx_metadata.py
index f63efa4..3d8cf89 100644
--- a/tests/managers/thl/test_ledger/test_lm_tx_metadata.py
+++ b/tests/managers/thl/test_ledger/test_lm_tx_metadata.py
@@ -1,9 +1,12 @@
 from __future__ import annotations
 
-from generalresearch.managers.thl.ledger_manager.ledger import (
-    LedgerManager,
-    LedgerTransaction,
-)
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from generalresearch.managers.thl.ledger_manager.ledger import (
+        LedgerManager,
+        LedgerTransaction,
+    )
 
 
 class TestLedgerMetadataManager:
diff --git a/tests/managers/thl/test_ledger/test_thl_lm_accounts.py b/tests/managers/thl/test_ledger/test_thl_lm_accounts.py
index 60eb71c..adff446 100644
--- a/tests/managers/thl/test_ledger/test_thl_lm_accounts.py
+++ b/tests/managers/thl/test_ledger/test_thl_lm_accounts.py
@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 from collections.abc import Callable
+from typing import TYPE_CHECKING
 from uuid import uuid4
 
 import pytest
@@ -9,18 +10,20 @@ from generalresearch.currency import LedgerCurrency
 from generalresearch.managers.thl.ledger_manager.exceptions import (
     LedgerAccountDoesntExistError,
 )
-from generalresearch.managers.thl.ledger_manager.ledger import (
-    LedgerAccountManager,
-    LedgerManager,
-)
-from generalresearch.managers.thl.ledger_manager.thl_ledger import ThlLedgerManager
 from generalresearch.models.thl.ledger import (
     AccountType,
     Direction,
     LedgerAccount,
 )
 from generalresearch.models.thl.product import Product
-from generalresearch.models.thl.user import User
+
+if TYPE_CHECKING:
+    from generalresearch.managers.thl.ledger_manager.ledger import (
+        LedgerAccountManager,
+        LedgerManager,
+    )
+    from generalresearch.managers.thl.ledger_manager.thl_ledger import ThlLedgerManager
+    from generalresearch.models.thl.user import User
 
 
 class TestThlLedgerManagerAccounts:
diff --git a/tests/managers/thl/test_ledger/test_thl_lm_bp_payout.py b/tests/managers/thl/test_ledger/test_thl_lm_bp_payout.py
index b518453..14c5270 100644
--- a/tests/managers/thl/test_ledger/test_thl_lm_bp_payout.py
+++ b/tests/managers/thl/test_ledger/test_thl_lm_bp_payout.py
@@ -5,6 +5,7 @@ from collections.abc import Callable
 from datetime import UTC, datetime, timedelta
 from decimal import Decimal
 from random import randint
+from typing import TYPE_CHECKING
 from uuid import uuid4
 
 import pytest
@@ -12,7 +13,7 @@ import redis
 from pydantic import RedisDsn
 from redis.lock import Lock
 
-from generalresearch.currency import LedgerCurrency, USDCent
+from generalresearch.currency import USDCent
 from generalresearch.managers.base import Permission
 from generalresearch.managers.thl.ledger_manager.exceptions import (
     LedgerTransactionConditionFailedError,
@@ -22,24 +23,27 @@ from generalresearch.managers.thl.ledger_manager.exceptions import (
 )
 from generalresearch.managers.thl.ledger_manager.ledger import LedgerTransaction
 from generalresearch.managers.thl.ledger_manager.thl_ledger import ThlLedgerManager
-from generalresearch.managers.thl.payout import (
-    BrokerageProductPayoutEventManager,
-)
-from generalresearch.models import Source
+from generalresearch.models.definitions import Source
 from generalresearch.models.thl.definitions import PayoutStatus
 from generalresearch.models.thl.ledger import Direction, TransactionType
-from generalresearch.models.thl.product import Product
 from generalresearch.models.thl.session import (
     Session,
     Status,
     StatusCode1,
     Wall,
 )
-from generalresearch.models.thl.user import User
-from generalresearch.models.thl.wallet import PayoutType
-from generalresearch.pg_helper import PostgresConfig
+from generalresearch.models.thl.wallet.definitions import PayoutType
 from generalresearch.redis_helper import RedisConfig
 
+if TYPE_CHECKING:
+    from generalresearch.currency import LedgerCurrency
+    from generalresearch.managers.thl.payout import (
+        BrokerageProductPayoutEventManager,
+    )
+    from generalresearch.models.thl.product import Product
+    from generalresearch.models.thl.user import User
+    from generalresearch.pg_helper import PostgresConfig
+
 
 def broken_acquire(self, *args, **kwargs):
     raise redis.exceptions.TimeoutError("Simulated timeout during acquire")
diff --git a/tests/managers/thl/test_ledger/test_thl_lm_tx.py b/tests/managers/thl/test_ledger/test_thl_lm_tx.py
index 1860d6d..2e4ab5e 100644
--- a/tests/managers/thl/test_ledger/test_thl_lm_tx.py
+++ b/tests/managers/thl/test_ledger/test_thl_lm_tx.py
@@ -5,26 +5,21 @@ from collections.abc import Callable
 from datetime import UTC, datetime, timedelta
 from decimal import Decimal
 from random import randint
+from typing import TYPE_CHECKING
 from uuid import uuid4
 
 import pytest
 
-from generalresearch.currency import LedgerCurrency, USDCent
+from generalresearch.currency import USDCent
 from generalresearch.managers.thl.ledger_manager.ledger import (
-    LedgerManager,
     LedgerTransaction,
 )
-from generalresearch.managers.thl.ledger_manager.thl_ledger import ThlLedgerManager
-from generalresearch.managers.thl.product import ProductManager
-from generalresearch.managers.thl.session import SessionManager
-from generalresearch.managers.thl.wall import WallManager
-from generalresearch.models import Source
+from generalresearch.models.definitions import Source
 from generalresearch.models.thl.definitions import (
     WALL_ALLOWED_STATUS_STATUS_CODE,
 )
 from generalresearch.models.thl.ledger import (
     Direction,
-    LedgerAccount,
     TransactionType,
 )
 from generalresearch.models.thl.payout import UserPayoutEvent
@@ -41,8 +36,21 @@ from generalresearch.models.thl.session import (
     Wall,
     WallAdjustedStatus,
 )
-from generalresearch.models.thl.user import User
-from generalresearch.models.thl.wallet import PayoutType
+from generalresearch.models.thl.wallet.definitions import PayoutType
+
+if TYPE_CHECKING:
+    from generalresearch.currency import LedgerCurrency
+    from generalresearch.managers.thl.ledger_manager.ledger import (
+        LedgerManager,
+    )
+    from generalresearch.managers.thl.ledger_manager.thl_ledger import ThlLedgerManager
+    from generalresearch.managers.thl.product import ProductManager
+    from generalresearch.managers.thl.session import SessionManager
+    from generalresearch.managers.thl.wall import WallManager
+    from generalresearch.models.thl.ledger import (
+        LedgerAccount,
+    )
+    from generalresearch.models.thl.user import User
 
 logger = logging.getLogger("LedgerManager")
 
diff --git a/tests/managers/thl/test_ledger/test_thl_lm_tx__user_payouts.py b/tests/managers/thl/test_ledger/test_thl_lm_tx__user_payouts.py
index 82dc143..3fd21dc 100644
--- a/tests/managers/thl/test_ledger/test_thl_lm_tx__user_payouts.py
+++ b/tests/managers/thl/test_ledger/test_thl_lm_tx__user_payouts.py
@@ -3,6 +3,7 @@ from __future__ import annotations
 import logging
 from collections.abc import Callable
 from decimal import Decimal
+from typing import TYPE_CHECKING
 from uuid import uuid4
 
 import pytest
@@ -11,12 +12,14 @@ from generalresearch.managers.thl.ledger_manager.exceptions import (
     LedgerTransactionConditionFailedError,
     LedgerTransactionFlagAlreadyExistsError,
 )
-from generalresearch.managers.thl.ledger_manager.ledger import LedgerManager
-from generalresearch.managers.thl.ledger_manager.thl_ledger import ThlLedgerManager
 from generalresearch.models.thl.payout import UserPayoutEvent
-from generalresearch.models.thl.product import Product
-from generalresearch.models.thl.user import User
-from generalresearch.models.thl.wallet import PayoutType
+from generalresearch.models.thl.wallet.definitions import PayoutType
+
+if TYPE_CHECKING:
+    from generalresearch.managers.thl.ledger_manager.ledger import LedgerManager
+    from generalresearch.managers.thl.ledger_manager.thl_ledger import ThlLedgerManager
+    from generalresearch.models.thl.product import Product
+    from generalresearch.models.thl.user import User
 
 
 class TestLedgerManagerAMT:
diff --git a/tests/managers/thl/test_ledger/test_thl_pem.py b/tests/managers/thl/test_ledger/test_thl_pem.py
index 29341cf..9dbec48 100644
--- a/tests/managers/thl/test_ledger/test_thl_pem.py
+++ b/tests/managers/thl/test_ledger/test_thl_pem.py
@@ -2,28 +2,31 @@ from __future__ import annotations
 
 from collections.abc import Callable
 from random import randint
+from typing import TYPE_CHECKING
 from uuid import UUID, uuid4
 
 import pytest
 
 from generalresearch.currency import USDCent
-from generalresearch.managers.thl.ledger_manager.ledger import LedgerManager
-from generalresearch.managers.thl.ledger_manager.thl_ledger import (
-    ThlLedgerManager,
-)
-from generalresearch.managers.thl.payout import (
-    BrokerageProductPayoutEventManager,
-    UserPayoutEventManager,
-)
 from generalresearch.models.thl.definitions import PayoutStatus
 from generalresearch.models.thl.payout import (
     BrokerageProductPayoutEvent,
 )
-from generalresearch.models.thl.product import Product
 from generalresearch.models.thl.wallet.cashout_method import (
     CashoutRequestInfo,
 )
 
+if TYPE_CHECKING:
+    from generalresearch.managers.thl.ledger_manager.ledger import LedgerManager
+    from generalresearch.managers.thl.ledger_manager.thl_ledger import (
+        ThlLedgerManager,
+    )
+    from generalresearch.managers.thl.payout import (
+        BrokerageProductPayoutEventManager,
+        UserPayoutEventManager,
+    )
+    from generalresearch.models.thl.product import Product
+
 
 class TestThlPayoutEventManager:
 
diff --git a/tests/managers/thl/test_ledger/test_user_txs.py b/tests/managers/thl/test_ledger/test_user_txs.py
index 56dc485..1c08498 100644
--- a/tests/managers/thl/test_ledger/test_user_txs.py
+++ b/tests/managers/thl/test_ledger/test_user_txs.py
@@ -3,12 +3,9 @@ from __future__ import annotations
 from collections.abc import Callable
 from datetime import UTC, datetime
 from decimal import Decimal
+from typing import TYPE_CHECKING
 from uuid import uuid4
 
-from generalresearch.config import GRLBaseSettings
-from generalresearch.managers.thl.ledger_manager.ledger import LedgerManager
-from generalresearch.managers.thl.ledger_manager.thl_ledger import ThlLedgerManager
-from generalresearch.managers.thl.payout import UserPayoutEventManager
 from generalresearch.managers.thl.user_compensate import user_compensate
 from generalresearch.models.thl.definitions import (
     Status,
@@ -18,10 +15,16 @@ from generalresearch.models.thl.ledger import (
     UserLedgerTransactionTypesSummary,
     UserLedgerTransactionTypeSummary,
 )
-from generalresearch.models.thl.product import Product
-from generalresearch.models.thl.session import Session
-from generalresearch.models.thl.user import User
-from generalresearch.models.thl.wallet import PayoutType
+from generalresearch.models.thl.wallet.definitions import PayoutType
+
+if TYPE_CHECKING:
+    from generalresearch.config import GRLBaseSettings
+    from generalresearch.managers.thl.ledger_manager.ledger import LedgerManager
+    from generalresearch.managers.thl.ledger_manager.thl_ledger import ThlLedgerManager
+    from generalresearch.managers.thl.payout import UserPayoutEventManager
+    from generalresearch.models.thl.product import Product
+    from generalresearch.models.thl.session import Session
+    from generalresearch.models.thl.user import User
 
 
 def test_user_txs(
diff --git a/tests/managers/thl/test_ledger/test_wallet.py b/tests/managers/thl/test_ledger/test_wallet.py
index cad3ea4..1ee9bf9 100644
--- a/tests/managers/thl/test_ledger/test_wallet.py
+++ b/tests/managers/thl/test_ledger/test_wallet.py
@@ -2,12 +2,11 @@ from __future__ import annotations
 
 from collections.abc import Callable
 from decimal import Decimal
+from typing import TYPE_CHECKING
 from uuid import uuid4
 
 import pytest
 
-from generalresearch.managers.thl.ledger_manager.thl_ledger import ThlLedgerManager
-from generalresearch.managers.thl.product import ProductManager
 from generalresearch.models.thl.product import (
     PayoutConfig,
     PayoutTransformation,
@@ -15,7 +14,11 @@ from generalresearch.models.thl.product import (
     Product,
     UserWalletConfig,
 )
-from generalresearch.models.thl.user import User
+
+if TYPE_CHECKING:
+    from generalresearch.managers.thl.ledger_manager.thl_ledger import ThlLedgerManager
+    from generalresearch.managers.thl.product import ProductManager
+    from generalresearch.models.thl.user import User
 
 
 @pytest.fixture()
diff --git a/tests/managers/thl/test_payout.py b/tests/managers/thl/test_payout.py
index 0f3f103..2494de8 100644
--- a/tests/managers/thl/test_payout.py
+++ b/tests/managers/thl/test_payout.py
@@ -6,6 +6,7 @@ from datetime import UTC, datetime, timedelta
 from decimal import Decimal
 from random import choice as rand_choice
 from random import randint
+from typing import TYPE_CHECKING
 from uuid import uuid4
 
 import pandas as pd
@@ -13,35 +14,39 @@ import pytest
 from dask.distributed import Client as DaskClient
 
 from generalresearch.currency import USDCent
-from generalresearch.incite.base import GRLDatasets
-from generalresearch.incite.collections.thl_web import (
-    LedgerDFCollection,
-)
-from generalresearch.incite.mergers.pop_ledger import PopLedgerMerge
-from generalresearch.managers.thl.ledger_manager.ledger import LedgerManager
-from generalresearch.managers.thl.ledger_manager.thl_ledger import ThlLedgerManager
-from generalresearch.managers.thl.payout import (
-    BrokerageProductPayoutEventManager,
-    BusinessPayoutEventManager,
-    PayoutEventManager,
-    UserPayoutEventManager,
-)
-from generalresearch.managers.thl.product import ProductManager
-from generalresearch.models.gr.business import Business
 from generalresearch.models.thl.definitions import PayoutStatus
 from generalresearch.models.thl.finance import BusinessBalances
-from generalresearch.models.thl.ledger import LedgerAccount
 from generalresearch.models.thl.payout import (
     BrokerageProductPayoutEvent,
     BusinessPayoutEvent,
-    UserPayoutEvent,
 )
-from generalresearch.models.thl.product import Product
-from generalresearch.models.thl.session import Session
-from generalresearch.models.thl.user import User
-from generalresearch.models.thl.wallet import PayoutType
-from generalresearch.pg_helper import PostgresConfig
-from generalresearch.redis_helper import RedisConfig
+from generalresearch.models.thl.wallet.definitions import PayoutType
+
+if TYPE_CHECKING:
+    from generalresearch.incite.base import GRLDatasets
+    from generalresearch.incite.collections.thl_web import (
+        LedgerDFCollection,
+    )
+    from generalresearch.incite.mergers.pop_ledger import PopLedgerMerge
+    from generalresearch.managers.thl.ledger_manager.ledger import LedgerManager
+    from generalresearch.managers.thl.ledger_manager.thl_ledger import ThlLedgerManager
+    from generalresearch.managers.thl.payout import (
+        BrokerageProductPayoutEventManager,
+        BusinessPayoutEventManager,
+        PayoutEventManager,
+        UserPayoutEventManager,
+    )
+    from generalresearch.managers.thl.product import ProductManager
+    from generalresearch.models.gr.business import Business
+    from generalresearch.models.thl.ledger import LedgerAccount
+    from generalresearch.models.thl.payout import (
+        UserPayoutEvent,
+    )
+    from generalresearch.models.thl.product import Product
+    from generalresearch.models.thl.session import Session
+    from generalresearch.models.thl.user import User
+    from generalresearch.pg_helper import PostgresConfig
+    from generalresearch.redis_helper import RedisConfig
 
 logger = logging.getLogger()
 
@@ -189,7 +194,7 @@ class TestPayout:
         utc_now: datetime,
     ):
         from generalresearch.models.thl.definitions import PayoutStatus
-        from generalresearch.models.thl.wallet import PayoutType
+        from generalresearch.models.thl.wallet.definitions import PayoutType
 
         user_account = thl_ledger_manager.get_account_or_create_user_wallet(user=user)
         bp_account = thl_ledger_manager.get_account_or_create_bp_wallet(product=product)
diff --git a/tests/managers/thl/test_product.py b/tests/managers/thl/test_product.py
index f93ac36..644dc90 100644
--- a/tests/managers/thl/test_product.py
+++ b/tests/managers/thl/test_product.py
@@ -1,13 +1,12 @@
 from __future__ import annotations
 
 from collections.abc import Callable
+from typing import TYPE_CHECKING
 from uuid import uuid4
 
 import pytest
 
-from generalresearch.managers.thl.product import ProductManager
-from generalresearch.models import Source
-from generalresearch.models.gr.team import Team
+from generalresearch.models.definitions import Source
 from generalresearch.models.thl.product import (
     Product,
     ProfilingConfig,
@@ -19,6 +18,10 @@ from generalresearch.models.thl.product import (
     UserHealthConfig,
 )
 
+if TYPE_CHECKING:
+    from generalresearch.managers.thl.product import ProductManager
+    from generalresearch.models.gr.team import Team
+
 
 class TestProductManagerGetMethods:
     def test_get_by_uuid(self, product_manager: ProductManager):
diff --git a/tests/managers/thl/test_product_prod.py b/tests/managers/thl/test_product_prod.py
index 8734210..d584527 100644
--- a/tests/managers/thl/test_product_prod.py
+++ b/tests/managers/thl/test_product_prod.py
@@ -2,13 +2,16 @@ from __future__ import annotations
 
 import logging
 from collections.abc import Callable
+from typing import TYPE_CHECKING
 from uuid import uuid4
 
 import pytest
 
-from generalresearch.managers.thl.product import ProductManager
 from generalresearch.models.thl.product import Product
 
+if TYPE_CHECKING:
+    from generalresearch.managers.thl.product import ProductManager
+
 logger = logging.getLogger()
 
 
diff --git a/tests/managers/thl/test_profiling/test_question.py b/tests/managers/thl/test_profiling/test_question.py
index 97e7365..e4afb87 100644
--- a/tests/managers/thl/test_profiling/test_question.py
+++ b/tests/managers/thl/test_profiling/test_question.py
@@ -1,8 +1,11 @@
 from collections.abc import Callable
+from typing import TYPE_CHECKING
 from uuid import uuid4
 
-from generalresearch.managers.thl.profiling.question import QuestionManager
-from generalresearch.models import Source
+from generalresearch.models.definitions import Source
+
+if TYPE_CHECKING:
+    from generalresearch.managers.thl.profiling.question import QuestionManager
 
 
 class TestQuestionManager:
diff --git a/tests/managers/thl/test_profiling/test_schema.py b/tests/managers/thl/test_profiling/test_schema.py
index b0eae31..feab902 100644
--- a/tests/managers/thl/test_profiling/test_schema.py
+++ b/tests/managers/thl/test_profiling/test_schema.py
@@ -1,10 +1,13 @@
 from collections.abc import Callable
+from typing import TYPE_CHECKING
 
-from generalresearch.managers.thl.profiling.schema import (
-    UpkSchemaManager,
-)
 from generalresearch.models.thl.profiling.upk_property import PropertyType
 
+if TYPE_CHECKING:
+    from generalresearch.managers.thl.profiling.schema import (
+        UpkSchemaManager,
+    )
+
 
 class TestUpkSchemaManager:
 
diff --git a/tests/managers/thl/test_profiling/test_user_upk.py b/tests/managers/thl/test_profiling/test_user_upk.py
index fa10b67..0f3140c 100644
--- a/tests/managers/thl/test_profiling/test_user_upk.py
+++ b/tests/managers/thl/test_profiling/test_user_upk.py
@@ -1,8 +1,10 @@
 from collections.abc import Callable
 from datetime import UTC, datetime
+from typing import TYPE_CHECKING
 
-from generalresearch.managers.thl.profiling.user_upk import UserUpkManager
-from generalresearch.models.thl.user import User
+if TYPE_CHECKING:
+    from generalresearch.managers.thl.profiling.user_upk import UserUpkManager
+    from generalresearch.models.thl.user import User
 
 now = datetime.now(tz=UTC)
 base = {
diff --git a/tests/managers/thl/test_session_manager.py b/tests/managers/thl/test_session_manager.py
index 05a49c1..30fd9ec 100644
--- a/tests/managers/thl/test_session_manager.py
+++ b/tests/managers/thl/test_session_manager.py
@@ -3,24 +3,27 @@ from __future__ import annotations
 from collections.abc import Callable
 from datetime import datetime, timedelta
 from decimal import Decimal
+from typing import TYPE_CHECKING
 from uuid import uuid4
 
 from faker import Faker
 
-from generalresearch.managers.thl.session import SessionManager
-from generalresearch.models import DeviceType
-from generalresearch.models.gr.business import Business
-from generalresearch.models.gr.team import Team
+from generalresearch.models.definitions import DeviceType
 from generalresearch.models.legacy.bucket import Bucket
 from generalresearch.models.thl.definitions import (
     SessionStatusCode2,
     Status,
     StatusCode1,
 )
-from generalresearch.models.thl.product import Product
 from generalresearch.models.thl.session import Session
 from generalresearch.models.thl.user import User
-from generalresearch.pg_helper import PostgresConfig
+
+if TYPE_CHECKING:
+    from generalresearch.managers.thl.session import SessionManager
+    from generalresearch.models.gr.business import Business
+    from generalresearch.models.gr.team import Team
+    from generalresearch.models.thl.product import Product
+    from generalresearch.pg_helper import PostgresConfig
 
 fake = Faker()
 
diff --git a/tests/managers/thl/test_survey.py b/tests/managers/thl/test_survey.py
index c3ab162..e114b70 100644
--- a/tests/managers/thl/test_survey.py
+++ b/tests/managers/thl/test_survey.py
@@ -4,16 +4,11 @@ import uuid
 from collections.abc import Callable
 from datetime import UTC, datetime
 from decimal import Decimal
+from typing import TYPE_CHECKING
 
 import pytest
 
-from generalresearch.managers.thl.buyer import BuyerManager
-from generalresearch.managers.thl.profiling.question import (
-    QuestionManager,
-)
-from generalresearch.managers.thl.profiling.uqa import UQAManager
-from generalresearch.managers.thl.survey import SurveyManager, SurveyStatManager
-from generalresearch.models import Source
+from generalresearch.models.definitions import Source
 from generalresearch.models.legacy.bucket import (
     DurationSummary,
     PayoutSummary,
@@ -30,6 +25,14 @@ from generalresearch.models.thl.survey.model import (
     SurveyStat,
 )
 
+if TYPE_CHECKING:
+    from generalresearch.managers.thl.buyer import BuyerManager
+    from generalresearch.managers.thl.profiling.question import (
+        QuestionManager,
+    )
+    from generalresearch.managers.thl.profiling.uqa import UQAManager
+    from generalresearch.managers.thl.survey import SurveyManager, SurveyStatManager
+
 
 @pytest.fixture(scope="session")
 def surveys_fixture() -> list[Survey]:
@@ -223,7 +226,6 @@ class TestSurvey:
 class TestSurveyStat:
     def test(
         self,
-        delete_buyers_surveys: Callable[..., None],
         surveystat_manager,
         survey_manager: SurveyManager,
         surveys_fixture: list[Survey],
diff --git a/tests/managers/thl/test_survey_penalty.py b/tests/managers/thl/test_survey_penalty.py
index 9c29a0a..04f69d2 100644
--- a/tests/managers/thl/test_survey_penalty.py
+++ b/tests/managers/thl/test_survey_penalty.py
@@ -1,16 +1,19 @@
 from __future__ import annotations
 
 import uuid
+from typing import TYPE_CHECKING
 
 import pytest
 
-from generalresearch.managers.thl.survey_penalty import SurveyPenaltyManager
-from generalresearch.models import Source
+from generalresearch.models.definitions import Source
 from generalresearch.models.thl.survey.penalty import (
     BPSurveyPenalty,
     TeamSurveyPenalty,
 )
 
+if TYPE_CHECKING:
+    from generalresearch.managers.thl.survey_penalty import SurveyPenaltyManager
+
 
 @pytest.fixture
 def product_uuid() -> str:
diff --git a/tests/managers/thl/test_task_adjustment.py b/tests/managers/thl/test_task_adjustment.py
index a7324c3..a14401e 100644
--- a/tests/managers/thl/test_task_adjustment.py
+++ b/tests/managers/thl/test_task_adjustment.py
@@ -5,23 +5,26 @@ from collections.abc import Callable
 from datetime import UTC, datetime, timedelta
 from decimal import Decimal
 from random import randint
+from typing import TYPE_CHECKING
 
 import pytest
 
-from generalresearch.managers.thl.ledger_manager.thl_ledger import ThlLedgerManager
-from generalresearch.managers.thl.session import SessionManager
-from generalresearch.managers.thl.task_adjustment import (
-    TaskAdjustmentManager,
-)
-from generalresearch.managers.thl.wall import WallManager
-from generalresearch.models import Source
+from generalresearch.models.definitions import Source
 from generalresearch.models.thl.definitions import (
     Status,
     StatusCode1,
     WallAdjustedStatus,
 )
-from generalresearch.models.thl.session import Session
-from generalresearch.models.thl.user import User
+
+if TYPE_CHECKING:
+    from generalresearch.managers.thl.ledger_manager.thl_ledger import ThlLedgerManager
+    from generalresearch.managers.thl.session import SessionManager
+    from generalresearch.managers.thl.task_adjustment import (
+        TaskAdjustmentManager,
+    )
+    from generalresearch.managers.thl.wall import WallManager
+    from generalresearch.models.thl.session import Session
+    from generalresearch.models.thl.user import User
 
 
 @pytest.fixture()
diff --git a/tests/managers/thl/test_task_status.py b/tests/managers/thl/test_task_status.py
index b47f650..9846ce0 100644
--- a/tests/managers/thl/test_task_status.py
+++ b/tests/managers/thl/test_task_status.py
@@ -3,13 +3,11 @@ from __future__ import annotations
 from collections.abc import Callable
 from datetime import UTC, datetime, timedelta
 from decimal import Decimal
+from typing import TYPE_CHECKING
 
 import pytest
 
-from generalresearch.managers.thl.product import ProductManager
-from generalresearch.managers.thl.session import SessionManager
-from generalresearch.managers.thl.wall import WallManager
-from generalresearch.models import Source
+from generalresearch.models.definitions import Source
 from generalresearch.models.thl.definitions import (
     Status,
     StatusCode1,
@@ -19,12 +17,18 @@ from generalresearch.models.thl.product import (
     PayoutConfig,
     PayoutTransformation,
     PayoutTransformationPercentArgs,
-    Product,
     UserWalletConfig,
 )
-from generalresearch.models.thl.session import Session, WallOut
+from generalresearch.models.thl.session import WallOut
 from generalresearch.models.thl.task_status import TaskStatusResponse
-from generalresearch.models.thl.user import User
+
+if TYPE_CHECKING:
+    from generalresearch.managers.thl.product import ProductManager
+    from generalresearch.managers.thl.session import SessionManager
+    from generalresearch.managers.thl.wall import WallManager
+    from generalresearch.models.thl.product import Product
+    from generalresearch.models.thl.session import Session
+    from generalresearch.models.thl.user import User
 
 start1 = datetime(2023, 2, 1, tzinfo=UTC)
 finish1 = start1 + timedelta(minutes=5)
diff --git a/tests/managers/thl/test_user_manager/test_base.py b/tests/managers/thl/test_user_manager/test_base.py
index 8cd83ad..4a9750e 100644
--- a/tests/managers/thl/test_user_manager/test_base.py
+++ b/tests/managers/thl/test_user_manager/test_base.py
@@ -1,11 +1,11 @@
 import logging
 from datetime import UTC, datetime
 from random import randint
+from typing import TYPE_CHECKING
 from uuid import uuid4
 
 import pytest
 
-from generalresearch.managers.thl.product import ProductManager
 from generalresearch.managers.thl.user_manager import (
     UserCreateNotAllowedError,
     get_bp_user_create_limit_hourly,
@@ -17,13 +17,17 @@ from generalresearch.managers.thl.user_manager.rate_limit import (
     RateLimitItemPerHourConstantKey,
     UserManagerLimiter,
 )
-from generalresearch.managers.thl.user_manager.user_manager import (
-    UserManager,
-)
-from generalresearch.managers.thl.userhealth import AuditLogManager
-from generalresearch.models.thl.product import Product, UserCreateConfig
+from generalresearch.models.thl.product import UserCreateConfig
 from generalresearch.models.thl.user import User
-from generalresearch.pg_helper import PostgresConfig
+
+if TYPE_CHECKING:
+    from generalresearch.managers.thl.product import ProductManager
+    from generalresearch.managers.thl.user_manager.user_manager import (
+        UserManager,
+    )
+    from generalresearch.managers.thl.userhealth import AuditLogManager
+    from generalresearch.models.thl.product import Product
+    from generalresearch.pg_helper import PostgresConfig
 
 logger = logging.getLogger()
 
diff --git a/tests/managers/thl/test_user_manager/test_mysql.py b/tests/managers/thl/test_user_manager/test_mysql.py
index e6f43ef..ed7d458 100644
--- a/tests/managers/thl/test_user_manager/test_mysql.py
+++ b/tests/managers/thl/test_user_manager/test_mysql.py
@@ -1,9 +1,12 @@
 from __future__ import annotations
 
-from generalresearch.managers.thl.user_manager.mysql_user_manager import (
-    MysqlUserManager,
-)
-from generalresearch.models.thl.user import User
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from generalresearch.managers.thl.user_manager.mysql_user_manager import (
+        MysqlUserManager,
+    )
+    from generalresearch.models.thl.user import User
 
 
 class TestUserManagerMysqlNew:
diff --git a/tests/managers/thl/test_user_manager/test_redis.py b/tests/managers/thl/test_user_manager/test_redis.py
index 04071ee..e51aae9 100644
--- a/tests/managers/thl/test_user_manager/test_redis.py
+++ b/tests/managers/thl/test_user_manager/test_redis.py
@@ -1,14 +1,18 @@
 from __future__ import annotations
 
+from typing import TYPE_CHECKING
+
 import pytest
 
-from generalresearch.config import GRLBaseSettings
 from generalresearch.managers.base import Permission
 from generalresearch.managers.thl.user_manager.redis_user_manager import (
     RedisUserManager,
 )
-from generalresearch.models.thl.user import User
-from generalresearch.pg_helper import PostgresConfig
+
+if TYPE_CHECKING:
+    from generalresearch.config import GRLBaseSettings
+    from generalresearch.models.thl.user import User
+    from generalresearch.pg_helper import PostgresConfig
 
 
 class TestUserManagerRedis:
diff --git a/tests/managers/thl/test_user_manager/test_user_fetch.py b/tests/managers/thl/test_user_manager/test_user_fetch.py
index 87d010a..9a279ed 100644
--- a/tests/managers/thl/test_user_manager/test_user_fetch.py
+++ b/tests/managers/thl/test_user_manager/test_user_fetch.py
@@ -1,13 +1,15 @@
 from __future__ import annotations
 
 from collections.abc import Callable
+from typing import TYPE_CHECKING
 from uuid import uuid4
 
 import pytest
 
-from generalresearch.managers.thl.user_manager.user_manager import UserManager
-from generalresearch.models.thl.product import Product
-from generalresearch.models.thl.user import User
+if TYPE_CHECKING:
+    from generalresearch.managers.thl.user_manager.user_manager import UserManager
+    from generalresearch.models.thl.product import Product
+    from generalresearch.models.thl.user import User
 
 
 class TestUserManagerFetch:
diff --git a/tests/managers/thl/test_user_manager/test_user_metadata.py b/tests/managers/thl/test_user_manager/test_user_metadata.py
index 670e38a..eb6a272 100644
--- a/tests/managers/thl/test_user_manager/test_user_metadata.py
+++ b/tests/managers/thl/test_user_manager/test_user_metadata.py
@@ -1,17 +1,20 @@
 from __future__ import annotations
 
 from collections.abc import Callable
+from typing import TYPE_CHECKING
 from uuid import uuid4
 
 import pytest
 
-from generalresearch.managers.thl.user_manager.user_metadata_manager import (
-    UserMetadataManager,
-)
-from generalresearch.models.thl.product import Product
-from generalresearch.models.thl.user import User
 from generalresearch.models.thl.user_profile import UserMetadata
 
+if TYPE_CHECKING:
+    from generalresearch.managers.thl.user_manager.user_metadata_manager import (
+        UserMetadataManager,
+    )
+    from generalresearch.models.thl.product import Product
+    from generalresearch.models.thl.user import User
+
 
 class TestUserMetadataManager:
 
diff --git a/tests/managers/thl/test_user_streak.py b/tests/managers/thl/test_user_streak.py
index 61e2947..564a142 100644
--- a/tests/managers/thl/test_user_streak.py
+++ b/tests/managers/thl/test_user_streak.py
@@ -3,17 +3,15 @@ from __future__ import annotations
 import copy
 from datetime import UTC, date, datetime, timedelta
 from decimal import Decimal
+from typing import TYPE_CHECKING
 from zoneinfo import ZoneInfo
 
 import pytest
 
-from generalresearch.managers.thl.session import SessionManager
 from generalresearch.managers.thl.user_streak import (
-    UserStreakManager,
     compute_streaks_from_days,
 )
 from generalresearch.models.thl.definitions import Status, StatusCode1
-from generalresearch.models.thl.user import User
 from generalresearch.models.thl.user_streak import (
     StreakFulfillment,
     StreakPeriod,
@@ -21,6 +19,13 @@ from generalresearch.models.thl.user_streak import (
     UserStreak,
 )
 
+if TYPE_CHECKING:
+    from generalresearch.managers.thl.session import SessionManager
+    from generalresearch.managers.thl.user_streak import (
+        UserStreakManager,
+    )
+    from generalresearch.models.thl.user import User
+
 
 def test_compute_streaks_from_days():
     days = [
diff --git a/tests/managers/thl/test_userhealth.py b/tests/managers/thl/test_userhealth.py
index ea54359..ce6c221 100644
--- a/tests/managers/thl/test_userhealth.py
+++ b/tests/managers/thl/test_userhealth.py
@@ -2,6 +2,7 @@ from __future__ import annotations
 
 from collections.abc import Callable
 from datetime import UTC, datetime
+from typing import TYPE_CHECKING
 from uuid import uuid4
 
 import faker
@@ -12,16 +13,24 @@ from generalresearch.managers.thl.userhealth import (
     IPRecordManager,
     UserIpHistoryManager,
 )
-from generalresearch.models.thl.ipinfo import GeoIPInformation, IPGeoname, IPInformation
-from generalresearch.models.thl.product import Product
-from generalresearch.models.thl.user import User
+from generalresearch.models.thl.ipinfo import (
+    GeoIPInformation,
+)
 from generalresearch.models.thl.user_iphistory import (
     IPRecord,
     UserIPHistory,
 )
 from generalresearch.models.thl.userhealth import AuditLog, AuditLogLevel
-from generalresearch.pg_helper import PostgresConfig
-from generalresearch.redis_helper import RedisConfig
+
+if TYPE_CHECKING:
+    from generalresearch.models.thl.ipinfo import (
+        IPGeoname,
+        IPInformation,
+    )
+    from generalresearch.models.thl.product import Product
+    from generalresearch.models.thl.user import User
+    from generalresearch.pg_helper import PostgresConfig
+    from generalresearch.redis_helper import RedisConfig
 
 fake = faker.Faker()
 
diff --git a/tests/managers/thl/test_wall_manager.py b/tests/managers/thl/test_wall_manager.py
index b8a636f..3215de8 100644
--- a/tests/managers/thl/test_wall_manager.py
+++ b/tests/managers/thl/test_wall_manager.py
@@ -3,21 +3,24 @@ from __future__ import annotations
 from collections.abc import Callable
 from datetime import UTC, datetime, timedelta
 from decimal import Decimal
+from typing import TYPE_CHECKING
 from uuid import uuid4
 
 import pytest
 from pydantic import PositiveInt
 
-from generalresearch.managers.thl.session import SessionManager
-from generalresearch.managers.thl.wall import WallCacheManager, WallManager
-from generalresearch.models import Source
+from generalresearch.models.definitions import Source
 from generalresearch.models.thl.session import (
     ReportValue,
-    Session,
     Status,
     StatusCode1,
 )
-from generalresearch.models.thl.user import User
+
+if TYPE_CHECKING:
+    from generalresearch.managers.thl.session import SessionManager
+    from generalresearch.managers.thl.wall import WallCacheManager, WallManager
+    from generalresearch.models.thl.session import Session
+    from generalresearch.models.thl.user import User
 
 
 class TestWallManager:
diff --git a/tests/models/custom_types/test_aware_datetime.py b/tests/models/custom_types/test_aware_datetime.py
index e8a5aa3..54a5d9b 100644
--- a/tests/models/custom_types/test_aware_datetime.py
+++ b/tests/models/custom_types/test_aware_datetime.py
@@ -2,12 +2,14 @@ from __future__ import annotations
 
 import logging
 from datetime import UTC, datetime
+from typing import TYPE_CHECKING
 
 import pytest
 import pytz
 from pydantic import BaseModel, Field, ValidationError
 
-from generalresearch.models.custom_types import AwareDatetimeISO
+if TYPE_CHECKING:
+    from generalresearch.models.custom_types import AwareDatetimeISO
 
 logger = logging.getLogger()
 
diff --git a/tests/models/custom_types/test_dsn.py b/tests/models/custom_types/test_dsn.py
index d8c7c53..2aae579 100644
--- a/tests/models/custom_types/test_dsn.py
+++ b/tests/models/custom_types/test_dsn.py
@@ -1,12 +1,14 @@
 from __future__ import annotations
 
+from typing import TYPE_CHECKING
 from uuid import uuid4
 
 import pytest
 from pydantic import BaseModel, Field, MySQLDsn, ValidationError
 from pydantic_core import Url
 
-from generalresearch.models.custom_types import DaskDsn, SentryDsn
+if TYPE_CHECKING:
+    from generalresearch.models.custom_types import DaskDsn, SentryDsn
 
 # --- Test Pydantic Models ---
 
diff --git a/tests/models/custom_types/test_uuid_str.py b/tests/models/custom_types/test_uuid_str.py
index 02e6a8b..92489a0 100644
--- a/tests/models/custom_types/test_uuid_str.py
+++ b/tests/models/custom_types/test_uuid_str.py
@@ -1,11 +1,13 @@
 from __future__ import annotations
 
+from typing import TYPE_CHECKING
 from uuid import uuid4
 
 import pytest
 from pydantic import BaseModel, Field, ValidationError
 
-from generalresearch.models.custom_types import UUIDStr
+if TYPE_CHECKING:
+    from generalresearch.models.custom_types import UUIDStr
 
 
 class UUIDStrModel(BaseModel):
diff --git a/tests/models/dynata/test_survey.py b/tests/models/dynata/test_survey.py
index ad953a3..3e33897 100644
--- a/tests/models/dynata/test_survey.py
+++ b/tests/models/dynata/test_survey.py
@@ -1,3 +1,6 @@
+from __future__ import annotations
+
+
 class TestDynataCondition:
 
     def test_condition_create(self):
diff --git a/tests/models/gr/test_authentication.py b/tests/models/gr/test_authentication.py
index d2a7054..ac1298f 100644
--- a/tests/models/gr/test_authentication.py
+++ b/tests/models/gr/test_authentication.py
@@ -6,17 +6,21 @@ import os
 from collections.abc import Callable
 from datetime import UTC, datetime
 from random import randint
+from typing import TYPE_CHECKING
 from uuid import uuid4
 
 import pytest
 from redis import Redis
 
 from generalresearch.models.gr.authentication import Claims, GRToken, GRUser
-from generalresearch.models.gr.business import Business
-from generalresearch.models.gr.team import Membership, Team
-from generalresearch.models.thl.product import Product
-from generalresearch.pg_helper import PostgresConfig
-from generalresearch.redis_helper import RedisConfig
+from generalresearch.models.gr.team import Team
+
+if TYPE_CHECKING:
+    from generalresearch.models.gr.business import Business
+    from generalresearch.models.gr.team import Membership
+    from generalresearch.models.thl.product import Product
+    from generalresearch.pg_helper import PostgresConfig
+    from generalresearch.redis_helper import RedisConfig
 
 SSO_ISSUER = ""
 
diff --git a/tests/models/gr/test_base.py b/tests/models/gr/test_base.py
index f019fc0..fba0960 100644
--- a/tests/models/gr/test_base.py
+++ b/tests/models/gr/test_base.py
@@ -3,11 +3,13 @@ from __future__ import annotations
 import subprocess
 from collections.abc import Callable
 from pathlib import Path
+from typing import TYPE_CHECKING
 
 import pytest
 from pydantic import PostgresDsn
 
-from generalresearch.pg_helper import PostgresConfig
+if TYPE_CHECKING:
+    from generalresearch.pg_helper import PostgresConfig
 
 
 class TestGRPostgresDjangoCreation:
diff --git a/tests/models/gr/test_business.py b/tests/models/gr/test_business.py
index 9310d2c..2c12da1 100644
--- a/tests/models/gr/test_business.py
+++ b/tests/models/gr/test_business.py
@@ -19,40 +19,42 @@ from distributed.utils_test import (
 from pytest import approx
 
 from generalresearch.currency import USDCent
-from generalresearch.incite.base import GRLDatasets
-from generalresearch.incite.collections.thl_web import (
-    SessionDFCollection,
-    WallDFCollection,
-)
-from generalresearch.incite.mergers.pop_ledger import PopLedgerMerge
-from generalresearch.managers.gr.business import BusinessBankAccountManager
-from generalresearch.managers.gr.team import TeamManager
-from generalresearch.managers.thl.ledger_manager.ledger import LedgerManager
-from generalresearch.managers.thl.ledger_manager.thl_ledger import ThlLedgerManager
-from generalresearch.managers.thl.payout import (
-    BusinessPayoutEventManager,
-    PayoutEventManager,
-)
 from generalresearch.models.gr.business import (
     Business,
     BusinessAddress,
-    BusinessBankAccount,
     BusinessContact,
 )
-from generalresearch.models.gr.team import Team
 from generalresearch.models.thl.finance import (
     BusinessBalances,
     ProductBalances,
 )
 from generalresearch.models.thl.product import Product
-from generalresearch.models.thl.user import User
-from generalresearch.pg_helper import PostgresConfig
-from generalresearch.redis_helper import RedisConfig
 
 if TYPE_CHECKING:
+    from generalresearch.incite.base import GRLDatasets
+    from generalresearch.incite.collections.thl_web import (
+        SessionDFCollection,
+        WallDFCollection,
+    )
+    from generalresearch.incite.mergers.pop_ledger import PopLedgerMerge
+    from generalresearch.managers.gr.business import BusinessBankAccountManager
+    from generalresearch.managers.gr.team import TeamManager
+    from generalresearch.managers.thl.ledger_manager.ledger import LedgerManager
+    from generalresearch.managers.thl.ledger_manager.thl_ledger import ThlLedgerManager
+    from generalresearch.managers.thl.payout import (
+        BusinessPayoutEventManager,
+        PayoutEventManager,
+    )
     from generalresearch.managers.thl.product import ProductManager
+    from generalresearch.models.gr.business import (
+        BusinessBankAccount,
+    )
+    from generalresearch.models.gr.team import Team
     from generalresearch.models.thl.product import BrokerageProductPayoutEvent
     from generalresearch.models.thl.session import Session
+    from generalresearch.models.thl.user import User
+    from generalresearch.pg_helper import PostgresConfig
+    from generalresearch.redis_helper import RedisConfig
 
 
 class TestBusinessBankAccount:
diff --git a/tests/models/gr/test_team.py b/tests/models/gr/test_team.py
index dc7d4b9..c1ae6d6 100644
--- a/tests/models/gr/test_team.py
+++ b/tests/models/gr/test_team.py
@@ -5,6 +5,7 @@ from collections.abc import Callable
 from datetime import datetime, timedelta
 from decimal import Decimal
 from pathlib import Path
+from typing import TYPE_CHECKING
 
 import pandas as pd
 from dask.distributed import Client as DaskClient
@@ -12,24 +13,29 @@ from distributed.utils_test import (
     client_no_amm,
 )
 
-from generalresearch.incite.base import GRLDatasets
-from generalresearch.incite.collections.thl_web import (
-    SessionDFCollection,
-    WallDFCollection,
-)
-from generalresearch.incite.mergers.foundations.enriched_session import (
-    EnrichedSessionMerge,
-)
-from generalresearch.incite.mergers.foundations.enriched_wall import EnrichedWallMerge
-from generalresearch.managers.gr.team import MembershipManager, TeamManager
-from generalresearch.models.gr.authentication import GRUser
 from generalresearch.models.gr.business import Business
-from generalresearch.models.gr.team import Membership, Team
+from generalresearch.models.gr.team import Team
 from generalresearch.models.thl.product import Product
-from generalresearch.models.thl.session import Session
-from generalresearch.models.thl.user import User
-from generalresearch.pg_helper import PostgresConfig
-from generalresearch.redis_helper import RedisConfig
+
+if TYPE_CHECKING:
+    from generalresearch.incite.base import GRLDatasets
+    from generalresearch.incite.collections.thl_web import (
+        SessionDFCollection,
+        WallDFCollection,
+    )
+    from generalresearch.incite.mergers.foundations.enriched_session import (
+        EnrichedSessionMerge,
+    )
+    from generalresearch.incite.mergers.foundations.enriched_wall import (
+        EnrichedWallMerge,
+    )
+    from generalresearch.managers.gr.team import MembershipManager, TeamManager
+    from generalresearch.models.gr.authentication import GRUser
+    from generalresearch.models.gr.team import Membership
+    from generalresearch.models.thl.session import Session
+    from generalresearch.models.thl.user import User
+    from generalresearch.pg_helper import PostgresConfig
+    from generalresearch.redis_helper import RedisConfig
 
 
 class TestTeam:
diff --git a/tests/models/innovate/test_question.py b/tests/models/innovate/test_question.py
index b206177..ea2fc8c 100644
--- a/tests/models/innovate/test_question.py
+++ b/tests/models/innovate/test_question.py
@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from generalresearch.models import Source
+from generalresearch.models.definitions import Source
 from generalresearch.models.innovate.question import (
     InnovateQuestion,
     InnovateQuestionOption,
diff --git a/tests/models/legacy/test_offerwall_parse_response.py b/tests/models/legacy/test_offerwall_parse_response.py
index 56ba077..93f5c26 100644
--- a/tests/models/legacy/test_offerwall_parse_response.py
+++ b/tests/models/legacy/test_offerwall_parse_response.py
@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import json
 
-from generalresearch.models import Source
+from generalresearch.models.definitions import Source
 from generalresearch.models.legacy.bucket import (
     BucketTask,
     DurationSummary,
diff --git a/tests/models/legacy/test_user_question_answer_in.py b/tests/models/legacy/test_user_question_answer_in.py
index 3fdaa05..f14c1a7 100644
--- a/tests/models/legacy/test_user_question_answer_in.py
+++ b/tests/models/legacy/test_user_question_answer_in.py
@@ -4,19 +4,22 @@ import json
 from collections.abc import Callable
 from datetime import datetime
 from decimal import Decimal
+from typing import TYPE_CHECKING
 from uuid import uuid4
 
 import pytest
 
-from generalresearch.managers.thl.user_manager.user_manager import UserManager
-from generalresearch.models import Source
+from generalresearch.models.definitions import Source
 from generalresearch.models.legacy.questions import (
     UserQuestionAnswers,
 )
-from generalresearch.models.thl.product import Product
 from generalresearch.models.thl.session import Session, Wall
 from generalresearch.models.thl.user import User
 
+if TYPE_CHECKING:
+    from generalresearch.managers.thl.user_manager.user_manager import UserManager
+    from generalresearch.models.thl.product import Product
+
 
 class TestUserQuestionAnswers:
     """This is for the GRS POST submission that may contain multiple
diff --git a/tests/models/network/test_mtr.py b/tests/models/network/test_mtr.py
index 7f8a736..5d136c4 100644
--- a/tests/models/network/test_mtr.py
+++ b/tests/models/network/test_mtr.py
@@ -1,11 +1,15 @@
 from __future__ import annotations
 
+from typing import TYPE_CHECKING
+
 import faker
 
-from generalresearch.managers.network.tool_run import ToolRunManager
 from generalresearch.models.network.mtr.execute import execute_mtr
 from generalresearch.models.network.tool_run import ToolClass, ToolName
 
+if TYPE_CHECKING:
+    from generalresearch.managers.network.tool_run import ToolRunManager
+
 fake = faker.Faker()
 
 
diff --git a/tests/models/network/test_nmap.py b/tests/models/network/test_nmap.py
index db39997..6adc9e4 100644
--- a/tests/models/network/test_nmap.py
+++ b/tests/models/network/test_nmap.py
@@ -1,14 +1,18 @@
 from __future__ import annotations
 
 import subprocess
+from typing import TYPE_CHECKING
 
 import faker
 
-from generalresearch.managers.network.tool_run import ToolRunManager
 from generalresearch.models.network.definitions import IPProtocol
 from generalresearch.models.network.nmap.execute import execute_nmap
 from generalresearch.models.network.nmap.result import NmapResult, PortState
-from generalresearch.models.network.tool_run import NmapRun, ToolClass, ToolName
+from generalresearch.models.network.tool_run import ToolClass, ToolName
+
+if TYPE_CHECKING:
+    from generalresearch.managers.network.tool_run import ToolRunManager
+    from generalresearch.models.network.tool_run import NmapRun
 
 fake = faker.Faker()
 
diff --git a/tests/models/network/test_nmap_parser.py b/tests/models/network/test_nmap_parser.py
index 473a63f..fc9884b 100644
--- a/tests/models/network/test_nmap_parser.py
+++ b/tests/models/network/test_nmap_parser.py
@@ -1,14 +1,15 @@
 from __future__ import annotations
 
 import os
+from typing import TYPE_CHECKING
 
 import pytest
 
 from generalresearch.models.network.nmap.parser import parse_nmap_xml
-from generalresearch.models.network.nmap.result import (
-    NmapResult,
-    NmapTrace,
-)
+from generalresearch.models.network.nmap.result import NmapTrace
+
+if TYPE_CHECKING:
+    from generalresearch.models.network.nmap.result import NmapResult
 
 
 @pytest.fixture
diff --git a/tests/models/network/test_rdns.py b/tests/models/network/test_rdns.py
index 1a15a28..82126dd 100644
--- a/tests/models/network/test_rdns.py
+++ b/tests/models/network/test_rdns.py
@@ -1,11 +1,15 @@
 from __future__ import annotations
 
+from typing import TYPE_CHECKING
+
 import faker
 
-from generalresearch.managers.network.tool_run import ToolRunManager
 from generalresearch.models.network.rdns.execute import execute_rdns
 from generalresearch.models.network.tool_run import ToolClass, ToolName
 
+if TYPE_CHECKING:
+    from generalresearch.managers.network.tool_run import ToolRunManager
+
 fake = faker.Faker()
 
 
diff --git a/tests/models/spectrum/test_question.py b/tests/models/spectrum/test_question.py
index a44286d..d469530 100644
--- a/tests/models/spectrum/test_question.py
+++ b/tests/models/spectrum/test_question.py
@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from datetime import UTC, datetime
 
-from generalresearch.models import Source
+from generalresearch.models.definitions import Source
 from generalresearch.models.spectrum.question import (
     SpectrumQuestion,
     SpectrumQuestionClass,
diff --git a/tests/models/spectrum/test_survey.py b/tests/models/spectrum/test_survey.py
index bad6857..02c5d3f 100644
--- a/tests/models/spectrum/test_survey.py
+++ b/tests/models/spectrum/test_survey.py
@@ -3,7 +3,7 @@ from __future__ import annotations
 from datetime import UTC, datetime
 from decimal import Decimal
 
-from generalresearch.models import (
+from generalresearch.models.definitions import (
     LogicalOperator,
     Source,
     TaskCalculationType,
diff --git a/tests/models/spectrum/test_survey_manager.py b/tests/models/spectrum/test_survey_manager.py
index 11dc01f..0300956 100644
--- a/tests/models/spectrum/test_survey_manager.py
+++ b/tests/models/spectrum/test_survey_manager.py
@@ -3,15 +3,17 @@ from __future__ import annotations
 import logging
 from datetime import UTC, datetime
 from decimal import Decimal
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 from pymysql import IntegrityError
 
 from generalresearch.config import is_debug
-from generalresearch.managers.spectrum.survey import (
-    SpectrumSurveyManager,
-)
-from generalresearch.sql_helper import SqlHelper
+
+if TYPE_CHECKING:
+    from generalresearch.managers.spectrum.survey import (
+        SpectrumSurveyManager,
+    )
+    from generalresearch.sql_helper import SqlHelper
 
 logger = logging.getLogger()
 
diff --git a/tests/models/test_device.py b/tests/models/test_device.py
index 8e1251a..fdbd906 100644
--- a/tests/models/test_device.py
+++ b/tests/models/test_device.py
@@ -15,7 +15,7 @@ chromebook_ua_string = (
 )
 
 
-from generalresearch.models import DeviceType
+from generalresearch.models.definitions import DeviceType
 from generalresearch.models.device import parse_device_from_useragent
 
 
diff --git a/tests/models/test_finance.py b/tests/models/test_finance.py
index 72f4f4d..eabc877 100644
--- a/tests/models/test_finance.py
+++ b/tests/models/test_finance.py
@@ -4,6 +4,7 @@ from collections.abc import Callable
 from datetime import UTC, datetime, timedelta
 from itertools import product as iter_product
 from random import randint
+from typing import TYPE_CHECKING
 from uuid import uuid4
 
 import pandas as pd
@@ -16,25 +17,27 @@ from distributed.utils_test import (
 )
 from faker import Faker
 
-from generalresearch.incite.collections.thl_web import LedgerDFCollection
-from generalresearch.incite.mergers.pop_ledger import PopLedgerMerge
 from generalresearch.incite.schemas.mergers.pop_ledger import (
     numerical_col_names,
 )
-from generalresearch.managers.thl.ledger_manager.thl_ledger import ThlLedgerManager
 from generalresearch.models.thl.finance import (
     BusinessBalances,
     POPFinancial,
     ProductBalances,
 )
-from generalresearch.models.thl.ledger import LedgerAccount
-from generalresearch.models.thl.product import Product
-from generalresearch.models.thl.session import Session
-from generalresearch.models.thl.user import User
-from generalresearch.pg_helper import PostgresConfig
 from test_utils.incite.collections.conftest import ledger_collection
 from test_utils.incite.mergers.conftest import pop_ledger_merge
 
+if TYPE_CHECKING:
+    from generalresearch.incite.collections.thl_web import LedgerDFCollection
+    from generalresearch.incite.mergers.pop_ledger import PopLedgerMerge
+    from generalresearch.managers.thl.ledger_manager.thl_ledger import ThlLedgerManager
+    from generalresearch.models.thl.ledger import LedgerAccount
+    from generalresearch.models.thl.product import Product
+    from generalresearch.models.thl.session import Session
+    from generalresearch.models.thl.user import User
+    from generalresearch.pg_helper import PostgresConfig
+
 fake = Faker()
 
 
diff --git a/tests/models/thl/test_adjustments.py b/tests/models/thl/test_adjustments.py
index c5b3f6b..cd75318 100644
--- a/tests/models/thl/test_adjustments.py
+++ b/tests/models/thl/test_adjustments.py
@@ -3,22 +3,27 @@ from __future__ import annotations
 from collections.abc import Callable
 from datetime import UTC, datetime, timedelta
 from decimal import Decimal
+from typing import TYPE_CHECKING
 
 import pytest
 
-from generalresearch.managers.thl.session import SessionManager
-from generalresearch.managers.thl.wall import WallManager
-from generalresearch.models import Source
+from generalresearch.models.definitions import Source
 from generalresearch.models.thl.product import Product
 from generalresearch.models.thl.session import (
-    Session,
     SessionAdjustedStatus,
     Status,
     StatusCode1,
-    Wall,
     WallAdjustedStatus,
 )
-from generalresearch.models.thl.user import User
+
+if TYPE_CHECKING:
+    from generalresearch.managers.thl.session import SessionManager
+    from generalresearch.managers.thl.wall import WallManager
+    from generalresearch.models.thl.session import (
+        Session,
+        Wall,
+    )
+    from generalresearch.models.thl.user import User
 
 started1 = datetime(2023, 1, 1, tzinfo=UTC)
 started2 = datetime(2023, 1, 1, 0, 10, 0, tzinfo=UTC)
diff --git a/tests/models/thl/test_buyer.py b/tests/models/thl/test_buyer.py
index 02093e2..ef97166 100644
--- a/tests/models/thl/test_buyer.py
+++ b/tests/models/thl/test_buyer.py
@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from generalresearch.models import Source
+from generalresearch.models.definitions import Source
 from generalresearch.models.thl.survey.buyer import BuyerCountryStat
 
 
diff --git a/tests/models/thl/test_contest/test_contest.py b/tests/models/thl/test_contest/test_contest.py
index e1053f4..ed8477b 100644
--- a/tests/models/thl/test_contest/test_contest.py
+++ b/tests/models/thl/test_contest/test_contest.py
@@ -1,11 +1,13 @@
 from __future__ import annotations
 
 from collections.abc import Callable
+from typing import TYPE_CHECKING
 
 import pytest
 
-from generalresearch.models.thl.product import Product
-from generalresearch.models.thl.user import User
+if TYPE_CHECKING:
+    from generalresearch.models.thl.product import Product
+    from generalresearch.models.thl.user import User
 
 
 class TestContest:
diff --git a/tests/models/thl/test_contest/test_leaderboard_contest.py b/tests/models/thl/test_contest/test_leaderboard_contest.py
index 99cfb37..c49776b 100644
--- a/tests/models/thl/test_contest/test_leaderboard_contest.py
+++ b/tests/models/thl/test_contest/test_leaderboard_contest.py
@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 from datetime import UTC
+from typing import TYPE_CHECKING
 from uuid import uuid4
 
 import pytest
@@ -8,7 +9,6 @@ from redis import Redis
 
 from generalresearch.currency import USDCent
 from generalresearch.managers.leaderboard.manager import LeaderboardManager
-from generalresearch.managers.thl.user_manager.user_manager import UserManager
 from generalresearch.models.thl.contest import ContestPrize
 from generalresearch.models.thl.contest.definitions import (
     ContestPrizeKind,
@@ -21,10 +21,13 @@ from generalresearch.models.thl.contest.utils import (
     distribute_leaderboard_prizes,
 )
 from generalresearch.models.thl.leaderboard import LeaderboardRow
-from generalresearch.models.thl.product import Product
 from generalresearch.models.thl.user import User
 from tests.models.thl.test_contest.test_contest import TestContest
 
+if TYPE_CHECKING:
+    from generalresearch.managers.thl.user_manager.user_manager import UserManager
+    from generalresearch.models.thl.product import Product
+
 
 class TestLeaderboardContest(TestContest):
 
diff --git a/tests/models/thl/test_contest/test_raffle_contest.py b/tests/models/thl/test_contest/test_raffle_contest.py
index 8812cb3..e71851e 100644
--- a/tests/models/thl/test_contest/test_raffle_contest.py
+++ b/tests/models/thl/test_contest/test_raffle_contest.py
@@ -2,6 +2,7 @@ from __future__ import annotations
 
 from collections import Counter
 from datetime import datetime
+from typing import TYPE_CHECKING
 from uuid import uuid4
 
 import pytest
@@ -21,10 +22,12 @@ from generalresearch.models.thl.contest.definitions import (
     ContestType,
 )
 from generalresearch.models.thl.contest.raffle import RaffleContest
-from generalresearch.models.thl.product import Product
-from generalresearch.models.thl.user import User
 from tests.models.thl.test_contest.test_contest import TestContest
 
+if TYPE_CHECKING:
+    from generalresearch.models.thl.product import Product
+    from generalresearch.models.thl.user import User
+
 
 class TestRaffleContest(TestContest):
 
diff --git a/tests/models/thl/test_marketplace_condition.py b/tests/models/thl/test_marketplace_condition.py
index 1dd25e8..6936a7c 100644
--- a/tests/models/thl/test_marketplace_condition.py
+++ b/tests/models/thl/test_marketplace_condition.py
@@ -3,7 +3,7 @@ from __future__ import annotations
 import pytest
 from pydantic import ValidationError
 
-from generalresearch.models import LogicalOperator
+from generalresearch.models.definitions import LogicalOperator
 from generalresearch.models.thl.survey.condition import (
     ConditionValueType,
     MarketplaceCondition,
@@ -130,7 +130,7 @@ class TestMarketplaceCondition:
         assert c.evaluate_criterion(user_qas) is None
 
     def test_list_and_negate(self):
-        from generalresearch.models import LogicalOperator
+        from generalresearch.models.definitions import LogicalOperator
         from generalresearch.models.thl.survey.condition import (
             ConditionValueType,
             MarketplaceCondition,
@@ -247,7 +247,7 @@ class TestMarketplaceCondition:
         assert ["1", "10", "11", "12", "2", "3", "4", "5"] == c.values
 
     def test_ranges_infinity(self):
-        from generalresearch.models import LogicalOperator
+        from generalresearch.models.definitions import LogicalOperator
         from generalresearch.models.thl.survey.condition import (
             ConditionValueType,
             MarketplaceCondition,
diff --git a/tests/models/thl/test_payout.py b/tests/models/thl/test_payout.py
index daf1bd7..927687e 100644
--- a/tests/models/thl/test_payout.py
+++ b/tests/models/thl/test_payout.py
@@ -7,12 +7,16 @@ from pydantic import ValidationError
 
 from generalresearch.currency import USDCent
 from generalresearch.models.gr import Team
-from generalresearch.models.gr.business import Business, BusinessAddress, BusinessType
+from generalresearch.models.gr.business import (
+    Business,
+    BusinessAddress,
+    BusinessType,
+)
 from generalresearch.models.thl.payout import (
     BrokerageProductPayoutEvent,
     BusinessPayoutEvent,
 )
-from generalresearch.models.thl.wallet import PayoutType
+from generalresearch.models.thl.wallet.definitions import PayoutType
 
 
 class TestBusinessPayoutEvent:
diff --git a/tests/models/thl/test_payout_format.py b/tests/models/thl/test_payout_format.py
index fe7aea5..56eafe3 100644
--- a/tests/models/thl/test_payout_format.py
+++ b/tests/models/thl/test_payout_format.py
@@ -1,14 +1,20 @@
 from __future__ import annotations
 
+from typing import TYPE_CHECKING
+
 import pytest
 from pydantic import BaseModel
 
 from generalresearch.models.thl.payout_format import (
     PayoutFormatField,
-    PayoutFormatType,
     format_payout_format,
 )
 
+if TYPE_CHECKING:
+    from generalresearch.models.thl.payout_format import (
+        PayoutFormatType,
+    )
+
 
 class PayoutFormatTestClass(BaseModel):
     payout_format: PayoutFormatType = PayoutFormatField
diff --git a/tests/models/thl/test_product.py b/tests/models/thl/test_product.py
index 880799a..cc0fa8e 100644
--- a/tests/models/thl/test_product.py
+++ b/tests/models/thl/test_product.py
@@ -5,6 +5,7 @@ import shutil
 from collections.abc import Callable
 from datetime import UTC, datetime, timedelta
 from decimal import Decimal
+from typing import TYPE_CHECKING
 from uuid import uuid4
 
 import pytest
@@ -12,22 +13,9 @@ from dask.distributed import Client as DaskClient
 from pydantic import ValidationError
 
 from generalresearch.currency import USDCent
-from generalresearch.incite.base import GRLDatasets
-from generalresearch.incite.collections.thl_web import LedgerDFCollection
-from generalresearch.incite.mergers.pop_ledger import PopLedgerMerge
-from generalresearch.managers.thl.ledger_manager.thl_ledger import (
-    ThlLedgerManager,
-)
-from generalresearch.managers.thl.payout import PayoutEventManager
-from generalresearch.managers.thl.product import ProductManager
-from generalresearch.models import Source
-from generalresearch.models.gr.business import Business
+from generalresearch.models.definitions import Source
 from generalresearch.models.thl.finance import ProductBalances
-from generalresearch.models.thl.payout import (
-    BrokerageProductPayoutEvent,
-)
 from generalresearch.models.thl.product import (
-    BrokerageProductPayoutEventManager,
     IntegrationMode,
     PayoutConfig,
     PayoutTransformation,
@@ -39,9 +27,24 @@ from generalresearch.models.thl.product import (
     SupplyConfig,
     SupplyPolicy,
 )
-from generalresearch.models.thl.session import Session
-from generalresearch.models.thl.user import User
-from generalresearch.redis_helper import RedisConfig
+
+if TYPE_CHECKING:
+    from generalresearch.incite.base import GRLDatasets
+    from generalresearch.incite.collections.thl_web import LedgerDFCollection
+    from generalresearch.incite.mergers.pop_ledger import PopLedgerMerge
+    from generalresearch.managers.thl.ledger_manager.thl_ledger import (
+        ThlLedgerManager,
+    )
+    from generalresearch.managers.thl.payout import PayoutEventManager
+    from generalresearch.managers.thl.product import ProductManager
+    from generalresearch.models.gr.business import Business
+    from generalresearch.models.thl.payout import (
+        BrokerageProductPayoutEvent,
+    )
+    from generalresearch.models.thl.product import BrokerageProductPayoutEventManager
+    from generalresearch.models.thl.session import Session
+    from generalresearch.models.thl.user import User
+    from generalresearch.redis_helper import RedisConfig
 
 
 class TestProduct:
diff --git a/tests/models/thl/test_product_userwalletconfig.py b/tests/models/thl/test_product_userwalletconfig.py
index b348981..b1bfa60 100644
--- a/tests/models/thl/test_product_userwalletconfig.py
+++ b/tests/models/thl/test_product_userwalletconfig.py
@@ -6,7 +6,7 @@ from random import shuffle as rshuffle
 from generalresearch.models.thl.product import (
     UserWalletConfig,
 )
-from generalresearch.models.thl.wallet import PayoutType
+from generalresearch.models.thl.wallet.definitions import PayoutType
 
 
 def all_equal(iterable: list[str]) -> bool:
diff --git a/tests/models/thl/test_soft_pair.py b/tests/models/thl/test_soft_pair.py
index 3cf835e..34902e2 100644
--- a/tests/models/thl/test_soft_pair.py
+++ b/tests/models/thl/test_soft_pair.py
@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from generalresearch.models import Source
+from generalresearch.models.definitions import Source
 from generalresearch.models.dynata.survey import (
     ConditionValueType,
     DynataCondition,
diff --git a/tests/models/thl/test_user.py b/tests/models/thl/test_user.py
index 9c4b548..bc941d4 100644
--- a/tests/models/thl/test_user.py
+++ b/tests/models/thl/test_user.py
@@ -6,16 +6,19 @@ from datetime import UTC, datetime, timedelta, timezone
 from decimal import Decimal
 from random import choice as rand_choice
 from random import randint
+from typing import TYPE_CHECKING
 from uuid import uuid4
 
 import pytest
 from pydantic import ValidationError
 
-from generalresearch.managers.thl.ledger_manager.thl_ledger import ThlLedgerManager
-from generalresearch.managers.thl.userhealth import AuditLogManager
-from generalresearch.models.thl.product import Product
 from generalresearch.models.thl.user import User
 
+if TYPE_CHECKING:
+    from generalresearch.managers.thl.ledger_manager.thl_ledger import ThlLedgerManager
+    from generalresearch.managers.thl.userhealth import AuditLogManager
+    from generalresearch.models.thl.product import Product
+
 
 class TestUserUserID:
 
diff --git a/tests/models/thl/test_user_metadata.py b/tests/models/thl/test_user_metadata.py
index a7b479d..7e84f3e 100644
--- a/tests/models/thl/test_user_metadata.py
+++ b/tests/models/thl/test_user_metadata.py
@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import pytest
 
-from generalresearch.models import MAX_INT32
+from generalresearch.models.definitions import MAX_INT32
 from generalresearch.models.thl.user_profile import UserMetadata
 
 
diff --git a/tests/models/thl/test_wall.py b/tests/models/thl/test_wall.py
index 58e9825..61ca11d 100644
--- a/tests/models/thl/test_wall.py
+++ b/tests/models/thl/test_wall.py
@@ -7,7 +7,7 @@ from uuid import uuid4
 import pytest
 from pydantic import ValidationError
 
-from generalresearch.models import Source
+from generalresearch.models.definitions import Source
 from generalresearch.models.thl.definitions import (
     Status,
     StatusCode1,
diff --git a/tests/models/thl/test_wall_session.py b/tests/models/thl/test_wall_session.py
index 48b89ea..40d3619 100644
--- a/tests/models/thl/test_wall_session.py
+++ b/tests/models/thl/test_wall_session.py
@@ -5,7 +5,7 @@ from decimal import Decimal
 
 import pytest
 
-from generalresearch.models import Source
+from generalresearch.models.definitions import Source
 from generalresearch.models.thl.definitions import Status, StatusCode1
 from generalresearch.models.thl.session import Session, Wall
 from generalresearch.models.thl.user import User
diff --git a/tests/test_postgres.py b/tests/test_postgres.py
index ed5a7ae..c53f644 100644
--- a/tests/test_postgres.py
+++ b/tests/test_postgres.py
@@ -1,12 +1,15 @@
 import socket
 import subprocess
 from collections.abc import Callable
+from typing import TYPE_CHECKING
 
 from pydantic import PostgresDsn
 
-from generalresearch.models.custom_types import InternalHostname, PostgresDict
 from generalresearch.pg_helper import PostgresConfig
 
+if TYPE_CHECKING:
+    from generalresearch.models.custom_types import InternalHostname, PostgresDict
+
 
 def is_port_open(host: InternalHostname, port: int = 5432, timeout: int = 3):
     try:
-- 
cgit v1.2.3