diff --git a/tests/domain/test_environments.py b/tests/domain/test_environments.py
index 65e808a0..64ad12b4 100644
--- a/tests/domain/test_environments.py
+++ b/tests/domain/test_environments.py
@@ -1,51 +1,42 @@
-import pytest
-from uuid import uuid4
-
 from atst.domain.environments import Environments
 from atst.domain.environment_roles import EnvironmentRoles
-from atst.domain.projects import Projects
-from atst.domain.roles import Roles
-from atst.domain.workspaces import Workspaces
-from atst.domain.workspace_users import WorkspaceUsers
-from atst.domain.exceptions import NotFoundError
-from atst.models.environment_role import EnvironmentRole
 
-from tests.factories import (
-    RequestFactory,
-    UserFactory,
-    WorkspaceFactory,
-    EnvironmentFactory,
-    ProjectFactory,
-    SuperWorkspaceFactory,
-)
+from tests.factories import UserFactory, SuperWorkspaceFactory
 
 
 def test_update_environment_roles():
     owner = UserFactory.create()
-    developer_data = {
-        "dod_id": "1234567890",
-        "first_name": "Test",
-        "last_name": "User",
-        "email": "test.user@mail.com",
-        "workspace_role": "developer",
-    }
+    developer = UserFactory.from_atat_role("developer")
 
-    workspace = Workspaces.create(RequestFactory.create(creator=owner))
-    workspace_user = Workspaces.create_member(owner, workspace, developer_data)
-    project = Projects.create(
-        owner, workspace, "my test project", "It's mine.", ["dev", "staging", "prod"]
+    workspace = SuperWorkspaceFactory.create(
+        owner=owner,
+        members=[{"user": developer, "role_name": "developer"}],
+        projects=[
+            {
+                "name": "project1",
+                "environments": [
+                    {
+                        "name": "project1 dev",
+                        "members": [{"user": developer, "role_name": "devlops"}],
+                    },
+                    {
+                        "name": "project1 staging",
+                        "members": [{"user": developer, "role_name": "developer"}]
+                    },
+                    {"name": "project1 prod"},
+                ],
+            }
+        ],
     )
 
-    dev_env = project.environments[0]
-    staging_env = project.environments[1]
-    Environments.add_member(dev_env, workspace_user.user, "devops")
-    Environments.add_member(staging_env, workspace_user.user, "developer")
-
+    dev_env = workspace.projects[0].environments[0]
+    staging_env = workspace.projects[0].environments[1]
     new_ids_and_roles = [
         {"id": dev_env.id, "role": "billing_admin"},
         {"id": staging_env.id, "role": "developer"},
     ]
 
+    workspace_user = workspace.members[0]
     Environments.update_environment_role(owner, new_ids_and_roles, workspace_user)
     new_dev_env_role = EnvironmentRoles.get(workspace_user.user.id, dev_env.id)
     staging_env_role = EnvironmentRoles.get(workspace_user.user.id, staging_env.id)
@@ -57,7 +48,6 @@ def test_update_environment_roles():
 def test_get_scoped_environments(db):
     developer = UserFactory.create()
     workspace = SuperWorkspaceFactory.create(
-        name="hey",
         members=[{"user": developer, "role_name": "developer"}],
         projects=[
             {