bug[ats_1CZMY]: Filter My Assignee for cancelled task throws null pointer exception

11 files changed, 106 insertions, 114 deletions

diff --git a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/AtsTestUtil.java b/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/AtsTestUtil.java
index 899994a1f4d..006986433ad 100644
--- a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/AtsTestUtil.java
+++ b/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/AtsTestUtil.java
@@ -36,7 +36,7 @@ import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact;
 import org.eclipse.osee.ats.core.client.type.AtsArtifactTypes;
 import org.eclipse.osee.ats.core.client.type.AtsAttributeTypes;
 import org.eclipse.osee.ats.core.client.type.AtsRelationTypes;
-import org.eclipse.osee.ats.core.client.util.AtsUsers;
+import org.eclipse.osee.ats.core.client.util.AtsUsersClient;
 import org.eclipse.osee.ats.core.client.util.AtsUtilCore;
 import org.eclipse.osee.ats.core.client.version.VersionArtifact;
 import org.eclipse.osee.ats.core.client.workdef.WorkDefinitionFactory;
@@ -282,7 +282,7 @@ public class AtsTestUtil {
       teamDef.setSoleAttributeValue(AtsAttributeTypes.WorkflowDefinition, WORK_DEF_NAME);
       teamDef.setSoleAttributeValue(AtsAttributeTypes.Active, true);
       teamDef.setSoleAttributeValue(AtsAttributeTypes.TeamUsesVersions, true);
-      teamDef.addRelation(AtsRelationTypes.TeamLead_Lead, AtsUsers.getOseeUser());
+      teamDef.addRelation(AtsRelationTypes.TeamLead_Lead, AtsUsersClient.getOseeUser());
 
       testAi.addRelation(AtsRelationTypes.TeamActionableItem_Team, teamDef);
       testAi2.addRelation(AtsRelationTypes.TeamActionableItem_Team, teamDef);
@@ -299,7 +299,7 @@ public class AtsTestUtil {
 
       actionArt =
          ActionManager.createAction(null, getTitle("Team WF", postFixName), "description", ChangeType.Improvement, "1",
-            false, null, Arrays.asList(testAi), new Date(), AtsUsers.getUser(), null, transaction);
+            false, null, Arrays.asList(testAi), new Date(), AtsUsersClient.getUser(), null, transaction);
 
       teamArt = actionArt.getFirstTeam();
 
@@ -316,7 +316,7 @@ public class AtsTestUtil {
    public static TaskArtifact getOrCreateTaskOffTeamWf1() throws OseeCoreException {
       ensureLoaded();
       if (taskArtWf1 == null) {
-         taskArtWf1 = teamArt.createNewTask(getTitle("Task", postFixName), new Date(), AtsUsers.getUser());
+         taskArtWf1 = teamArt.createNewTask(getTitle("Task", postFixName), new Date(), AtsUsersClient.getUser());
          taskArtWf1.setSoleAttributeValue(AtsAttributeTypes.RelatedToState, teamArt.getCurrentStateName());
          taskArtWf1.persist("AtsTestUtil - addTaskWf1");
       }
@@ -326,7 +326,7 @@ public class AtsTestUtil {
    public static TaskArtifact getOrCreateTaskOffTeamWf2() throws OseeCoreException {
       ensureLoaded();
       if (taskArtWf2 == null) {
-         taskArtWf2 = teamArt.createNewTask(getTitle("Task", postFixName), new Date(), AtsUsers.getUser());
+         taskArtWf2 = teamArt.createNewTask(getTitle("Task", postFixName), new Date(), AtsUsersClient.getUser());
          taskArtWf2.setSoleAttributeValue(AtsAttributeTypes.RelatedToState, teamArt.getCurrentStateName());
          taskArtWf2.persist("AtsTestUtil - addTaskWf2");
       }
@@ -339,11 +339,11 @@ public class AtsTestUtil {
          List<DecisionReviewOption> options = new ArrayList<DecisionReviewOption>();
          options.add(new DecisionReviewOption(DecisionReviewState.Completed.getPageName(), false, null));
          options.add(new DecisionReviewOption(DecisionReviewState.Followup.getPageName(), true,
-            Arrays.asList(AtsUsers.getUser().getUserId())));
+            Arrays.asList(AtsUsersClient.getUser().getUserId())));
          decRevArt =
             DecisionReviewManager.createNewDecisionReview(teamArt, reviewBlockType,
                AtsTestUtil.class.getSimpleName() + " Test Decision Review", relatedToState.getPageName(),
-               "Decision Review", options, Arrays.asList(AtsUsers.getUser()), new Date(), AtsUsers.getUser());
+               "Decision Review", options, Arrays.asList(AtsUsersClient.getUser()), new Date(), AtsUsersClient.getUser());
       }
       return decRevArt;
    }
@@ -547,7 +547,7 @@ public class AtsTestUtil {
             TransactionManager.createTransaction(AtsUtilCore.getAtsBranch(), AtsTestUtil.class.getSimpleName());
          actionArt2 =
             ActionManager.createAction(null, getTitle("Team WF2", postFixName), "description", ChangeType.Improvement,
-               "1", false, null, Arrays.asList(testAi2), new Date(), AtsUsers.getUser(), null, transaction);
+               "1", false, null, Arrays.asList(testAi2), new Date(), AtsUsersClient.getUser(), null, transaction);
 
          teamArt2 = actionArt2.getFirstTeam();
          transaction.execute();
diff --git a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/AtsTestUtilTest.java b/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/AtsTestUtilTest.java
index 0965df60cfe..0e9f7a123b2 100644
--- a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/AtsTestUtilTest.java
+++ b/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/AtsTestUtilTest.java
@@ -13,7 +13,7 @@ package org.eclipse.osee.ats.core.client;
 import junit.framework.Assert;
 import org.eclipse.osee.ats.core.client.team.TeamState;
 import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact;
-import org.eclipse.osee.ats.core.client.util.AtsUsers;
+import org.eclipse.osee.ats.core.client.util.AtsUsersClient;
 import org.eclipse.osee.ats.core.client.util.AtsUtilCore;
 import org.eclipse.osee.ats.core.client.workflow.transition.TransitionOption;
 import org.eclipse.osee.ats.core.workdef.ReviewBlockType;
@@ -126,13 +126,13 @@ public class AtsTestUtilTest extends AtsTestUtil {
       SkynetTransaction transaction = TransactionManager.createTransaction(AtsUtilCore.getAtsBranch(), "test");
 
       Result result =
-         AtsTestUtil.transitionTo(AtsTestUtilState.Implement, AtsUsers.getUser(), transaction,
+         AtsTestUtil.transitionTo(AtsTestUtilState.Implement, AtsUsersClient.getUser(), transaction,
             TransitionOption.OverrideAssigneeCheck, TransitionOption.OverrideTransitionValidityCheck);
       Assert.assertEquals(Result.TrueResult, result);
       Assert.assertEquals(teamArt.getCurrentStateName(), TeamState.Implement.getPageName());
 
       result =
-         AtsTestUtil.transitionTo(AtsTestUtilState.Completed, AtsUsers.getUser(), transaction,
+         AtsTestUtil.transitionTo(AtsTestUtilState.Completed, AtsUsersClient.getUser(), transaction,
             TransitionOption.OverrideAssigneeCheck, TransitionOption.OverrideTransitionValidityCheck);
       Assert.assertEquals(Result.TrueResult, result);
       Assert.assertEquals(teamArt.getCurrentStateName(), TeamState.Completed.getPageName());
@@ -155,7 +155,7 @@ public class AtsTestUtilTest extends AtsTestUtil {
       SkynetTransaction transaction = TransactionManager.createTransaction(AtsUtilCore.getAtsBranch(), "test");
 
       Result result =
-         AtsTestUtil.transitionTo(AtsTestUtilState.Cancelled, AtsUsers.getUser(), transaction,
+         AtsTestUtil.transitionTo(AtsTestUtilState.Cancelled, AtsUsersClient.getUser(), transaction,
             TransitionOption.OverrideAssigneeCheck, TransitionOption.OverrideTransitionValidityCheck);
       Assert.assertEquals(Result.TrueResult, result);
       Assert.assertEquals(teamArt.getCurrentStateName(), TeamState.Cancelled.getPageName());
diff --git a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/notify/AtsNotificationManagerTest.java b/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/notify/AtsNotificationManagerTest.java
index 4171e5dde87..fca1e0cb7e0 100644
--- a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/notify/AtsNotificationManagerTest.java
+++ b/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/notify/AtsNotificationManagerTest.java
@@ -24,7 +24,7 @@ import org.eclipse.osee.ats.core.client.review.role.UserRoleManager;
 import org.eclipse.osee.ats.core.client.team.TeamState;
 import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact;
 import org.eclipse.osee.ats.core.client.type.AtsRelationTypes;
-import org.eclipse.osee.ats.core.client.util.AtsUsers;
+import org.eclipse.osee.ats.core.client.util.AtsUsersClient;
 import org.eclipse.osee.ats.core.client.util.AtsUtilCore;
 import org.eclipse.osee.ats.core.client.workflow.ChangeType;
 import org.eclipse.osee.ats.core.client.workflow.transition.TransitionOption;
@@ -83,7 +83,7 @@ public class AtsNotificationManagerTest {
       UserManager.getUser(DemoUsers.Alex_Kay).persist(getClass().getSimpleName());
 
       // reset the originator
-      teamArt.setCreatedBy(AtsUsers.getUserFromToken(DemoUsers.Alex_Kay), false, new Date());
+      teamArt.setCreatedBy(AtsUsersClient.getUserFromToken(DemoUsers.Alex_Kay), false, new Date());
       // persist will kick event which will log the notification event and send
       teamArt.persist("Change originator");
 
@@ -97,7 +97,7 @@ public class AtsNotificationManagerTest {
       //---------------------------------------------------
 
       // reset the originator back to joe smith
-      teamArt.setCreatedBy(AtsUsers.getUserFromToken(DemoUsers.Joe_Smith), false, new Date());
+      teamArt.setCreatedBy(AtsUsersClient.getUserFromToken(DemoUsers.Joe_Smith), false, new Date());
       // persist will kick event which will log the notification event and send
       teamArt.persist("Change originator");
       AtsNotificationManager.setInTest(true);
@@ -111,7 +111,7 @@ public class AtsNotificationManagerTest {
       UserManager.getUser(DemoUsers.Alex_Kay).persist(getClass().getSimpleName());
 
       // reset the originator
-      teamArt.setCreatedBy(AtsUsers.getUserFromToken(DemoUsers.Alex_Kay), false, new Date());
+      teamArt.setCreatedBy(AtsUsersClient.getUserFromToken(DemoUsers.Alex_Kay), false, new Date());
       // persist will kick event which will log the notification event and send
       teamArt.persist("Change originator");
 
@@ -123,7 +123,7 @@ public class AtsNotificationManagerTest {
       //---------------------------------------------------
 
       // reset the originator back to joe smith
-      teamArt.setCreatedBy(AtsUsers.getUserFromToken(DemoUsers.Joe_Smith), false, new Date());
+      teamArt.setCreatedBy(AtsUsersClient.getUserFromToken(DemoUsers.Joe_Smith), false, new Date());
       // persist will kick event which will log the notification event and send
       teamArt.persist("Change originator");
       AtsNotificationManager.setInTest(true);
@@ -137,7 +137,7 @@ public class AtsNotificationManagerTest {
       UserManager.getUser(DemoUsers.Alex_Kay).persist(getClass().getSimpleName());
 
       // reset the originator
-      teamArt.setCreatedBy(AtsUsers.getUserFromToken(DemoUsers.Alex_Kay), false, new Date());
+      teamArt.setCreatedBy(AtsUsersClient.getUserFromToken(DemoUsers.Alex_Kay), false, new Date());
       // persist will kick event which will log the notification event and send
       teamArt.persist("Change originator");
 
@@ -182,7 +182,7 @@ public class AtsNotificationManagerTest {
       UserManager.getUser().setEmail("joe.smith@boeing.com");
       users.add(UserManager.getUser());
 
-      teamArt.getStateMgr().addAssignees(AtsUsers.getAtsUsers(users));
+      teamArt.getStateMgr().addAssignees(AtsUsersClient.getAtsUsers(users));
 
       // verify notification exists now only for active, valid email Alex, not for others
       Assert.assertEquals(1, mgr.getNotificationEvents().size());
@@ -217,7 +217,7 @@ public class AtsNotificationManagerTest {
       User Alex_Kay = UserManager.getUser(DemoUsers.Alex_Kay);
       Alex_Kay.setSoleAttributeValue(CoreAttributeTypes.Email, "alex.kay@boeing.com");
       Alex_Kay.persist(getClass().getSimpleName());
-      teamArt.getStateMgr().addAssignee(AtsUsers.getUserFromOseeUser(Alex_Kay));
+      teamArt.getStateMgr().addAssignee(AtsUsersClient.getUserFromOseeUser(Alex_Kay));
       teamArt.persist(getClass().getSimpleName());
       Assert.assertEquals("Alex and Joe should be assigned; currently = " + teamArt.getStateMgr().getAssigneesStr(), 2,
          teamArt.getStateMgr().getAssignees().size());
@@ -240,7 +240,7 @@ public class AtsNotificationManagerTest {
       usersToSet.add(UserManager.getUser());
       usersToSet.add(Alex_Kay);
 
-      teamArt.getStateMgr().setAssignees(AtsUsers.getAtsUsers(usersToSet));
+      teamArt.getStateMgr().setAssignees(AtsUsersClient.getAtsUsers(usersToSet));
 
       // verify notification exists now only for Jason_Michael, not for others
       Assert.assertEquals(1, mgr.getNotificationEvents().size());
@@ -270,7 +270,7 @@ public class AtsNotificationManagerTest {
 
       // set originator as Alex Kay
       TeamWorkFlowArtifact teamArt = AtsTestUtil.getTeamWf();
-      teamArt.setCreatedBy(AtsUsers.getUserFromToken(DemoUsers.Alex_Kay), false, new Date());
+      teamArt.setCreatedBy(AtsUsersClient.getUserFromToken(DemoUsers.Alex_Kay), false, new Date());
       teamArt.persist(getClass().getSimpleName() + " - set originator");
 
       // set alex kay having valid email address
@@ -284,7 +284,7 @@ public class AtsNotificationManagerTest {
       SkynetTransaction transaction =
          TransactionManager.createTransaction(AtsUtilCore.getAtsBranch(), getClass().getSimpleName());
       Result result =
-         AtsTestUtil.transitionTo(AtsTestUtilState.Completed, AtsUsers.getUser(), transaction,
+         AtsTestUtil.transitionTo(AtsTestUtilState.Completed, AtsUsersClient.getUser(), transaction,
             TransitionOption.OverrideAssigneeCheck, TransitionOption.OverrideTransitionValidityCheck);
       Assert.assertEquals(Result.TrueResult, result);
       Assert.assertEquals(teamArt.getCurrentStateName(), TeamState.Completed.getPageName());
@@ -312,7 +312,7 @@ public class AtsNotificationManagerTest {
 
       // set originator as Alex Kay
       TeamWorkFlowArtifact teamArt = AtsTestUtil.getTeamWf();
-      teamArt.setCreatedBy(AtsUsers.getUserFromToken(DemoUsers.Alex_Kay), false, new Date());
+      teamArt.setCreatedBy(AtsUsersClient.getUserFromToken(DemoUsers.Alex_Kay), false, new Date());
       teamArt.persist(getClass().getSimpleName() + " - set originator");
 
       // set alex kay having valid email address
@@ -326,7 +326,7 @@ public class AtsNotificationManagerTest {
       SkynetTransaction transaction =
          TransactionManager.createTransaction(AtsUtilCore.getAtsBranch(), getClass().getSimpleName());
       Result result =
-         AtsTestUtil.transitionTo(AtsTestUtilState.Cancelled, AtsUsers.getUser(), transaction,
+         AtsTestUtil.transitionTo(AtsTestUtilState.Cancelled, AtsUsersClient.getUser(), transaction,
             TransitionOption.OverrideAssigneeCheck, TransitionOption.OverrideTransitionValidityCheck);
       Assert.assertEquals(Result.TrueResult, result);
       Assert.assertEquals(teamArt.getCurrentStateName(), TeamState.Cancelled.getPageName());
@@ -369,7 +369,7 @@ public class AtsNotificationManagerTest {
       ActionArtifact actionArt =
          ActionManager.createAction(null, getClass().getSimpleName() + " - testSubscribedTeam", "description",
             ChangeType.Improvement, "1", false, null, Arrays.asList(AtsTestUtil.getTestAi()), new Date(),
-            AtsUsers.getUser(), null, transaction);
+            AtsUsersClient.getUser(), null, transaction);
 
       // verify notification to subscriber
       Assert.assertEquals(1, mgr.getNotificationEvents().size());
@@ -423,7 +423,7 @@ public class AtsNotificationManagerTest {
       ActionArtifact actionArt =
          ActionManager.createAction(null, getClass().getSimpleName() + " - testSubscribedAI", "description",
             ChangeType.Improvement, "1", false, null, Arrays.asList(AtsTestUtil.getTestAi()), new Date(),
-            AtsUsers.getUser(), null, transaction);
+            AtsUsersClient.getUser(), null, transaction);
 
       // verify notification to subscriber
       Assert.assertEquals(1, mgr.getNotificationEvents().size());
@@ -476,7 +476,7 @@ public class AtsNotificationManagerTest {
       SkynetTransaction transaction =
          TransactionManager.createTransaction(AtsUtilCore.getAtsBranch(), getClass().getSimpleName());
       Result result =
-         AtsTestUtil.transitionTo(AtsTestUtilState.Implement, AtsUsers.getUser(), transaction,
+         AtsTestUtil.transitionTo(AtsTestUtilState.Implement, AtsUsersClient.getUser(), transaction,
             TransitionOption.OverrideAssigneeCheck, TransitionOption.OverrideTransitionValidityCheck);
       Assert.assertEquals(Result.TrueResult, result);
       transaction.execute();
@@ -518,23 +518,25 @@ public class AtsNotificationManagerTest {
       PeerToPeerReviewArtifact peerArt =
          AtsTestUtil.getOrCreatePeerReview(ReviewBlockType.None, AtsTestUtilState.Analyze, transaction);
       List<UserRole> roles = new ArrayList<UserRole>();
-      UserRole author = new UserRole(Role.Author, AtsUsers.getUserFromOseeUser(alex));
+      UserRole author = new UserRole(Role.Author, AtsUsersClient.getUserFromOseeUser(alex));
       roles.add(author);
-      UserRole moderator = new UserRole(Role.Moderator, AtsUsers.getUserFromOseeUser(kay));
+      UserRole moderator = new UserRole(Role.Moderator, AtsUsersClient.getUserFromOseeUser(kay));
       roles.add(moderator);
-      UserRole reviewer1 = new UserRole(Role.Reviewer, AtsUsers.getUser());
+      UserRole reviewer1 = new UserRole(Role.Reviewer, AtsUsersClient.getUser());
       roles.add(reviewer1);
-      UserRole reviewer2 = new UserRole(Role.Reviewer, AtsUsers.getUserFromToken(DemoUsers.Jason_Michael));
+      UserRole reviewer2 = new UserRole(Role.Reviewer, AtsUsersClient.getUserFromToken(DemoUsers.Jason_Michael));
       roles.add(reviewer2);
 
       Result result =
-         PeerToPeerReviewManager.transitionTo(peerArt, PeerToPeerReviewState.Review, roles, null, AtsUsers.getUser(),
-            false, transaction);
+         PeerToPeerReviewManager.transitionTo(peerArt, PeerToPeerReviewState.Review, roles, null,
+            AtsUsersClient.getUser(), false, transaction);
       Assert.assertEquals(Result.TrueResult, result);
       peerArt.persist(transaction);
       transaction.execute();
       mgr.clear();
 
+      peerArt.getCurrentStateName();
+
       // complete reviewer1 role
       transaction =
          TransactionManager.createTransaction(AtsUtilCore.getAtsBranch(),
diff --git a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/notify/AtsNotifyUsersTest.java b/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/notify/AtsNotifyUsersTest.java
index 9ba5edb3813..0704a17fc5a 100644
--- a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/notify/AtsNotifyUsersTest.java
+++ b/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/notify/AtsNotifyUsersTest.java
@@ -20,7 +20,7 @@ import org.eclipse.osee.ats.core.client.action.ActionManager;
 import org.eclipse.osee.ats.core.client.notify.AtsNotificationManager.ConfigurationProvider;
 import org.eclipse.osee.ats.core.client.team.TeamState;
 import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact;
-import org.eclipse.osee.ats.core.client.util.AtsUsers;
+import org.eclipse.osee.ats.core.client.util.AtsUsersClient;
 import org.eclipse.osee.ats.core.client.util.AtsUtilCore;
 import org.eclipse.osee.ats.core.client.util.SubscribeManager;
 import org.eclipse.osee.ats.core.client.workflow.ActionableItemManagerCore;
@@ -64,6 +64,9 @@ public class AtsNotifyUsersTest {
       UserManager.getUser(DemoUsers.Inactive_Steve).reloadAttributesAndRelations();
       AtsTestUtil.cleanup();
       cleanUpAction();
+
+      AtsTestUtil.validateArtifactCache();
+
    }
 
    private static void cleanUpAction() throws OseeCoreException {
@@ -97,12 +100,12 @@ public class AtsNotifyUsersTest {
       SkynetTransaction transaction =
          TransactionManager.createTransaction(AtsUtilCore.getAtsBranch(), getClass().getSimpleName());
       TeamWorkFlowArtifact teamArt = AtsTestUtil.getTeamWf();
-      teamArt.setName(AtsNotifyUsersTest.class.getSimpleName());
-      teamArt.internalSetCreatedBy(AtsUsers.getUserFromOseeUser(kay_ValidEmail));
+      teamArt.setName(AtsNotifyUsersTest.class.getSimpleName() + "-testNotify");
+      teamArt.internalSetCreatedBy(AtsUsersClient.getUserFromOseeUser(kay_ValidEmail));
       List<User> assignees = new ArrayList<User>();
       assignees.addAll(Arrays.asList(inactiveSteve, alex_NoValidEmail, jason_ValidEmail, kay_ValidEmail,
          joeSmith_CurrentUser));
-      teamArt.getStateMgr().setAssignees(AtsUsers.getAtsUsers(assignees));
+      teamArt.getStateMgr().setAssignees(AtsUsersClient.getAtsUsers(assignees));
       teamArt.persist(transaction);
       transaction.execute();
 
@@ -113,15 +116,15 @@ public class AtsNotifyUsersTest {
       Assert.assertEquals(AtsNotifyType.Originator.name(), event.getType());
       Assert.assertEquals(kay_ValidEmail, event.getUsers().iterator().next());
       Assert.assertEquals(
-         "You have been set as the originator of [Team Workflow] state [Analyze] titled [AtsNotifyUsersTest]",
+         "You have been set as the originator of [Team Workflow] state [Analyze] titled [AtsNotifyUsersTest-testNotify]",
          event.getDescription());
 
       notifyManager.clear();
-      teamArt.internalSetCreatedBy(AtsUsers.getUserFromOseeUser(inactiveSteve));
+      teamArt.internalSetCreatedBy(AtsUsersClient.getUserFromOseeUser(inactiveSteve));
       teamArt.persist(getClass().getSimpleName());
       AtsNotificationManager.notify(teamArt, AtsNotifyType.Originator);
       Assert.assertEquals(0, notifyManager.getNotificationEvents().size());
-      teamArt.internalSetCreatedBy(AtsUsers.getUserFromOseeUser(kay_ValidEmail));
+      teamArt.internalSetCreatedBy(AtsUsersClient.getUserFromOseeUser(kay_ValidEmail));
       teamArt.persist(getClass().getSimpleName());
 
       notifyManager.clear();
@@ -138,12 +141,12 @@ public class AtsNotifyUsersTest {
       users.addAll(event.getUsers());
       Assert.assertTrue(org.eclipse.osee.framework.jdk.core.util.Collections.isEqual(expected, users));
       Assert.assertEquals(
-         "You have been set as the assignee of [Team Workflow] in state [Analyze] titled [AtsNotifyUsersTest]",
+         "You have been set as the assignee of [Team Workflow] in state [Analyze] titled [AtsNotifyUsersTest-testNotify]",
          event.getDescription());
 
       notifyManager.clear();
-      AtsNotificationManager.notify(teamArt, Collections.singleton(AtsUsers.getUserFromOseeUser(jason_ValidEmail)),
-         AtsNotifyType.Assigned);
+      AtsNotificationManager.notify(teamArt,
+         Collections.singleton(AtsUsersClient.getUserFromOseeUser(jason_ValidEmail)), AtsNotifyType.Assigned);
       Assert.assertEquals(1, notifyManager.getNotificationEvents().size());
       event = notifyManager.getNotificationEvents().get(0);
       Assert.assertEquals(AtsNotifyType.Assigned.name(), event.getType());
@@ -151,14 +154,14 @@ public class AtsNotifyUsersTest {
       Assert.assertEquals(1, event.getUsers().size());
       Assert.assertEquals(jason_ValidEmail, event.getUsers().iterator().next());
       Assert.assertEquals(
-         "You have been set as the assignee of [Team Workflow] in state [Analyze] titled [AtsNotifyUsersTest]",
+         "You have been set as the assignee of [Team Workflow] in state [Analyze] titled [AtsNotifyUsersTest-testNotify]",
          event.getDescription());
 
       notifyManager.clear();
       SubscribeManager.toggleSubscribe(teamArt);
       transaction =
          TransactionManager.createTransaction(AtsUtilCore.getAtsBranch(), "AtsNotifyUsersTests.toggle.subscribed");
-      SubscribeManager.addSubscribed(teamArt, AtsUsers.getUserFromOseeUser(inactiveSteve), transaction);
+      SubscribeManager.addSubscribed(teamArt, AtsUsersClient.getUserFromOseeUser(inactiveSteve), transaction);
       transaction.execute();
       AtsNotificationManager.notify(teamArt, AtsNotifyType.Subscribed);
       Assert.assertEquals(1, notifyManager.getNotificationEvents().size());
@@ -166,7 +169,7 @@ public class AtsNotifyUsersTest {
       Assert.assertEquals(AtsNotifyType.Subscribed.name(), event.getType());
       Assert.assertEquals(UserManager.getUser(), event.getUsers().iterator().next());
       Assert.assertEquals(
-         "[Team Workflow] titled [AtsNotifyUsersTest] transitioned to [Analyze] and you subscribed for notification.",
+         "[Team Workflow] titled [AtsNotifyUsersTest-testNotify] transitioned to [Analyze] and you subscribed for notification.",
          event.getDescription());
       SubscribeManager.toggleSubscribe(teamArt);
 
@@ -175,24 +178,25 @@ public class AtsNotifyUsersTest {
       Assert.assertEquals(0, notifyManager.getNotificationEvents().size());
 
       notifyManager.clear();
-      teamArt.getStateMgr().initializeStateMachine(TeamState.Completed, null);
+      teamArt.getStateMgr().initializeStateMachine(TeamState.Completed, null, AtsUsersClient.getUser());
       AtsNotificationManager.notify(teamArt, AtsNotifyType.Completed);
       event = notifyManager.getNotificationEvents().get(0);
       Assert.assertEquals(AtsNotifyType.Completed.name(), event.getType());
       Assert.assertEquals(kay_ValidEmail, event.getUsers().iterator().next());
-      Assert.assertEquals("[Team Workflow] titled [AtsNotifyUsersTest] is [Completed]", event.getDescription());
+      Assert.assertEquals("[Team Workflow] titled [AtsNotifyUsersTest-testNotify] is [Completed]",
+         event.getDescription());
 
       notifyManager.clear();
-      teamArt.internalSetCreatedBy(AtsUsers.getUserFromOseeUser(inactiveSteve));
+      teamArt.internalSetCreatedBy(AtsUsersClient.getUserFromOseeUser(inactiveSteve));
       teamArt.persist(getClass().getSimpleName());
-      teamArt.getStateMgr().initializeStateMachine(TeamState.Completed, null);
+      teamArt.getStateMgr().initializeStateMachine(TeamState.Completed, null, AtsUsersClient.getUser());
       AtsNotificationManager.notify(teamArt, AtsNotifyType.Completed);
       Assert.assertEquals(0, notifyManager.getNotificationEvents().size());
-      teamArt.internalSetCreatedBy(AtsUsers.getUserFromOseeUser(kay_ValidEmail));
+      teamArt.internalSetCreatedBy(AtsUsersClient.getUserFromOseeUser(kay_ValidEmail));
       teamArt.persist(getClass().getSimpleName());
 
       notifyManager.clear();
-      teamArt.getStateMgr().initializeStateMachine(TeamState.Analyze, null);
+      teamArt.getStateMgr().initializeStateMachine(TeamState.Analyze, null, AtsUsersClient.getUser());
       TransitionHelper helper =
          new TransitionHelper(getClass().getSimpleName(), Arrays.asList(teamArt), TeamState.Cancelled.getPageName(),
             null, "this is the reason", TransitionOption.OverrideTransitionValidityCheck);
@@ -207,7 +211,7 @@ public class AtsNotifyUsersTest {
       Assert.assertEquals(AtsNotifyType.Cancelled.name(), event.getType());
       Assert.assertEquals(kay_ValidEmail, event.getUsers().iterator().next());
       Assert.assertTrue(event.getDescription().startsWith(
-         "[Team Workflow] titled [AtsNotifyUsersTest] was [Cancelled] from the [Analyze] state on"));
+         "[Team Workflow] titled [AtsNotifyUsersTest-testNotify] was [Cancelled] from the [Analyze] state on"));
       Assert.assertTrue(event.getDescription().endsWith(".<br>Reason: [this is the reason]"));
 
    }
@@ -228,7 +232,7 @@ public class AtsNotifyUsersTest {
       ActionManager.createAction(null, getClass().getSimpleName() + "-OnNewAction", "Description",
          ChangeType.Improvement, "2", false, null,
          ActionableItemManagerCore.getActionableItems(Arrays.asList(DemoActionableItems.SAW_SW_Design.getName())),
-         new Date(), AtsUsers.getUser(), null, transaction);
+         new Date(), AtsUsersClient.getUser(), null, transaction);
       transaction.execute();
 
       Assert.assertEquals(1, notifyManager.getNotificationEvents().size());
diff --git a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/review/DecisionReviewDefinitionManagerTest.java b/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/review/DecisionReviewDefinitionManagerTest.java
index 1e584359bbb..942678581ef 100644
--- a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/review/DecisionReviewDefinitionManagerTest.java
+++ b/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/review/DecisionReviewDefinitionManagerTest.java
@@ -15,7 +15,7 @@ import junit.framework.Assert;
 import org.eclipse.osee.ats.core.client.AtsTestUtil;
 import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact;
 import org.eclipse.osee.ats.core.client.type.AtsAttributeTypes;
-import org.eclipse.osee.ats.core.client.util.AtsUsers;
+import org.eclipse.osee.ats.core.client.util.AtsUsersClient;
 import org.eclipse.osee.ats.core.client.util.AtsUtilCore;
 import org.eclipse.osee.ats.core.client.workflow.transition.MockTransitionHelper;
 import org.eclipse.osee.ats.core.client.workflow.transition.TransitionManager;
@@ -71,7 +71,7 @@ public class DecisionReviewDefinitionManagerTest extends DecisionReviewDefinitio
          TransactionManager.createTransaction(AtsUtilCore.getAtsBranch(), getClass().getSimpleName());
       MockTransitionHelper helper =
          new MockTransitionHelper(getClass().getSimpleName(), Arrays.asList(teamArt), implement.getPageName(),
-            Arrays.asList(AtsUsers.getUser()), null, TransitionOption.None);
+            Arrays.asList(AtsUsersClient.getUser()), null, TransitionOption.None);
       TransitionManager transMgr = new TransitionManager(helper, transaction);
       TransitionResults results = transMgr.handleAll();
       transaction.execute();
@@ -117,7 +117,7 @@ public class DecisionReviewDefinitionManagerTest extends DecisionReviewDefinitio
          TransactionManager.createTransaction(AtsUtilCore.getAtsBranch(), getClass().getSimpleName());
       MockTransitionHelper helper =
          new MockTransitionHelper(getClass().getSimpleName(), Arrays.asList(teamArt), implement.getPageName(),
-            Arrays.asList(AtsUsers.getUser()), null, TransitionOption.None);
+            Arrays.asList(AtsUsersClient.getUser()), null, TransitionOption.None);
       TransitionManager transMgr = new TransitionManager(helper, transaction);
       TransitionResults results = transMgr.handleAll();
       transaction.execute();
diff --git a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/review/DecisionReviewManagerTest.java b/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/review/DecisionReviewManagerTest.java
index 1121d18e799..f630517913a 100644
--- a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/review/DecisionReviewManagerTest.java
+++ b/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/review/DecisionReviewManagerTest.java
@@ -19,7 +19,7 @@ import org.eclipse.osee.ats.core.client.AtsTestUtil;
 import org.eclipse.osee.ats.core.client.team.TeamState;
 import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact;
 import org.eclipse.osee.ats.core.client.type.AtsAttributeTypes;
-import org.eclipse.osee.ats.core.client.util.AtsUsers;
+import org.eclipse.osee.ats.core.client.util.AtsUsersClient;
 import org.eclipse.osee.ats.core.client.util.AtsUtilCore;
 import org.eclipse.osee.ats.core.workdef.DecisionReviewOption;
 import org.eclipse.osee.ats.core.workdef.ReviewBlockType;
@@ -59,7 +59,7 @@ public class DecisionReviewManagerTest extends DecisionReviewManager {
       List<DecisionReviewOption> options = new ArrayList<DecisionReviewOption>();
       options.add(new DecisionReviewOption(DecisionReviewState.Completed.getPageName(), false, null));
       options.add(new DecisionReviewOption(DecisionReviewState.Followup.getPageName(), true,
-         Arrays.asList(AtsUsers.getUser().getUserId())));
+         Arrays.asList(AtsUsersClient.getUser().getUserId())));
 
       // create and transition decision review
       SkynetTransaction transaction =
@@ -68,7 +68,7 @@ public class DecisionReviewManagerTest extends DecisionReviewManager {
       DecisionReviewArtifact decRev =
          DecisionReviewManager.createNewDecisionReviewAndTransitionToDecision(teamWf, reviewTitle, "my description",
             AtsTestUtil.getAnalyzeStateDef().getPageName(), ReviewBlockType.Transition, options,
-            Arrays.asList(AtsUsers.getUser()), new Date(), AtsUsers.getUser(), transaction);
+            Arrays.asList(AtsUsersClient.getUser()), new Date(), AtsUsersClient.getUser(), transaction);
       transaction.execute();
 
       Assert.assertNotNull(decRev);
@@ -88,7 +88,7 @@ public class DecisionReviewManagerTest extends DecisionReviewManager {
       List<DecisionReviewOption> options = new ArrayList<DecisionReviewOption>();
       options.add(new DecisionReviewOption(DecisionReviewState.Completed.getPageName(), false, null));
       options.add(new DecisionReviewOption(DecisionReviewState.Followup.getPageName(), true,
-         Arrays.asList(AtsUsers.getUser().getUserId())));
+         Arrays.asList(AtsUsersClient.getUser().getUserId())));
 
       // create and transition decision review
       SkynetTransaction transaction =
@@ -97,7 +97,7 @@ public class DecisionReviewManagerTest extends DecisionReviewManager {
       DecisionReviewArtifact decRev =
          DecisionReviewManager.createNewDecisionReviewAndTransitionToDecision(teamWf, reviewTitle, "my description",
             AtsTestUtil.getAnalyzeStateDef().getPageName(), ReviewBlockType.Transition, options,
-            Arrays.asList(AtsUsers.getUserFromToken(SystemUser.UnAssigned)), new Date(), AtsUsers.getUser(), transaction);
+            Arrays.asList(AtsUsersClient.getUserFromToken(SystemUser.UnAssigned)), new Date(), AtsUsersClient.getUser(), transaction);
       transaction.execute();
 
       Assert.assertNotNull(decRev);
@@ -119,7 +119,7 @@ public class DecisionReviewManagerTest extends DecisionReviewManager {
       DecisionReviewArtifact decRev =
          DecisionReviewManager.createNewDecisionReview(teamWf, ReviewBlockType.Commit, reviewTitle,
             TeamState.Implement.getPageName(), "description", DecisionReviewManager.getDefaultDecisionReviewOptions(),
-            Arrays.asList(AtsUsers.getUserFromToken(DemoUsers.Alex_Kay)), new Date(), AtsUsers.getUser());
+            Arrays.asList(AtsUsersClient.getUserFromToken(DemoUsers.Alex_Kay)), new Date(), AtsUsersClient.getUser());
 
       Assert.assertNotNull(decRev);
       Assert.assertEquals(reviewTitle, decRev.getName());
@@ -139,7 +139,7 @@ public class DecisionReviewManagerTest extends DecisionReviewManager {
       DecisionReviewArtifact decRev =
          DecisionReviewManager.createNewDecisionReview(teamWf, ReviewBlockType.Commit, reviewTitle,
             TeamState.Implement.getPageName(), "description", DecisionReviewManager.getDefaultDecisionReviewOptions(),
-            Arrays.asList(AtsUsers.getUserFromToken(SystemUser.UnAssigned)), new Date(), AtsUsers.getUser());
+            Arrays.asList(AtsUsersClient.getUserFromToken(SystemUser.UnAssigned)), new Date(), AtsUsersClient.getUser());
 
       Assert.assertNotNull(decRev);
       Assert.assertEquals(reviewTitle, decRev.getName());
@@ -153,7 +153,7 @@ public class DecisionReviewManagerTest extends DecisionReviewManager {
 
       DecisionReviewArtifact decRev =
          DecisionReviewManager.createNewDecisionReview(teamWf, ReviewBlockType.Commit, true, new Date(),
-            AtsUsers.getUser());
+            AtsUsersClient.getUser());
 
       Assert.assertNotNull(decRev);
       Assert.assertEquals("Should we do this?  Yes will require followup, No will not", decRev.getName());
diff --git a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/review/PeerReviewDefinitionManagerTest.java b/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/review/PeerReviewDefinitionManagerTest.java
index a25949471b9..03346659fbe 100644
--- a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/review/PeerReviewDefinitionManagerTest.java
+++ b/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/review/PeerReviewDefinitionManagerTest.java
@@ -15,7 +15,7 @@ import junit.framework.Assert;
 import org.eclipse.osee.ats.core.client.AtsTestUtil;
 import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact;
 import org.eclipse.osee.ats.core.client.type.AtsAttributeTypes;
-import org.eclipse.osee.ats.core.client.util.AtsUsers;
+import org.eclipse.osee.ats.core.client.util.AtsUsersClient;
 import org.eclipse.osee.ats.core.client.util.AtsUtilCore;
 import org.eclipse.osee.ats.core.client.workflow.transition.MockTransitionHelper;
 import org.eclipse.osee.ats.core.client.workflow.transition.TransitionManager;
@@ -69,7 +69,7 @@ public class PeerReviewDefinitionManagerTest extends PeerReviewDefinitionManager
          TransactionManager.createTransaction(AtsUtilCore.getAtsBranch(), getClass().getSimpleName());
       MockTransitionHelper helper =
          new MockTransitionHelper(getClass().getSimpleName(), Arrays.asList(teamArt), implement.getPageName(),
-            Arrays.asList(AtsUsers.getUser()), null, TransitionOption.None);
+            Arrays.asList(AtsUsersClient.getUser()), null, TransitionOption.None);
       TransitionManager transMgr = new TransitionManager(helper, transaction);
       TransitionResults results = transMgr.handleAll();
       transaction.execute();
diff --git a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/review/PeerToPeerReviewManagerTest.java b/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/review/PeerToPeerReviewManagerTest.java
index 5b76137c0c5..e1ef9a917d2 100644
--- a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/review/PeerToPeerReviewManagerTest.java
+++ b/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/review/PeerToPeerReviewManagerTest.java
@@ -15,9 +15,8 @@ import junit.framework.Assert;
 import org.eclipse.osee.ats.core.client.AtsTestUtil;
 import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact;
 import org.eclipse.osee.ats.core.client.type.AtsAttributeTypes;
-import org.eclipse.osee.ats.core.client.util.AtsUsers;
+import org.eclipse.osee.ats.core.client.util.AtsUsersClient;
 import org.eclipse.osee.ats.core.client.util.AtsUtilCore;
-import org.eclipse.osee.framework.core.enums.SystemUser;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
 import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager;
@@ -50,8 +49,7 @@ public class PeerToPeerReviewManagerTest extends PeerToPeerReviewManager {
 
       PeerToPeerReviewArtifact peerArt =
          PeerToPeerReviewManager.createNewPeerToPeerReview(teamArt, reviewTitle,
-            AtsTestUtil.getAnalyzeStateDef().getPageName(), new Date(), AtsUsers.getUserFromToken(SystemUser.OseeSystem),
-            transaction);
+            AtsTestUtil.getAnalyzeStateDef().getPageName(), new Date(), AtsUsersClient.getUser(), transaction);
       transaction.execute();
 
       Assert.assertNotNull(peerArt);
@@ -60,7 +58,7 @@ public class PeerToPeerReviewManagerTest extends PeerToPeerReviewManager {
          peerArt.isDirty());
       Assert.assertEquals(PeerToPeerReviewState.Prepare.getPageName(), peerArt.getCurrentStateName());
       Assert.assertEquals("Joe Smith", peerArt.getStateMgr().getAssigneesStr());
-      Assert.assertEquals("OSEE System", peerArt.getCreatedBy().getName());
+      Assert.assertEquals("Joe Smith", peerArt.getCreatedBy().getName());
       Assert.assertEquals(AtsTestUtil.getAnalyzeStateDef().getPageName(),
          peerArt.getSoleAttributeValue(AtsAttributeTypes.RelatedToState));
 
diff --git a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/task/TaskManagerTest.java b/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/task/TaskManagerTest.java
index b6589d4d136..c2d5447fe92 100644
--- a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/task/TaskManagerTest.java
+++ b/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/task/TaskManagerTest.java
@@ -15,7 +15,7 @@ import junit.framework.Assert;
 import org.eclipse.osee.ats.core.client.AtsTestUtil;
 import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact;
 import org.eclipse.osee.ats.core.client.type.AtsAttributeTypes;
-import org.eclipse.osee.ats.core.client.util.AtsUsers;
+import org.eclipse.osee.ats.core.client.util.AtsUsersClient;
 import org.eclipse.osee.ats.core.client.util.AtsUtilCore;
 import org.eclipse.osee.ats.core.client.workdef.WorkDefinitionFactory;
 import org.eclipse.osee.ats.core.client.workflow.HoursSpentUtil;
@@ -155,10 +155,9 @@ public class TaskManagerTest extends TaskManager {
       transaction =
          TransactionManager.createTransaction(AtsUtilCore.getAtsBranch(),
             getClass().getSimpleName() + " testTransitionToCompletedThenInWork() 2");
-      result = TaskManager.transitionToInWork(taskArt, AtsUsers.getUser(), 45, .5, transaction);
+      result = TaskManager.transitionToInWork(taskArt, AtsUsersClient.getUser(), 45, .5, transaction);
       Assert.assertEquals(Result.TrueResult, result);
       transaction.execute();
-
       Assert.assertEquals(TaskStates.InWork.getPageName(), taskArt.getCurrentStateName());
       Assert.assertEquals(3.5, HoursSpentUtil.getHoursSpentTotal(taskArt));
       Assert.assertEquals("Joe Smith", taskArt.getStateMgr().getAssigneesStr());
diff --git a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/util/AtsUserTest.java b/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/util/AtsUserTest.java
index 415b4f25ee5..c448c1012cb 100644
--- a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/util/AtsUserTest.java
+++ b/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/util/AtsUserTest.java
@@ -9,7 +9,6 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
 import junit.framework.Assert;
-import org.eclipse.osee.ats.core.model.IAtsChildren;
 import org.eclipse.osee.ats.core.model.IAtsUser;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.jdk.core.util.Collections;
@@ -56,13 +55,13 @@ public class AtsUserTest {
    @org.junit.Test
    public void testRemove() throws OseeCoreException {
       Collection<IAtsUser> assignees = new HashSet<IAtsUser>();
-      assignees.add(AtsUsers.getUserFromToken(DemoUsers.Alex_Kay));
-      assignees.add(AtsUsers.getUserFromToken(DemoUsers.Joe_Smith));
+      assignees.add(AtsUsersClient.getUserFromToken(DemoUsers.Alex_Kay));
+      assignees.add(AtsUsersClient.getUserFromToken(DemoUsers.Joe_Smith));
       Assert.assertTrue(Collections.isEqual(assignees,
-         Arrays.asList(AtsUsers.getUserFromToken(DemoUsers.Alex_Kay), AtsUsers.getUserFromToken(DemoUsers.Joe_Smith))));
+         Arrays.asList(AtsUsersClient.getUserFromToken(DemoUsers.Alex_Kay), AtsUsersClient.getUserFromToken(DemoUsers.Joe_Smith))));
 
-      assignees.remove(AtsUsers.getUser());
-      Assert.assertTrue(Collections.isEqual(assignees, Arrays.asList(AtsUsers.getUserFromToken(DemoUsers.Alex_Kay))));
+      assignees.remove(AtsUsersClient.getUser());
+      Assert.assertTrue(Collections.isEqual(assignees, Arrays.asList(AtsUsersClient.getUserFromToken(DemoUsers.Alex_Kay))));
    }
 
    public IAtsUser getAtsUser(final String name, final String userId) {
@@ -79,11 +78,6 @@ public class AtsUserTest {
          }
 
          @Override
-         public Integer getIdInt() {
-            return null;
-         }
-
-         @Override
          public String getHumanReadableId() {
             return null;
          }
@@ -99,11 +93,6 @@ public class AtsUserTest {
          }
 
          @Override
-         public IAtsChildren getAtsChildren() {
-            return null;
-         }
-
-         @Override
          public boolean isActive() {
             return false;
          }
diff --git a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/workflow/transition/TransitionManagerTest.java b/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/workflow/transition/TransitionManagerTest.java
index 256871eaf45..d7cd728bcd4 100644
--- a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/workflow/transition/TransitionManagerTest.java
+++ b/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/workflow/transition/TransitionManagerTest.java
@@ -20,7 +20,7 @@ import org.eclipse.osee.ats.core.client.team.TeamState;
 import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact;
 import org.eclipse.osee.ats.core.client.type.AtsAttributeTypes;
 import org.eclipse.osee.ats.core.client.type.AtsRelationTypes;
-import org.eclipse.osee.ats.core.client.util.AtsUsers;
+import org.eclipse.osee.ats.core.client.util.AtsUsersClient;
 import org.eclipse.osee.ats.core.client.util.AtsUtilCore;
 import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact;
 import org.eclipse.osee.ats.core.model.IAtsUser;
@@ -60,7 +60,7 @@ public class TransitionManagerTest {
       AtsTestUtil.cleanupAndReset("TransitionManagerTest");
       TransitionHelper helper =
          new TransitionHelper(getClass().getSimpleName(), EMPTY_AWAS, AtsTestUtil.getImplementStateDef().getPageName(),
-            Arrays.asList(AtsUsers.getUser()), null, TransitionOption.None);
+            Arrays.asList(AtsUsersClient.getUser()), null, TransitionOption.None);
       TransitionManager transMgr = new TransitionManager(helper);
       TransitionResults results = new TransitionResults();
       transMgr.handleTransitionValidation(results);
@@ -71,7 +71,7 @@ public class TransitionManagerTest {
    public void testHandleTransitionValidation__ToStateNotNull() throws OseeCoreException {
       TransitionHelper helper =
          new TransitionHelper(getClass().getSimpleName(), Arrays.asList(AtsTestUtil.getTeamWf()), null,
-            Arrays.asList(AtsUsers.getUser()), null, TransitionOption.None);
+            Arrays.asList(AtsUsersClient.getUser()), null, TransitionOption.None);
       TransitionManager transMgr = new TransitionManager(helper);
       TransitionResults results = new TransitionResults();
       transMgr.handleTransitionValidation(results);
@@ -82,7 +82,7 @@ public class TransitionManagerTest {
    public void testHandleTransitionValidation__InvalidToState() throws OseeCoreException {
       TransitionHelper helper =
          new TransitionHelper(getClass().getSimpleName(), Arrays.asList(AtsTestUtil.getTeamWf()), "InvalidStateName",
-            Arrays.asList(AtsUsers.getUser()), null, TransitionOption.None);
+            Arrays.asList(AtsUsersClient.getUser()), null, TransitionOption.None);
       TransitionManager transMgr = new TransitionManager(helper);
       TransitionResults results = new TransitionResults();
       transMgr.handleTransitionValidation(results);
@@ -94,7 +94,7 @@ public class TransitionManagerTest {
       TeamWorkFlowArtifact teamArt = AtsTestUtil.getTeamWf();
       TransitionHelper helper =
          new TransitionHelper(getClass().getSimpleName(), Arrays.asList(teamArt),
-            AtsTestUtil.getImplementStateDef().getPageName(), Arrays.asList(AtsUsers.getUser()), null,
+            AtsTestUtil.getImplementStateDef().getPageName(), Arrays.asList(AtsUsersClient.getUser()), null,
             TransitionOption.None);
       TransitionManager transMgr = new TransitionManager(helper);
       TransitionResults results = new TransitionResults();
@@ -107,7 +107,7 @@ public class TransitionManagerTest {
       results.clear();
       Assert.assertFalse(helper.isPrivilegedEditEnabled());
       Assert.assertFalse(helper.isOverrideAssigneeCheck());
-      teamArt.getStateMgr().setAssignee(AtsUsers.getUserFromToken(DemoUsers.Alex_Kay));
+      teamArt.getStateMgr().setAssignee(AtsUsersClient.getUserFromToken(DemoUsers.Alex_Kay));
       transMgr.handleTransitionValidation(results);
       Assert.assertTrue(results.contains(AtsTestUtil.getTeamWf(), TransitionResult.MUST_BE_ASSIGNED));
 
@@ -116,7 +116,7 @@ public class TransitionManagerTest {
       Assert.assertFalse(helper.isOverrideAssigneeCheck());
       helper.addTransitionOption(TransitionOption.PrivilegedEditEnabled);
       Assert.assertTrue(helper.isPrivilegedEditEnabled());
-      teamArt.getStateMgr().setAssignee(AtsUsers.getUserFromToken(DemoUsers.Alex_Kay));
+      teamArt.getStateMgr().setAssignee(AtsUsersClient.getUserFromToken(DemoUsers.Alex_Kay));
       transMgr.handleTransitionValidation(results);
       Assert.assertTrue(results.isEmpty());
 
@@ -126,7 +126,7 @@ public class TransitionManagerTest {
       helper.addTransitionOption(TransitionOption.OverrideAssigneeCheck);
       Assert.assertFalse(helper.isPrivilegedEditEnabled());
       Assert.assertTrue(helper.isOverrideAssigneeCheck());
-      teamArt.getStateMgr().setAssignee(AtsUsers.getUserFromToken(DemoUsers.Alex_Kay));
+      teamArt.getStateMgr().setAssignee(AtsUsersClient.getUserFromToken(DemoUsers.Alex_Kay));
       transMgr.handleTransitionValidation(results);
       Assert.assertTrue(results.isEmpty());
 
@@ -135,12 +135,12 @@ public class TransitionManagerTest {
       helper.removeTransitionOption(TransitionOption.OverrideAssigneeCheck);
       Assert.assertFalse(helper.isPrivilegedEditEnabled());
       Assert.assertFalse(helper.isOverrideAssigneeCheck());
-      teamArt.getStateMgr().setAssignee(AtsUsers.getUserFromToken(SystemUser.UnAssigned));
+      teamArt.getStateMgr().setAssignee(AtsUsersClient.getUserFromToken(SystemUser.UnAssigned));
       transMgr.handleTransitionValidation(results);
       Assert.assertTrue(results.isEmpty());
 
       // cleanup test
-      teamArt.getStateMgr().setAssignee(AtsUsers.getUserFromToken(SystemUser.UnAssigned));
+      teamArt.getStateMgr().setAssignee(AtsUsersClient.getUserFromToken(SystemUser.UnAssigned));
    }
 
    @org.junit.Test
@@ -148,7 +148,7 @@ public class TransitionManagerTest {
       TeamWorkFlowArtifact teamArt = AtsTestUtil.getTeamWf();
       MockTransitionHelper helper =
          new MockTransitionHelper(getClass().getSimpleName(), Arrays.asList(teamArt),
-            AtsTestUtil.getImplementStateDef().getPageName(), Arrays.asList(AtsUsers.getUser()), null,
+            AtsTestUtil.getImplementStateDef().getPageName(), Arrays.asList(AtsUsersClient.getUser()), null,
             TransitionOption.None);
       TransitionManager transMgr = new TransitionManager(helper);
       TransitionResults results = new TransitionResults();
@@ -185,7 +185,7 @@ public class TransitionManagerTest {
       TeamWorkFlowArtifact teamArt = AtsTestUtil.getTeamWf();
       MockTransitionHelper helper =
          new MockTransitionHelper(getClass().getSimpleName(), Arrays.asList(teamArt),
-            AtsTestUtil.getImplementStateDef().getPageName(), Arrays.asList(AtsUsers.getUser()), null,
+            AtsTestUtil.getImplementStateDef().getPageName(), Arrays.asList(AtsUsersClient.getUser()), null,
             TransitionOption.None);
       TransitionManager transMgr = new TransitionManager(helper);
       TransitionResults results = new TransitionResults();
@@ -211,7 +211,7 @@ public class TransitionManagerTest {
       TeamWorkFlowArtifact teamArt = AtsTestUtil.getTeamWf();
       MockTransitionHelper helper =
          new MockTransitionHelper(getClass().getSimpleName(), Arrays.asList(teamArt),
-            AtsTestUtil.getImplementStateDef().getPageName(), Arrays.asList(AtsUsers.getUser()), null,
+            AtsTestUtil.getImplementStateDef().getPageName(), Arrays.asList(AtsUsersClient.getUser()), null,
             TransitionOption.None);
       StateDefinition fromStateDef = AtsTestUtil.getAnalyzeStateDef();
       TransitionManager transMgr = new TransitionManager(helper);
@@ -250,7 +250,7 @@ public class TransitionManagerTest {
       TeamWorkFlowArtifact teamArt = AtsTestUtil.getTeamWf();
       MockTransitionHelper helper =
          new MockTransitionHelper(getClass().getSimpleName(), Arrays.asList(teamArt),
-            AtsTestUtil.getImplementStateDef().getPageName(), Arrays.asList(AtsUsers.getUser()), null,
+            AtsTestUtil.getImplementStateDef().getPageName(), Arrays.asList(AtsUsersClient.getUser()), null,
             TransitionOption.None);
       StateDefinition fromStateDef = AtsTestUtil.getAnalyzeStateDef();
       TransitionManager transMgr = new TransitionManager(helper);
@@ -304,7 +304,7 @@ public class TransitionManagerTest {
       TeamWorkFlowArtifact teamArt = AtsTestUtil.getTeamWf();
       MockTransitionHelper helper =
          new MockTransitionHelper(getClass().getSimpleName(), Arrays.asList(teamArt),
-            AtsTestUtil.getImplementStateDef().getPageName(), Arrays.asList(AtsUsers.getUser()), null,
+            AtsTestUtil.getImplementStateDef().getPageName(), Arrays.asList(AtsUsersClient.getUser()), null,
             TransitionOption.None);
       TransitionManager transMgr = new TransitionManager(helper);
       TransitionResults results = new TransitionResults();
@@ -314,7 +314,7 @@ public class TransitionManagerTest {
       Assert.assertTrue(results.isEmpty());
 
       // validate that can't transition with InWork task
-      TaskArtifact taskArt = teamArt.createNewTask("New Tasks", new Date(), AtsUsers.getUser());
+      TaskArtifact taskArt = teamArt.createNewTask("New Tasks", new Date(), AtsUsersClient.getUser());
       results.clear();
       transMgr.handleTransitionValidation(results);
       Assert.assertTrue(results.contains(teamArt, TransitionResult.TASKS_NOT_COMPLETED));
@@ -336,7 +336,7 @@ public class TransitionManagerTest {
          // attempt to transition parent to cancelled, should not be able to transition with un-completed/cancelled tasks
          helper =
             new MockTransitionHelper(getClass().getSimpleName(), Arrays.asList(teamArt),
-               AtsTestUtil.getCancelledStateDef().getPageName(), Arrays.asList(AtsUsers.getUser()), null,
+               AtsTestUtil.getCancelledStateDef().getPageName(), Arrays.asList(AtsUsersClient.getUser()), null,
                TransitionOption.None);
          transMgr = new TransitionManager(helper);
          results.clear();
@@ -364,7 +364,7 @@ public class TransitionManagerTest {
       TeamWorkFlowArtifact teamArt = AtsTestUtil.getTeamWf();
       MockTransitionHelper helper =
          new MockTransitionHelper(getClass().getSimpleName(), Arrays.asList(teamArt),
-            AtsTestUtil.getImplementStateDef().getPageName(), Arrays.asList(AtsUsers.getUser()), null,
+            AtsTestUtil.getImplementStateDef().getPageName(), Arrays.asList(AtsUsersClient.getUser()), null,
             TransitionOption.None);
       TransitionManager transMgr = new TransitionManager(helper);
       TransitionResults results = new TransitionResults();
@@ -393,7 +393,7 @@ public class TransitionManagerTest {
       TeamWorkFlowArtifact teamArt = AtsTestUtil.getTeamWf();
       MockTransitionHelper helper =
          new MockTransitionHelper(getClass().getSimpleName(), Arrays.asList(teamArt),
-            AtsTestUtil.getImplementStateDef().getPageName(), Arrays.asList(AtsUsers.getUser()), null,
+            AtsTestUtil.getImplementStateDef().getPageName(), Arrays.asList(AtsUsersClient.getUser()), null,
             TransitionOption.None);
       TransitionManager transMgr = new TransitionManager(helper);
       TransitionResults results = new TransitionResults();
@@ -423,7 +423,7 @@ public class TransitionManagerTest {
       TeamWorkFlowArtifact teamArt = AtsTestUtil.getTeamWf();
       MockTransitionHelper helper =
          new MockTransitionHelper(getClass().getSimpleName(), Arrays.asList(teamArt),
-            AtsTestUtil.getImplementStateDef().getPageName(), Arrays.asList(AtsUsers.getUser()), null,
+            AtsTestUtil.getImplementStateDef().getPageName(), Arrays.asList(AtsUsersClient.getUser()), null,
             TransitionOption.None);
       TransitionManager transMgr = new TransitionManager(helper);
       TransitionResults results = new TransitionResults();
@@ -457,7 +457,7 @@ public class TransitionManagerTest {
       results.clear();
       SkynetTransaction transaction =
          TransactionManager.createTransaction(AtsUtilCore.getAtsBranch(), getClass().getSimpleName());
-      DecisionReviewManager.transitionTo(decArt, DecisionReviewState.Completed, AtsUsers.getUser(), false, transaction);
+      DecisionReviewManager.transitionTo(decArt, DecisionReviewState.Completed, AtsUsersClient.getUser(), false, transaction);
       transaction.execute();
       transMgr.handleTransitionValidation(results);
       Assert.assertTrue(results.isEmpty());
@@ -470,7 +470,7 @@ public class TransitionManagerTest {
       TeamWorkFlowArtifact teamArt = AtsTestUtil.getTeamWf();
       MockTransitionHelper helper =
          new MockTransitionHelper(getClass().getSimpleName(), Arrays.asList(teamArt),
-            AtsTestUtil.getImplementStateDef().getPageName(), Arrays.asList(AtsUsers.getUser()), null,
+            AtsTestUtil.getImplementStateDef().getPageName(), Arrays.asList(AtsUsersClient.getUser()), null,
             TransitionOption.None);
       TransitionManager transMgr = new TransitionManager(helper);
       TransitionResults results = new TransitionResults();