Ruff morning!

7 files changed, 152 insertions, 130 deletions

diff --git a/tests/models/custom_types/test_dsn.py b/tests/models/custom_types/test_dsn.py
index eb27526..d8c7c53 100644
--- a/tests/models/custom_types/test_dsn.py
+++ b/tests/models/custom_types/test_dsn.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from uuid import uuid4
 
 import pytest
diff --git a/tests/models/custom_types/test_therest.py b/tests/models/custom_types/test_therest.py
index 13e9bae..01bc644 100644
--- a/tests/models/custom_types/test_therest.py
+++ b/tests/models/custom_types/test_therest.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import json
 from uuid import UUID
 
diff --git a/tests/models/dynata/test_eligbility.py b/tests/models/dynata/test_eligbility.py
index 27de5b3..b3a9f13 100644
--- a/tests/models/dynata/test_eligbility.py
+++ b/tests/models/dynata/test_eligbility.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from datetime import UTC, datetime
 
 
diff --git a/tests/models/gr/test_authentication.py b/tests/models/gr/test_authentication.py
index d4db112..d2a7054 100644
--- a/tests/models/gr/test_authentication.py
+++ b/tests/models/gr/test_authentication.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import binascii
 import json
 import os
@@ -7,9 +9,14 @@ from random import randint
 from uuid import uuid4
 
 import pytest
+from redis import Redis
 
-from generalresearch.models.gr.authentication import GRUser
+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
 
 SSO_ISSUER = ""
 
@@ -29,7 +36,13 @@ class TestGRUser:
     def test_businesses(self):
         pass
 
-    def test_teams(self, gr_user: GRUser, membership, gr_db, gr_redis_config):
+    def test_teams(
+        self,
+        gr_user: GRUser,
+        membership: Membership,
+        gr_db: PostgresConfig,
+        gr_redis_config: RedisConfig,
+    ):
 
         assert gr_user.teams is None
 
@@ -41,15 +54,15 @@ class TestGRUser:
 
     def test_prefetch_team_duplicates(
         self,
-        gr_user_token,
+        gr_user_token: GRToken,
         gr_user: GRUser,
         membership: Membership,
         product_factory: Callable[..., Product],
-        membership_factory,
+        membership_factory: Callable[..., Membership],
         team: Team,
         thl_web_rr: PostgresConfig,
-        gr_redis_config,
-        gr_db,
+        gr_redis_config: RedisConfig,
+        gr_db: PostgresConfig,
     ):
         product_factory(team=team)
         membership_factory(team=team, gr_user=gr_user)
@@ -67,9 +80,9 @@ class TestGRUser:
         product_factory: Callable[..., Product],
         team: Team,
         membership: Membership,
-        gr_db,
+        gr_db: PostgresConfig,
         thl_web_rr: PostgresConfig,
-        gr_redis_config,
+        gr_redis_config: RedisConfig,
     ):
         from generalresearch.models.thl.product import Product
 
@@ -78,6 +91,8 @@ class TestGRUser:
         # Create a new Team membership, and then create a Product that
         #    is  part of that team
         membership.prefetch_team(pg_config=gr_db, redis_config=gr_redis_config)
+        assert isinstance(membership.team, Team)
+
         p: Product = product_factory(team=team)
         assert p.id_int
         assert team.uuid == membership.team.uuid
@@ -87,7 +102,7 @@ class TestGRUser:
 
         gr_user.prefetch_products(
             pg_config=gr_db,
-            thl_pg_config=thl_web_rr: PostgresConfig,
+            thl_pg_config=thl_web_rr,
             redis_config=gr_redis_config,
         )
         assert isinstance(gr_user.products, list)
@@ -97,7 +112,7 @@ class TestGRUser:
 
 class TestGRUserMethods:
 
-    def test_cache_key(self, gr_user, gr_redis):
+    def test_cache_key(self, gr_user: GRUser, gr_redis: RedisConfig):
         assert isinstance(gr_user.cache_key, str)
         assert ":" in gr_user.cache_key
         assert str(gr_user.id) in gr_user.cache_key
@@ -105,11 +120,11 @@ class TestGRUserMethods:
     def test_to_redis(
         self,
         gr_user: GRUser,
-        gr_redis,
+        gr_redis: Redis,
         team: Team,
         business: Business,
         product_factory: Callable[..., Product],
-        membership_factory: Callable[Membership],
+        membership_factory: Callable[..., Membership],
     ):
         product_factory(team=team, business=business)
         membership_factory(team=team, gr_user=gr_user)
