diff --git a/atst/routes/dev.py b/atst/routes/dev.py
index b1f14a56..ee43a38d 100644
--- a/atst/routes/dev.py
+++ b/atst/routes/dev.py
@@ -12,6 +12,8 @@ import pendulum
 from . import redirect_after_login_url
 from atst.domain.users import Users
 from atst.queue import queue
+from tests.factories import random_service_branch
+from atst.utils import pick
 
 bp = Blueprint("dev", __name__)
 
@@ -22,7 +24,7 @@ _DEV_USERS = {
         "last_name": "Stevenson",
         "atat_role_name": "ccpo",
         "email": "sam@example.com",
-        "service_branch": "Fake Service Branch",
+        "service_branch": random_service_branch(),
         "phone_number": "1234567890",
         "citizenship": "United States",
         "designation": "Military",
@@ -34,7 +36,7 @@ _DEV_USERS = {
         "last_name": "Adamson",
         "atat_role_name": "default",
         "email": "amanda@example.com",
-        "service_branch": "Fake Service Branch",
+        "service_branch": random_service_branch(),
         "phone_number": "1234567890",
         "citizenship": "United States",
         "designation": "Military",
@@ -46,7 +48,7 @@ _DEV_USERS = {
         "last_name": "Buchannan",
         "atat_role_name": "default",
         "email": "brandon@example.com",
-        "service_branch": "Fake Service Branch",
+        "service_branch": random_service_branch(),
         "phone_number": "1234567890",
         "citizenship": "United States",
         "designation": "Military",
@@ -58,7 +60,7 @@ _DEV_USERS = {
         "last_name": "Collins",
         "atat_role_name": "default",
         "email": "christina@example.com",
-        "service_branch": "Fake Service Branch",
+        "service_branch": random_service_branch(),
         "phone_number": "1234567890",
         "citizenship": "United States",
         "designation": "Military",
@@ -70,7 +72,7 @@ _DEV_USERS = {
         "last_name": "Domingo",
         "atat_role_name": "default",
         "email": "dominick@example.com",
-        "service_branch": "Fake Service Branch",
+        "service_branch": random_service_branch(),
         "phone_number": "1234567890",
         "citizenship": "United States",
         "designation": "Military",
@@ -82,7 +84,7 @@ _DEV_USERS = {
         "last_name": "Eichner",
         "atat_role_name": "default",
         "email": "erica@example.com",
-        "service_branch": "Fake Service Branch",
+        "service_branch": random_service_branch(),
         "phone_number": "1234567890",
         "citizenship": "United States",
         "designation": "Military",
@@ -97,10 +99,20 @@ def login_dev():
     user_data = _DEV_USERS[role]
     user = Users.get_or_create_by_dod_id(
         user_data["dod_id"],
-        atat_role_name=user_data["atat_role_name"],
-        first_name=user_data["first_name"],
-        last_name=user_data["last_name"],
-        email=user_data["email"],
+        **pick(
+            [
+                "atat_role_name",
+                "first_name",
+                "last_name",
+                "email",
+                "service_branch",
+                "phone_number",
+                "citizenship",
+                "designation",
+                "date_latest_training",
+            ],
+            user_data,
+        ),
     )
     session["user_id"] = user.id
 
diff --git a/tests/factories.py b/tests/factories.py
index 179fc02d..8d62a22d 100644
--- a/tests/factories.py
+++ b/tests/factories.py
@@ -21,7 +21,6 @@ from atst.domain.roles import 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
-from atst.domain.workspaces import Workspaces
 from atst.domain.invitations import Invitations