Ruff std replacements

82 files changed, 140 insertions, 378 deletions

diff --git a/tests/incite/collections/test_df_collection_base.py b/tests/incite/collections/test_df_collection_base.py
index c3c64e4..176bf4b 100644
--- a/tests/incite/collections/test_df_collection_base.py
+++ b/tests/incite/collections/test_df_collection_base.py
@@ -1,4 +1,4 @@
-from datetime import UTC, datetime, timezone
+from datetime import UTC, datetime
 from typing import TYPE_CHECKING
 
 import pandas as pd
@@ -9,7 +9,6 @@ from generalresearch.incite.collections import (
     DFCollection,
     DFCollectionType,
 )
-from test_utils.incite.conftest import mnt_filepath
 
 if TYPE_CHECKING:
     from generalresearch.incite.base import GRLDatasets
diff --git a/tests/incite/collections/test_df_collection_item_base.py b/tests/incite/collections/test_df_collection_item_base.py
index 8cf719d..0218f30 100644
--- a/tests/incite/collections/test_df_collection_item_base.py
+++ b/tests/incite/collections/test_df_collection_item_base.py
@@ -1,4 +1,4 @@
-from datetime import UTC, datetime, timezone
+from datetime import UTC, datetime
 from typing import TYPE_CHECKING
 
 import pytest
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 062171d..3d70e56 100644
--- a/tests/incite/collections/test_df_collection_item_thl_web.py
+++ b/tests/incite/collections/test_df_collection_item_thl_web.py
@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from collections.abc import Callable, Generator
-from datetime import UTC, datetime, timedelta, timezone
+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
@@ -236,7 +236,6 @@ class TestDFCollectionItemMethod:
         incite_item_factory,
         delete_df_collection,
     ):
-        from generalresearch.models.thl.user import User
 
         if df_collection.data_type in unsupported_mock_types:
             return
@@ -280,7 +279,6 @@ class TestDFCollectionItemMethod:
         incite_item_factory,
         delete_df_collection,
     ):
-        from generalresearch.models.thl.user import User
 
         if df_collection.data_type in unsupported_mock_types:
             return
@@ -333,7 +331,6 @@ class TestDFCollectionItemMethod:
         delete_df_collection,
         mnt_filepath,
     ):
-        from generalresearch.models.thl.user import User
 
         if df_collection.data_type != DFCollectionType.LEDGER:
             return
@@ -385,7 +382,6 @@ class TestDFCollectionItemMethod:
         delete_df_collection,
         mnt_filepath,
     ):
-        from generalresearch.models.thl.user import User
 
         if df_collection.data_type in unsupported_mock_types:
             return
@@ -766,7 +762,6 @@ class TestDFCollectionItemFunctionalTest:
         delete_df_collection,
         mnt_filepath: GRLDatasets,
     ):
-        from generalresearch.models.thl.user import User
 
         if df_collection.data_type in unsupported_mock_types:
             return
@@ -828,7 +823,6 @@ class TestDFCollectionItemFunctionalTest:
 
         import pyarrow.parquet as pq
 
-        from generalresearch.models.thl.user import User
 
         if df_collection.data_type in unsupported_mock_types:
             return
@@ -864,7 +858,6 @@ class TestDFCollectionItemFunctionalTest:
         delete_df_collection,
         mnt_filepath: GRLDatasets,
     ):
-        from generalresearch.models.thl.user import User
 
         delete_df_collection(coll=df_collection)
         df_collection._client = client_no_amm
@@ -920,7 +913,6 @@ class TestDFCollectionItemFunctionalTest:
         """Don't allow creating an archive for data that will likely be
         overwritten or updated
         """
-        from generalresearch.models.thl.user import User
 
         if df_collection.data_type in unsupported_mock_types:
             return
@@ -987,7 +979,6 @@ class TestDFCollectionItemFunctionalTest:
         duration: timedelta,
         mnt_filepath,
     ):
-        from generalresearch.models.thl.user import User
 
         delete_df_collection(coll=df_collection)
         df_collection._client = client_no_amm
diff --git a/tests/incite/collections/test_df_collection_thl_marketplaces.py b/tests/incite/collections/test_df_collection_thl_marketplaces.py
index 2597d38..d2d3ce4 100644
--- a/tests/incite/collections/test_df_collection_thl_marketplaces.py
+++ b/tests/incite/collections/test_df_collection_thl_marketplaces.py
@@ -1,6 +1,5 @@
-from datetime import UTC, datetime, timezone
+from datetime import UTC, datetime
 from itertools import product
-from typing import TYPE_CHECKING
 
 import pytest
 from pandera.pandas import Column, DataFrameSchema, Index
@@ -12,10 +11,6 @@ from generalresearch.incite.collections.thl_marketplaces import (
     SagoSurveyHistoryCollection,
     SpectrumSurveyTimeseriesCollection,
 )
-from test_utils.incite.conftest import mnt_filepath
-
-if TYPE_CHECKING:
-    from generalresearch.incite.base import GRLDatasets
 
 
 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 2cb0ba0..bcdeb83 100644
--- a/tests/incite/collections/test_df_collection_thl_web.py
+++ b/tests/incite/collections/test_df_collection_thl_web.py
@@ -13,9 +13,7 @@ from pandera.pandas import DataFrameSchema
 from generalresearch.incite.collections import DFCollection, DFCollectionType
 
 if TYPE_CHECKING:
-    from generalresearch.incite.base import GRLDatasets
     from generalresearch.incite.collections import (
-        DFCollectionItem,
         DFCollectionType,
     )
 
diff --git a/tests/incite/mergers/foundations/test_enriched_session.py b/tests/incite/mergers/foundations/test_enriched_session.py
index a0ae01e..ba11725 100644
--- a/tests/incite/mergers/foundations/test_enriched_session.py
+++ b/tests/incite/mergers/foundations/test_enriched_session.py
@@ -1,7 +1,6 @@
-from datetime import UTC, datetime, timedelta, timezone
+from datetime import UTC, datetime, timedelta
 from decimal import Decimal
 from itertools import product
-from typing import Optional
 
 import dask.dataframe as dd
 import pandas as pd
@@ -11,10 +10,6 @@ from generalresearch.incite.schemas.admin_responses import (
     AdminPOPSessionSchema,
 )
 from generalresearch.pg_helper import PostgresConfig
-from test_utils.incite.collections.conftest import (
-    session_collection,
-    wall_collection,
-)
 
 
 @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 96c214f..8c3a647 100644
--- a/tests/incite/mergers/foundations/test_enriched_task_adjust.py
+++ b/tests/incite/mergers/foundations/test_enriched_task_adjust.py
@@ -5,13 +5,6 @@ import dask.dataframe as dd
 import pandas as pd
 import pytest
 