@@ -125,11 +140,11 @@ class TestGRUserMethods:
     def test_set_cache(
         self,
         gr_user: GRUser,
-        gr_user_token,
-        gr_redis,
-        gr_db,
+        gr_user_token: GRToken,
+        gr_redis: Redis,
+        gr_db: PostgresConfig,
         thl_web_rr: PostgresConfig,
-        gr_redis_config,
+        gr_redis_config: RedisConfig,
     ):
         assert gr_redis.get(name=gr_user.cache_key) is None
         assert gr_redis.get(name=f"{gr_user.cache_key}:team_uuids") is None
@@ -137,7 +152,7 @@ class TestGRUserMethods:
         assert gr_redis.get(name=f"{gr_user.cache_key}:product_uuids") is None
 
         gr_user.set_cache(
-            pg_config=gr_db, thl_web_rr=thl_web_rr: PostgresConfig, redis_config=gr_redis_config
+            pg_config=gr_db, thl_web_rr=thl_web_rr, redis_config=gr_redis_config
         )
 
         assert gr_redis.get(name=gr_user.cache_key) is not None
@@ -148,14 +163,14 @@ class TestGRUserMethods:
     def test_set_cache_gr_user(
         self,
         gr_user: GRUser,
-        gr_user_token,
-        gr_redis,
-        gr_redis_config,
-        gr_db,
+        gr_user_token: GRToken,
+        gr_redis: RedisConfig,
+        gr_redis_config: RedisConfig,
+        gr_db: PostgresConfig,
         thl_web_rr: PostgresConfig,
         product_factory: Callable[..., Product],
-        team,
-        membership_factory,
+        team: Team,
+        membership_factory: Callable[..., Membership],
         thl_redis_config: RedisConfig,
     ):
         from generalresearch.models.gr.authentication import GRUser
@@ -164,7 +179,7 @@ class TestGRUserMethods:
         membership_factory(team=team, gr_user=gr_user)
 
         gr_user.set_cache(
-            pg_config=gr_db, thl_web_rr=thl_web_rr: PostgresConfig, redis_config=gr_redis_config
+            pg_config=gr_db, thl_web_rr=thl_web_rr, redis_config=gr_redis_config
         )
 
         res: str = gr_redis.get(name=gr_user.cache_key)
@@ -176,27 +191,27 @@ class TestGRUserMethods:
 
         gru2.prefetch_products(
             pg_config=gr_db,
-            thl_pg_config=thl_web_rr: PostgresConfig,
-            redis_config=thl_redis_config: RedisConfig,
+            thl_pg_config=thl_web_rr,
+            redis_config=thl_redis_config,
         )
         assert gru2.product_uuids == [p1.uuid]
 
     def test_set_cache_team_uuids(
         self,
-        gr_user,
-        membership,
-        gr_user_token,
-        gr_redis,
-        gr_db,
+        gr_user: GRUser,
+        membership: Membership,
+        gr_user_token: GRToken,
+        gr_redis: Redis,
+        gr_db: PostgresConfig,
         thl_web_rr: PostgresConfig,
         product_factory: Callable[..., Product],
-        team,
-        gr_redis_config,
+        team: Team,
+        gr_redis_config: RedisConfig,
     ):
         product_factory(team=team)
 
         gr_user.set_cache(
-            pg_config=gr_db, thl_web_rr=thl_web_rr: PostgresConfig, redis_config=gr_redis_config
+            pg_config=gr_db, thl_web_rr=thl_web_rr, redis_config=gr_redis_config
         )
         res = json.loads(gr_redis.get(name=f"{gr_user.cache_key}:team_uuids"))
         assert len(res) == 1
@@ -206,18 +221,18 @@ class TestGRUserMethods:
     def test_set_cache_business_uuids(
         self,
         gr_user: GRUser,
-        gr_redis,
-        gr_db,
+        gr_redis: Redis,
+        gr_db: PostgresConfig,
         thl_web_rr: PostgresConfig,
         product_factory: Callable[..., Product],
         business: Business,
-        team,
-        gr_redis_config,
+        team: Team,
+        gr_redis_config: RedisConfig,
     ):
         product_factory(team=team, business=business)
 
         gr_user.set_cache(
-            pg_config=gr_db, thl_web_rr=thl_web_rr: PostgresConfig, redis_config=gr_redis_config
+            pg_config=gr_db, thl_web_rr=thl_web_rr, redis_config=gr_redis_config
         )
         res = json.loads(gr_redis.get(name=f"{gr_user.cache_key}:business_uuids"))
         assert len(res) == 1
