diff --git a/scipost_django/submissions/factories/assignment.py b/scipost_django/submissions/factories/assignment.py
index d0d0fca6a20d3acdd6162157457b3e33da182198..5bc513f62337cf6be1d1e3bc3981c42defd9890c 100644
--- a/scipost_django/submissions/factories/assignment.py
+++ b/scipost_django/submissions/factories/assignment.py
@@ -5,7 +5,7 @@ __license__ = "AGPL v3"
 import factory
 
 from scipost.models import Contributor
-from submissions.constants import ASSIGNMENT_STATUSES
+from submissions.models.submission import Submission
 from submissions.models import EditorialAssignment
 
 
@@ -18,7 +18,7 @@ class EditorialAssignmentFactory(factory.django.DjangoModelFactory):
 
     submission = None
     to = factory.Iterator(Contributor.objects.all())
-    status = factory.Iterator(ASSIGNMENT_STATUSES, getter=lambda c: c[0])
+    status = factory.Iterator(Submission.SUBMISSION_STATUSES, getter=lambda c: c[0])
     date_created = factory.lazy_attribute(lambda o: o.submission.latest_activity)
     date_answered = factory.lazy_attribute(lambda o: o.submission.latest_activity)
 
diff --git a/scipost_django/submissions/factories/referee_invitation.py b/scipost_django/submissions/factories/referee_invitation.py
index 565387f4069dfb3a1eb7d250c5e609231b47afe4..3f303de013b8eec7ff19d96d4d47f244ee6731f0 100644
--- a/scipost_django/submissions/factories/referee_invitation.py
+++ b/scipost_django/submissions/factories/referee_invitation.py
@@ -4,6 +4,7 @@ __license__ = "AGPL v3"
 
 import factory
 import pytz
+import random
 
 from faker import Faker
 
@@ -46,6 +47,7 @@ class AcceptedRefereeInvitationFactory(RefereeInvitationFactory):
     @factory.post_generation
     def report(self, create, extracted, **kwargs):
         if create:
+            from submissions.factories import VettedReportFactory
             VettedReportFactory(submission=self.submission, author=self.referee)
 
 
diff --git a/scipost_django/submissions/factories/submission.py b/scipost_django/submissions/factories/submission.py
index 954fd91956f2bb754df526e26b8cb8187a60e470..a8af6df0b59784568ec151e9a2e7d3280bba169d 100644
--- a/scipost_django/submissions/factories/submission.py
+++ b/scipost_django/submissions/factories/submission.py
@@ -4,6 +4,7 @@ __license__ = "AGPL v3"
 
 import factory
 import pytz
+import random
 
 from faker import Faker
 
@@ -308,6 +309,11 @@ class PublishedSubmissionFactory(InRefereeingSubmissionFactory):
 
     @factory.post_generation
     def referee_invites(self, create, extracted, **kwargs):
+        from submissions.factories import (
+            FulfilledRefereeInvitationFactory,
+            CancelledRefereeInvitationFactory
+        )
+        
         for i in range(random.randint(2, 4)):
             FulfilledRefereeInvitationFactory(submission=self)
         for i in range(random.randint(0, 2)):