-from test_utils.incite.collections.conftest import (
-    wall_collection,
-    task_adj_collection,
-    session_collection,
-)
-from test_utils.incite.mergers.conftest import enriched_wall_merge
-
 
 @pytest.mark.parametrize(
     argnames="offset, duration,",
diff --git a/tests/incite/mergers/foundations/test_enriched_wall.py b/tests/incite/mergers/foundations/test_enriched_wall.py
index b421df8..0e28bce 100644
--- a/tests/incite/mergers/foundations/test_enriched_wall.py
+++ b/tests/incite/mergers/foundations/test_enriched_wall.py
@@ -1,34 +1,15 @@
-from datetime import UTC, datetime, timedelta, timezone
+from datetime import UTC, datetime, timedelta
 from decimal import Decimal
 from itertools import product as iter_product
-from typing import Optional
 
 import dask.dataframe as dd
 import pandas as pd
 import pytest
 
 # noinspection PyUnresolvedReferences
-from distributed.utils_test import (
-    cleanup,
-    client,
-    client_no_amm,
-    cluster_fixture,
-    gen_cluster,
-    loop,
-    loop_in_thread,
-)
-
 from generalresearch.incite.mergers.foundations.enriched_wall import (
     EnrichedWallMergeItem,
 )
-from test_utils.incite.collections.conftest import (
-    session_collection,
-    wall_collection,
-)
-from test_utils.incite.conftest import incite_item_factory
-from test_utils.incite.mergers.conftest import (
-    enriched_wall_merge,
-)
 
 
 @pytest.mark.parametrize(
@@ -118,7 +99,7 @@ class TestEnrichedWall:
 
             try:
                 modified_time1 = path.stat().st_mtime
-            except (Exception,):
+            except Exception:
                 modified_time1 = 0
 
             item.build(
diff --git a/tests/incite/mergers/foundations/test_user_id_product.py b/tests/incite/mergers/foundations/test_user_id_product.py
index a696b45..10802e5 100644
--- a/tests/incite/mergers/foundations/test_user_id_product.py
+++ b/tests/incite/mergers/foundations/test_user_id_product.py
@@ -1,24 +1,13 @@
-from datetime import UTC, datetime, timedelta, timezone
+from datetime import UTC, datetime, timedelta
 from itertools import product
 
 import pandas as pd
 import pytest
 
 # noinspection PyUnresolvedReferences
-from distributed.utils_test import (
-    cleanup,
-    client,
-    client_no_amm,
-    cluster_fixture,
-    gen_cluster,
-    loop,
-    loop_in_thread,
-)
-
 from generalresearch.incite.mergers.foundations.user_id_product import (
     UserIdProductMergeItem,
 )
-from test_utils.incite.mergers.conftest import user_id_product_merge
 
 
 @pytest.mark.parametrize(
@@ -51,7 +40,7 @@ class TestUserIDProduct:
 
             try:
                 modified_time1 = path.stat().st_mtime
-            except (Exception,):
+            except Exception:
                 modified_time1 = 0
 
             user_id_product_merge.build(client=client_no_amm, user_coll=user_collection)
diff --git a/tests/incite/mergers/test_merge_collection.py b/tests/incite/mergers/test_merge_collection.py
index 77fa8c7..15fa4db 100644
--- a/tests/incite/mergers/test_merge_collection.py
+++ b/tests/incite/mergers/test_merge_collection.py
@@ -1,4 +1,4 @@
-from datetime import UTC, datetime, timedelta, timezone
+from datetime import UTC, datetime, timedelta
 from itertools import product
 
 import pandas as pd
@@ -9,7 +9,6 @@ from generalresearch.incite.mergers import (
     MergeCollection,
     MergeType,
 )
-from test_utils.incite.conftest import mnt_filepath
 
 merge_types = list(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 96f8789..3d0b644 100644
--- a/tests/incite/mergers/test_merge_collection_item.py
+++ b/tests/incite/mergers/test_merge_collection_item.py
@@ -1,17 +1,10 @@
-from datetime import datetime, timezone, timedelta
+from datetime import timedelta
 from itertools import product
 from pathlib import PurePath
 
 import pytest
 
 from generalresearch.incite.mergers import MergeCollectionItem, MergeType
-from generalresearch.incite.mergers.foundations.enriched_session import (
-    EnrichedSessionMerge,
-)
-from generalresearch.incite.mergers.foundations.enriched_wall import (
-    EnrichedWallMerge,
-)
-from test_utils.incite.mergers.conftest import merge_collection
 
 
 @pytest.mark.parametrize(
diff --git a/tests/incite/mergers/test_pop_ledger.py b/tests/incite/mergers/test_pop_ledger.py
index 7583faf..dc01179 100644
--- a/tests/incite/mergers/test_pop_ledger.py
+++ b/tests/incite/mergers/test_pop_ledger.py
@@ -1,18 +1,12 @@
-from datetime import UTC, datetime, timedelta, timezone
+from datetime import UTC, datetime, timedelta
 from itertools import product as iter_product
-from typing import Optional
 
 import pandas as pd
 import pytest
-from distributed.utils_test import client_no_amm
 
 from generalresearch.incite.schemas.mergers.pop_ledger import (
     numerical_col_names,
 )
-from test_utils.incite.collections.conftest import ledger_collection
-from test_utils.incite.conftest import incite_item_factory, mnt_filepath
-from test_utils.incite.mergers.conftest import pop_ledger_merge
-from test_utils.managers.ledger.conftest import create_main_accounts
 
 
 @pytest.mark.parametrize(
diff --git a/tests/incite/mergers/test_ym_survey_merge.py b/tests/incite/mergers/test_ym_survey_merge.py
index 9107f21..850df8a 100644
--- a/tests/incite/mergers/test_ym_survey_merge.py
+++ b/tests/incite/mergers/test_ym_survey_merge.py
@@ -1,25 +1,10 @@
-from datetime import UTC, datetime, timedelta, timezone
+from datetime import UTC, datetime, timedelta
 from itertools import product
 
 import pandas as pd
 import pytest
 
 # noinspection PyUnresolvedReferences
-from distributed.utils_test import (
-    cleanup,
-    client,
-    client_no_amm,
-    cluster_fixture,
-    gen_cluster,
-    loop,
-    loop_in_thread,
-)
-
-from test_utils.incite.collections.conftest import session_collection, wall_collection
-from test_utils.incite.mergers.conftest import (
-    enriched_session_merge,
-    ym_survey_wall_merge,
-)
 
 
 @pytest.mark.parametrize(
diff --git a/tests/incite/test_collection_base.py b/tests/incite/test_collection_base.py
index 5a63019..7e1577a 100644
--- a/tests/incite/test_collection_base.py
+++ b/tests/incite/test_collection_base.py
@@ -10,7 +10,6 @@ import pytest
 from _pytest._code.code import ExceptionInfo
 
 from generalresearch.incite.base import CollectionBase
-from test_utils.incite.conftest import mnt_filepath
 
 AGO_15min = (datetime.now(tz=UTC) - timedelta(minutes=15)).replace(microsecond=0)
 AGO_1HR = (datetime.now(tz=UTC) - timedelta(hours=1)).replace(microsecond=0)
@@ -108,7 +107,7 @@ class TestCollectionBase:
 
         with pytest.raises(expected_exception=ValueError) as cm:
             cm: ExceptionInfo
-            CollectionBase(offset=f"59sec", archive_path=mnt_filepath.data_src)
+            CollectionBase(offset="59sec", archive_path=mnt_filepath.data_src)
         assert "Must be equal to, or longer than 1 min" in str(cm.value)
 
         with pytest.raises(expected_exception=ValueError) as cm:
diff --git a/tests/incite/test_collection_base_item.py b/tests/incite/test_collection_base_item.py
index 3f4d023..7a0a581 100644
--- a/tests/incite/test_collection_base_item.py
+++ b/tests/incite/test_collection_base_item.py
@@ -1,4 +1,4 @@
-from datetime import UTC, datetime, timezone
+from datetime import UTC, datetime
 from os.path import join as pjoin
 from pathlib import Path
 from uuid import uuid4
diff --git a/tests/incite/test_grl_flow.py b/tests/incite/test_grl_flow.py
index c632f9a..6aea182 100644
--- a/tests/incite/test_grl_flow.py
+++ b/tests/incite/test_grl_flow.py
@@ -1,15 +1,16 @@
 class TestGRLFlow:
 
     def test_init(self, mnt_filepath, thl_web_rr):
+        from generalresearch.incite.collections.thl_web import (
+            LedgerDFCollection,
+            TaskAdjustmentDFCollection,
+        )
         from generalresearch.incite.defaults import (
             ledger_df_collection,
             task_df_collection,
-            pop_ledger as plm,
         )
-
-        from generalresearch.incite.collections.thl_web import (
-            LedgerDFCollection,
-            TaskAdjustmentDFCollection,
+        from generalresearch.incite.defaults import (
+            pop_ledger as plm,
         )
         from generalresearch.incite.mergers.pop_ledger import PopLedgerMerge
 
diff --git a/tests/incite/test_interval_idx.py b/tests/incite/test_interval_idx.py
index ea2bced..3034c21 100644
--- a/tests/incite/test_interval_idx.py
+++ b/tests/incite/test_interval_idx.py
@@ -1,5 +1,6 @@
+from datetime import datetime
+
 import pandas as pd
-from datetime import datetime, timezone, timedelta
 
 
 class TestIntervalIndex:
diff --git a/tests/managers/gr/test_authentication.py b/tests/managers/gr/test_authentication.py
index 53b6931..b9f43a6 100644
--- a/tests/managers/gr/test_authentication.py
+++ b/tests/managers/gr/test_authentication.py
@@ -1,11 +1,9 @@
 import logging
-from random import randint
 from uuid import uuid4
 
 import pytest
 
 from generalresearch.models.gr.authentication import GRUser
-from test_utils.models.conftest import gr_user
 
 SSO_ISSUER = ""
 
@@ -13,7 +11,6 @@ SSO_ISSUER = ""
 class TestGRUserManager:
 
     def test_create(self, gr_um):
-        from generalresearch.models.gr.authentication import GRUser
 
         user: GRUser = gr_um.create_dummy()
         instance = gr_um.get_by_id(user.id)
diff --git a/tests/managers/gr/test_business.py b/tests/managers/gr/test_business.py
index 7eb77f8..74a5450 100644
--- a/tests/managers/gr/test_business.py
+++ b/tests/managers/gr/test_business.py
@@ -2,8 +2,6 @@ from uuid import uuid4
 
 import pytest
 
-from test_utils.models.conftest import business
-
 
 class TestBusinessBankAccountManager:
 
@@ -12,8 +10,8 @@ class TestBusinessBankAccountManager:
 
     def test_create(self, business, business_bank_account_manager):
         from generalresearch.models.gr.business import (
-            TransferMethod,
             BusinessBankAccount,
+            TransferMethod,
         )
 
         instance = business_bank_account_manager.create(
diff --git a/tests/managers/gr/test_team.py b/tests/managers/gr/test_team.py
index 9215da4..0918ab8 100644
--- a/tests/managers/gr/test_team.py
+++ b/tests/managers/gr/test_team.py
@@ -1,7 +1,5 @@
 from uuid import uuid4
 
-from test_utils.models.conftest import team
-
 
 class TestMembershipManager:
 
diff --git a/tests/managers/leaderboard.py b/tests/managers/leaderboard.py
index 149bdbb..7773030 100644
--- a/tests/managers/leaderboard.py
+++ b/tests/managers/leaderboard.py
@@ -1,7 +1,7 @@
 import os
 import time
 import zoneinfo
-from datetime import UTC, datetime, timezone
+from datetime import UTC, datetime
 from decimal import Decimal
 from uuid import uuid4
 
diff --git a/tests/managers/network/test_label.py b/tests/managers/network/test_label.py
index 5b9a790..bfc7518 100644
--- a/tests/managers/network/test_label.py
+++ b/tests/managers/network/test_label.py
@@ -9,8 +9,8 @@ from generalresearch.managers.network.label import IPLabelManager
 from generalresearch.models.network.label import (
     IPLabel,
     IPLabelKind,
-    IPLabelSource,
     IPLabelMetadata,
+    IPLabelSource,
 )
 from generalresearch.models.thl.ipinfo import normalize_ip
 
diff --git a/tests/managers/test_events.py b/tests/managers/test_events.py
index 6941c00..cc9a1bf 100644
--- a/tests/managers/test_events.py
+++ b/tests/managers/test_events.py
@@ -1,11 +1,10 @@
 import math
 import random
 import time
-from datetime import UTC, datetime, timedelta, timezone
+from datetime import UTC, datetime, timedelta
 from decimal import Decimal
 from functools import partial
 from math import floor
-from typing import Optional
 from uuid import uuid4
 
 import pytest
@@ -384,7 +383,7 @@ class TestTaskStatsManager:
             "task_created_count_last_24h": AggregateBySource(total=0),
         }
         event_manager.set_source_task_stats(
-            source=Source.TESTING, live_task_count=0, live_tasks_max_payout=Decimal("0")
+            source=Source.TESTING, live_task_count=0, live_tasks_max_payout=Decimal(0)
         )
         assert event_manager.get_task_stats_raw() == {
             "live_task_count": AggregateBySource(
@@ -400,7 +399,7 @@ class TestTaskStatsManager:
         event_manager.set_source_task_stats(
             source=Source.TESTING,
             live_task_count=0,
-            live_tasks_max_payout=Decimal("0"),
+            live_tasks_max_payout=Decimal(0),
             created_count=10,
         )
         res = event_manager.get_task_stats_raw()
@@ -414,7 +413,7 @@ class TestTaskStatsManager:
         event_manager.set_source_task_stats(
             source=Source.TESTING,
             live_task_count=0,
-            live_tasks_max_payout=Decimal("0"),
+            live_tasks_max_payout=Decimal(0),
             created_count=10,
         )
         res = event_manager.get_task_stats_raw()
@@ -428,7 +427,7 @@ class TestTaskStatsManager:
         event_manager.set_source_task_stats(
             source=Source.TESTING2,
             live_task_count=0,
-            live_tasks_max_payout=Decimal("0"),
+            live_tasks_max_payout=Decimal(0),
             created_count=1,
         )
         res = event_manager.get_task_stats_raw()
@@ -481,7 +480,7 @@ class TestChannelsSubscriptions:
 
         wall = Wall(
             req_survey_id="a",
-            req_cpi=Decimal("1"),
+            req_cpi=Decimal(1),
             source=Source.TESTING,
             session_id=session.id,
             user_id=user.user_id,
@@ -497,7 +496,7 @@ class TestChannelsSubscriptions:
             status=Status.COMPLETE,
             status_code_1=StatusCode1.COMPLETE,
             finished=datetime.now(tz=UTC),
-            cpi=Decimal("1"),
+            cpi=Decimal(1),
         )
         event_manager.handle_task_finish(wall, session, user)
         msg = event_subscriber.get_next_message()
diff --git a/tests/managers/test_userpid.py b/tests/managers/test_userpid.py
index 4a3f699..36c2de9 100644
--- a/tests/managers/test_userpid.py
+++ b/tests/managers/test_userpid.py
@@ -1,11 +1,10 @@
 import pytest
 from pydantic import MySQLDsn
 
-from generalresearch.managers.marketplace.user_pid import UserPidMultiManager
-from generalresearch.sql_helper import SqlHelper
 from generalresearch.managers.cint.user_pid import CintUserPidManager
 from generalresearch.managers.dynata.user_pid import DynataUserPidManager
 from generalresearch.managers.innovate.user_pid import InnovateUserPidManager
+from generalresearch.managers.marketplace.user_pid import UserPidMultiManager
 from generalresearch.managers.morning.user_pid import MorningUserPidManager
 
 # from generalresearch.managers.precision import PrecisionUserPidManager
@@ -13,6 +12,7 @@ from generalresearch.managers.prodege.user_pid import ProdegeUserPidManager
 from generalresearch.managers.repdata.user_pid import RepdataUserPidManager
 from generalresearch.managers.sago.user_pid import SagoUserPidManager
 from generalresearch.managers.spectrum.user_pid import SpectrumUserPidManager
+from generalresearch.sql_helper import SqlHelper
 
 dsn = ""
 
diff --git a/tests/managers/thl/test_contest/test_leaderboard.py b/tests/managers/thl/test_contest/test_leaderboard.py
index 1a52f83..7adea9c 100644
--- a/tests/managers/thl/test_contest/test_leaderboard.py
+++ b/tests/managers/thl/test_contest/test_leaderboard.py
@@ -1,4 +1,4 @@
-from datetime import UTC, datetime, timedelta, timezone
+from datetime import UTC, datetime, timedelta
 from zoneinfo import ZoneInfo
 
 from generalresearch.currency import USDCent
@@ -12,12 +12,6 @@ from generalresearch.models.thl.contest.leaderboard import (
 )
 from generalresearch.models.thl.product import Product
 from generalresearch.models.thl.user import User
-from test_utils.managers.contest.conftest import (
-    leaderboard_contest_create as contest_create,
-)
-from test_utils.managers.contest.conftest import (
-    leaderboard_contest_in_db as contest_in_db,
-)
 
 
 class TestLeaderboardContestCRUD:
diff --git a/tests/managers/thl/test_contest/test_milestone.py b/tests/managers/thl/test_contest/test_milestone.py
index 66c5dc4..ed0bbb5 100644
--- a/tests/managers/thl/test_contest/test_milestone.py
+++ b/tests/managers/thl/test_contest/test_milestone.py
@@ -1,4 +1,4 @@
-from datetime import UTC, datetime, timezone
+from datetime import UTC, datetime
 
 from generalresearch.models.thl.contest.definitions import (
     ContestEndReason,
@@ -12,18 +12,6 @@ from generalresearch.models.thl.contest.milestone import (
 )
 from generalresearch.models.thl.product import Product
 from generalresearch.models.thl.user import User
-from test_utils.managers.contest.conftest import (
-    milestone_contest as contest,
-)
-from test_utils.managers.contest.conftest import (
-    milestone_contest_create as contest_create,
-)
-from test_utils.managers.contest.conftest import (
-    milestone_contest_factory as contest_factory,
-)
-from test_utils.managers.contest.conftest import (
-    milestone_contest_in_db as contest_in_db,
-)
 
 
 class TestMilestoneContest:
diff --git a/tests/managers/thl/test_contest/test_raffle.py b/tests/managers/thl/test_contest/test_raffle.py
index 5804ea3..736a5e9 100644
--- a/tests/managers/thl/test_contest/test_raffle.py
+++ b/tests/managers/thl/test_contest/test_raffle.py
@@ -1,4 +1,4 @@
-from datetime import UTC, datetime, timezone
+from datetime import UTC, datetime
 
 import pytest
 from pydantic import ValidationError
@@ -28,18 +28,6 @@ from generalresearch.models.thl.contest.raffle import (
 )
 from generalresearch.models.thl.product import Product
 from generalresearch.models.thl.user import User
-from test_utils.managers.contest.conftest import (
-    raffle_contest as contest,
-)
-from test_utils.managers.contest.conftest import (
-    raffle_contest_create as contest_create,
-)
-from test_utils.managers.contest.conftest import (
-    raffle_contest_factory as contest_factory,
-)
-from test_utils.managers.contest.conftest import (
-    raffle_contest_in_db as contest_in_db,
-)
 
 
 class TestRaffleContest:
diff --git a/tests/managers/thl/test_harmonized_uqa.py b/tests/managers/thl/test_harmonized_uqa.py
index 3b6df48..81ac080 100644
--- a/tests/managers/thl/test_harmonized_uqa.py
+++ b/tests/managers/thl/test_harmonized_uqa.py
@@ -1,4 +1,4 @@
-from datetime import UTC, datetime, timezone
+from datetime import UTC, datetime
 
 import pytest
 
diff --git a/tests/managers/thl/test_ipinfo.py b/tests/managers/thl/test_ipinfo.py
index 847b00c..61d4d19 100644
--- a/tests/managers/thl/test_ipinfo.py
+++ b/tests/managers/thl/test_ipinfo.py
@@ -1,9 +1,9 @@
 import faker
 
 from generalresearch.managers.thl.ipinfo import (
+    GeoIpInfoManager,
     IPGeonameManager,
     IPInformationManager,
-    GeoIpInfoManager,
 )
 from generalresearch.models.thl.ipinfo import IPGeoname, IPInformation
 
diff --git a/tests/managers/thl/test_ledger/test_lm_accounts.py b/tests/managers/thl/test_ledger/test_lm_accounts.py
index faef5fb..11b2835 100644
--- a/tests/managers/thl/test_ledger/test_lm_accounts.py
+++ b/tests/managers/thl/test_ledger/test_lm_accounts.py
@@ -1,4 +1,3 @@
-from collections.abc import Callable
 from itertools import product as iproduct
 from random import randint
 from typing import TYPE_CHECKING
@@ -22,7 +21,6 @@ from generalresearch.models.thl.ledger import (
 if TYPE_CHECKING:
     from pydantic import PositiveInt
 
-    from generalresearch.config import GRLSettings
     from generalresearch.currency import LedgerCurrency
     from generalresearch.managers.thl.ledger_manager.ledger import LedgerManager
     from generalresearch.models.custom_types import AccountType, Direction, UUIDStr
@@ -32,10 +30,6 @@ if TYPE_CHECKING:
         LedgerAccount,
         LedgerTransaction,
     )
-    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
 
 
 @pytest.mark.parametrize(
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 07c3712..020b74a 100644
--- a/tests/managers/thl/test_ledger/test_lm_tx_locks.py
+++ b/tests/managers/thl/test_ledger/test_lm_tx_locks.py
@@ -1,6 +1,6 @@
 import logging
 from collections.abc import Callable
-from datetime import UTC, datetime, timedelta, timezone
+from datetime import UTC, datetime, timedelta
 from decimal import Decimal
 
 import pytest
@@ -23,7 +23,6 @@ from generalresearch.models.thl.session import (
     WallAdjustedStatus,
 )
 from generalresearch.models.thl.user import User
-from test_utils.models.conftest import product_user_wallet_no, session, user_factory
 
 logger = logging.getLogger("LedgerManager")
 
@@ -56,7 +55,7 @@ class TestLedgerLocks:
         s1 = session_factory(
             user=user,
             wall_count=3,
-            wall_req_cpis=[Decimal("1.23"), Decimal("3.21"), Decimal("4")],
+            wall_req_cpis=[Decimal("1.23"), Decimal("3.21"), Decimal(4)],
             wall_statuses=[Status.COMPLETE, Status.COMPLETE, Status.COMPLETE],
         )
 
@@ -187,7 +186,7 @@ class TestLedgerLocks:
             user_id=user.user_id,
             source=Source.DYNATA,
             req_survey_id="xxx",
-            req_cpi=Decimal("4"),
+            req_cpi=Decimal(4),
             session_id=1,
             status=Status.COMPLETE,
             status_code_1=StatusCode1.COMPLETE,
@@ -292,13 +291,7 @@ class TestLedgerLocks:
         status, status_code_1 = session.determine_session_status()
         thl_net, commission_amount, bp_pay, user_pay = session.determine_payments()
         session.update(
-            **{
-                "status": status,
-                "status_code_1": status_code_1,
-                "finished": session.started + timedelta(minutes=10),
-                "payout": bp_pay,
-                "user_payout": user_pay,
-            }
+            status=status, status_code_1=status_code_1, finished=session.started + timedelta(minutes=10), payout=bp_pay, user_payout=user_pay
         )
         print(thl_net, commission_amount, bp_pay, user_pay)
 
@@ -336,13 +329,7 @@ class TestLedgerLocks:
         status, status_code_1 = session.determine_session_status()
         thl_net, commission_amount, bp_pay, user_pay = session.determine_payments()
         session.update(
-            **{
-                "status": status,
-                "status_code_1": status_code_1,
-                "finished": session.started + timedelta(minutes=10),
-                "payout": bp_pay,
-                "user_payout": user_pay,
-            }
+            status=status, status_code_1=status_code_1, finished=session.started + timedelta(minutes=10), payout=bp_pay, user_payout=user_pay
         )
         print(thl_net, commission_amount, bp_pay, user_pay)
 
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 01d5fe1..8d7d828 100644
--- a/tests/managers/thl/test_ledger/test_thl_lm_accounts.py
+++ b/tests/managers/thl/test_ledger/test_thl_lm_accounts.py
@@ -8,9 +8,9 @@ class TestThlLedgerManagerAccounts:
     def test_get_account_or_create_user_wallet(self, user, thl_lm, lm):
         from generalresearch.currency import LedgerCurrency
         from generalresearch.models.thl.ledger import (
-            LedgerAccount,
-            Direction,
             AccountType,
+            Direction,
+            LedgerAccount,
         )
 
         account = thl_lm.get_account_or_create_user_wallet(user=user)
@@ -31,9 +31,9 @@ class TestThlLedgerManagerAccounts:
     def test_get_account_or_create_bp_wallet(self, product, thl_lm, lm):
         from generalresearch.currency import LedgerCurrency
         from generalresearch.models.thl.ledger import (
-            LedgerAccount,
-            Direction,
             AccountType,
+            Direction,
+            LedgerAccount,
         )
 
         account = thl_lm.get_account_or_create_bp_wallet(product=product)
@@ -54,8 +54,8 @@ class TestThlLedgerManagerAccounts:
     def test_get_account_or_create_bp_commission(self, product, thl_lm, lm):
         from generalresearch.currency import LedgerCurrency
         from generalresearch.models.thl.ledger import (
-            Direction,
             AccountType,
+            Direction,
         )
 
         account = thl_lm.get_account_or_create_bp_commission(product=product)
@@ -76,8 +76,8 @@ class TestThlLedgerManagerAccounts:
     def test_get_account_or_create_bp_expense(self, product, expense, thl_lm, lm):
         from generalresearch.currency import LedgerCurrency
         from generalresearch.models.thl.ledger import (
-            Direction,
             AccountType,
+            Direction,
         )
 
         account = thl_lm.get_account_or_create_bp_expense(
@@ -98,8 +98,8 @@ class TestThlLedgerManagerAccounts:
     def test_get_or_create_bp_pending_payout_account(self, product, thl_lm, lm):
         from generalresearch.currency import LedgerCurrency
         from generalresearch.models.thl.ledger import (
-            Direction,
             AccountType,
+            Direction,
         )
 
         account = thl_lm.get_or_create_bp_pending_payout_account(product=product)
@@ -132,8 +132,8 @@ class TestThlLedgerManagerAccounts:
         self, account_cash, account_revenue_task_complete, thl_lm, lm
     ):
         from generalresearch.models.thl.ledger import (
-            LedgerAccount,
             AccountType,
+            LedgerAccount,
         )
 
         res = thl_lm.get_account_task_complete_revenue()
@@ -155,8 +155,8 @@ class TestThlLedgerManagerAccounts:
 
     def test_get_account_cash(self, account_cash, thl_lm, lm):
         from generalresearch.models.thl.ledger import (
-            LedgerAccount,
             AccountType,
+            LedgerAccount,
         )
 
         res = thl_lm.get_account_cash()
@@ -167,10 +167,10 @@ class TestThlLedgerManagerAccounts:
         assert res.display_name == "Operating Cash Account"
 
     def test_get_accounts(self, setup_accounts, product, user_factory, thl_lm, lm, lam):
-        from generalresearch.models.thl.user import User
         from generalresearch.managers.thl.ledger_manager.exceptions import (
             LedgerAccountDoesntExistError,
         )
+        from generalresearch.models.thl.user import User
 
         user1: User = user_factory(product=product)
         user2: User = user_factory(product=product)
@@ -276,9 +276,9 @@ class TestLedgerAccountManager:
             LedgerAccountDoesntExistError,
         )
         from generalresearch.models.thl.ledger import (
-            LedgerAccount,
-            Direction,
             AccountType,
+            Direction,
+            LedgerAccount,
         )
 
         u = uuid4().hex
@@ -311,8 +311,8 @@ class TestLedgerAccountManager:
             LedgerAccountDoesntExistError,
         )
         from generalresearch.models.thl.ledger import (
-            LedgerAccount,
             AccountType,
+            LedgerAccount,
         )
 
         with pytest.raises(LedgerAccountDoesntExistError):
@@ -326,10 +326,10 @@ class TestLedgerAccountManager:
         assert user.product.uuid == account.reference_uuid
 
     def test_get_many(self, product_factory, thl_lm, lm, lam, currency):
-        from generalresearch.models.thl.product import Product
         from generalresearch.managers.thl.ledger_manager.exceptions import (
             LedgerAccountDoesntExistError,
         )
+        from generalresearch.models.thl.product import Product
 
         p1: Product = product_factory()
         p2: Product = product_factory()
@@ -388,9 +388,9 @@ class TestLedgerAccountManager:
 
     def test_create_account(self, thl_lm, lm, lam):
         from generalresearch.models.thl.ledger import (
-            LedgerAccount,
-            Direction,
             AccountType,
+            Direction,
+            LedgerAccount,
         )
 
         u = uuid4().hex
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 1fb9c01..cfb8f8f 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
@@ -1,5 +1,5 @@
 import logging
-from datetime import UTC, datetime, timedelta, timezone
+from datetime import UTC, datetime, timedelta
 from decimal import Decimal
 from random import randint
 from uuid import uuid4
@@ -78,13 +78,7 @@ class TestThlLedgerManagerBPPayout:
         status, status_code_1 = session.determine_session_status()
         thl_net, commission_amount, bp_pay, user_pay = session.determine_payments()
         session.update(
-            **{
-                "status": status,
-                "status_code_1": status_code_1,
-                "finished": now + timedelta(minutes=10),
-                "payout": bp_pay,
-                "user_payout": user_pay,
-            }
+            status=status, status_code_1=status_code_1, finished=now + timedelta(minutes=10), payout=bp_pay, user_payout=user_pay
         )
         thl_lm.create_tx_bp_payment(session=session, created=wall1.started)
 
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 be988a1..1130621 100644
--- a/tests/managers/thl/test_ledger/test_thl_lm_tx.py
+++ b/tests/managers/thl/test_ledger/test_thl_lm_tx.py
@@ -1,5 +1,5 @@
 import logging
-from datetime import UTC, datetime, timedelta, timezone
+from datetime import UTC, datetime, timedelta
 from decimal import Decimal
 from random import randint
 from uuid import uuid4
@@ -114,7 +114,7 @@ class TestThlLedgerTxManager:
             user_wallet_config=UserWalletConfig(amt=True, enabled=True),
         )
         user = user_factory(product=product)
-        s1 = session_factory(user=user, wall_req_cpi=Decimal("1"))
+        s1 = session_factory(user=user, wall_req_cpi=Decimal(1))
 
         status, status_code_1 = s1.determine_session_status()
         assert status == Status.COMPLETE
@@ -207,9 +207,7 @@ class TestThlLedgerTxManager:
         # Update the finished timestamp, but nothing else. This means that
         #   there is no financial changes needed
         session.update(
-            **{
-                "finished": datetime.now(tz=UTC) + timedelta(minutes=10),
-            }
+            finished=datetime.now(tz=UTC) + timedelta(minutes=10)
         )
         assert session.finished
         with caplog.at_level(logging.INFO):
@@ -829,13 +827,7 @@ class TestThlLedgerTxManagerFlows:
         status, status_code_1 = s1.determine_session_status()
         thl_net, commission_amount, bp_pay, user_pay = s1.determine_payments()
         s1.update(
-            **{
-                "status": status,
-                "status_code_1": status_code_1,
-                "finished": s1.started + timedelta(minutes=10),
-                "payout": bp_pay,
-                "user_payout": user_pay,
-            }
+            status=status, status_code_1=status_code_1, finished=s1.started + timedelta(minutes=10), payout=bp_pay, user_payout=user_pay
         )
         print(thl_net, commission_amount, bp_pay, user_pay)
         thl_lm.create_tx_bp_payment(session=s1, created=w1.started)
@@ -892,13 +884,7 @@ class TestThlLedgerTxManagerFlows:
         status, status_code_1 = session.determine_session_status()
         thl_net, commission_amount, bp_pay, user_pay = session.determine_payments()
         session.update(
-            **{
-                "status": status,
-                "status_code_1": status_code_1,
-                "finished": session.started + timedelta(minutes=10),
-                "payout": bp_pay,
-                "user_payout": user_pay,
-            }
+            status=status, status_code_1=status_code_1, finished=session.started + timedelta(minutes=10), payout=bp_pay, user_payout=user_pay
         )
 
         print(thl_net, commission_amount, bp_pay, user_pay)
@@ -930,13 +916,7 @@ class TestThlLedgerTxManagerFlows:
         status, status_code_1 = session.determine_session_status()
         # thl_net, commission_amount, bp_pay, user_pay = session.determine_payments()
         session.update(
-            **{
-                "status": status,
-                "status_code_1": status_code_1,
-                "finished": session.started + timedelta(minutes=10),
-                "payout": Decimal("1.53"),
-                "user_payout": Decimal("1.53"),
-            }
+            status=status, status_code_1=status_code_1, finished=session.started + timedelta(minutes=10), payout=Decimal("1.53"), user_payout=Decimal("1.53")
         )
 
         thl_lm.create_tx_bp_payment(session=session, created=wall1.started)
@@ -971,13 +951,7 @@ class TestThlLedgerTxManagerFlows:
         status, status_code_1 = session.determine_session_status()
         # thl_net, commission_amount, bp_pay, user_pay = session.determine_payments()
         session.update(
-            **{
-                "status": status,
-                "status_code_1": status_code_1,
-                "finished": session.started + timedelta(minutes=10),
-                "payout": Decimal("0.39"),
-                "user_payout": Decimal("0.26"),
-            }
+            status=status, status_code_1=status_code_1, finished=session.started + timedelta(minutes=10), payout=Decimal("0.39"), user_payout=Decimal("0.26")
         )
         # with pytest.logs(logger, level=logging.WARNING) as cm:
         #     tx = thl_lm.create_transaction_bp_payment(session, created=wall1.started)
@@ -1310,13 +1284,7 @@ class TestThlLedgerManagerAdj:
         status, status_code_1 = session.determine_session_status()
         thl_net, commission_amount, bp_pay, user_pay = session.determine_payments()
         session.update(
-            **{
-                "status": status,
-                "status_code_1": status_code_1,
-                "finished": utc_hour_ago + timedelta(minutes=10),
-                "payout": bp_pay,
-                "user_payout": user_pay,
-            }
+            status=status, status_code_1=status_code_1, finished=utc_hour_ago + timedelta(minutes=10), payout=bp_pay, user_payout=user_pay
         )
         thl_lm.create_tx_bp_payment(session, created=wall1.started)
 
@@ -1484,13 +1452,7 @@ class TestThlLedgerManagerAdj:
         assert user_pay == Decimal("1.52")
 
         session.update(
-            **{
-                "status": status,
-                "status_code_1": status_code_1,
-                "finished": now + timedelta(minutes=10),
-                "payout": bp_pay,
-                "user_payout": user_pay,
-            }
+            status=status, status_code_1=status_code_1, finished=now + timedelta(minutes=10), payout=bp_pay, user_payout=user_pay
         )
 
         tx = thl_lm.create_tx_bp_adjustment(session=session, created=wall1.started)
@@ -1664,13 +1626,7 @@ class TestThlLedgerManagerAdj:
         status, status_code_1 = session.determine_session_status()
         thl_net, commission_amount, bp_pay, user_pay = session.determine_payments()
         session.update(
-            **{
-                "status": status,
-                "status_code_1": status_code_1,
-                "finished": utc_hour_ago + timedelta(minutes=10),
-                "payout": bp_pay,
-                "user_payout": user_pay,
-            }
+            status=status, status_code_1=status_code_1, finished=utc_hour_ago + timedelta(minutes=10), payout=bp_pay, user_payout=user_pay
         )
         thl_lm.create_tx_bp_payment(session, created=wall1.started)
 
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 9253ff0..cd6ea79 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
@@ -1,5 +1,5 @@
 import logging
-from datetime import UTC, datetime, timedelta, timezone
+from datetime import UTC, datetime, timedelta
 from decimal import Decimal
 from uuid import uuid4
 
@@ -12,7 +12,6 @@ from generalresearch.managers.thl.ledger_manager.exceptions import (
 from generalresearch.models.thl.payout import UserPayoutEvent
 from generalresearch.models.thl.user import User
 from generalresearch.models.thl.wallet import PayoutType
-from test_utils.managers.ledger.conftest import create_main_accounts
 
 
 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 5fb9e7d..7a4f0c9 100644
--- a/tests/managers/thl/test_ledger/test_thl_pem.py
+++ b/tests/managers/thl/test_ledger/test_thl_pem.py
@@ -1,6 +1,5 @@
-import uuid
 from random import randint
-from uuid import uuid4, UUID
+from uuid import UUID, uuid4
 
 import pytest
 
@@ -33,7 +32,6 @@ class TestThlPayoutEventManager:
         thl_lm,
         brokerage_product_payout_event_manager,
     ):
-        from generalresearch.models.thl.payout import UserPayoutEvent
 
         N_PRODUCTS = randint(3, 10)
         N_PAYOUT_EVENTS = randint(3, 10)
@@ -73,7 +71,6 @@ class TestThlPayoutEventManager:
         brokerage_product_payout_event_manager,
         thl_lm,
     ):
-        from generalresearch.models.thl.payout import UserPayoutEvent
 
         N_PRODUCTS = randint(3, 10)
         N_PAYOUT_EVENTS = randint(3, 10)
@@ -119,7 +116,6 @@ class TestThlPayoutEventManager:
         description can't be None
         """
         from generalresearch.models.thl.payout import (
-            UserPayoutEvent,
             PayoutType,
         )
 
@@ -174,7 +170,6 @@ class TestThlPayoutEventManager:
         brokerage_product_payout_event_manager,
         lm,
     ):
-        from generalresearch.models.thl.payout import UserPayoutEvent
 
         delete_ledger_db()
         create_main_accounts()
diff --git a/tests/managers/thl/test_ledger/test_user_txs.py b/tests/managers/thl/test_ledger/test_user_txs.py
index b4b0437..f83641e 100644
--- a/tests/managers/thl/test_ledger/test_user_txs.py
+++ b/tests/managers/thl/test_ledger/test_user_txs.py
@@ -1,5 +1,5 @@
 from collections.abc import Callable
-from datetime import UTC, datetime, timedelta, timezone
+from datetime import UTC, datetime
 from decimal import Decimal
 from typing import TYPE_CHECKING
 from uuid import uuid4
@@ -8,7 +8,6 @@ from generalresearch.managers.thl.ledger_manager.thl_ledger import ThlLedgerMana
 from generalresearch.managers.thl.user_compensate import user_compensate
 from generalresearch.models.thl.definitions import (
     Status,
-    WallAdjustedStatus,
 )
 from generalresearch.models.thl.ledger import (
     TransactionType,
diff --git a/tests/managers/thl/test_ledger/test_wallet.py b/tests/managers/thl/test_ledger/test_wallet.py
index a0abd7c..bb49cd8 100644
--- a/tests/managers/thl/test_ledger/test_wallet.py
+++ b/tests/managers/thl/test_ledger/test_wallet.py
@@ -4,10 +4,10 @@ from uuid import uuid4
 import pytest
 
 from generalresearch.models.thl.product import (
-    UserWalletConfig,
     PayoutConfig,
     PayoutTransformation,
     PayoutTransformationPercentArgs,
+    UserWalletConfig,
 )
 from generalresearch.models.thl.user import User
 
diff --git a/tests/managers/thl/test_product.py b/tests/managers/thl/test_product.py
index 78d5dde..f8dd44d 100644
--- a/tests/managers/thl/test_product.py
+++ b/tests/managers/thl/test_product.py
@@ -5,15 +5,14 @@ import pytest
 from generalresearch.models import Source
 from generalresearch.models.thl.product import (
     Product,
+    ProfilingConfig,
     SourceConfig,
-    UserCreateConfig,
     SourcesConfig,
-    UserHealthConfig,
-    ProfilingConfig,
-    SupplyPolicy,
     SupplyConfig,
+    SupplyPolicy,
+    UserCreateConfig,
+    UserHealthConfig,
 )
-from test_utils.models.conftest import product_factory
 
 
 class TestProductManagerGetMethods:
diff --git a/tests/managers/thl/test_product_prod.py b/tests/managers/thl/test_product_prod.py
index 7b4f677..f5aa78d 100644
--- a/tests/managers/thl/test_product_prod.py
+++ b/tests/managers/thl/test_product_prod.py
@@ -4,7 +4,6 @@ from uuid import uuid4
 import pytest
 
 from generalresearch.models.thl.product import Product
-from test_utils.models.conftest import product_factory
 
 logger = logging.getLogger()
 
@@ -79,4 +78,3 @@ class TestProductManagerGetAll:
         products = product_manager.get_all(rand_limit=50)
         logger.info(f"Fetching {len(products)} product uuids")
         # todo: once timebucks stops spamming broken accounts, fetch more
-        pass
diff --git a/tests/managers/thl/test_profiling/test_user_upk.py b/tests/managers/thl/test_profiling/test_user_upk.py
index 491e2b1..8b995b1 100644
--- a/tests/managers/thl/test_profiling/test_user_upk.py
+++ b/tests/managers/thl/test_profiling/test_user_upk.py
@@ -1,4 +1,4 @@
-from datetime import UTC, datetime, timezone
+from datetime import UTC, datetime
 
 from generalresearch.managers.thl.profiling.user_upk import UserUpkManager
 
diff --git a/tests/managers/thl/test_session_manager.py b/tests/managers/thl/test_session_manager.py
index 6bedc2b..adcbe25 100644
--- a/tests/managers/thl/test_session_manager.py
+++ b/tests/managers/thl/test_session_manager.py
@@ -7,11 +7,10 @@ from faker import Faker
 from generalresearch.models import DeviceType
 from generalresearch.models.legacy.bucket import Bucket
 from generalresearch.models.thl.definitions import (
+    SessionStatusCode2,
     Status,
     StatusCode1,
-    SessionStatusCode2,
 )
-from test_utils.models.conftest import user
 
 fake = Faker()
 
@@ -21,8 +20,8 @@ class TestSessionManager:
         bucket = Bucket(
             loi_min=timedelta(seconds=60),
             loi_max=timedelta(seconds=120),
-            user_payout_min=Decimal("1"),
-            user_payout_max=Decimal("2"),
+            user_payout_min=Decimal(1),
+            user_payout_max=Decimal(2),
         )
 
         s1 = session_manager.create(
diff --git a/tests/managers/thl/test_survey.py b/tests/managers/thl/test_survey.py
index 4b4a579..37f0b66 100644
--- a/tests/managers/thl/test_survey.py
+++ b/tests/managers/thl/test_survey.py
@@ -1,5 +1,5 @@
 import uuid
-from datetime import UTC, datetime, timezone
+from datetime import UTC, datetime
 from decimal import Decimal
 
 import pytest
diff --git a/tests/managers/thl/test_survey_penalty.py b/tests/managers/thl/test_survey_penalty.py
index 4c7dc08..2a3cdc2 100644
--- a/tests/managers/thl/test_survey_penalty.py
+++ b/tests/managers/thl/test_survey_penalty.py
@@ -1,7 +1,6 @@
 import uuid
 
 import pytest
-from cachetools.keys import _HashedTuple
 
 from generalresearch.models import Source
 from generalresearch.models.thl.survey.penalty import (
diff --git a/tests/managers/thl/test_task_adjustment.py b/tests/managers/thl/test_task_adjustment.py
index 71e3535..43337b6 100644
--- a/tests/managers/thl/test_task_adjustment.py
+++ b/tests/managers/thl/test_task_adjustment.py
@@ -1,5 +1,5 @@
 import logging
-from datetime import UTC, datetime, timedelta, timezone
+from datetime import UTC, datetime, timedelta
 from decimal import Decimal
 from random import randint
 
diff --git a/tests/managers/thl/test_task_status.py b/tests/managers/thl/test_task_status.py
index 468fd5e..93a624d 100644
--- a/tests/managers/thl/test_task_status.py
+++ b/tests/managers/thl/test_task_status.py
@@ -1,4 +1,4 @@
-from datetime import UTC, datetime, timedelta, timezone
+from datetime import UTC, datetime, timedelta
 from decimal import Decimal
 
 import pytest
diff --git a/tests/managers/thl/test_user_manager/test_base.py b/tests/managers/thl/test_user_manager/test_base.py
index 2704490..7d83c11 100644
--- a/tests/managers/thl/test_user_manager/test_base.py
+++ b/tests/managers/thl/test_user_manager/test_base.py
@@ -1,5 +1,5 @@
 import logging
-from datetime import UTC, datetime, timezone
+from datetime import UTC, datetime
 from random import randint
 from uuid import uuid4
 
@@ -156,7 +156,7 @@ class TestCreateUserManager:
 
         # make sure thl_user row is created
         res_thl_user = thl_web_rw.execute_sql_query(
-            query=f"""
+            query="""
                 SELECT * 
                 FROM thl_user AS u
                 WHERE u.id = %s
diff --git a/tests/managers/thl/test_user_manager/test_mysql.py b/tests/managers/thl/test_user_manager/test_mysql.py
index 0313bbf..d414a13 100644
--- a/tests/managers/thl/test_user_manager/test_mysql.py
+++ b/tests/managers/thl/test_user_manager/test_mysql.py
@@ -1,4 +1,3 @@
-from test_utils.models.conftest import user, user_manager
 
 
 class TestUserManagerMysqlNew:
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 a4b3d57..7c9e012 100644
--- a/tests/managers/thl/test_user_manager/test_user_fetch.py
+++ b/tests/managers/thl/test_user_manager/test_user_fetch.py
@@ -3,7 +3,6 @@ from uuid import uuid4
 import pytest
 
 from generalresearch.models.thl.user import User
-from test_utils.models.conftest import product, user_manager, user_factory
 
 
 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 91dc16a..19b3d9f 100644
--- a/tests/managers/thl/test_user_manager/test_user_metadata.py
+++ b/tests/managers/thl/test_user_manager/test_user_metadata.py
@@ -3,7 +3,6 @@ from uuid import uuid4
 import pytest
 
 from generalresearch.models.thl.user_profile import UserMetadata
-from test_utils.models.conftest import user, user_manager, user_factory
 
 
 class TestUserMetadataManager:
diff --git a/tests/managers/thl/test_user_streak.py b/tests/managers/thl/test_user_streak.py
index ef25e2b..be0729c 100644
--- a/tests/managers/thl/test_user_streak.py
+++ b/tests/managers/thl/test_user_streak.py
@@ -1,5 +1,5 @@
 import copy
-from datetime import UTC, date, datetime, timedelta, timezone
+from datetime import UTC, date, datetime, timedelta
 from decimal import Decimal
 from zoneinfo import ZoneInfo
 
diff --git a/tests/managers/thl/test_userhealth.py b/tests/managers/thl/test_userhealth.py
index e2ea4a8..be8f9c8 100644
--- a/tests/managers/thl/test_userhealth.py
+++ b/tests/managers/thl/test_userhealth.py
@@ -1,4 +1,4 @@
-from datetime import UTC, datetime, timezone
+from datetime import UTC, datetime
 from uuid import uuid4
 
 import faker
diff --git a/tests/managers/thl/test_wall_manager.py b/tests/managers/thl/test_wall_manager.py
index 46d199f..5abc648 100644
--- a/tests/managers/thl/test_wall_manager.py
+++ b/tests/managers/thl/test_wall_manager.py
@@ -1,4 +1,4 @@
-from datetime import UTC, datetime, timedelta, timezone
+from datetime import UTC, datetime, timedelta
 from decimal import Decimal
 from uuid import uuid4
 
@@ -10,7 +10,6 @@ from generalresearch.models.thl.session import (
     Status,
     StatusCode1,
 )
-from test_utils.models.conftest import session, user
 
 
 class TestWallManager:
@@ -92,7 +91,7 @@ class TestWallManager:
             source=Source.DYNATA,
             buyer_id="123",
             req_survey_id="456",
-            req_cpi=Decimal("1"),
+            req_cpi=Decimal(1),
         )
 
         assert w is not None
@@ -110,7 +109,7 @@ class TestWallManager:
             source=Source.DYNATA,
             buyer_id="123",
             req_survey_id="456",
-            req_cpi=Decimal("1"),
+            req_cpi=Decimal(1),
         )
         wall_manager.report(
             wall=w1,
@@ -151,7 +150,7 @@ class TestWallManager:
             source=Source.DYNATA,
             buyer_id="123",
             req_survey_id="456",
-            req_cpi=Decimal("1"),
+            req_cpi=Decimal(1),
         )
 
         finish_ts = utc_hour_ago + timedelta(minutes=10)
@@ -190,7 +189,7 @@ class TestWallManager:
             source=Source.DYNATA,
             buyer_id="123",
             req_survey_id="456",
-            req_cpi=Decimal("1"),
+            req_cpi=Decimal(1),
         )
         res = wall_manager.filter_wall_attempts(user_id=user.user_id)
         assert len(res) == 1
@@ -202,7 +201,7 @@ class TestWallManager:
             source=Source.DYNATA,
             buyer_id="123",
             req_survey_id="555",
-            req_cpi=Decimal("1"),
+            req_cpi=Decimal(1),
         )
         res = wall_manager.filter_wall_attempts(user_id=user.user_id)
         assert len(res) == 2
diff --git a/tests/models/admin/test_report_request.py b/tests/models/admin/test_report_request.py
index 4626ab4..5b2ff0d 100644
--- a/tests/models/admin/test_report_request.py
+++ b/tests/models/admin/test_report_request.py
@@ -1,4 +1,4 @@
-from datetime import UTC, datetime, timezone
+from datetime import UTC, datetime
 
 import pandas as pd
 import pytest
diff --git a/tests/models/custom_types/test_aware_datetime.py b/tests/models/custom_types/test_aware_datetime.py
index 043fba0..7c45710 100644
--- a/tests/models/custom_types/test_aware_datetime.py
+++ b/tests/models/custom_types/test_aware_datetime.py
@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import logging
-from datetime import UTC, datetime, timezone
+from datetime import UTC, datetime
 
 import pytest
 import pytz
diff --git a/tests/models/custom_types/test_dsn.py b/tests/models/custom_types/test_dsn.py
index 050976e..eb27526 100644
--- a/tests/models/custom_types/test_dsn.py
+++ b/tests/models/custom_types/test_dsn.py
@@ -1,4 +1,3 @@
-from typing import Optional
 from uuid import uuid4
 
 import pytest
diff --git a/tests/models/dynata/test_eligbility.py b/tests/models/dynata/test_eligbility.py
index 16cad26..27de5b3 100644
--- a/tests/models/dynata/test_eligbility.py
+++ b/tests/models/dynata/test_eligbility.py
@@ -1,4 +1,4 @@
-from datetime import UTC, datetime, timezone
+from datetime import UTC, datetime
 
 
 class TestEligibility:
diff --git a/tests/models/gr/test_authentication.py b/tests/models/gr/test_authentication.py
index 51595a7..ac39e64 100644
--- a/tests/models/gr/test_authentication.py
+++ b/tests/models/gr/test_authentication.py
@@ -2,7 +2,7 @@ import binascii
 import json
 import os
 from collections.abc import Callable
-from datetime import UTC, datetime, timezone
+from datetime import UTC, datetime
 from random import randint
 from uuid import uuid4
 
diff --git a/tests/models/gr/test_business.py b/tests/models/gr/test_business.py
index 716ec75..948acb3 100644
--- a/tests/models/gr/test_business.py
+++ b/tests/models/gr/test_business.py
@@ -1,7 +1,6 @@
 import os
-from datetime import UTC, datetime, timedelta, timezone
+from datetime import UTC, datetime, timedelta
 from decimal import Decimal
-from typing import Optional
 from uuid import uuid4
 
 import pandas as pd
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,
 )
 
 
diff --git a/tests/models/legacy/test_user_question_answer_in.py b/tests/models/legacy/test_user_question_answer_in.py
index 224334a..1904798 100644
--- a/tests/models/legacy/test_user_question_answer_in.py
+++ b/tests/models/legacy/test_user_question_answer_in.py
@@ -263,12 +263,12 @@ class TestUserQuestionAnswerIn:
             UserQuestionAnswerIn,
         )
 
-        for qid in {
+        for qid in (
             "2fbedb2b9f7647b09ff5e52fa119cc5e",
             "4030c52371b04e80b64e058d9c5b82e9",
             "a91cb1dea814480dba12d9b7b48696dd",
             "1d1e2e8380ac474b87fb4e4c569b48df",
-        }:
+        ):
             # This is the UserAgent question which only allows a single answer
             with pytest.raises(ValueError) as cm:
                 UserQuestionAnswerIn.model_validate(
diff --git a/tests/models/morning/test.py b/tests/models/morning/test.py
index 222cb93..7474766 100644
--- a/tests/models/morning/test.py
+++ b/tests/models/morning/test.py
@@ -1,4 +1,4 @@
-from datetime import UTC, datetime, timezone
+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 2965300..840a773 100644
--- a/tests/models/network/test_mtr.py
+++ b/tests/models/network/test_mtr.py
@@ -1,7 +1,7 @@
-from generalresearch.models.network.mtr.execute import execute_mtr
 import faker
 
-from generalresearch.models.network.tool_run import ToolName, ToolClass
+from generalresearch.models.network.mtr.execute import execute_mtr
+from generalresearch.models.network.tool_run import ToolClass, ToolName
 
 fake = faker.Faker()
 
diff --git a/tests/models/network/test_nmap_parser.py b/tests/models/network/test_nmap_parser.py
index abc83c9..7822380 100644
--- a/tests/models/network/test_nmap_parser.py
+++ b/tests/models/network/test_nmap_parser.py
@@ -4,6 +4,7 @@ import pytest
 
 from generalresearch.models.network.nmap.parser import parse_nmap_xml
 
+
 @pytest.fixture
 def nmap_raw_output_2(request) -> str:
     fp = os.path.join(request.config.rootpath, "data/nmaprun2.xml")
diff --git a/tests/models/prodege/test_survey_participation.py b/tests/models/prodege/test_survey_participation.py
index 3b35d0c..e1ba9ab 100644
--- a/tests/models/prodege/test_survey_participation.py
+++ b/tests/models/prodege/test_survey_participation.py
@@ -1,4 +1,4 @@
-from datetime import UTC, datetime, timedelta, timezone
+from datetime import UTC, datetime, timedelta
 
 
 class TestProdegeParticipation:
diff --git a/tests/models/spectrum/test_question.py b/tests/models/spectrum/test_question.py
index 4f92961..57d260d 100644
--- a/tests/models/spectrum/test_question.py
+++ b/tests/models/spectrum/test_question.py
@@ -1,4 +1,4 @@
-from datetime import UTC, datetime, timezone
+from datetime import UTC, datetime
 
 from generalresearch.models import Source
 from generalresearch.models.spectrum.question import (
diff --git a/tests/models/spectrum/test_survey.py b/tests/models/spectrum/test_survey.py
index 5e095a3..7365c7e 100644
--- a/tests/models/spectrum/test_survey.py
+++ b/tests/models/spectrum/test_survey.py
@@ -1,4 +1,4 @@
-from datetime import UTC, datetime, timezone
+from datetime import UTC, datetime
 from decimal import Decimal
 
 
diff --git a/tests/models/spectrum/test_survey_manager.py b/tests/models/spectrum/test_survey_manager.py
index 11970bf..ce26c44 100644
--- a/tests/models/spectrum/test_survey_manager.py
+++ b/tests/models/spectrum/test_survey_manager.py
@@ -1,6 +1,6 @@
 import copy
 import logging
-from datetime import UTC, datetime, timezone
+from datetime import UTC, datetime
 from decimal import Decimal
 
 from pymysql import IntegrityError
diff --git a/tests/models/test_finance.py b/tests/models/test_finance.py
index 6dcd441..3d3ff3a 100644
--- a/tests/models/test_finance.py
+++ b/tests/models/test_finance.py
@@ -1,5 +1,5 @@
 from collections.abc import Callable
-from datetime import UTC, datetime, timedelta, timezone
+from datetime import UTC, datetime, timedelta
 from itertools import product as iter_product
 from random import randint
 from uuid import uuid4
diff --git a/tests/models/thl/question/test_question_info.py b/tests/models/thl/question/test_question_info.py
index 945ee7a..b619fc3 100644
--- a/tests/models/thl/question/test_question_info.py
+++ b/tests/models/thl/question/test_question_info.py
@@ -1,6 +1,6 @@
 from generalresearch.models.thl.profiling.upk_property import (
-    UpkProperty,
     ProfilingInfo,
+    UpkProperty,
 )
 
 
diff --git a/tests/models/thl/test_adjustments.py b/tests/models/thl/test_adjustments.py
index c2c035d..30e9bce 100644
--- a/tests/models/thl/test_adjustments.py
+++ b/tests/models/thl/test_adjustments.py
@@ -1,5 +1,5 @@
 from collections.abc import Callable
-from datetime import UTC, datetime, timedelta, timezone
+from datetime import UTC, datetime, timedelta
 from decimal import Decimal
 
 import pytest
@@ -426,7 +426,7 @@ class TestAdjustments:
         s1 = session_factory(
             user=user,
             wall_count=1,
-            wall_req_cpi=Decimal("1"),
+            wall_req_cpi=Decimal(1),
             final_status=Status.COMPLETE,
             started=utc_hour_ago,
         )
@@ -525,7 +525,7 @@ class TestAdjustments:
         s1 = session_factory(
             user=user,
             wall_count=1,
-            wall_req_cpi=Decimal("1"),
+            wall_req_cpi=Decimal(1),
             final_status=Status.COMPLETE,
             started=utc_hour_ago,
         )
@@ -534,13 +534,7 @@ class TestAdjustments:
         status, status_code_1 = s1.determine_session_status()
         thl_net, commission_amount, bp_pay, user_pay = s1.determine_payments()
         s1.update(
-            **{
-                "status": status,
-                "status_code_1": status_code_1,
-                "finished": utc_hour_ago + timedelta(minutes=10),
-                "payout": bp_pay,
-                "user_payout": user_pay,
-            }
+            status=status, status_code_1=status_code_1, finished=utc_hour_ago + timedelta(minutes=10), payout=bp_pay, user_payout=user_pay
         )
         w1.update(
             adjusted_status=WallAdjustedStatus.ADJUSTED_TO_FAIL,
@@ -592,13 +586,7 @@ class TestAdjustments:
         thl_net = Decimal(sum(w.cpi for w in s1.wall_events if w.is_visible_complete()))
         payout = user.product.determine_bp_payment(thl_net=thl_net)
         s1.update(
-            **{
-                "status": status,
-                "status_code_1": status_code_1,
-                "finished": utc_hour_ago + timedelta(minutes=25),
-                "payout": payout,
-                "user_payout": None,
-            }
+            status=status, status_code_1=status_code_1, finished=utc_hour_ago + timedelta(minutes=25), payout=payout, user_payout=None
         )
 
         # Test. Adjust first fail to complete. Now we have 2 completes.
@@ -646,13 +634,7 @@ class TestAdjustments:
         thl_net = Decimal(sum(w.cpi for w in s1.wall_events if w.is_visible_complete()))
         payout = user.product.determine_bp_payment(thl_net)
         s1.update(
-            **{
-                "status": status,
-                "status_code_1": status_code_1,
-                "finished": utc_hour_ago + timedelta(minutes=25),
-                "payout": payout,
-                "user_payout": None,
-            }
+            status=status, status_code_1=status_code_1, finished=utc_hour_ago + timedelta(minutes=25), payout=payout, user_payout=None
         )
 
         # Test. Adjust complete to fail. Now we have 2 fails.
diff --git a/tests/models/thl/test_contest/test_leaderboard_contest.py b/tests/models/thl/test_contest/test_leaderboard_contest.py
index 3efcf2f..52a4bec 100644
--- a/tests/models/thl/test_contest/test_leaderboard_contest.py
+++ b/tests/models/thl/test_contest/test_leaderboard_contest.py
@@ -1,4 +1,4 @@
-from datetime import UTC, timezone
+from datetime import UTC
 from uuid import uuid4
 
 import pytest
diff --git a/tests/models/thl/test_ledger.py b/tests/models/thl/test_ledger.py
index 5edcc9d..7066180 100644
--- a/tests/models/thl/test_ledger.py
+++ b/tests/models/thl/test_ledger.py
@@ -1,4 +1,4 @@
-from datetime import UTC, datetime, timezone
+from datetime import UTC, datetime
 from uuid import uuid4
 
 import pytest
diff --git a/tests/models/thl/test_payout.py b/tests/models/thl/test_payout.py
index 7068a41..d0b0acc 100644
--- a/tests/models/thl/test_payout.py
+++ b/tests/models/thl/test_payout.py
@@ -5,14 +5,13 @@ 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.thl.payout import (
-    BusinessPayoutEvent,
     BrokerageProductPayoutEvent,
+    BusinessPayoutEvent,
 )
 from generalresearch.models.thl.wallet import PayoutType
 
-from generalresearch.models.gr.business import Business, BusinessAddress, BusinessType
-
 
 class TestBusinessPayoutEvent:
 
diff --git a/tests/models/thl/test_product.py b/tests/models/thl/test_product.py
index 78bc10a..bc95c2d 100644
--- a/tests/models/thl/test_product.py
+++ b/tests/models/thl/test_product.py
@@ -3,7 +3,7 @@ from __future__ import annotations
 import os
 import shutil
 from collections.abc import Callable
-from datetime import UTC, datetime, timedelta, timezone
+from datetime import UTC, datetime, timedelta
 from decimal import Decimal
 from uuid import uuid4
 
diff --git a/tests/models/thl/test_upkquestion.py b/tests/models/thl/test_upkquestion.py
index d32875c..99d7871 100644
--- a/tests/models/thl/test_upkquestion.py
+++ b/tests/models/thl/test_upkquestion.py
@@ -201,18 +201,10 @@ class TestUpkQuestion:
         )
 
         q = MorningQuestion(
-            **{
-                "id": "gender",
-                "country_iso": "us",
-                "language_iso": "eng",
-                "name": "Gender",
-                "text": "What is your gender?",
-                "type": "s",
-                "options": [
+            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(
diff --git a/tests/models/thl/test_user.py b/tests/models/thl/test_user.py
index a4f331a..aafce68 100644
--- a/tests/models/thl/test_user.py
+++ b/tests/models/thl/test_user.py
@@ -197,7 +197,7 @@ class TestUserProductUserID:
         assert "Input should be a valid string" in str(cm.value)
 
         with pytest.raises(ValueError) as cm:
-            User(user_id=self.user_id, product_user_id=Decimal("0"))
+            User(user_id=self.user_id, product_user_id=Decimal(0))
         assert "1 validation error for User" in str(cm.value)
         assert "Input should be a valid string" in str(cm.value)
 
@@ -236,7 +236,7 @@ class TestUserProductUserID:
     def test_invalid_chars_slash(self):
         from generalresearch.models.thl.user import User
 
-        product_user_id = f"{self.randomword(50)}\{self.randomword(50)}"
+        product_user_id = rf"{self.randomword(50)}\{self.randomword(50)}"
         with pytest.raises(expected_exception=ValueError) as cm:
             User(user_id=self.user_id, product_user_id=product_user_id)
         assert "1 validation error for User" in str(cm.value)
@@ -310,7 +310,7 @@ class TestUserUUID:
         assert "Input should be a valid string" in str(cm.value)
 
         with pytest.raises(ValueError) as cm:
-            User(user_id=self.user_id, uuid=Decimal("0"))
+            User(user_id=self.user_id, uuid=Decimal(0))
         assert "1 validation error for User" in str(cm.value)
         assert "Input should be a valid string" in str(cm.value)
 
diff --git a/tests/models/thl/test_user_iphistory.py b/tests/models/thl/test_user_iphistory.py
index 0f050b0..d6ade9d 100644
--- a/tests/models/thl/test_user_iphistory.py
+++ b/tests/models/thl/test_user_iphistory.py
@@ -1,4 +1,4 @@
-from datetime import UTC, datetime, timedelta, timezone
+from datetime import UTC, datetime, timedelta
 
 from generalresearch.models.thl.user_iphistory import (
     UserIPHistory,
diff --git a/tests/models/thl/test_user_streak.py b/tests/models/thl/test_user_streak.py
index 0cacd3e..26c5e25 100644
--- a/tests/models/thl/test_user_streak.py
+++ b/tests/models/thl/test_user_streak.py
@@ -1,8 +1,8 @@
 from datetime import datetime, timedelta
+from zoneinfo import ZoneInfo
 
 import pytest
 from pydantic import ValidationError
-from zoneinfo import ZoneInfo
 
 from generalresearch.models.thl.user_streak import (
     StreakFulfillment,
diff --git a/tests/models/thl/test_wall.py b/tests/models/thl/test_wall.py
index 9e9483b..88914ac 100644
--- a/tests/models/thl/test_wall.py
+++ b/tests/models/thl/test_wall.py
@@ -1,4 +1,4 @@
-from datetime import UTC, datetime, timedelta, timezone
+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 10f3cba..b39ad31 100644
--- a/tests/models/thl/test_wall_session.py
+++ b/tests/models/thl/test_wall_session.py
@@ -1,4 +1,4 @@
-from datetime import UTC, datetime, timedelta, timezone
+from datetime import UTC, datetime, timedelta
 from decimal import Decimal
 
 import pytest
diff --git a/tests/sql_helper.py b/tests/sql_helper.py
index c4cc2ca..8ab7bdb 100644
--- a/tests/sql_helper.py
+++ b/tests/sql_helper.py
@@ -19,7 +19,7 @@ class TestSqlHelper:
     def test_scheme(self):
         from generalresearch.sql_helper import SqlHelper
 
-        dsn = MySQLDsn(f"mysql://root@localhost/test")
+        dsn = MySQLDsn("mysql://root@localhost/test")
         instance = SqlHelper(dsn=dsn)
         assert instance.is_mysql()
 
@@ -30,7 +30,7 @@ class TestSqlHelper:
         # self.assertTrue(instance.is_postgresql())
 
         with pytest.raises(ValidationError):
-            SqlHelper(dsn=MariaDBDsn(f"maria://root@localhost/test"))
+            SqlHelper(dsn=MariaDBDsn("maria://root@localhost/test"))
 
     def test_row_decode(self):
         from generalresearch.sql_helper import decode_uuids