3 files changed, 14 insertions, 14 deletions
diff --git a/test_utils/incite/collections/conftest.py b/test_utils/incite/collections/conftest.py
index f490e14..499f90b 100644
--- a/test_utils/incite/collections/conftest.py
+++ b/test_utils/incite/collections/conftest.py
@@ -197,7 +197,7 @@ def df_collection(
     utc_90days_ago: datetime,
     thl_web_rr: PostgresConfig,
 ) -> DFCollection:
-    from generalresearch.incite.collections import DFCollection
+    from generalresearch.incite.collections.base import DFCollection
 
     start = utc_90days_ago.replace(microsecond=0)
 
diff --git a/test_utils/incite/conftest.py b/test_utils/incite/conftest.py
index 2968d18..bcf0511 100644
--- a/test_utils/incite/conftest.py
+++ b/test_utils/incite/conftest.py
@@ -16,11 +16,11 @@ from faker import Faker
 if TYPE_CHECKING:
     from generalresearch.config import GRLBaseSettings
     from generalresearch.incite.base import GRLDatasets
-    from generalresearch.incite.collections import (
+    from generalresearch.incite.collections.base import (
         DFCollectionItem,
         DFCollectionType,
     )
-    from generalresearch.incite.mergers import MergeType
+    from generalresearch.incite.mergers.base import MergeType
     from generalresearch.models.admin.request import (
         ReportRequest,
     )
@@ -131,14 +131,14 @@ def duration() -> timedelta | None:
 
 @pytest.fixture
 def df_collection_data_type() -> DFCollectionType:
-    from generalresearch.incite.collections import DFCollectionType
+    from generalresearch.incite.collections.base import DFCollectionType
 
     return DFCollectionType.TEST
 
 
 @pytest.fixture
 def merge_type() -> MergeType:
-    from generalresearch.incite.mergers import MergeType
+    from generalresearch.incite.mergers.base import MergeType
 
     return MergeType.TEST
 
@@ -156,7 +156,7 @@ def incite_item_factory(
         observations: int = 3,
         user: User | None = None,
     ):
-        from generalresearch.incite.collections import (
+        from generalresearch.incite.collections.base import (
             DFCollection,
             DFCollectionType,
         )
diff --git a/test_utils/incite/mergers/conftest.py b/test_utils/incite/mergers/conftest.py
index 4eb3f2d..fb95c81 100644
--- a/test_utils/incite/mergers/conftest.py
+++ b/test_utils/incite/mergers/conftest.py
@@ -58,7 +58,7 @@ def pop_ledger_merge(
     duration: timedelta,
 ) -> PopLedgerMerge:
 
-    from generalresearch.incite.mergers import MergeType
+    from generalresearch.incite.mergers.base import MergeType
     from generalresearch.incite.mergers.pop_ledger import PopLedgerMerge
 
     return PopLedgerMerge(
@@ -88,7 +88,7 @@ def ym_survey_wall_merge(
     mnt_filepath: GRLDatasets,
     start: datetime,
 ) -> YMSurveyWallMerge:
-    from generalresearch.incite.mergers import MergeType
+    from generalresearch.incite.mergers.base import MergeType
     from generalresearch.incite.mergers.ym_survey_wall import YMSurveyWallMerge
 
     return YMSurveyWallMerge(
@@ -119,7 +119,7 @@ def ym_wall_summary_merge(
     duration: timedelta,
     start: datetime,
 ) -> YMWallSummaryMerge:
-    from generalresearch.incite.mergers import MergeType
+    from generalresearch.incite.mergers.base import MergeType
     from generalresearch.incite.mergers.ym_wall_summary import YMWallSummaryMerge
 
     return YMWallSummaryMerge(
@@ -155,7 +155,7 @@ def enriched_session_merge(
     duration: timedelta,
     start: datetime,
 ) -> EnrichedSessionMerge:
-    from generalresearch.incite.mergers import MergeType
+    from generalresearch.incite.mergers.base import MergeType
     from generalresearch.incite.mergers.foundations.enriched_session import (
         EnrichedSessionMerge,
     )
@@ -175,7 +175,7 @@ def enriched_task_adjust_merge(
     duration: timedelta,
     start: datetime,
 ) -> EnrichedTaskAdjustMerge:
-    from generalresearch.incite.mergers import MergeType
+    from generalresearch.incite.mergers.base import MergeType
     from generalresearch.incite.mergers.foundations.enriched_task_adjust import (
         EnrichedTaskAdjustMerge,
     )
@@ -197,7 +197,7 @@ def enriched_wall_merge(
     duration: timedelta,
     start: datetime,
 ) -> EnrichedWallMerge:
-    from generalresearch.incite.mergers import MergeType
+    from generalresearch.incite.mergers.base import MergeType
     from generalresearch.incite.mergers.foundations.enriched_wall import (
         EnrichedWallMerge,
     )
@@ -217,7 +217,7 @@ def user_id_product_merge(
     offset: str,
     start: datetime,
 ) -> UserIdProductMerge:
-    from generalresearch.incite.mergers import MergeType
+    from generalresearch.incite.mergers.base import MergeType
     from generalresearch.incite.mergers.foundations.user_id_product import (
         UserIdProductMerge,
     )
@@ -243,7 +243,7 @@ def merge_collection(
     duration: timedelta,
     start: datetime,
 ):
-    from generalresearch.incite.mergers import MergeCollection
+    from generalresearch.incite.mergers.base import MergeCollection
 
     return MergeCollection(
         merge_type=merge_type,