diff --git a/tests/domain/test_workspace_roles.py b/tests/domain/test_workspace_roles.py
index bac09bff..a1662b5c 100644
--- a/tests/domain/test_workspace_roles.py
+++ b/tests/domain/test_workspace_roles.py
@@ -55,5 +55,11 @@ def test_workspace_role_permissions():
         status=WorkspaceRoleStatus.PENDING,
     )
 
-    assert WorkspaceRoles.workspace_role_permissions(workspace_one, new_user)
-    assert not WorkspaceRoles.workspace_role_permissions(workspace_two, new_user)
+    default_perms = set(new_user.atat_role.permissions)
+    assert len(
+        WorkspaceRoles.workspace_role_permissions(workspace_one, new_user)
+    ) > len(default_perms)
+    assert (
+        WorkspaceRoles.workspace_role_permissions(workspace_two, new_user)
+        == default_perms
+    )
diff --git a/tests/factories.py b/tests/factories.py
index fb2779dd..787afdb1 100644
--- a/tests/factories.py
+++ b/tests/factories.py
@@ -18,7 +18,7 @@ from atst.models.task_order import TaskOrder
 from atst.models.user import User
 from atst.models.role import Role
 from atst.models.workspace import Workspace
-from atst.domain.roles import Roles
+from atst.domain.roles import Roles, WORKSPACE_ROLES
 from atst.models.workspace_role import WorkspaceRole, Status as WorkspaceRoleStatus
 from atst.models.environment_role import EnvironmentRole
 from atst.models.invitation import Invitation, Status as InvitationStatus
@@ -50,22 +50,17 @@ def random_future_date(year_min=1, year_max=5):
     )
 
 
+def random_workspace_role():
+    choice = random.choice(WORKSPACE_ROLES)
+    return Roles.get(choice["name"])
+
+
 class Base(factory.alchemy.SQLAlchemyModelFactory):
     @classmethod
     def dictionary(cls, **attrs):
         return factory.build(dict, FACTORY_CLASS=cls, **attrs)
 
 
-class RoleFactory(Base):
-    class Meta:
-        model = Role
-
-    name = factory.Faker("name")
-    display_name = "Role display name"
-    description = "This is a test role."
-    permissions = []
-
-
 class UserFactory(Base):
     class Meta:
         model = User
@@ -74,7 +69,7 @@ class UserFactory(Base):
     email = factory.Faker("email")
     first_name = factory.Faker("first_name")
     last_name = factory.Faker("last_name")
-    atat_role = factory.SubFactory(RoleFactory)
+    atat_role = factory.LazyFunction(lambda: Roles.get("default"))
     dod_id = factory.LazyFunction(random_dod_id)
     phone_number = factory.LazyFunction(
         lambda: "".join(random.choices(string.digits, k=10))
@@ -340,7 +335,7 @@ class WorkspaceRoleFactory(Base):
         model = WorkspaceRole
 
     workspace = factory.SubFactory(WorkspaceFactory)
-    role = factory.SubFactory(RoleFactory)
+    role = factory.LazyFunction(random_workspace_role)
     user = factory.SubFactory(UserFactory)
     status = WorkspaceRoleStatus.PENDING
 
diff --git a/tests/mocks.py b/tests/mocks.py
index ee8247ac..d5995f1b 100644
--- a/tests/mocks.py
+++ b/tests/mocks.py
@@ -1,8 +1,6 @@
 from tests.factories import RequestFactory, UserFactory
 
 
-MOCK_USER = UserFactory.build()
-MOCK_REQUEST = RequestFactory.build(creator=MOCK_USER)
 DOD_SDN_INFO = {"first_name": "ART", "last_name": "GARFUNKEL", "dod_id": "5892460358"}
 DOD_SDN = f"CN={DOD_SDN_INFO['last_name']}.{DOD_SDN_INFO['first_name']}.G.{DOD_SDN_INFO['dod_id']},OU=OTHER,OU=PKI,OU=DoD,O=U.S. Government,C=US"
 
diff --git a/tests/routes/requests/requests_form/test_submit.py b/tests/routes/requests/requests_form/test_submit.py
index f5f9c1d8..c824015d 100644
--- a/tests/routes/requests/requests_form/test_submit.py
+++ b/tests/routes/requests/requests_form/test_submit.py
@@ -1,5 +1,4 @@
 import pytest
-from tests.mocks import MOCK_USER
 from tests.factories import RequestFactory
 from atst.models.request_status_event import RequestStatus