@@ -225,20 +240,20 @@ class TestGRUserMethods:
 
     def test_set_cache_product_uuids(
         self,
-        gr_user,
-        membership,
-        gr_user_token,
-        gr_redis,
-        gr_db,
+        gr_user: GRUser,
+        membership: Membership,
+        gr_user_token: GRToken,
+        gr_redis: Redis,
+        gr_db: PostgresConfig,
         thl_web_rr: PostgresConfig,
         product_factory: Callable[..., Product],
-        team,
-        gr_redis_config,
+        team: Team,
+        gr_redis_config: RedisConfig,
     ):
         product_factory(team=team)
 
         gr_user.set_cache(
-            pg_config=gr_db, thl_web_rr=thl_web_rr: PostgresConfig, redis_config=gr_redis_config
+            pg_config=gr_db, thl_web_rr=thl_web_rr, redis_config=gr_redis_config
         )
         res = json.loads(gr_redis.get(name=f"{gr_user.cache_key}:product_uuids"))
         assert len(res) == 1
@@ -248,9 +263,7 @@ class TestGRUserMethods:
 class TestGRToken:
 
     @pytest.fixture
-    def gr_token(self, gr_user):
-        from generalresearch.models.gr.authentication import GRToken
-
+    def gr_token(self, gr_user: GRUser):
         now = datetime.now(tz=UTC)
         token = binascii.hexlify(os.urandom(20)).decode()
 
@@ -258,29 +271,26 @@ class TestGRToken:
 
         return gr_token
 
-    def test_init(self, gr_token):
-        from generalresearch.models.gr.authentication import GRToken
-
+    def test_init(self, gr_token: GRToken):
         assert isinstance(gr_token, GRToken)
         assert gr_token.created
 
-    def test_user(self, gr_token, gr_db, gr_redis_config):
-        from generalresearch.models.gr.authentication import GRUser
-
+    def test_user(
+        self, gr_token: GRToken, gr_db: PostgresConfig, gr_redis_config: RedisConfig
+    ):
         assert gr_token.user is None
 
         gr_token.prefetch_user(pg_config=gr_db, redis_config=gr_redis_config)
 
         assert isinstance(gr_token.user, GRUser)
 
-    def test_auth_header(self, gr_token):
+    def test_auth_header(self, gr_token: GRToken):
         assert isinstance(gr_token.auth_header, dict)
 
 
 class TestClaims:
 
     def test_init(self):
-        from generalresearch.models.gr.authentication import Claims
 
         d = {
             "iss": SSO_ISSUER,
diff --git a/tests/models/gr/test_base.py b/tests/models/gr/test_base.py
index 8da28d3..412fa52 100644
--- a/tests/models/gr/test_base.py
+++ b/tests/models/gr/test_base.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import subprocess
 from collections.abc import Callable
 from pathlib import Path
diff --git a/tests/models/gr/test_business.py b/tests/models/gr/test_business.py
index 5239ac2..f0107de 100644
--- a/tests/models/gr/test_business.py
+++ b/tests/models/gr/test_business.py
@@ -19,6 +19,10 @@ 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
@@ -29,7 +33,7 @@ from generalresearch.managers.thl.payout import (
     PayoutEventManager,
 )
 from generalresearch.models.gr.business import (
-    business: Business,
+    Business,
     BusinessAddress,
     BusinessBankAccount,
     BusinessContact,
@@ -50,7 +54,7 @@ class TestBusinessBankAccount:
 
     def test_init(
         self,
-        business: business: Business,
+        business: Business,
         business_bank_account_manager: BusinessBankAccountManager,
     ):
         from generalresearch.models.gr.business import (
@@ -68,7 +72,7 @@ class TestBusinessBankAccount:
     def test_business(
         self,
         business_bank_account: BusinessBankAccount,
-        business: business: Business,
+        business: Business,
         gr_db: PostgresConfig,
         gr_redis_config: RedisConfig,
     ):
@@ -79,7 +83,7 @@ class TestBusinessBankAccount:
         business_bank_account.prefetch_business(
             pg_config=gr_db, redis_config=gr_redis_config
         )
-        assert isinstance(business_bank_account.business: Business, Business)
+        assert isinstance(business_bank_account.business, Business)
         assert business_bank_account.business.uuid == business.uuid
 
 
@@ -112,13 +116,13 @@ class TestBusiness:
 
     def test_init(self, business: Business):
 
-        assert isinstance(business: Business, Business)
+        assert isinstance(business, Business)
         assert isinstance(business.id, int)
         assert isinstance(business.uuid, str)
 
     def test_str_and_repr(
         self,
-        business: business: Business,
+        business: Business,
         product_factory: Callable[..., Product],
         thl_web_rr: PostgresConfig,
         ledger_manager: LedgerManager,
@@ -181,12 +185,12 @@ class TestBusiness:
         pop_ledger_merge.build(client=client_no_amm, ledger_coll=ledger_collection)
 
         business.prebuild_payouts(
-            thl_pg_config=thl_web_rr: PostgresConfig,
+            thl_pg_config=thl_web_rr,
             thl_lm=thl_ledger_manager,
             bpem=business_payout_event_manager,
         )
         business.prebuild_balance(
-            thl_pg_config=thl_web_rr: PostgresConfig,
+            thl_pg_config=thl_web_rr,
             lm=ledger_manager,
             ds=mnt_filepath,
             client=client_no_amm,
@@ -198,7 +202,7 @@ class TestBusiness:
 
     def test_addresses(
         self,
-        business: business: Business,
+        business: Business,
         business_address: BusinessAddress,
         gr_db: PostgresConfig,
     ):
@@ -213,7 +217,7 @@ class TestBusiness:
 
     def test_teams(
         self,
-        business: business: Business,
+        business: Business,
         team: Team,
         team_manager: TeamManager,
         gr_db: PostgresConfig,
@@ -231,7 +235,7 @@ class TestBusiness:
 
     def test_products(
         self,
-        business: business: Business,
+        business: Business,
         product_factory: Callable[..., Product],
         thl_web_rr: PostgresConfig,
     ):
@@ -254,7 +258,7 @@ class TestBusiness:
         business.prefetch_products(thl_pg_config=thl_web_rr)
         assert len(business.products) == 3
 
-    def test_bank_accounts(self, business: business: Business, gr_db: PostgresConfig):
+    def test_bank_accounts(self, business: Business, gr_db: PostgresConfig):
         assert business.products is None
 
         # It's an empty list after prefetch
@@ -264,7 +268,7 @@ class TestBusiness:
 
     def test_balance(
         self,
-        business: business: Business,
+        business: Business,
         mnt_filepath: GRLDatasets,
         client_no_amm: DaskClient,
         thl_web_rr: PostgresConfig,
@@ -275,7 +279,7 @@ class TestBusiness:
 
         with pytest.raises(expected_exception=AssertionError) as cm:
             business.prebuild_balance(
-                thl_pg_config=thl_web_rr: PostgresConfig,
+                thl_pg_config=thl_web_rr,
                 lm=ledger_manager,
                 ds=mnt_filepath,
                 client=client_no_amm,
@@ -289,7 +293,7 @@ class TestBusiness:
 
     def test_payouts_no_accounts(
         self,
-        business: business: Business,
+        business: Business,
         product_factory: Callable[..., Product],
         thl_web_rr: PostgresConfig,
         thl_ledger_manager: ThlLedgerManager,
@@ -299,7 +303,7 @@ class TestBusiness:
 
         with pytest.raises(expected_exception=AssertionError) as cm:
             business.prebuild_payouts(
-                thl_pg_config=thl_web_rr: PostgresConfig,
+                thl_pg_config=thl_web_rr,
                 thl_lm=thl_ledger_manager,
                 bpem=business_payout_event_manager,
             )
@@ -309,7 +313,7 @@ class TestBusiness:
         thl_ledger_manager.get_account_or_create_bp_wallet(product=p)
 
         business.prebuild_payouts(
-            thl_pg_config=thl_web_rr: PostgresConfig,
+            thl_pg_config=thl_web_rr,
             thl_lm=thl_ledger_manager,
             bpem=business_payout_event_manager,
         )
@@ -318,7 +322,7 @@ class TestBusiness:
 
     def test_payouts(
         self,
-        business: business: Business,
+        business: Business,
         product_factory: Callable[..., Product],
         bp_payout_factory: Callable[..., BrokerageProductPayoutEvent],
         thl_ledger_manager: ThlLedgerManager,
@@ -338,7 +342,7 @@ class TestBusiness:
         )
 
         business.prebuild_payouts(
-            thl_pg_config=thl_web_rr: PostgresConfig,
+            thl_pg_config=thl_web_rr,
             thl_lm=thl_ledger_manager,
             bpem=business_payout_event_manager,
         )
@@ -356,7 +360,7 @@ class TestBusiness:
             thl_lm=thl_ledger_manager
         )
         business.prebuild_payouts(
-            thl_pg_config=thl_web_rr: PostgresConfig,
+            thl_pg_config=thl_web_rr,
             thl_lm=thl_ledger_manager,
             bpem=business_payout_event_manager,
         )
@@ -367,12 +371,12 @@ class TestBusiness:
 
     def test_payouts_totals(
         self,
-        business: business: Business,
+        business: Business,
         product_factory: Callable[..., Product],
         bp_payout_factory: Callable[..., BrokerageProductPayoutEvent],
         thl_ledger_manager: ThlLedgerManager,
         thl_web_rr: PostgresConfig,
-        business_payout_event_manager,
+        business_payout_event_manager: BusinessPayoutEventManager,
         create_main_accounts: Callable[..., None],
     ):
 
@@ -406,7 +410,7 @@ class TestBusiness:
         )
 
         business.prebuild_payouts(
-            thl_pg_config=thl_web_rr: PostgresConfig,
+            thl_pg_config=thl_web_rr,
             thl_lm=thl_ledger_manager,
             bpem=business_payout_event_manager,
         )
@@ -419,7 +423,7 @@ class TestBusiness:
 
     def test_pop_financial(
         self,
-        business: business: Business,
+        business: Business,
         thl_web_rr: PostgresConfig,
         thl_ledger_manager: ThlLedgerManager,
         mnt_filepath: GRLDatasets,
@@ -428,7 +432,7 @@ class TestBusiness:
     ):
         assert business.pop_financial is None
         business.prebuild_pop_financial(
-            thl_pg_config=thl_web_rr: PostgresConfig,
+            thl_pg_config=thl_web_rr,
             thl_lm=thl_ledger_manager,
             ds=mnt_filepath,
             client=client_no_amm,
@@ -438,7 +442,7 @@ class TestBusiness:
 
     def test_bp_accounts(
         self,
-        business: business: Business,
+        business: Business,
         thl_web_rr: PostgresConfig,
         product_factory: Callable[..., Product],
         thl_ledger_manager: ThlLedgerManager,
@@ -480,7 +484,7 @@ class TestBusinessBalance:
 
     def test_single_product(
         self,
-        business: business: Business,
+        business: Business,
         product_factory: Callable[..., Product],
         user_factory: Callable[..., User],
         mnt_filepath,
@@ -519,7 +523,7 @@ class TestBusinessBalance:
         pop_ledger_merge.build(client=client_no_amm, ledger_coll=ledger_collection)
 
         business.prebuild_balance(
-            thl_pg_config=thl_web_rr: PostgresConfig,
+            thl_pg_config=thl_web_rr,
             lm=ledger_manager,
             ds=mnt_filepath,
             client=client_no_amm,
@@ -541,7 +545,7 @@ class TestBusinessBalance:
 
     def test_multi_product(
         self,
-        business: business: Business,
+        business: Business,
         product_factory: Callable[..., Product],
         user_factory: Callable[..., User],
         mnt_filepath: GRLDatasets,
@@ -579,7 +583,7 @@ class TestBusinessBalance:
         pop_ledger_merge.build(client=client_no_amm, ledger_coll=ledger_collection)
 
         business.prebuild_balance(
-            thl_pg_config=thl_web_rr: PostgresConfig,
+            thl_pg_config=thl_web_rr,
             lm=ledger_manager,
             ds=mnt_filepath,
             client=client_no_amm,
@@ -625,7 +629,7 @@ class TestBusinessBalance:
 
     def test_multi_product_multi_payout(
         self,
-        business: business: Business,
+        business: Business,
         product_factory: Callable[..., Product],
         user_factory: Callable[..., User],
         mnt_filepath: GRLDatasets,
@@ -665,7 +669,7 @@ class TestBusinessBalance:
         payout_event_manager.set_account_lookup_table(thl_lm=thl_ledger_manager)
 
         bp_payout_factory(
-            product=u1.product: Product,
+            product=u1.product,
             amount=USDCent(5),
             created=start + timedelta(days=4),
             skip_wallet_balance_check=True,
@@ -673,7 +677,7 @@ class TestBusinessBalance:
         )
 
         bp_payout_factory(
-            product=u2.product: Product,
+            product=u2.product,
             amount=USDCent(50),
             created=start + timedelta(days=4),
             skip_wallet_balance_check=True,
@@ -684,7 +688,7 @@ class TestBusinessBalance:
         pop_ledger_merge.build(client=client_no_amm, ledger_coll=ledger_collection)
 
         business.prebuild_balance(
-            thl_pg_config=thl_web_rr: PostgresConfig,
+            thl_pg_config=thl_web_rr,
             lm=ledger_manager,
             ds=mnt_filepath,
             client=client_no_amm,
@@ -699,7 +703,7 @@ class TestBusinessBalance:
 
     def test_multi_product_multi_payout_adjustment(
         self,
-        business: business: Business,
+        business: Business,
         product_factory: Callable[..., Product],
         user_factory: Callable[..., User],
         mnt_filepath: GRLDatasets,
@@ -758,7 +762,7 @@ class TestBusinessBalance:
         payout_event_manager.set_account_lookup_table(thl_lm=thl_ledger_manager)
 
         bp_payout_factory(
-            product=u1.product: Product,
+            product=u1.product,
             amount=USDCent(250),
             created=start + timedelta(days=3),
             skip_wallet_balance_check=True,
@@ -766,7 +770,7 @@ class TestBusinessBalance:
         )
 
         bp_payout_factory(
-            product=u2.product: Product,
+            product=u2.product,
             amount=USDCent(50),
             created=start + timedelta(days=4),
             skip_wallet_balance_check=True,
@@ -796,7 +800,7 @@ class TestBusinessBalance:
         assert df.shape == (20, 28)
 
         business.prebuild_balance(
-            thl_pg_config=thl_web_rr: PostgresConfig,
+            thl_pg_config=thl_web_rr,
             lm=ledger_manager,
             ds=mnt_filepath,
             client=client_no_amm,
@@ -833,7 +837,7 @@ class TestBusinessBalance:
         create_main_accounts: Callable[..., None],
         delete_df_collection: Callable[..., None],
         ledger_collection,
-        business: business: Business,
+        business: Business,
         user_factory: Callable[..., User],
         product_factory: Callable[..., Product],
         session_with_tx_factory: Callable[..., Session],
@@ -869,7 +873,7 @@ class TestBusinessBalance:
         )
         payout_event_manager.set_account_lookup_table(thl_lm=thl_ledger_manager)
         bp_payout_factory(
-            product=u1.product: Product,
+            product=u1.product,
             amount=USDCent(71),
             ext_ref_id=uuid4().hex,
             created=start + timedelta(days=1, minutes=1),
@@ -898,7 +902,7 @@ class TestBusinessBalance:
         pop_ledger_merge.build(client=client_no_amm, ledger_coll=ledger_collection)
 
         business.prebuild_balance(
-            thl_pg_config=thl_web_rr: PostgresConfig,
+            thl_pg_config=thl_web_rr,
             lm=ledger_manager,
             ds=mnt_filepath,
             client=client_no_amm,
@@ -946,7 +950,7 @@ class TestBusinessBalance:
 
     def test_multi_product_multi_payout_adjustment_at_timestamp(
         self,
-        business: business: Business,
+        business: Business,
         product_factory: Callable[..., Product],
         user_factory: Callable[..., User],
         mnt_filepath: GRLDatasets,
@@ -1022,7 +1026,7 @@ class TestBusinessBalance:
         payout_event_manager.set_account_lookup_table(thl_lm=thl_ledger_manager)
 
         bp_payout_factory(
-            product=u1.product: Product,
+            product=u1.product,
             amount=USDCent(250),
             created=start + timedelta(days=3),
             skip_wallet_balance_check=True,
@@ -1030,7 +1034,7 @@ class TestBusinessBalance:
         )
 
         bp_payout_factory(
-            product=u2.product: Product,
+            product=u2.product,
             amount=USDCent(50),
             created=start + timedelta(days=4),
             skip_wallet_balance_check=True,
@@ -1060,7 +1064,7 @@ class TestBusinessBalance:
         assert df.shape == (20, 28)
 
         business.prebuild_balance(
-            thl_pg_config=thl_web_rr: PostgresConfig,
+            thl_pg_config=thl_web_rr,
             lm=ledger_manager,
             ds=mnt_filepath,
             client=client_no_amm,
@@ -1068,7 +1072,7 @@ class TestBusinessBalance:
         )
 
         business.prebuild_balance(
-            thl_pg_config=thl_web_rr: PostgresConfig,
+            thl_pg_config=thl_web_rr,
             lm=ledger_manager,
             ds=mnt_filepath,
             client=client_no_amm,
@@ -1078,7 +1082,7 @@ class TestBusinessBalance:
         day1_bal = business.balance
 
         business.prebuild_balance(
-            thl_pg_config=thl_web_rr: PostgresConfig,
+            thl_pg_config=thl_web_rr,
             lm=ledger_manager,
             ds=mnt_filepath,
             client=client_no_amm,
@@ -1088,7 +1092,7 @@ class TestBusinessBalance:
         day2_bal = business.balance
 
         business.prebuild_balance(
-            thl_pg_config=thl_web_rr: PostgresConfig,
+            thl_pg_config=thl_web_rr,
             lm=ledger_manager,
             ds=mnt_filepath,
             client=client_no_amm,
@@ -1098,7 +1102,7 @@ class TestBusinessBalance:
         day3_bal = business.balance
 
         business.prebuild_balance(
-            thl_pg_config=thl_web_rr: PostgresConfig,
+            thl_pg_config=thl_web_rr,
             lm=ledger_manager,
             ds=mnt_filepath,
             client=client_no_amm,
@@ -1108,7 +1112,7 @@ class TestBusinessBalance:
         day4_bal = business.balance
 
         business.prebuild_balance(
-            thl_pg_config=thl_web_rr: PostgresConfig,
+            thl_pg_config=thl_web_rr,
             lm=ledger_manager,
             ds=mnt_filepath,
             client=client_no_amm,
@@ -1118,7 +1122,7 @@ class TestBusinessBalance:
         day5_bal = business.balance
 
         business.prebuild_balance(
-            thl_pg_config=thl_web_rr: PostgresConfig,
+            thl_pg_config=thl_web_rr,
             lm=ledger_manager,
             ds=mnt_filepath,
             client=client_no_amm,
@@ -1183,7 +1187,7 @@ class TestBusinessMethods:
 
     def test_set_cache(
         self,
-        business: business: Business,
+        business: Business,
         gr_redis: RedisConfig,
         gr_db: PostgresConfig,
         thl_web_rr: PostgresConfig,
@@ -1219,7 +1223,7 @@ class TestBusinessMethods:
 
         business.set_cache(
             pg_config=gr_db,
-            thl_web_rr=thl_web_rr: PostgresConfig,
+            thl_web_rr=thl_web_rr,
             redis_config=gr_redis_config,
             client=client_no_amm,
             ds=mnt_filepath,
@@ -1245,7 +1249,7 @@ class TestBusinessMethods:
 
     def test_set_cache_business(
         self,
-        business: business: Business,
+        business: Business,
         gr_db: PostgresConfig,
         thl_web_rr: PostgresConfig,
         product_factory: Callable[..., Product],
@@ -1282,7 +1286,7 @@ class TestBusinessMethods:
 
         business.set_cache(
             pg_config=gr_db,
-            thl_web_rr=thl_web_rr: PostgresConfig,
+            thl_web_rr=thl_web_rr,
             redis_config=gr_redis_config,
             client=client_no_amm,
             ds=mnt_filepath,
@@ -1345,15 +1349,15 @@ class TestBusinessMethods:
         self,
         enriched_session_merge,
         client_no_amm: DaskClient,
-        wall_collection,
-        session_collection,
+        wall_collection: WallDFCollection,
+        session_collection: SessionDFCollection,
         thl_web_rr: PostgresConfig,
         user_factory: Callable[..., User],
         start: datetime,
         session_factory: Callable[..., Session],
         product_factory: Callable[..., Product],
         delete_df_collection: Callable[..., None],
-        business: business: Business,
+        business: Business,
         mnt_filepath: GRLDatasets,
         mnt_gr_api_dir: Path,
     ):
@@ -1380,11 +1384,11 @@ class TestBusinessMethods:
             client=client_no_amm,
             session_coll=session_collection,
             wall_coll=wall_collection,
-            pg_config=thl_web_rr: PostgresConfig,
+            pg_config=thl_web_rr,
         )
 
         business.prebuild_enriched_session_parquet(
-            thl_pg_config=thl_web_rr: PostgresConfig,
+            thl_pg_config=thl_web_rr,
             ds=mnt_filepath,
             client=client_no_amm,
             mnt_gr_api=mnt_gr_api_dir,
@@ -1401,15 +1405,15 @@ class TestBusinessMethods:
         self,
         enriched_wall_merge,
         client_no_amm: DaskClient,
-        wall_collection,
-        session_collection,
+        wall_collection: WallDFCollection,
+        session_collection: SessionDFCollection,
         thl_web_rr: PostgresConfig,
         user_factory: Callable[..., User],
         start: datetime,
         session_factory: Callable[..., Session],
         product_factory: Callable[..., Product],
         delete_df_collection: Callable[..., None],
-        business: business: Business,
+        business: Business,
         mnt_filepath: GRLDatasets,
         mnt_gr_api_dir: Path,
     ):
@@ -1436,11 +1440,11 @@ class TestBusinessMethods:
             client=client_no_amm,
             session_coll=session_collection,
             wall_coll=wall_collection,
-            pg_config=thl_web_rr: PostgresConfig,
+            pg_config=thl_web_rr,
         )
 
         business.prebuild_enriched_wall_parquet(
-            thl_pg_config=thl_web_rr: PostgresConfig,
+            thl_pg_config=thl_web_rr,
             ds=mnt_filepath,
             client=client_no_amm,
             mnt_gr_api=mnt_gr_api_dir,
diff --git a/tests/models/gr/test_team.py b/tests/models/gr/test_team.py
index 26300b9..dc7d4b9 100644
--- a/tests/models/gr/test_team.py
+++ b/tests/models/gr/test_team.py
@@ -97,7 +97,7 @@ class TestTeam:
     def test_businesses(
         self,
         team: Team,
-        business: business: Business,
+        business: Business,
         team_manager: TeamManager,
         gr_db: PostgresConfig,
         gr_redis_config: RedisConfig,
@@ -160,7 +160,7 @@ class TestTeamMethods:
 
         team.set_cache(
             pg_config=gr_db,
-            thl_web_rr=thl_web_rr: PostgresConfig,
+            thl_web_rr=thl_web_rr,
             redis_config=gr_redis_config,
             client=client_no_amm,
             ds=mnt_filepath,
@@ -192,7 +192,7 @@ class TestTeamMethods:
 
         team.set_cache(
             pg_config=gr_db,
-            thl_web_rr=thl_web_rr: PostgresConfig,
+            thl_web_rr=thl_web_rr,
             redis_config=gr_redis_config,
             client=client_no_amm,
             ds=mnt_filepath,
@@ -254,11 +254,11 @@ class TestTeamMethods:
             client=client_no_amm,
             session_coll=session_collection,
             wall_coll=wall_collection,
-            pg_config=thl_web_rr: PostgresConfig,
+            pg_config=thl_web_rr,
         )
 
         team.prebuild_enriched_session_parquet(
-            thl_pg_config=thl_web_rr: PostgresConfig,
+            thl_pg_config=thl_web_rr,
             ds=mnt_filepath,
             client=client_no_amm,
             mnt_gr_api=mnt_gr_api_dir,
@@ -310,11 +310,11 @@ class TestTeamMethods:
             client=client_no_amm,
             session_coll=session_collection,
             wall_coll=wall_collection,
-            pg_config=thl_web_rr: PostgresConfig,
+            pg_config=thl_web_rr,
         )
 
         team.prebuild_enriched_wall_parquet(
-            thl_pg_config=thl_web_rr: PostgresConfig,
+            thl_pg_config=thl_web_rr,
             ds=mnt_filepath,
             client=client_no_amm,
             mnt_gr_api=mnt_gr_api_dir,