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

43 files changed, 208 insertions, 305 deletions

diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/AtsTest_Demo_Access_Suite.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/AtsTest_Demo_Access_Suite.java
index 2989a4ced6a..e4202d137d2 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/AtsTest_Demo_Access_Suite.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/AtsTest_Demo_Access_Suite.java
@@ -11,6 +11,7 @@
 package org.eclipse.osee.ats;
 
 import org.eclipse.osee.ats.access.AtsBranchAccessManagerTest;
+import org.eclipse.osee.ats.util.DemoTestUtil;
 import org.eclipse.osee.framework.jdk.core.util.OseeProperties;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -27,6 +28,7 @@ public class AtsTest_Demo_Access_Suite {
    public static void setUp() throws Exception {
       OseeProperties.setIsInTest(true);
       System.out.println("\n\nBegin " + AtsTest_Demo_Access_Suite.class.getSimpleName());
+      DemoTestUtil.setUpTest();
    }
 
    @AfterClass
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/AtsTest_Demo_Column_Suite.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/AtsTest_Demo_Column_Suite.java
index 3430d056cce..a23ce192464 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/AtsTest_Demo_Column_Suite.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/AtsTest_Demo_Column_Suite.java
@@ -12,7 +12,6 @@ package org.eclipse.osee.ats;
 
 import static org.junit.Assert.assertTrue;
 import org.eclipse.osee.ats.column.ActionableItemsColumnTest;
-import org.eclipse.osee.ats.column.AssigneeColumnUITest;
 import org.eclipse.osee.ats.column.BranchStatusColumnTest;
 import org.eclipse.osee.ats.column.CancelledDateColumnTest;
 import org.eclipse.osee.ats.column.CategoryColumnTest;
@@ -33,6 +32,7 @@ import org.eclipse.osee.ats.column.StateColumnTest;
 import org.eclipse.osee.ats.column.TargetedVersionColumnTest;
 import org.eclipse.osee.ats.column.TeamColumnTest;
 import org.eclipse.osee.ats.column.TypeColumnTest;
+import org.eclipse.osee.ats.util.DemoTestUtil;
 import org.eclipse.osee.framework.core.client.ClientSessionManager;
 import org.eclipse.osee.framework.jdk.core.util.OseeProperties;
 import org.junit.AfterClass;
@@ -59,7 +59,6 @@ import org.junit.runners.Suite;
    DeadlineColumnTest.class,
    CreatedDateColumnTest.class,
    ActionableItemsColumnTest.class,
-   AssigneeColumnUITest.class,
    BranchStatusColumnTest.class,
    CancelledDateColumnTest.class,
    CompletedDateColumnTest.class,
@@ -76,6 +75,7 @@ public class AtsTest_Demo_Column_Suite {
       assertTrue("Client must authenticate using demo protocol",
          ClientSessionManager.getSession().getAuthenticationProtocol().equals("demo"));
       System.out.println("\n\nBegin " + AtsTest_Demo_Column_Suite.class.getSimpleName());
+      DemoTestUtil.setUpTest();
    }
 
    @AfterClass
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/AtsTest_Demo_Config_Suite.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/AtsTest_Demo_Config_Suite.java
index a21bdd77437..44d21ca0685 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/AtsTest_Demo_Config_Suite.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/AtsTest_Demo_Config_Suite.java
@@ -15,6 +15,7 @@ import org.eclipse.osee.ats.config.copy.CopyAtsConfigurationOperationTest;
 import org.eclipse.osee.ats.config.copy.CopyAtsUtilTest;
 import org.eclipse.osee.ats.config.copy.CopyAtsValidationTest;
 import org.eclipse.osee.ats.core.client.config.AtsCoreClient_Config_Demo_PT_Suite;
+import org.eclipse.osee.ats.util.DemoTestUtil;
 import org.eclipse.osee.framework.jdk.core.util.OseeProperties;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -38,6 +39,7 @@ public class AtsTest_Demo_Config_Suite {
    public static void setUp() throws Exception {
       OseeProperties.setIsInTest(true);
       System.out.println("\n\nBegin " + AtsTest_Demo_Config_Suite.class.getSimpleName());
+      DemoTestUtil.setUpTest();
    }
 
    @AfterClass
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/AtsTest_Demo_StateItem_Suite.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/AtsTest_Demo_StateItem_Suite.java
index eb038c89b9d..e58d707e51f 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/AtsTest_Demo_StateItem_Suite.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/AtsTest_Demo_StateItem_Suite.java
@@ -15,6 +15,7 @@ import org.eclipse.osee.ats.editor.stateItem.AtsDecisionReviewPrepareStateItemTe
 import org.eclipse.osee.ats.editor.stateItem.AtsForceAssigneesToTeamLeadsStateItemTest;
 import org.eclipse.osee.ats.editor.stateItem.AtsPeerToPeerReviewPrepareStateItemTest;
 import org.eclipse.osee.ats.editor.stateItem.AtsPeerToPeerReviewReviewStateItemTest;
+import org.eclipse.osee.ats.util.DemoTestUtil;
 import org.eclipse.osee.framework.jdk.core.util.OseeProperties;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -38,6 +39,7 @@ public class AtsTest_Demo_StateItem_Suite {
    public static void setUp() throws Exception {
       OseeProperties.setIsInTest(true);
       System.out.println("\n\nBegin " + AtsTest_Demo_StateItem_Suite.class.getSimpleName());
+      DemoTestUtil.setUpTest();
    }
 
    @AfterClass
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/AtsTest_Demo_Suite.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/AtsTest_Demo_Suite.java
index 0952a83cf85..b87c1654e74 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/AtsTest_Demo_Suite.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/AtsTest_Demo_Suite.java
@@ -25,8 +25,8 @@ import org.eclipse.osee.ats.navigate.AtsNavigateItemsToWorldViewTest;
 import org.eclipse.osee.ats.render.RendererManagerTest;
 import org.eclipse.osee.ats.util.AtsDeleteManagerTest;
 import org.eclipse.osee.ats.util.AtsImageTest;
-import org.eclipse.osee.ats.util.AtsPurgeTest;
 import org.eclipse.osee.ats.util.AtsXWidgetsExampleBlamTest;
+import org.eclipse.osee.ats.util.DemoTestUtil;
 import org.eclipse.osee.ats.util.ImportActionsViaSpreadsheetTest;
 import org.eclipse.osee.ats.workflow.SMAPromptChangeStatusTest;
 import org.eclipse.osee.framework.core.client.ClientSessionManager;
@@ -38,11 +38,11 @@ import org.junit.runners.Suite;
 
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
-   AtsTest_Demo_Action_Suite.class,
-   AtsTest_Demo_Access_Suite.class,
    AtsNavigateItemsToMassEditorTest.class,
    AtsNavigateItemsToTaskEditorTest.class,
    AtsNavigateItemsToWorldViewTest.class,
+   AtsTest_Demo_Action_Suite.class,
+   AtsTest_Demo_Access_Suite.class,
    ImportActionsViaSpreadsheetTest.class,
    AtsTest_Demo_Column_Suite.class,
    AtsTest_Demo_Util_Suite.class,
@@ -58,11 +58,14 @@ import org.junit.runners.Suite;
    AtsBranchConfigurationTest.class,
    AtsValidateAtsDatabaseTest.class,
    AtsXWidgetsExampleBlamTest.class,
-   AtsPurgeTest.class,})
+//   AtsPurgeTest.class,
+//
+})
 /**
  * @author Donald G. Dunne
  */
 public class AtsTest_Demo_Suite {
+
    @BeforeClass
    public static void setUp() throws Exception {
       OseeProperties.setIsInTest(true);
@@ -71,6 +74,7 @@ public class AtsTest_Demo_Suite {
       assertTrue("Client must authenticate using demo protocol",
          ClientSessionManager.getSession().getAuthenticationProtocol().equals("demo"));
       System.out.println("\n\nBegin " + AtsTest_Demo_Suite.class.getSimpleName());
+      DemoTestUtil.setUpTest();
    }
 
    @AfterClass
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/AtsTest_Demo_Util_Suite.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/AtsTest_Demo_Util_Suite.java
index 58f8ee44825..510c581a5cc 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/AtsTest_Demo_Util_Suite.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/AtsTest_Demo_Util_Suite.java
@@ -11,6 +11,7 @@
 package org.eclipse.osee.ats;
 
 import org.eclipse.osee.ats.util.CreateActionUsingAllActionableItemsTest;
+import org.eclipse.osee.ats.util.DemoTestUtil;
 import org.eclipse.osee.framework.jdk.core.util.OseeProperties;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -27,6 +28,7 @@ public class AtsTest_Demo_Util_Suite {
    public static void setUp() throws Exception {
       OseeProperties.setIsInTest(true);
       System.out.println("\n\nBegin " + AtsTest_Demo_Util_Suite.class.getSimpleName());
+      DemoTestUtil.setUpTest();
    }
 
    @AfterClass
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/AtsTest_Demo_Action_Suite.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/AtsTest_Demo_Action_Suite.java
index d6a5ce1608c..88297116891 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/AtsTest_Demo_Action_Suite.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/AtsTest_Demo_Action_Suite.java
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.osee.ats.actions;
 
+import org.eclipse.osee.ats.util.DemoTestUtil;
 import org.eclipse.osee.framework.jdk.core.util.OseeProperties;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -70,6 +71,7 @@ public class AtsTest_Demo_Action_Suite {
    public static void setUp() throws Exception {
       OseeProperties.setIsInTest(true);
       System.out.println("\n\nBegin " + AtsTest_Demo_Action_Suite.class.getSimpleName());
+      DemoTestUtil.setUpTest();
    }
 
    @AfterClass
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/FavoriteActionTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/FavoriteActionTest.java
index a30a3cfaabb..eaa34bb2bb1 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/FavoriteActionTest.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/FavoriteActionTest.java
@@ -8,7 +8,7 @@ package org.eclipse.osee.ats.actions;
 import junit.framework.Assert;
 import org.eclipse.osee.ats.core.client.AtsTestUtil;
 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.framework.logging.SevereLoggingMonitor;
 import org.eclipse.osee.support.test.util.TestUtil;
 import org.junit.Test;
@@ -22,11 +22,11 @@ public class FavoriteActionTest extends AbstractAtsActionTest {
    public void test() throws Exception {
       SevereLoggingMonitor monitor = TestUtil.severeLoggingStart();
       AtsTestUtil.cleanupAndReset(getClass().getSimpleName());
-      Assert.assertFalse(AtsUsers.getOseeUser().getRelatedArtifacts(AtsRelationTypes.FavoriteUser_Artifact).contains(
+      Assert.assertFalse(AtsUsersClient.getOseeUser().getRelatedArtifacts(AtsRelationTypes.FavoriteUser_Artifact).contains(
          AtsTestUtil.getTeamWf()));
       FavoriteAction action = createAction();
       action.runWithException();
-      Assert.assertTrue(AtsUsers.getOseeUser().getRelatedArtifacts(AtsRelationTypes.FavoriteUser_Artifact).contains(
+      Assert.assertTrue(AtsUsersClient.getOseeUser().getRelatedArtifacts(AtsRelationTypes.FavoriteUser_Artifact).contains(
          AtsTestUtil.getTeamWf()));
       TestUtil.severeLoggingEnd(monitor);
    }
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/OpenInAtsWorkflowEditorActionTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/OpenInAtsWorkflowEditorActionTest.java
index 14418fad372..0dd14f225d5 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/OpenInAtsWorkflowEditorActionTest.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/OpenInAtsWorkflowEditorActionTest.java
@@ -6,7 +6,8 @@
 package org.eclipse.osee.ats.actions;
 
 import org.eclipse.osee.ats.core.client.AtsTestUtil;
-
+import org.eclipse.osee.ats.editor.SMAEditor;
+import org.junit.After;
 
 /**
  * @author Donald G. Dunne
@@ -18,4 +19,8 @@ public class OpenInAtsWorkflowEditorActionTest extends AbstractAtsActionRunTest
       return new OpenInAtsWorkflowEditorAction(AtsTestUtil.getSelectedAtsArtifactsForTeamWf());
    }
 
+   @After
+   public void closeEditors() {
+      SMAEditor.closeAll();
+   }
 }
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/ResourceHistoryActionTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/ResourceHistoryActionTest.java
index c70591aa634..c2b0aef4d1d 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/ResourceHistoryActionTest.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/ResourceHistoryActionTest.java
@@ -8,7 +8,7 @@ package org.eclipse.osee.ats.actions;
 import junit.framework.Assert;
 import org.eclipse.osee.ats.core.client.AtsTestUtil;
 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.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.logging.SevereLoggingMonitor;
 import org.eclipse.osee.support.test.util.TestUtil;
@@ -23,7 +23,7 @@ public class ResourceHistoryActionTest extends AbstractAtsActionTest {
    public void test() throws Exception {
       SevereLoggingMonitor monitor = TestUtil.severeLoggingStart();
       AtsTestUtil.cleanupAndReset(getClass().getSimpleName());
-      Assert.assertFalse(AtsUsers.getOseeUser().getRelatedArtifacts(AtsRelationTypes.FavoriteUser_Artifact).contains(
+      Assert.assertFalse(AtsUsersClient.getOseeUser().getRelatedArtifacts(AtsRelationTypes.FavoriteUser_Artifact).contains(
          AtsTestUtil.getTeamWf()));
       ResourceHistoryAction action = createAction();
       action.runWithException();
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/SubscribedActionTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/SubscribedActionTest.java
index dc555ed7bf3..9a26a0ac79c 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/SubscribedActionTest.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/SubscribedActionTest.java
@@ -8,7 +8,7 @@ package org.eclipse.osee.ats.actions;
 import junit.framework.Assert;
 import org.eclipse.osee.ats.core.client.AtsTestUtil;
 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.framework.logging.SevereLoggingMonitor;
 import org.eclipse.osee.support.test.util.TestUtil;
 import org.junit.Test;
@@ -22,11 +22,11 @@ public class SubscribedActionTest extends AbstractAtsActionTest {
    public void test() throws Exception {
       SevereLoggingMonitor monitor = TestUtil.severeLoggingStart();
       AtsTestUtil.cleanupAndReset(getClass().getSimpleName());
-      Assert.assertFalse(AtsUsers.getOseeUser().getRelatedArtifacts(AtsRelationTypes.SubscribedUser_Artifact).contains(
+      Assert.assertFalse(AtsUsersClient.getOseeUser().getRelatedArtifacts(AtsRelationTypes.SubscribedUser_Artifact).contains(
          AtsTestUtil.getTeamWf()));
       SubscribedAction action = createAction();
       action.runWithException();
-      Assert.assertTrue(AtsUsers.getOseeUser().getRelatedArtifacts(AtsRelationTypes.SubscribedUser_Artifact).contains(
+      Assert.assertTrue(AtsUsersClient.getOseeUser().getRelatedArtifacts(AtsRelationTypes.SubscribedUser_Artifact).contains(
          AtsTestUtil.getTeamWf()));
       TestUtil.severeLoggingEnd(monitor);
    }
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/artifact/log/LogItemTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/artifact/log/LogItemTest.java
index c9fdf3a4124..3a4f95d5a90 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/artifact/log/LogItemTest.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/artifact/log/LogItemTest.java
@@ -11,7 +11,7 @@
 package org.eclipse.osee.ats.artifact.log;
 
 import java.util.Date;
-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.workflow.log.LogItem;
 import org.eclipse.osee.ats.core.client.workflow.log.LogType;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
@@ -36,8 +36,8 @@ public class LogItemTest {
    public static void validateItem(LogItem item, Date date) throws OseeCoreException {
       Assert.assertEquals(LogType.Error, item.getType());
       Assert.assertEquals(date, item.getDate());
-      Assert.assertEquals(AtsUsers.getUser(), item.getUser());
-      Assert.assertEquals(AtsUsers.getUser().getUserId(), item.getUserId());
+      Assert.assertEquals(AtsUsersClient.getUser(), item.getUser());
+      Assert.assertEquals(AtsUsersClient.getUser().getUserId(), item.getUserId());
       Assert.assertEquals("Analyze", item.getState());
       Assert.assertEquals("my msg", item.getMsg());
    }
@@ -46,7 +46,7 @@ public class LogItemTest {
    public void testLogItemLogTypeStringStringStringStringString() throws OseeCoreException {
       Date date = new Date();
       LogItem item =
-         new LogItem(LogType.Error, String.valueOf(date.getTime()), AtsUsers.getUser().getUserId(), "Analyze",
+         new LogItem(LogType.Error, String.valueOf(date.getTime()), AtsUsersClient.getUser().getUserId(), "Analyze",
             "my msg", "ASDF4");
 
       validateItem(item, date);
@@ -56,14 +56,14 @@ public class LogItemTest {
    public void testLogItemStringStringStringStringStringString() throws OseeCoreException {
       Date date = new Date();
       LogItem item =
-         new LogItem(LogType.Error.name(), String.valueOf(date.getTime()), AtsUsers.getUser().getUserId(), "Analyze",
+         new LogItem(LogType.Error.name(), String.valueOf(date.getTime()), AtsUsersClient.getUser().getUserId(), "Analyze",
             "my msg", "ASDF4");
 
       validateItem(item, date);
    }
 
    public static LogItem getTestLogItem(Date date) throws OseeCoreException {
-      return new LogItem(LogType.Error, date, AtsUsers.getUser(), "Analyze", "my msg", "ASDF4");
+      return new LogItem(LogType.Error, date, AtsUsersClient.getUser(), "Analyze", "my msg", "ASDF4");
    }
 
    @Test
@@ -72,7 +72,7 @@ public class LogItemTest {
       LogItem item = getTestLogItem(date);
 
       Assert.assertEquals(
-         "my msg (Error)from Analyze by " + AtsUsers.getUser().getName() + " on " + DateUtil.getMMDDYYHHMM(date),
+         "my msg (Error)from Analyze by " + AtsUsersClient.getUser().getName() + " on " + DateUtil.getMMDDYYHHMM(date),
          item.toString());
    }
 
@@ -81,7 +81,7 @@ public class LogItemTest {
       Date date = new Date();
       LogItem item = getTestLogItem(date);
 
-      Assert.assertEquals("NOTE (Error): my msg (" + AtsUsers.getUser().getName() + ")", item.toHTML(AHTML.LABEL_FONT));
+      Assert.assertEquals("NOTE (Error): my msg (" + AtsUsersClient.getUser().getName() + ")", item.toHTML(AHTML.LABEL_FONT));
    }
 
 }
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/artifact/note/NoteItemTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/artifact/note/NoteItemTest.java
index 2da8ea70ffd..a4aa33a55ed 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/artifact/note/NoteItemTest.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/artifact/note/NoteItemTest.java
@@ -13,7 +13,7 @@ package org.eclipse.osee.ats.artifact.note;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
-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.workflow.note.NoteItem;
 import org.eclipse.osee.ats.core.client.workflow.note.NoteType;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
@@ -30,26 +30,26 @@ public class NoteItemTest {
    public void testNoteItemNoteTypeStringStringUserString() throws OseeCoreException {
       Date date = new Date();
       NoteItem item =
-         new NoteItem(NoteType.Comment, "Implement", String.valueOf(date.getTime()), AtsUsers.getUser(), "my msg");
+         new NoteItem(NoteType.Comment, "Implement", String.valueOf(date.getTime()), AtsUsersClient.getUser(), "my msg");
       validate(item, date);
    }
 
    public static void validate(NoteItem item, Date date) throws OseeCoreException {
       Assert.assertEquals(NoteType.Comment, item.getType());
       Assert.assertEquals("Implement", item.getState());
-      Assert.assertEquals(AtsUsers.getUser(), item.getUser());
+      Assert.assertEquals(AtsUsersClient.getUser(), item.getUser());
       Assert.assertEquals("my msg", item.getMsg());
    }
 
    public static NoteItem getTestNoteItem(Date date) throws OseeCoreException {
-      return new NoteItem(NoteType.Comment, "Implement", String.valueOf(date.getTime()), AtsUsers.getUser(), "my msg");
+      return new NoteItem(NoteType.Comment, "Implement", String.valueOf(date.getTime()), AtsUsersClient.getUser(), "my msg");
    }
 
    @Test
    public void testNoteItemStringStringStringUserString() throws OseeCoreException {
       Date date = new Date();
       NoteItem item =
-         new NoteItem(NoteType.Comment.name(), "Implement", String.valueOf(date.getTime()), AtsUsers.getUser(),
+         new NoteItem(NoteType.Comment.name(), "Implement", String.valueOf(date.getTime()), AtsUsersClient.getUser(),
             "my msg");
       validate(item, date);
    }
@@ -60,7 +60,7 @@ public class NoteItemTest {
       NoteItem item = getTestNoteItem(date);
 
       Assert.assertEquals(
-         "Note: Comment from " + AtsUsers.getUser().getName() + " for \"Implement\" on " + DateUtil.getMMDDYYHHMM(date) + " - my msg",
+         "Note: Comment from " + AtsUsersClient.getUser().getName() + " for \"Implement\" on " + DateUtil.getMMDDYYHHMM(date) + " - my msg",
          item.toString());
    }
 
@@ -69,14 +69,14 @@ public class NoteItemTest {
       Date date = new Date();
       NoteItem item = getTestNoteItem(date);
       NoteItem item2 =
-         new NoteItem(NoteType.Question.name(), "Analyze", String.valueOf(date.getTime()), AtsUsers.getUser(),
+         new NoteItem(NoteType.Question.name(), "Analyze", String.valueOf(date.getTime()), AtsUsersClient.getUser(),
             "another message");
 
       String xml = NoteItem.toXml(Arrays.asList(item, item2));
       Assert.assertEquals(
          "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?><AtsNote>" + //
-         "<Item date=\"" + date.getTime() + "\" msg=\"my msg\" state=\"Implement\" type=\"Comment\" userId=\"" + AtsUsers.getUser().getUserId() + "\"/>" + //
-         "<Item date=\"" + date.getTime() + "\" msg=\"another message\" state=\"Analyze\" type=\"Question\" userId=\"" + AtsUsers.getUser().getUserId() + "\"/></AtsNote>",
+         "<Item date=\"" + date.getTime() + "\" msg=\"my msg\" state=\"Implement\" type=\"Comment\" userId=\"" + AtsUsersClient.getUser().getUserId() + "\"/>" + //
+         "<Item date=\"" + date.getTime() + "\" msg=\"another message\" state=\"Analyze\" type=\"Question\" userId=\"" + AtsUsersClient.getUser().getUserId() + "\"/></AtsNote>",
          xml);
 
       List<NoteItem> items = NoteItem.fromXml(xml, "ASDF4");
@@ -85,7 +85,7 @@ public class NoteItemTest {
       NoteItem fromXmlItem2 = items.get(1);
       Assert.assertEquals(NoteType.Question, fromXmlItem2.getType());
       Assert.assertEquals("Analyze", fromXmlItem2.getState());
-      Assert.assertEquals(AtsUsers.getUser(), fromXmlItem2.getUser());
+      Assert.assertEquals(AtsUsersClient.getUser(), fromXmlItem2.getUser());
       Assert.assertEquals("another message", fromXmlItem2.getMsg());
 
    }
@@ -96,7 +96,7 @@ public class NoteItemTest {
       NoteItem item = getTestNoteItem(date);
 
       Assert.assertEquals(
-         "<b>Note:</b>Comment from " + AtsUsers.getUser().getName() + " for \"Implement\" on " + DateUtil.getMMDDYYHHMM(date) + " - my msg",
+         "<b>Note:</b>Comment from " + AtsUsersClient.getUser().getName() + " for \"Implement\" on " + DateUtil.getMMDDYYHHMM(date) + " - my msg",
          item.toHTML());
    }
 
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/AssigneeColumnUITest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/AssigneeColumnUITest.java
index cff1f259734..f9733d9ffed 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/AssigneeColumnUITest.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/AssigneeColumnUITest.java
@@ -21,7 +21,7 @@ import org.eclipse.osee.support.test.util.TestUtil;
 import org.junit.Assert;
 
 /**
- * @tests AssigneeColumn
+ * @tests AssigneeColumnUI
  * @author Donald G. Dunne
  */
 public class AssigneeColumnUITest {
@@ -33,12 +33,12 @@ public class AssigneeColumnUITest {
       TeamWorkFlowArtifact codeArt =
          (TeamWorkFlowArtifact) DemoTestUtil.getUncommittedActionWorkflow(DemoWorkType.Code);
       Assert.assertEquals("Joe Smith",
-         AssigneeColumn.getInstance().getColumnText(codeArt, AssigneeColumn.getInstance(), 0));
+         AssigneeColumnUI.getInstance().getColumnText(codeArt, AssigneeColumnUI.getInstance(), 0));
 
       Artifact actionArt = codeArt.getParentActionArtifact();
       List<String> results = Arrays.asList("Kay Jones; Joe Smith", "Joe Smith; Kay Jones");
-      Assert.assertTrue(results.contains(AssigneeColumn.getInstance().getColumnText(actionArt,
-         AssigneeColumn.getInstance(), 0)));
+      Assert.assertTrue(results.contains(AssigneeColumnUI.getInstance().getColumnText(actionArt,
+         AssigneeColumnUI.getInstance(), 0)));
 
       TestUtil.severeLoggingEnd(loggingMonitor);
    }
@@ -48,13 +48,14 @@ public class AssigneeColumnUITest {
 
       TeamWorkFlowArtifact codeArt =
          (TeamWorkFlowArtifact) DemoTestUtil.getUncommittedActionWorkflow(DemoWorkType.Code);
-      Assert.assertNotNull(ActionableItemsColumn.getInstance().getColumnImage(codeArt, AssigneeColumn.getInstance(), 0));
+      Assert.assertNotNull(ActionableItemsColumn.getInstance().getColumnImage(codeArt, AssigneeColumnUI.getInstance(),
+         0));
 
       Artifact actionArt = codeArt.getParentActionArtifact();
-      Assert.assertNotNull(ActionableItemsColumn.getInstance().getColumnImage(actionArt, AssigneeColumn.getInstance(),
-         0));
+      Assert.assertNotNull(ActionableItemsColumn.getInstance().getColumnImage(actionArt,
+         AssigneeColumnUI.getInstance(), 0));
 
-      Assert.assertNull(ActionableItemsColumn.getInstance().getColumnImage("String", AssigneeColumn.getInstance(), 0));
+      Assert.assertNull(ActionableItemsColumn.getInstance().getColumnImage("String", AssigneeColumnUI.getInstance(), 0));
 
       TestUtil.severeLoggingEnd(loggingMonitor);
    }
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/BranchStatusColumnTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/BranchStatusColumnTest.java
index 208eeed75f0..3cc18cca23c 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/BranchStatusColumnTest.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/BranchStatusColumnTest.java
@@ -31,20 +31,21 @@ public class BranchStatusColumnTest {
       TeamWorkFlowArtifact reqArt =
          (TeamWorkFlowArtifact) DemoTestUtil.getUncommittedActionWorkflow(DemoWorkType.Requirements);
       Assert.assertEquals("Working",
-         BranchStatusColumn.getInstance().getColumnText(reqArt, AssigneeColumn.getInstance(), 0));
+         BranchStatusColumn.getInstance().getColumnText(reqArt, BranchStatusColumn.getInstance(), 0));
 
       TeamWorkFlowArtifact testArt =
          (TeamWorkFlowArtifact) DemoTestUtil.getUncommittedActionWorkflow(DemoWorkType.Test);
-      Assert.assertEquals("", BranchStatusColumn.getInstance().getColumnText(testArt, AssigneeColumn.getInstance(), 0));
+      Assert.assertEquals("",
+         BranchStatusColumn.getInstance().getColumnText(testArt, BranchStatusColumn.getInstance(), 0));
 
       Artifact actionArt = reqArt.getParentActionArtifact();
       Assert.assertEquals("Working",
-         BranchStatusColumn.getInstance().getColumnText(actionArt, AssigneeColumn.getInstance(), 0));
+         BranchStatusColumn.getInstance().getColumnText(actionArt, BranchStatusColumn.getInstance(), 0));
 
       TeamWorkFlowArtifact reqArt2 =
          (TeamWorkFlowArtifact) DemoTestUtil.getCommittedActionWorkflow(DemoWorkType.Requirements);
       Assert.assertEquals("Committed",
-         BranchStatusColumn.getInstance().getColumnText(reqArt2, AssigneeColumn.getInstance(), 0));
+         BranchStatusColumn.getInstance().getColumnText(reqArt2, BranchStatusColumn.getInstance(), 0));
 
       TestUtil.severeLoggingEnd(loggingMonitor);
    }
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/CancelledDateColumnTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/CancelledDateColumnTest.java
index 6262bd0bb66..592b30cae54 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/CancelledDateColumnTest.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/CancelledDateColumnTest.java
@@ -16,7 +16,7 @@ import java.util.Date;
 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.util.AtsUsers;
+import org.eclipse.osee.ats.core.client.util.AtsUsersClient;
 import org.eclipse.osee.ats.core.client.workflow.transition.TransitionHelper;
 import org.eclipse.osee.ats.core.client.workflow.transition.TransitionManager;
 import org.eclipse.osee.ats.core.client.workflow.transition.TransitionOption;
@@ -54,7 +54,8 @@ public class CancelledDateColumnTest {
          DemoTestUtil.createSimpleAction(CancelledDateColumnTest.class.getSimpleName(), transaction);
       transaction.execute();
 
-      Assert.assertEquals("", CancelledDateColumn.getInstance().getColumnText(teamArt, AssigneeColumn.getInstance(), 0));
+      Assert.assertEquals("",
+         CancelledDateColumn.getInstance().getColumnText(teamArt, CancelledDateColumn.getInstance(), 0));
       Date date = CancelledDateColumn.getDate(teamArt);
       Assert.assertNull(date);
       Assert.assertEquals("", CancelledDateColumn.getDateStr(teamArt));
@@ -71,11 +72,11 @@ public class CancelledDateColumnTest {
       Assert.assertNotNull(date);
       Assert.assertEquals(DateUtil.getMMDDYYHHMM(date), CancelledDateColumn.getDateStr(teamArt));
       Assert.assertEquals(DateUtil.getMMDDYYHHMM(date),
-         CancelledDateColumn.getInstance().getColumnText(teamArt, AssigneeColumn.getInstance(), 0));
+         CancelledDateColumn.getInstance().getColumnText(teamArt, CancelledDateColumn.getInstance(), 0));
 
       helper =
          new TransitionHelper("Transition to Endorse", Arrays.asList(teamArt), TeamState.Endorse.getPageName(),
-            Collections.singleton(AtsUsers.getUser()), null, TransitionOption.OverrideTransitionValidityCheck,
+            Collections.singleton(AtsUsersClient.getUser()), null, TransitionOption.OverrideTransitionValidityCheck,
             TransitionOption.OverrideAssigneeCheck);
       transitionMgr = new TransitionManager(helper);
       results = transitionMgr.handleAll();
@@ -83,7 +84,7 @@ public class CancelledDateColumnTest {
       transitionMgr.getTransaction().execute();
 
       Assert.assertEquals("Cancelled date should be blank again", "",
-         CancelledDateColumn.getInstance().getColumnText(teamArt, AssigneeColumn.getInstance(), 0));
+         CancelledDateColumn.getInstance().getColumnText(teamArt, CancelledDateColumn.getInstance(), 0));
       date = CancelledDateColumn.getDate(teamArt);
       Assert.assertNull(date);
 
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/CompletedDateColumnTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/CompletedDateColumnTest.java
index 7786d07d85b..084dd4fa6eb 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/CompletedDateColumnTest.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/CompletedDateColumnTest.java
@@ -15,7 +15,7 @@ import java.util.Date;
 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.util.AtsUsers;
+import org.eclipse.osee.ats.core.client.util.AtsUsersClient;
 import org.eclipse.osee.ats.core.client.workflow.transition.TransitionHelper;
 import org.eclipse.osee.ats.core.client.workflow.transition.TransitionManager;
 import org.eclipse.osee.ats.core.client.workflow.transition.TransitionOption;
@@ -53,7 +53,8 @@ public class CompletedDateColumnTest {
          DemoTestUtil.createSimpleAction(CompletedDateColumnTest.class.getSimpleName(), transaction);
       transaction.execute();
 
-      Assert.assertEquals("", CompletedDateColumn.getInstance().getColumnText(teamArt, AssigneeColumn.getInstance(), 0));
+      Assert.assertEquals("",
+         CompletedDateColumn.getInstance().getColumnText(teamArt, CompletedDateColumn.getInstance(), 0));
       Date date = CompletedDateColumn.getDate(teamArt);
       Assert.assertNull(date);
       Assert.assertEquals("", CompletedDateColumn.getDateStr(teamArt));
@@ -70,11 +71,11 @@ public class CompletedDateColumnTest {
       Assert.assertNotNull(date);
       Assert.assertEquals(DateUtil.getMMDDYYHHMM(date), CompletedDateColumn.getDateStr(teamArt));
       Assert.assertEquals(DateUtil.getMMDDYYHHMM(date),
-         CompletedDateColumn.getInstance().getColumnText(teamArt, AssigneeColumn.getInstance(), 0));
+         CompletedDateColumn.getInstance().getColumnText(teamArt, CompletedDateColumn.getInstance(), 0));
 
       helper =
          new TransitionHelper("Transition to Endorse", Arrays.asList(teamArt), TeamState.Endorse.getPageName(),
-            Arrays.asList(AtsUsers.getUser()), null, TransitionOption.OverrideTransitionValidityCheck,
+            Arrays.asList(AtsUsersClient.getUser()), null, TransitionOption.OverrideTransitionValidityCheck,
             TransitionOption.OverrideAssigneeCheck);
       transitionMgr = new TransitionManager(helper);
       results = transitionMgr.handleAll();
@@ -82,7 +83,7 @@ public class CompletedDateColumnTest {
       transitionMgr.getTransaction().execute();
 
       Assert.assertEquals("Cancelled date should be blank again", "",
-         CompletedDateColumn.getInstance().getColumnText(teamArt, AssigneeColumn.getInstance(), 0));
+         CompletedDateColumn.getInstance().getColumnText(teamArt, CompletedDateColumn.getInstance(), 0));
       date = CompletedDateColumn.getDate(teamArt);
       Assert.assertNull(date);
 
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/CreatedDateColumnTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/CreatedDateColumnTest.java
index 39e9fd9283f..fb8319bf8d6 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/CreatedDateColumnTest.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/CreatedDateColumnTest.java
@@ -32,7 +32,7 @@ public class CreatedDateColumnTest {
 
       TeamWorkFlowArtifact codeArt =
          (TeamWorkFlowArtifact) DemoTestUtil.getUncommittedActionWorkflow(DemoWorkType.Code);
-      Assert.assertNotNull(CreatedDateColumn.getInstance().getColumnText(codeArt, AssigneeColumn.getInstance(), 0));
+      Assert.assertNotNull(CreatedDateColumn.getInstance().getColumnText(codeArt, CreatedDateColumn.getInstance(), 0));
       Date date = CreatedDateColumn.getDate(codeArt);
       Assert.assertNotNull(date);
       Assert.assertEquals(DateUtil.getMMDDYYHHMM(date), CreatedDateColumn.getDateStr(codeArt));
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/DescriptionColumnTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/DescriptionColumnTest.java
index 97cd641ebab..421d5163441 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/DescriptionColumnTest.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/DescriptionColumnTest.java
@@ -31,11 +31,11 @@ public class DescriptionColumnTest {
       TeamWorkFlowArtifact reqArt =
          (TeamWorkFlowArtifact) DemoTestUtil.getUncommittedActionWorkflow(DemoWorkType.Requirements);
       Assert.assertEquals("Problem with the Diagram View",
-         DescriptionColumn.getInstance().getColumnText(reqArt, AssigneeColumn.getInstance(), 0));
+         DescriptionColumn.getInstance().getColumnText(reqArt, DescriptionColumn.getInstance(), 0));
 
       Artifact actionArt = reqArt.getParentActionArtifact();
       Assert.assertEquals("Problem with the Diagram View",
-         DescriptionColumn.getInstance().getColumnText(actionArt, AssigneeColumn.getInstance(), 0));
+         DescriptionColumn.getInstance().getColumnText(actionArt, DescriptionColumn.getInstance(), 0));
 
       TestUtil.severeLoggingEnd(loggingMonitor);
    }
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/EstimatedHoursColumnTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/EstimatedHoursColumnTest.java
index a70560da96f..4b73ba04b4e 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/EstimatedHoursColumnTest.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/EstimatedHoursColumnTest.java
@@ -17,7 +17,7 @@ import org.eclipse.osee.ats.core.client.review.PeerToPeerReviewManager;
 import org.eclipse.osee.ats.core.client.task.TaskArtifact;
 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.workflow.EstimatedHoursUtil;
 import org.eclipse.osee.ats.util.AtsUtil;
 import org.eclipse.osee.ats.util.DemoTestUtil;
@@ -55,10 +55,10 @@ public class EstimatedHoursColumnTest {
       TeamWorkFlowArtifact teamArt2 =
          DemoTestUtil.addTeamWorkflow(actionArt, EstimatedHoursColumnTest.class.getSimpleName(), transaction);
       TaskArtifact taskArt1 =
-         teamArt1.createNewTask(EstimatedHoursColumnTest.class.getSimpleName(), new Date(), AtsUsers.getUser());
+         teamArt1.createNewTask(EstimatedHoursColumnTest.class.getSimpleName(), new Date(), AtsUsersClient.getUser());
       taskArt1.persist(transaction);
       TaskArtifact taskArt2 =
-         teamArt1.createNewTask(EstimatedHoursColumnTest.class.getSimpleName(), new Date(), AtsUsers.getUser());
+         teamArt1.createNewTask(EstimatedHoursColumnTest.class.getSimpleName(), new Date(), AtsUsersClient.getUser());
       taskArt2.persist(transaction);
       PeerToPeerReviewArtifact peerArt =
          PeerToPeerReviewManager.createNewPeerToPeerReview(teamArt1, getClass().getSimpleName(),
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/GroupsColumnTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/GroupsColumnTest.java
index 881f29ee62e..33c0e37995a 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/GroupsColumnTest.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/GroupsColumnTest.java
@@ -30,12 +30,11 @@ public class GroupsColumnTest {
 
       TeamWorkFlowArtifact reqArt =
          (TeamWorkFlowArtifact) DemoTestUtil.getUncommittedActionWorkflow(DemoWorkType.Requirements);
-      Assert.assertEquals("Test Group",
-         GroupsColumn.getInstance().getColumnText(reqArt, AssigneeColumn.getInstance(), 0));
+      Assert.assertEquals("Test Group", GroupsColumn.getInstance().getColumnText(reqArt, GroupsColumn.getInstance(), 0));
 
       Artifact actionArt = reqArt.getParentActionArtifact();
       Assert.assertEquals("Test Group",
-         GroupsColumn.getInstance().getColumnText(actionArt, AssigneeColumn.getInstance(), 0));
+         GroupsColumn.getInstance().getColumnText(actionArt, GroupsColumn.getInstance(), 0));
 
       TestUtil.severeLoggingEnd(loggingMonitor);
    }
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/OriginatorColumnTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/OriginatorColumnTest.java
index 51346d6ac97..082fd0f0769 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/OriginatorColumnTest.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/OriginatorColumnTest.java
@@ -33,11 +33,11 @@ public class OriginatorColumnTest {
       TeamWorkFlowArtifact reqArt =
          (TeamWorkFlowArtifact) DemoTestUtil.getUncommittedActionWorkflow(DemoWorkType.Requirements);
       Assert.assertEquals(UserManager.getUser(DemoUsers.Joe_Smith).getName(),
-         OriginatorColumn.getInstance().getColumnText(reqArt, AssigneeColumn.getInstance(), 0));
+         OriginatorColumn.getInstance().getColumnText(reqArt, OriginatorColumn.getInstance(), 0));
 
       Artifact actionArt = reqArt.getParentActionArtifact();
       Assert.assertEquals(UserManager.getUser(DemoUsers.Joe_Smith).getName(),
-         OriginatorColumn.getInstance().getColumnText(actionArt, AssigneeColumn.getInstance(), 0));
+         OriginatorColumn.getInstance().getColumnText(actionArt, OriginatorColumn.getInstance(), 0));
 
       TestUtil.severeLoggingEnd(loggingMonitor);
    }
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/ParentStateAndIdColumnTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/ParentStateAndIdColumnTest.java
index e68346a0ce1..f81b35907b2 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/ParentStateAndIdColumnTest.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/ParentStateAndIdColumnTest.java
@@ -36,18 +36,19 @@ public class ParentStateAndIdColumnTest {
          (TeamWorkFlowArtifact) DemoTestUtil.getUncommittedActionWorkflow(DemoWorkType.Code);
       Artifact actionArt = codeArt.getParentActionArtifact();
 
-      Assert.assertEquals("", ParentStateColumn.getInstance().getColumnText(codeArt, AssigneeColumn.getInstance(), 0));
+      Assert.assertEquals("", ParentStateColumn.getInstance().getColumnText(codeArt, ParentHridColumn.getInstance(), 0));
       Assert.assertEquals(actionArt.getHumanReadableId(),
-         ParentHridColumn.getInstance().getColumnText(codeArt, AssigneeColumn.getInstance(), 0));
+         ParentHridColumn.getInstance().getColumnText(codeArt, ParentHridColumn.getInstance(), 0));
 
       PeerToPeerReviewArtifact peerArt =
          (PeerToPeerReviewArtifact) codeArt.getRelatedArtifact(AtsRelationTypes.TeamWorkflowToReview_Review);
       Assert.assertEquals(TeamState.Implement.getPageName(),
-         ParentStateColumn.getInstance().getColumnText(peerArt, AssigneeColumn.getInstance(), 0));
+         ParentStateColumn.getInstance().getColumnText(peerArt, ParentHridColumn.getInstance(), 0));
       Assert.assertEquals(codeArt.getHumanReadableId(),
-         ParentHridColumn.getInstance().getColumnText(peerArt, AssigneeColumn.getInstance(), 0));
+         ParentHridColumn.getInstance().getColumnText(peerArt, ParentHridColumn.getInstance(), 0));
 
-      Assert.assertEquals("", ParentStateColumn.getInstance().getColumnText(actionArt, AssigneeColumn.getInstance(), 0));
+      Assert.assertEquals("",
+         ParentStateColumn.getInstance().getColumnText(actionArt, ParentHridColumn.getInstance(), 0));
 
       TestUtil.severeLoggingEnd(loggingMonitor);
    }
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/PeerToPeerReviewColumnsTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/PeerToPeerReviewColumnsTest.java
index de04f1a557e..7dc70ce0eff 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/PeerToPeerReviewColumnsTest.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/PeerToPeerReviewColumnsTest.java
@@ -25,7 +25,7 @@ import org.eclipse.osee.ats.core.client.review.role.Role;
 import org.eclipse.osee.ats.core.client.review.role.UserRole;
 import org.eclipse.osee.ats.core.client.review.role.UserRoleManager;
 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.util.AtsUtil;
 import org.eclipse.osee.ats.util.DemoTestUtil;
 import org.eclipse.osee.framework.logging.SevereLoggingMonitor;
@@ -73,50 +73,50 @@ public class PeerToPeerReviewColumnsTest {
       transaction =
          TransactionManager.createTransaction(AtsUtil.getAtsBranch(), PeerToPeerReviewColumnsTest.class.getSimpleName());
       ReviewDefectItem item =
-         new ReviewDefectItem(AtsUsers.getUser(), Severity.Issue, Disposition.None, InjectionActivity.Code,
+         new ReviewDefectItem(AtsUsersClient.getUser(), Severity.Issue, Disposition.None, InjectionActivity.Code,
             "description", "resolution", "location", new Date());
       ReviewDefectManager defectManager = new ReviewDefectManager(peerArt);
       defectManager.addOrUpdateDefectItem(item);
       item =
-         new ReviewDefectItem(AtsUsers.getUser(), Severity.Issue, Disposition.None, InjectionActivity.Code,
+         new ReviewDefectItem(AtsUsersClient.getUser(), Severity.Issue, Disposition.None, InjectionActivity.Code,
             "description 2", "resolution", "location", new Date());
       defectManager.addOrUpdateDefectItem(item);
       item =
-         new ReviewDefectItem(AtsUsers.getUser(), Severity.Issue, Disposition.None, InjectionActivity.Code,
+         new ReviewDefectItem(AtsUsersClient.getUser(), Severity.Issue, Disposition.None, InjectionActivity.Code,
             "description 3", "resolution", "location", new Date());
       defectManager.addOrUpdateDefectItem(item);
       item =
-         new ReviewDefectItem(AtsUsers.getUser(), Severity.Issue, Disposition.None, InjectionActivity.Code,
+         new ReviewDefectItem(AtsUsersClient.getUser(), Severity.Issue, Disposition.None, InjectionActivity.Code,
             "description 34", "resolution", "location", new Date());
       defectManager.addOrUpdateDefectItem(item);
       item =
-         new ReviewDefectItem(AtsUsers.getUser(), Severity.Major, Disposition.None, InjectionActivity.Code,
+         new ReviewDefectItem(AtsUsersClient.getUser(), Severity.Major, Disposition.None, InjectionActivity.Code,
             "description 4", "resolution", "location", new Date());
       defectManager.addOrUpdateDefectItem(item);
       item =
-         new ReviewDefectItem(AtsUsers.getUser(), Severity.Minor, Disposition.None, InjectionActivity.Code,
+         new ReviewDefectItem(AtsUsersClient.getUser(), Severity.Minor, Disposition.None, InjectionActivity.Code,
             "description 5", "resolution", "location", new Date());
       defectManager.addOrUpdateDefectItem(item);
       item =
-         new ReviewDefectItem(AtsUsers.getUser(), Severity.Minor, Disposition.None, InjectionActivity.Code,
+         new ReviewDefectItem(AtsUsersClient.getUser(), Severity.Minor, Disposition.None, InjectionActivity.Code,
             "description 6", "resolution", "location", new Date());
       defectManager.addOrUpdateDefectItem(item);
       item =
-         new ReviewDefectItem(AtsUsers.getUser(), Severity.Minor, Disposition.None, InjectionActivity.Code,
+         new ReviewDefectItem(AtsUsersClient.getUser(), Severity.Minor, Disposition.None, InjectionActivity.Code,
             "description 6", "resolution", "location", new Date());
       defectManager.addOrUpdateDefectItem(item);
       defectManager.saveToArtifact(peerArt);
 
-      UserRole role = new UserRole(Role.Author, AtsUsers.getUserFromToken(DemoUsers.Alex_Kay));
+      UserRole role = new UserRole(Role.Author, AtsUsersClient.getUserFromToken(DemoUsers.Alex_Kay));
       UserRoleManager roleMgr = new UserRoleManager(peerArt);
       roleMgr.addOrUpdateUserRole(role);
 
-      role = new UserRole(Role.Moderator, AtsUsers.getUserFromToken(DemoUsers.Jason_Michael));
+      role = new UserRole(Role.Moderator, AtsUsersClient.getUserFromToken(DemoUsers.Jason_Michael));
       roleMgr.addOrUpdateUserRole(role);
 
-      role = new UserRole(Role.Reviewer, AtsUsers.getUserFromToken(DemoUsers.Joe_Smith));
+      role = new UserRole(Role.Reviewer, AtsUsersClient.getUserFromToken(DemoUsers.Joe_Smith));
       roleMgr.addOrUpdateUserRole(role);
-      role = new UserRole(Role.Reviewer, AtsUsers.getUserFromToken(DemoUsers.Kay_Jones));
+      role = new UserRole(Role.Reviewer, AtsUsersClient.getUserFromToken(DemoUsers.Kay_Jones));
       roleMgr.addOrUpdateUserRole(role);
       roleMgr.saveToArtifact(transaction);
       peerArt.persist(transaction);
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/PriorityColumnTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/PriorityColumnTest.java
index ff8d726f7b9..8b58fea4caa 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/PriorityColumnTest.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/PriorityColumnTest.java
@@ -33,22 +33,22 @@ public class PriorityColumnTest {
 
       TeamWorkFlowArtifact reqArt =
          (TeamWorkFlowArtifact) DemoTestUtil.getUncommittedActionWorkflow(DemoWorkType.Requirements);
-      Assert.assertEquals("3", PriorityColumn.getInstance().getColumnText(reqArt, AssigneeColumn.getInstance(), 0));
+      Assert.assertEquals("3", PriorityColumn.getInstance().getColumnText(reqArt, PriorityColumn.getInstance(), 0));
 
       TeamWorkFlowArtifact codeArt =
          (TeamWorkFlowArtifact) DemoTestUtil.getUncommittedActionWorkflow(DemoWorkType.Code);
-      Assert.assertEquals("3", PriorityColumn.getInstance().getColumnText(codeArt, AssigneeColumn.getInstance(), 0));
+      Assert.assertEquals("3", PriorityColumn.getInstance().getColumnText(codeArt, PriorityColumn.getInstance(), 0));
 
       PeerToPeerReviewArtifact peerArt =
          (PeerToPeerReviewArtifact) codeArt.getRelatedArtifact(AtsRelationTypes.TeamWorkflowToReview_Review);
-      Assert.assertEquals("", PriorityColumn.getInstance().getColumnText(peerArt, AssigneeColumn.getInstance(), 0));
+      Assert.assertEquals("", PriorityColumn.getInstance().getColumnText(peerArt, PriorityColumn.getInstance(), 0));
 
       TaskArtifact taskArt =
          (TaskArtifact) codeArt.getRelatedArtifacts(AtsRelationTypes.SmaToTask_Task).iterator().next();
-      Assert.assertEquals("", PriorityColumn.getInstance().getColumnText(taskArt, AssigneeColumn.getInstance(), 0));
+      Assert.assertEquals("", PriorityColumn.getInstance().getColumnText(taskArt, PriorityColumn.getInstance(), 0));
 
       Artifact actionArt = reqArt.getParentActionArtifact();
-      Assert.assertEquals("3", PriorityColumn.getInstance().getColumnText(actionArt, AssigneeColumn.getInstance(), 0));
+      Assert.assertEquals("3", PriorityColumn.getInstance().getColumnText(actionArt, PriorityColumn.getInstance(), 0));
 
       TestUtil.severeLoggingEnd(loggingMonitor);
    }
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/RelatedToStateColumnTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/RelatedToStateColumnTest.java
index dfe2b70ca4e..1e1b99de110 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/RelatedToStateColumnTest.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/RelatedToStateColumnTest.java
@@ -34,24 +34,25 @@ public class RelatedToStateColumnTest {
       TeamWorkFlowArtifact codeArt =
          (TeamWorkFlowArtifact) DemoTestUtil.getUncommittedActionWorkflow(DemoWorkType.Code);
       Assert.assertEquals("",
-         RelatedToStateColumn.getInstance().getColumnText(codeArt, AssigneeColumn.getInstance(), 0));
+         RelatedToStateColumn.getInstance().getColumnText(codeArt, RelatedToStateColumn.getInstance(), 0));
 
       PeerToPeerReviewArtifact peerArt =
          (PeerToPeerReviewArtifact) codeArt.getRelatedArtifact(AtsRelationTypes.TeamWorkflowToReview_Review);
       Assert.assertEquals("Implement",
-         RelatedToStateColumn.getInstance().getColumnText(peerArt, AssigneeColumn.getInstance(), 0));
+         RelatedToStateColumn.getInstance().getColumnText(peerArt, RelatedToStateColumn.getInstance(), 0));
 
       TaskArtifact taskArt =
          (TaskArtifact) codeArt.getRelatedArtifacts(AtsRelationTypes.SmaToTask_Task).iterator().next();
       Assert.assertEquals("Implement",
-         RelatedToStateColumn.getInstance().getColumnText(taskArt, AssigneeColumn.getInstance(), 0));
+         RelatedToStateColumn.getInstance().getColumnText(taskArt, RelatedToStateColumn.getInstance(), 0));
 
       TeamWorkFlowArtifact reqArt = (TeamWorkFlowArtifact) DemoTestUtil.getUncommittedActionWorkflow(DemoWorkType.Code);
-      Assert.assertEquals("", RelatedToStateColumn.getInstance().getColumnText(reqArt, AssigneeColumn.getInstance(), 0));
+      Assert.assertEquals("",
+         RelatedToStateColumn.getInstance().getColumnText(reqArt, RelatedToStateColumn.getInstance(), 0));
 
       Artifact actionArt = reqArt.getParentActionArtifact();
       Assert.assertEquals("",
-         RelatedToStateColumn.getInstance().getColumnText(actionArt, AssigneeColumn.getInstance(), 0));
+         RelatedToStateColumn.getInstance().getColumnText(actionArt, RelatedToStateColumn.getInstance(), 0));
 
       TestUtil.severeLoggingEnd(loggingMonitor);
    }
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/StateColumnTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/StateColumnTest.java
index b9d247f0367..472364f9811 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/StateColumnTest.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/StateColumnTest.java
@@ -32,11 +32,11 @@ public class StateColumnTest {
       TeamWorkFlowArtifact reqArt =
          (TeamWorkFlowArtifact) DemoTestUtil.getUncommittedActionWorkflow(DemoWorkType.Requirements);
       Assert.assertEquals(TeamState.Implement.getPageName(),
-         StateColumn.getInstance().getColumnText(reqArt, AssigneeColumn.getInstance(), 0));
+         StateColumn.getInstance().getColumnText(reqArt, StateColumn.getInstance(), 0));
 
       Artifact actionArt = reqArt.getParentActionArtifact();
       Assert.assertEquals(TeamState.Implement.getPageName(),
-         StateColumn.getInstance().getColumnText(actionArt, AssigneeColumn.getInstance(), 0));
+         StateColumn.getInstance().getColumnText(actionArt, StateColumn.getInstance(), 0));
 
       TestUtil.severeLoggingEnd(loggingMonitor);
    }
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/TargetedVersionColumnTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/TargetedVersionColumnTest.java
index ee42ecd9aef..7f669ad36ac 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/TargetedVersionColumnTest.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/TargetedVersionColumnTest.java
@@ -32,24 +32,24 @@ public class TargetedVersionColumnTest {
       TeamWorkFlowArtifact reqArt =
          (TeamWorkFlowArtifact) DemoTestUtil.getUncommittedActionWorkflow(DemoWorkType.Requirements);
       Assert.assertEquals(DemoSawBuilds.SAW_Bld_2.getName(),
-         TargetedVersionColumn.getInstance().getColumnText(reqArt, AssigneeColumn.getInstance(), 0));
+         TargetedVersionColumn.getInstance().getColumnText(reqArt, TargetedVersionColumn.getInstance(), 0));
 
       TeamWorkFlowArtifact codeArt =
          (TeamWorkFlowArtifact) DemoTestUtil.getUncommittedActionWorkflow(DemoWorkType.Code);
       Assert.assertEquals(DemoSawBuilds.SAW_Bld_2.getName(),
-         TargetedVersionColumn.getInstance().getColumnText(codeArt, AssigneeColumn.getInstance(), 0));
+         TargetedVersionColumn.getInstance().getColumnText(codeArt, TargetedVersionColumn.getInstance(), 0));
 
       Artifact actionArt = reqArt.getParentActionArtifact();
       Assert.assertEquals(DemoSawBuilds.SAW_Bld_2.getName(),
-         TargetedVersionColumn.getInstance().getColumnText(actionArt, AssigneeColumn.getInstance(), 0));
+         TargetedVersionColumn.getInstance().getColumnText(actionArt, TargetedVersionColumn.getInstance(), 0));
 
       TeamWorkFlowArtifact toolsArt = DemoTestUtil.getToolsTeamWorkflow();
       Assert.assertEquals("",
-         TargetedVersionColumn.getInstance().getColumnText(toolsArt, AssigneeColumn.getInstance(), 0));
+         TargetedVersionColumn.getInstance().getColumnText(toolsArt, TargetedVersionColumn.getInstance(), 0));
 
       actionArt = toolsArt.getParentActionArtifact();
       Assert.assertEquals("",
-         TargetedVersionColumn.getInstance().getColumnText(actionArt, AssigneeColumn.getInstance(), 0));
+         TargetedVersionColumn.getInstance().getColumnText(actionArt, TargetedVersionColumn.getInstance(), 0));
 
       TestUtil.severeLoggingEnd(loggingMonitor);
    }
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/TeamColumnTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/TeamColumnTest.java
index 75f00c21a51..f0d22b2d2d4 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/TeamColumnTest.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/TeamColumnTest.java
@@ -31,14 +31,14 @@ public class TeamColumnTest {
       TeamWorkFlowArtifact reqArt =
          (TeamWorkFlowArtifact) DemoTestUtil.getUncommittedActionWorkflow(DemoWorkType.Requirements);
       Assert.assertEquals("SAW Requirements",
-         TeamColumn.getInstance().getColumnText(reqArt, AssigneeColumn.getInstance(), 0));
+         TeamColumn.getInstance().getColumnText(reqArt, TeamColumn.getInstance(), 0));
 
       TeamWorkFlowArtifact codeArt =
          (TeamWorkFlowArtifact) DemoTestUtil.getUncommittedActionWorkflow(DemoWorkType.Code);
-      Assert.assertEquals("SAW Code", TeamColumn.getInstance().getColumnText(codeArt, AssigneeColumn.getInstance(), 0));
+      Assert.assertEquals("SAW Code", TeamColumn.getInstance().getColumnText(codeArt, TeamColumn.getInstance(), 0));
 
       Artifact actionArt = reqArt.getParentActionArtifact();
-      Assert.assertEquals("", TeamColumn.getInstance().getColumnText(actionArt, AssigneeColumn.getInstance(), 0));
+      Assert.assertEquals("", TeamColumn.getInstance().getColumnText(actionArt, TeamColumn.getInstance(), 0));
 
       TestUtil.severeLoggingEnd(loggingMonitor);
    }
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/TypeColumnTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/TypeColumnTest.java
index b835bd8860a..45267759d16 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/TypeColumnTest.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/TypeColumnTest.java
@@ -31,15 +31,15 @@ public class TypeColumnTest {
       TeamWorkFlowArtifact reqArt =
          (TeamWorkFlowArtifact) DemoTestUtil.getUncommittedActionWorkflow(DemoWorkType.Requirements);
       Assert.assertEquals("SAW Requirements Workflow",
-         TypeColumn.getInstance().getColumnText(reqArt, AssigneeColumn.getInstance(), 0));
+         TypeColumn.getInstance().getColumnText(reqArt, TypeColumn.getInstance(), 0));
 
       TeamWorkFlowArtifact codeArt =
          (TeamWorkFlowArtifact) DemoTestUtil.getUncommittedActionWorkflow(DemoWorkType.Code);
       Assert.assertEquals("SAW Code Workflow",
-         TypeColumn.getInstance().getColumnText(codeArt, AssigneeColumn.getInstance(), 0));
+         TypeColumn.getInstance().getColumnText(codeArt, TypeColumn.getInstance(), 0));
 
       Artifact actionArt = reqArt.getParentActionArtifact();
-      Assert.assertEquals("Action", TypeColumn.getInstance().getColumnText(actionArt, AssigneeColumn.getInstance(), 0));
+      Assert.assertEquals("Action", TypeColumn.getInstance().getColumnText(actionArt, TypeColumn.getInstance(), 0));
 
       TestUtil.severeLoggingEnd(loggingMonitor);
    }
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/config/AtsBranchConfigurationTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/config/AtsBranchConfigurationTest.java
index 21c81d8d56b..a3fabe48c6e 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/config/AtsBranchConfigurationTest.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/config/AtsBranchConfigurationTest.java
@@ -27,7 +27,7 @@ import org.eclipse.osee.ats.core.client.team.TeamWorkFlowManager;
 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.workflow.ActionableItemManagerCore;
 import org.eclipse.osee.ats.core.client.workflow.ChangeType;
 import org.eclipse.osee.ats.core.workdef.WorkDefinition;
@@ -157,10 +157,11 @@ public class AtsBranchConfigurationTest {
          ActionableItemManagerCore.getActionableItems(appendToName(BRANCH_VIA_VERSIONS, "A1"));
       Assert.assertFalse(selectedActionableItems.isEmpty());
 
-      SkynetTransaction transaction = TransactionManager.createTransaction(AtsUtil.getAtsBranch(), "Branch Configuration Test");
+      SkynetTransaction transaction =
+         TransactionManager.createTransaction(AtsUtil.getAtsBranch(), "Branch Configuration Test");
       Artifact actionArt =
          ActionManager.createAction(null, BRANCH_VIA_VERSIONS.getName() + " Req Changes", "description",
-            ChangeType.Problem, "1", false, null, selectedActionableItems, new Date(), AtsUsers.getUser(), null,
+            ChangeType.Problem, "1", false, null, selectedActionableItems, new Date(), AtsUsersClient.getUser(), null,
             transaction);
       ActionManager.getTeams(actionArt).iterator().next().addRelation(
          AtsRelationTypes.TeamWorkflowTargetedForVersion_Version, verArtToTarget);
@@ -175,7 +176,7 @@ public class AtsBranchConfigurationTest {
          OseeLog.log(Activator.class, Level.INFO, "Transitioning to Implement state");
       }
 
-      dtwm.transitionTo(TeamState.Implement, null, false, transaction);
+      dtwm.transitionTo(TeamState.Implement, AtsUsersClient.getUser(), false, transaction);
       teamWf.persist("Branch Configuration Test");
 
       SMAEditor.editArtifact(teamWf);
@@ -272,7 +273,7 @@ public class AtsBranchConfigurationTest {
       String actionTitle = BRANCH_VIA_TEAM_DEFINITION.getName() + " Req Changes";
       Artifact actionArt =
          ActionManager.createAction(null, actionTitle, "description", ChangeType.Problem, "1", false, null,
-            selectedActionableItems, new Date(), AtsUsers.getUser(), null, transaction);
+            selectedActionableItems, new Date(), AtsUsersClient.getUser(), null, transaction);
       transaction.execute();
 
       final TeamWorkFlowArtifact teamWf = ActionManager.getTeams(actionArt).iterator().next();
@@ -282,7 +283,7 @@ public class AtsBranchConfigurationTest {
       if (DEBUG) {
          OseeLog.log(Activator.class, Level.INFO, "Transitioning to Implement state");
       }
-      dtwm.transitionTo(TeamState.Implement, null, false, transaction);
+      dtwm.transitionTo(TeamState.Implement, AtsUsersClient.getUser(), false, transaction);
       teamWf.persist("Test branch via team definition: Transition to desired state");
 
       // create branch
@@ -321,7 +322,8 @@ public class AtsBranchConfigurationTest {
          ArtifactQuery.checkArtifactFromTypeAndName(AtsArtifactTypes.Action, branch.getName() + " Req Changes",
             AtsUtil.getAtsBranch());
       if (aArt != null) {
-         SkynetTransaction transaction = TransactionManager.createTransaction(AtsUtil.getAtsBranch(), "Branch Configuration Test");
+         SkynetTransaction transaction =
+            TransactionManager.createTransaction(AtsUtil.getAtsBranch(), "Branch Configuration Test");
          for (TeamWorkFlowArtifact teamArt : ActionManager.getTeams(aArt)) {
             SMAEditor.close(Collections.singleton(teamArt), false);
             teamArt.deleteAndPersist(transaction, true);
@@ -334,7 +336,8 @@ public class AtsBranchConfigurationTest {
       Collection<Artifact> arts =
          ArtifactQuery.getArtifactListFromType(AtsArtifactTypes.Version, AtsUtil.getAtsBranch());
       if (arts.size() > 0) {
-         SkynetTransaction transaction = TransactionManager.createTransaction(AtsUtil.getAtsBranch(), "Branch Configuration Test");
+         SkynetTransaction transaction =
+            TransactionManager.createTransaction(AtsUtil.getAtsBranch(), "Branch Configuration Test");
          for (Artifact verArt : arts) {
             if (verArt.getName().contains(branch.getName())) {
                verArt.deleteAndPersist(transaction, true);
@@ -348,7 +351,8 @@ public class AtsBranchConfigurationTest {
          ArtifactQuery.checkArtifactFromTypeAndName(AtsArtifactTypes.TeamDefinition, branch.getName(),
             AtsUtil.getAtsBranch());
       if (art != null) {
-         SkynetTransaction transaction = TransactionManager.createTransaction(AtsUtil.getAtsBranch(), "Branch Configuration Test");
+         SkynetTransaction transaction =
+            TransactionManager.createTransaction(AtsUtil.getAtsBranch(), "Branch Configuration Test");
          art.deleteAndPersist(transaction, true);
          transaction.execute();
       }
@@ -358,7 +362,8 @@ public class AtsBranchConfigurationTest {
          ArtifactQuery.checkArtifactFromTypeAndName(AtsArtifactTypes.ActionableItem, branch.getName(),
             AtsUtil.getAtsBranch());
       if (art != null) {
-         SkynetTransaction transaction = TransactionManager.createTransaction(AtsUtil.getAtsBranch(), "Branch Configuration Test");
+         SkynetTransaction transaction =
+            TransactionManager.createTransaction(AtsUtil.getAtsBranch(), "Branch Configuration Test");
          for (Artifact childArt : art.getChildren()) {
             childArt.deleteAndPersist(transaction, true);
          }
@@ -369,7 +374,8 @@ public class AtsBranchConfigurationTest {
       // Work Definition
       arts = ArtifactQuery.getArtifactListFromType(AtsArtifactTypes.WorkDefinition, AtsUtil.getAtsBranch());
       if (arts.size() > 0) {
-         SkynetTransaction transaction = TransactionManager.createTransaction(AtsUtil.getAtsBranch(), "Branch Configuration Test");
+         SkynetTransaction transaction =
+            TransactionManager.createTransaction(AtsUtil.getAtsBranch(), "Branch Configuration Test");
          for (Artifact workArt : arts) {
             if (workArt.getName().startsWith(namespace)) {
                workArt.deleteAndPersist(transaction, true);
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/editor/stateItem/AtsDecisionReviewDecisionStateItemTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/editor/stateItem/AtsDecisionReviewDecisionStateItemTest.java
index ed23ea4aa48..7953f98950c 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/editor/stateItem/AtsDecisionReviewDecisionStateItemTest.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/editor/stateItem/AtsDecisionReviewDecisionStateItemTest.java
@@ -18,7 +18,7 @@ import org.eclipse.osee.ats.core.client.review.DecisionReviewManager;
 import org.eclipse.osee.ats.core.client.review.DecisionReviewState;
 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.util.AtsUsers;
+import org.eclipse.osee.ats.core.client.util.AtsUsersClient;
 import org.eclipse.osee.ats.core.model.IAtsUser;
 import org.eclipse.osee.ats.core.workdef.StateDefinition;
 import org.eclipse.osee.ats.util.AtsUtil;
@@ -101,7 +101,7 @@ public class AtsDecisionReviewDecisionStateItemTest {
       AtsDecisionReviewDecisionStateItem stateItem = new AtsDecisionReviewDecisionStateItem();
       Collection<IAtsUser> users = stateItem.getOverrideTransitionToAssignees(decRevArt, decisionComboDam.get());
       Assert.assertEquals(1, users.size());
-      Assert.assertEquals(AtsUsers.getUser(), users.iterator().next());
+      Assert.assertEquals(AtsUsersClient.getUser(), users.iterator().next());
 
       // Set No
       decisionComboDam.set(2);
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/editor/stateItem/AtsDecisionReviewPrepareStateItemTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/editor/stateItem/AtsDecisionReviewPrepareStateItemTest.java
index 1d65b4f9f33..3015296f5db 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/editor/stateItem/AtsDecisionReviewPrepareStateItemTest.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/editor/stateItem/AtsDecisionReviewPrepareStateItemTest.java
@@ -18,7 +18,7 @@ import org.eclipse.osee.ats.core.client.review.DecisionReviewManager;
 import org.eclipse.osee.ats.core.client.review.DecisionReviewState;
 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.util.AtsUsers;
+import org.eclipse.osee.ats.core.client.util.AtsUsersClient;
 import org.eclipse.osee.ats.core.client.workflow.transition.TransitionResults;
 import org.eclipse.osee.ats.core.workflow.IWorkPage;
 import org.eclipse.osee.ats.util.AtsUtil;
@@ -76,7 +76,7 @@ public class AtsDecisionReviewPrepareStateItemTest {
       // make call to state item that should set options based on artifact's attribute value
       AtsDecisionReviewPrepareStateItem stateItem = new AtsDecisionReviewPrepareStateItem();
       TransitionResults results = new TransitionResults();
-      stateItem.transitioning(results, decRevArt, fromState, toState, Arrays.asList(AtsUsers.getUser()));
+      stateItem.transitioning(results, decRevArt, fromState, toState, Arrays.asList(AtsUsersClient.getUser()));
 
       // verify no errors
       Assert.assertTrue(results.toString(), results.isEmpty());
@@ -85,7 +85,7 @@ public class AtsDecisionReviewPrepareStateItemTest {
       decisionOptionStr = decisionOptionStr.replaceFirst("Completed", "NoState");
       decRevArt.setSoleAttributeValue(AtsAttributeTypes.DecisionReviewOptions, decisionOptionStr);
       decRevArt.persist(getClass().getSimpleName());
-      stateItem.transitioning(results, decRevArt, fromState, toState, Arrays.asList(AtsUsers.getUser()));
+      stateItem.transitioning(results, decRevArt, fromState, toState, Arrays.asList(AtsUsersClient.getUser()));
       Assert.assertTrue(results.contains("Invalid Decision Option"));
 
    }
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/editor/stateItem/AtsForceAssigneesToTeamLeadsStateItemTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/editor/stateItem/AtsForceAssigneesToTeamLeadsStateItemTest.java
index 599e6ac166d..33db1ef12a9 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/editor/stateItem/AtsForceAssigneesToTeamLeadsStateItemTest.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/editor/stateItem/AtsForceAssigneesToTeamLeadsStateItemTest.java
@@ -17,7 +17,7 @@ import java.util.List;
 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.util.AtsUsers;
+import org.eclipse.osee.ats.core.client.util.AtsUsersClient;
 import org.eclipse.osee.ats.core.workdef.RuleDefinition;
 import org.eclipse.osee.ats.core.workdef.RuleDefinitionOption;
 import org.eclipse.osee.ats.core.workdef.StateDefinition;
@@ -83,13 +83,13 @@ public class AtsForceAssigneesToTeamLeadsStateItemTest {
 
       // assignee should be Joe Smith
       Assert.assertEquals(1, teamArt.getStateMgr().getAssignees().size());
-      Assert.assertEquals(AtsUsers.getUserByName(JOE_SMITH), teamArt.getStateMgr().getAssignees().iterator().next());
+      Assert.assertEquals(AtsUsersClient.getUserByName(JOE_SMITH), teamArt.getStateMgr().getAssignees().iterator().next());
 
       // set assignee to Alex Kay
-      teamArt.getStateMgr().setAssignee(AtsUsers.getUserByName(ALEX_KAY));
+      teamArt.getStateMgr().setAssignee(AtsUsersClient.getUserByName(ALEX_KAY));
       teamArt.persist(getClass().getSimpleName());
       Assert.assertEquals(1, teamArt.getStateMgr().getAssignees().size());
-      Assert.assertEquals(AtsUsers.getUserByName(ALEX_KAY), teamArt.getStateMgr().getAssignees().iterator().next());
+      Assert.assertEquals(AtsUsersClient.getUserByName(ALEX_KAY), teamArt.getStateMgr().getAssignees().iterator().next());
 
       IWorkPage fromState = teamArt.getWorkDefinition().getStateByName(TeamState.Analyze.getPageName());
       IWorkPage toState = teamArt.getWorkDefinition().getStateByName(TeamState.Authorize.getPageName());
@@ -101,11 +101,11 @@ public class AtsForceAssigneesToTeamLeadsStateItemTest {
       AtsForceAssigneesToTeamLeadsStateItem stateItem = new AtsForceAssigneesToTeamLeadsStateItem();
       SkynetTransaction transaction =
          TransactionManager.createTransaction(AtsUtil.getAtsBranch(), getClass().getSimpleName());
-      stateItem.transitioned(teamArt, fromState, toState, Arrays.asList(AtsUsers.getUser()), transaction);
+      stateItem.transitioned(teamArt, fromState, toState, Arrays.asList(AtsUsersClient.getUser()), transaction);
       transaction.execute();
 
       // assignee should be Joe Smith
       Assert.assertEquals(1, teamArt.getStateMgr().getAssignees().size());
-      Assert.assertEquals(AtsUsers.getUserByName(JOE_SMITH), teamArt.getStateMgr().getAssignees().iterator().next());
+      Assert.assertEquals(AtsUsersClient.getUserByName(JOE_SMITH), teamArt.getStateMgr().getAssignees().iterator().next());
    }
 }
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/editor/stateItem/AtsPeerToPeerReviewReviewStateItemTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/editor/stateItem/AtsPeerToPeerReviewReviewStateItemTest.java
index 0c5003b5fba..630db194e28 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/editor/stateItem/AtsPeerToPeerReviewReviewStateItemTest.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/editor/stateItem/AtsPeerToPeerReviewReviewStateItemTest.java
@@ -19,7 +19,7 @@ import org.eclipse.osee.ats.core.client.review.PeerToPeerReviewState;
 import org.eclipse.osee.ats.core.client.review.role.Role;
 import org.eclipse.osee.ats.core.client.review.role.UserRole;
 import org.eclipse.osee.ats.core.client.review.role.UserRoleManager;
-import org.eclipse.osee.ats.core.client.util.AtsUsers;
+import org.eclipse.osee.ats.core.client.util.AtsUsersClient;
 import org.eclipse.osee.ats.core.model.IAtsUser;
 import org.eclipse.osee.ats.core.workflow.IWorkPage;
 import org.eclipse.osee.ats.util.AtsUtil;
@@ -69,13 +69,13 @@ public class AtsPeerToPeerReviewReviewStateItemTest {
 
       // assignee should be user creating review
       Assert.assertEquals(1, peerRevArt.getStateMgr().getAssignees().size());
-      Assert.assertEquals(AtsUsers.getUser(), peerRevArt.getStateMgr().getAssignees().iterator().next());
+      Assert.assertEquals(AtsUsersClient.getUser(), peerRevArt.getStateMgr().getAssignees().iterator().next());
 
       // set roles
-      UserRole userRole = new UserRole(Role.Author, AtsUsers.getUserByName("Joe Smith"));
+      UserRole userRole = new UserRole(Role.Author, AtsUsersClient.getUserByName("Joe Smith"));
       UserRoleManager roleMgr = new UserRoleManager(peerRevArt);
       roleMgr.addOrUpdateUserRole(userRole);
-      userRole = new UserRole(Role.Reviewer, AtsUsers.getUserByName("Alex Kay"));
+      userRole = new UserRole(Role.Reviewer, AtsUsersClient.getUserByName("Alex Kay"));
       SkynetTransaction transaction = TransactionManager.createTransaction(AtsUtil.getAtsBranch(), "test transition");
       roleMgr.addOrUpdateUserRole(userRole);
       roleMgr.saveToArtifact(transaction);
@@ -85,10 +85,10 @@ public class AtsPeerToPeerReviewReviewStateItemTest {
       Assert.assertEquals(2, peerRevArt.getStateMgr().getAssignees().size());
 
       // change assignees back to single user so can test transition
-      peerRevArt.getStateMgr().setAssignee(AtsUsers.getUser());
+      peerRevArt.getStateMgr().setAssignee(AtsUsersClient.getUser());
       peerRevArt.persist(getClass().getSimpleName());
       Assert.assertEquals(1, peerRevArt.getStateMgr().getAssignees().size());
-      Assert.assertEquals(AtsUsers.getUser(), peerRevArt.getStateMgr().getAssignees().iterator().next());
+      Assert.assertEquals(AtsUsersClient.getUser(), peerRevArt.getStateMgr().getAssignees().iterator().next());
 
       IWorkPage fromState = peerRevArt.getWorkDefinition().getStateByName(PeerToPeerReviewState.Prepare.getPageName());
       IWorkPage toState = peerRevArt.getWorkDefinition().getStateByName(PeerToPeerReviewState.Review.getPageName());
@@ -96,7 +96,7 @@ public class AtsPeerToPeerReviewReviewStateItemTest {
       // make call to state item that should set options based on artifact's attribute value
       AtsPeerToPeerReviewReviewStateItem stateItem = new AtsPeerToPeerReviewReviewStateItem();
       transaction = TransactionManager.createTransaction(AtsUtil.getAtsBranch(), "test transition");
-      stateItem.transitioned(peerRevArt, fromState, toState, Arrays.asList(AtsUsers.getUser()), transaction);
+      stateItem.transitioned(peerRevArt, fromState, toState, Arrays.asList(AtsUsersClient.getUser()), transaction);
       transaction.execute();
 
       // Joe and Alex should have been added to assignees
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/navigate/AtsNavigateItemsToWorldViewTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/navigate/AtsNavigateItemsToWorldViewTest.java
index e81af166603..fef573896d8 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/navigate/AtsNavigateItemsToWorldViewTest.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/navigate/AtsNavigateItemsToWorldViewTest.java
@@ -28,7 +28,7 @@ import org.eclipse.osee.ats.core.client.config.TeamDefinitionManager;
 import org.eclipse.osee.ats.core.client.team.TeamState;
 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.util.AtsUsers;
+import org.eclipse.osee.ats.core.client.util.AtsUsersClient;
 import org.eclipse.osee.ats.core.client.workflow.ActionableItemManagerCore;
 import org.eclipse.osee.ats.core.model.IAtsUser;
 import org.eclipse.osee.ats.editor.SMAEditor;
@@ -57,7 +57,6 @@ import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.logging.OseeLog;
 import org.eclipse.osee.framework.logging.SevereLoggingMonitor;
-import org.eclipse.osee.framework.skynet.core.UserManager;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
 import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
@@ -125,7 +124,7 @@ public class AtsNavigateItemsToWorldViewTest {
       WorldEditor editor = WorldEditorUtil.getSingleEditorOrFail();
       UserSearchWorkflowSearchItem dwl =
          (UserSearchWorkflowSearchItem) editor.getWorldXWidgetActionPage().getDynamicWidgetLayoutListener();
-      dwl.setSelectedUser(AtsUsers.getUserFromToken(DemoUsers.Joe_Smith));
+      dwl.setSelectedUser(AtsUsersClient.getUserFromToken(DemoUsers.Joe_Smith));
       dwl.setSelected(UserSearchOption.Favorites, true);
       runGeneralUserSearchTest(item, 3);
       runGeneralXColTest(20, false);
@@ -151,7 +150,7 @@ public class AtsNavigateItemsToWorldViewTest {
       XNavigateItem item = openUserSearchEditor();
       WorldEditor editor = WorldEditorUtil.getSingleEditorOrFail();
       IDynamicWidgetLayoutListener dwl = editor.getWorldXWidgetActionPage().getDynamicWidgetLayoutListener();
-      ((UserSearchWorkflowSearchItem) dwl).setSelectedUser(AtsUsers.getUserFromToken(DemoUsers.Joe_Smith));
+      ((UserSearchWorkflowSearchItem) dwl).setSelectedUser(AtsUsersClient.getUserFromToken(DemoUsers.Joe_Smith));
       ((UserSearchWorkflowSearchItem) dwl).setSelected(UserSearchOption.Subscribed, true);
       editor.getWorldXWidgetActionPage().reSearch(true);
       Collection<Artifact> arts = editor.getLoadedArtifacts();
@@ -166,7 +165,7 @@ public class AtsNavigateItemsToWorldViewTest {
       XNavigateItem item = openUserSearchEditor();
       WorldEditor editor = WorldEditorUtil.getSingleEditorOrFail();
       IDynamicWidgetLayoutListener dwl = editor.getWorldXWidgetActionPage().getDynamicWidgetLayoutListener();
-      ((UserSearchWorkflowSearchItem) dwl).setSelectedUser(AtsUsers.getUserFromToken(DemoUsers.Joe_Smith));
+      ((UserSearchWorkflowSearchItem) dwl).setSelectedUser(AtsUsersClient.getUserFromToken(DemoUsers.Joe_Smith));
       ((UserSearchWorkflowSearchItem) dwl).setSelected(UserSearchOption.Assignee, true);
       ((UserSearchWorkflowSearchItem) dwl).setSelectedState(TeamState.Implement.getPageName());
       editor.getWorldXWidgetActionPage().reSearch(true);
@@ -182,7 +181,7 @@ public class AtsNavigateItemsToWorldViewTest {
       XNavigateItem item = openUserSearchEditor();
       WorldEditor editor = WorldEditorUtil.getSingleEditorOrFail();
       IDynamicWidgetLayoutListener dwl = editor.getWorldXWidgetActionPage().getDynamicWidgetLayoutListener();
-      ((UserSearchWorkflowSearchItem) dwl).setSelectedUser(AtsUsers.getUserFromToken(DemoUsers.Joe_Smith));
+      ((UserSearchWorkflowSearchItem) dwl).setSelectedUser(AtsUsersClient.getUserFromToken(DemoUsers.Joe_Smith));
       ((UserSearchWorkflowSearchItem) dwl).setSelected(UserSearchOption.IncludeReviews, true);
       ((UserSearchWorkflowSearchItem) dwl).setSelected(UserSearchOption.IncludeTeamWorkflows, false);
       ((UserSearchWorkflowSearchItem) dwl).setSelected(UserSearchOption.IncludeTasks, false);
@@ -202,7 +201,7 @@ public class AtsNavigateItemsToWorldViewTest {
       XNavigateItem item = openUserSearchEditor();
       WorldEditor editor = WorldEditorUtil.getSingleEditorOrFail();
       IDynamicWidgetLayoutListener dwl = editor.getWorldXWidgetActionPage().getDynamicWidgetLayoutListener();
-      ((UserSearchWorkflowSearchItem) dwl).setSelectedUser(AtsUsers.getUserFromToken(DemoUsers.Joe_Smith));
+      ((UserSearchWorkflowSearchItem) dwl).setSelectedUser(AtsUsersClient.getUserFromToken(DemoUsers.Joe_Smith));
       ((UserSearchWorkflowSearchItem) dwl).setSelected(UserSearchOption.IncludeReviews, true);
       ((UserSearchWorkflowSearchItem) dwl).setSelected(UserSearchOption.IncludeTeamWorkflows, false);
       ((UserSearchWorkflowSearchItem) dwl).setSelected(UserSearchOption.IncludeTasks, false);
@@ -224,7 +223,7 @@ public class AtsNavigateItemsToWorldViewTest {
       XNavigateItem item = openUserSearchEditor();
       WorldEditor editor = WorldEditorUtil.getSingleEditorOrFail();
       IDynamicWidgetLayoutListener dwl = editor.getWorldXWidgetActionPage().getDynamicWidgetLayoutListener();
-      ((UserSearchWorkflowSearchItem) dwl).setSelectedUser(AtsUsers.getUserFromToken(DemoUsers.Joe_Smith));
+      ((UserSearchWorkflowSearchItem) dwl).setSelectedUser(AtsUsersClient.getUserFromToken(DemoUsers.Joe_Smith));
       ((UserSearchWorkflowSearchItem) dwl).setSelected(UserSearchOption.Originator, true);
       editor.getWorldXWidgetActionPage().reSearch(true);
 
@@ -244,7 +243,7 @@ public class AtsNavigateItemsToWorldViewTest {
       XNavigateItem item = openUserSearchEditor();
       WorldEditor editor = WorldEditorUtil.getSingleEditorOrFail();
       IDynamicWidgetLayoutListener dwl = editor.getWorldXWidgetActionPage().getDynamicWidgetLayoutListener();
-      ((UserSearchWorkflowSearchItem) dwl).setSelectedUser(AtsUsers.getUserFromToken(DemoUsers.Joe_Smith));
+      ((UserSearchWorkflowSearchItem) dwl).setSelectedUser(AtsUsersClient.getUserFromToken(DemoUsers.Joe_Smith));
       ((UserSearchWorkflowSearchItem) dwl).setSelected(UserSearchOption.Originator, true);
       ((UserSearchWorkflowSearchItem) dwl).setSelected(UserSearchOption.IncludeCompleted, true);
       editor.getWorldXWidgetActionPage().reSearch(true);
@@ -274,7 +273,7 @@ public class AtsNavigateItemsToWorldViewTest {
       WorldEditor editor = WorldEditorUtil.getSingleEditorOrFail();
       UserSearchWorkflowSearchItem dwl =
          (UserSearchWorkflowSearchItem) editor.getWorldXWidgetActionPage().getDynamicWidgetLayoutListener();
-      dwl.setSelectedUser(AtsUsers.getUserFromToken(DemoUsers.Joe_Smith));
+      dwl.setSelectedUser(AtsUsersClient.getUserFromToken(DemoUsers.Joe_Smith));
       dwl.setSelected(UserSearchOption.IncludeCompleted, true);
       dwl.setSelected(UserSearchOption.IncludeTasks, false);
       editor.getWorldXWidgetActionPage().reSearch(true);
@@ -303,7 +302,8 @@ public class AtsNavigateItemsToWorldViewTest {
       OseeLog.log(Activator.class, Level.INFO,
          "Testing User's items relating to " + DemoTestUtil.getDemoUser(DemoUsers.Kay_Jones));
       XNavigateItem item = NavigateTestUtil.getAtsNavigateItems("User's World").iterator().next();
-      runGeneralLoadingTest(item, AtsArtifactTypes.AbstractWorkflowArtifact, 12, AtsUsers.getUserFromToken(DemoUsers.Kay_Jones));
+      runGeneralLoadingTest(item, AtsArtifactTypes.AbstractWorkflowArtifact, 12,
+         AtsUsersClient.getUserFromToken(DemoUsers.Kay_Jones));
       TestUtil.severeLoggingEnd(monitor);
    }
 
@@ -314,7 +314,7 @@ public class AtsNavigateItemsToWorldViewTest {
       XNavigateItem item = openUserSearchEditor();
       WorldEditor editor = WorldEditorUtil.getSingleEditorOrFail();
       IDynamicWidgetLayoutListener dwl = editor.getWorldXWidgetActionPage().getDynamicWidgetLayoutListener();
-      ((UserSearchWorkflowSearchItem) dwl).setSelectedUser(AtsUsers.getUserFromToken(DemoUsers.Kay_Jones));
+      ((UserSearchWorkflowSearchItem) dwl).setSelectedUser(AtsUsersClient.getUserFromToken(DemoUsers.Kay_Jones));
       ((UserSearchWorkflowSearchItem) dwl).setSelected(UserSearchOption.IncludeReviews, true);
       ((UserSearchWorkflowSearchItem) dwl).setSelected(UserSearchOption.IncludeTeamWorkflows, false);
       ((UserSearchWorkflowSearchItem) dwl).setSelected(UserSearchOption.IncludeTasks, false);
@@ -332,7 +332,7 @@ public class AtsNavigateItemsToWorldViewTest {
       XNavigateItem item = openUserSearchEditor();
       WorldEditor editor = WorldEditorUtil.getSingleEditorOrFail();
       IDynamicWidgetLayoutListener dwl = editor.getWorldXWidgetActionPage().getDynamicWidgetLayoutListener();
-      ((UserSearchWorkflowSearchItem) dwl).setSelectedUser(AtsUsers.getUserFromToken(DemoUsers.Kay_Jones));
+      ((UserSearchWorkflowSearchItem) dwl).setSelectedUser(AtsUsersClient.getUserFromToken(DemoUsers.Kay_Jones));
       ((UserSearchWorkflowSearchItem) dwl).setSelected(UserSearchOption.IncludeReviews, true);
       ((UserSearchWorkflowSearchItem) dwl).setSelected(UserSearchOption.IncludeTeamWorkflows, false);
       ((UserSearchWorkflowSearchItem) dwl).setSelected(UserSearchOption.IncludeTasks, false);
@@ -351,7 +351,7 @@ public class AtsNavigateItemsToWorldViewTest {
       XNavigateItem item = openUserSearchEditor();
       WorldEditor editor = WorldEditorUtil.getSingleEditorOrFail();
       IDynamicWidgetLayoutListener dwl = editor.getWorldXWidgetActionPage().getDynamicWidgetLayoutListener();
-      ((UserSearchWorkflowSearchItem) dwl).setSelectedUser(AtsUsers.getUserFromToken(DemoUsers.Kay_Jones));
+      ((UserSearchWorkflowSearchItem) dwl).setSelectedUser(AtsUsersClient.getUserFromToken(DemoUsers.Kay_Jones));
       ((UserSearchWorkflowSearchItem) dwl).setSelected(UserSearchOption.Favorites, true);
       editor.getWorldXWidgetActionPage().reSearch(true);
       Collection<Artifact> arts = editor.getLoadedArtifacts();
@@ -366,7 +366,7 @@ public class AtsNavigateItemsToWorldViewTest {
       XNavigateItem item = openUserSearchEditor();
       WorldEditor editor = WorldEditorUtil.getSingleEditorOrFail();
       IDynamicWidgetLayoutListener dwl = editor.getWorldXWidgetActionPage().getDynamicWidgetLayoutListener();
-      ((UserSearchWorkflowSearchItem) dwl).setSelectedUser(AtsUsers.getUserFromToken(DemoUsers.Kay_Jones));
+      ((UserSearchWorkflowSearchItem) dwl).setSelectedUser(AtsUsersClient.getUserFromToken(DemoUsers.Kay_Jones));
       ((UserSearchWorkflowSearchItem) dwl).setSelected(UserSearchOption.Subscribed, true);
       editor.getWorldXWidgetActionPage().reSearch(true);
       Collection<Artifact> arts = editor.getLoadedArtifacts();
@@ -438,7 +438,7 @@ public class AtsNavigateItemsToWorldViewTest {
 
    private void runGeneralTeamWorkflowSearchOnAssigneeTest(XNavigateItem item, String assignee, int expectedNum) throws Exception {
       WorldEditor editor = WorldEditorUtil.getSingleEditorOrFail();
-      ((TeamWorkflowSearchWorkflowSearchItem) editor.getWorldXWidgetActionPage().getDynamicWidgetLayoutListener()).setSelectedUser(UserManager.getUserByName(assignee));
+      ((TeamWorkflowSearchWorkflowSearchItem) editor.getWorldXWidgetActionPage().getDynamicWidgetLayoutListener()).setSelectedUser(AtsUsersClient.getUserByName(assignee));
       runGeneralTeamWorkflowSearchTest(item, expectedNum);
    }
 
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/review/ReviewNavigateItemsToWorldViewTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/review/ReviewNavigateItemsToWorldViewTest.java
index 9c3971d6064..dc76081a8b7 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/review/ReviewNavigateItemsToWorldViewTest.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/review/ReviewNavigateItemsToWorldViewTest.java
@@ -13,7 +13,7 @@ package org.eclipse.osee.ats.review;
 import static org.junit.Assert.assertTrue;
 import java.util.Collection;
 import org.eclipse.osee.ats.core.client.type.AtsArtifactTypes;
-import org.eclipse.osee.ats.core.client.util.AtsUsers;
+import org.eclipse.osee.ats.core.client.util.AtsUsersClient;
 import org.eclipse.osee.ats.core.model.IAtsUser;
 import org.eclipse.osee.ats.navigate.SearchNavigateItem;
 import org.eclipse.osee.ats.navigate.VisitedItems;
@@ -55,14 +55,14 @@ public class ReviewNavigateItemsToWorldViewTest {
    @org.junit.Test
    public void testOtherUsersWorld_KayJones() throws Exception {
       XNavigateItem item = NavigateTestUtil.getAtsNavigateItems("User's Reviews").iterator().next();
-      runGeneralLoadingTest(item, AtsArtifactTypes.PeerToPeerReview, 1, AtsUsers.getUserFromToken(DemoUsers.Kay_Jones));
+      runGeneralLoadingTest(item, AtsArtifactTypes.PeerToPeerReview, 1, AtsUsersClient.getUserFromToken(DemoUsers.Kay_Jones));
    }
 
    @org.junit.Test
    public void testOtherUsersWorld_JoeSmith() throws Exception {
       XNavigateItem item = NavigateTestUtil.getAtsNavigateItems("User's Reviews").iterator().next();
-      runGeneralLoadingTest(item, AtsArtifactTypes.DecisionReview, 2, AtsUsers.getUserFromToken(DemoUsers.Joe_Smith));
-      runGeneralLoadingTest(item, AtsArtifactTypes.PeerToPeerReview, 2, AtsUsers.getUserFromToken(DemoUsers.Joe_Smith));
+      runGeneralLoadingTest(item, AtsArtifactTypes.DecisionReview, 2, AtsUsersClient.getUserFromToken(DemoUsers.Joe_Smith));
+      runGeneralLoadingTest(item, AtsArtifactTypes.PeerToPeerReview, 2, AtsUsersClient.getUserFromToken(DemoUsers.Joe_Smith));
    }
 
    @org.junit.Test
@@ -90,7 +90,7 @@ public class ReviewNavigateItemsToWorldViewTest {
       MassArtifactEditor.closeAll();
       XNavigateItem item =
          NavigateTestUtil.getAtsNavigateItems("Generate Review Participation Report").iterator().next();
-      ((GenerateReviewParticipationReport) item).setSelectedUser(AtsUsers.getUserFromToken(DemoUsers.Joe_Smith));
+      ((GenerateReviewParticipationReport) item).setSelectedUser(AtsUsersClient.getUserFromToken(DemoUsers.Joe_Smith));
 
       item.run(TableLoadOption.ForcePend);
 
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/review/ReviewWorldSearchItemDemoTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/review/ReviewWorldSearchItemDemoTest.java
index e4587cc3c9a..0106fdba5ed 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/review/ReviewWorldSearchItemDemoTest.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/review/ReviewWorldSearchItemDemoTest.java
@@ -17,11 +17,12 @@ import java.util.List;
 import java.util.Set;
 import org.eclipse.osee.ats.core.client.config.ActionableItemArtifact;
 import org.eclipse.osee.ats.core.client.type.AtsArtifactTypes;
+import org.eclipse.osee.ats.core.client.util.AtsUsersClient;
 import org.eclipse.osee.ats.core.client.workflow.ActionableItemManagerCore;
+import org.eclipse.osee.ats.core.model.IAtsUser;
 import org.eclipse.osee.ats.navigate.VisitedItems;
 import org.eclipse.osee.ats.util.DemoTestUtil;
 import org.eclipse.osee.ats.util.NavigateTestUtil;
-import org.eclipse.osee.framework.skynet.core.User;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 import org.eclipse.osee.support.test.util.DemoUsers;
 
@@ -41,7 +42,7 @@ public class ReviewWorldSearchItemDemoTest {
 
    @org.junit.Test
    public void testAiSearch() throws Exception {
-      User joe = DemoTestUtil.getDemoUser(DemoUsers.Joe_Smith);
+      IAtsUser joe = AtsUsersClient.getUserFromToken(DemoUsers.Joe_Smith);
       Set<ActionableItemArtifact> aias = ActionableItemManagerCore.getActionableItems(Arrays.asList("SAW Code"));
       ReviewWorldSearchItem search =
          new ReviewWorldSearchItem("", aias, false, false, false, null, joe, null, null, null);
@@ -52,7 +53,7 @@ public class ReviewWorldSearchItemDemoTest {
 
    @org.junit.Test
    public void testState() throws Exception {
-      User joe = DemoTestUtil.getDemoUser(DemoUsers.Joe_Smith);
+      IAtsUser joe = AtsUsersClient.getUserFromToken(DemoUsers.Joe_Smith);
       Set<ActionableItemArtifact> aias = ActionableItemManagerCore.getActionableItems(Arrays.asList("SAW Code"));
       ReviewWorldSearchItem search =
          new ReviewWorldSearchItem("", aias, false, false, false, null, joe, null, null, "Prepare");
@@ -73,7 +74,7 @@ public class ReviewWorldSearchItemDemoTest {
 
    @org.junit.Test
    public void testAssignee_Kay() throws Exception {
-      User Kay_Jones = DemoTestUtil.getDemoUser(DemoUsers.Kay_Jones);
+      IAtsUser Kay_Jones = AtsUsersClient.getUserFromToken(DemoUsers.Kay_Jones);
       Set<ActionableItemArtifact> aias = ActionableItemManagerCore.getActionableItems(Arrays.asList("SAW Code"));
       ReviewWorldSearchItem search =
          new ReviewWorldSearchItem("", aias, false, false, false, null, Kay_Jones, null, null, null);
@@ -84,7 +85,7 @@ public class ReviewWorldSearchItemDemoTest {
 
    @org.junit.Test
    public void testAssignee_Joe() throws Exception {
-      User Joe_Smith = DemoTestUtil.getDemoUser(DemoUsers.Joe_Smith);
+      IAtsUser Joe_Smith = AtsUsersClient.getUserFromToken(DemoUsers.Joe_Smith);
       ReviewWorldSearchItem search =
          new ReviewWorldSearchItem("", (List<String>) null, false, false, false, null, Joe_Smith, null, null, null);
       Collection<Artifact> arts = search.performSearchGetResults();
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/AtsDeleteManagerTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/AtsDeleteManagerTest.java
index 08f651b58b8..16c42065841 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/AtsDeleteManagerTest.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/AtsDeleteManagerTest.java
@@ -24,7 +24,7 @@ import org.eclipse.osee.ats.core.client.review.DecisionReviewManager;
 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.AtsArtifactTypes;
-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.workflow.ActionableItemManagerCore;
 import org.eclipse.osee.ats.core.client.workflow.ChangeType;
 import org.eclipse.osee.ats.core.model.IAtsUser;
@@ -203,7 +203,7 @@ public class AtsDeleteManagerTest {
 
    private TeamWorkFlowArtifact createAction(TestNames testName, Collection<ActionableItemArtifact> actionableItems, SkynetTransaction transaction) throws OseeCoreException {
       Date createdDate = new Date();
-      IAtsUser createdBy = AtsUsers.getUser();
+      IAtsUser createdBy = AtsUsersClient.getUser();
       Artifact actionArt =
          ActionManager.createAction(null, testName.name(), "Description", ChangeType.Improvement, "2", false, null,
             actionableItems, createdDate, createdBy, null, transaction);
@@ -221,7 +221,7 @@ public class AtsDeleteManagerTest {
       DecisionReviewArtifact decRev =
          DecisionReviewManager.createNewDecisionReview(teamArt, ReviewBlockType.None, testName.name(),
             TeamState.Endorse.getPageName(), "Description", DecisionReviewManager.getDefaultDecisionReviewOptions(),
-            Arrays.asList(AtsUsers.getUser()), createdDate, createdBy);
+            Arrays.asList(AtsUsersClient.getUser()), createdDate, createdBy);
       decRev.persist(transaction);
 
       return teamArt;
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/AtsPurgeTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/AtsPurgeTest.java
deleted file mode 100644
index e01d233ea00..00000000000
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/AtsPurgeTest.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.util;
-
-import static org.junit.Assert.assertFalse;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import org.eclipse.osee.ats.core.client.action.ActionManager;
-import org.eclipse.osee.ats.core.client.config.ActionableItemArtifact;
-import org.eclipse.osee.ats.core.client.task.TaskArtifact;
-import org.eclipse.osee.ats.core.client.type.AtsArtifactTypes;
-import org.eclipse.osee.ats.core.client.util.AtsUsers;
-import org.eclipse.osee.ats.core.client.util.AtsUtilCore;
-import org.eclipse.osee.ats.core.client.workflow.ChangeType;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.operation.NullOperationLogger;
-import org.eclipse.osee.framework.core.operation.Operations;
-import org.eclipse.osee.framework.database.operation.PurgeUnusedBackingDataAndTransactions;
-import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.artifact.PurgeArtifacts;
-import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
-import org.eclipse.osee.framework.skynet.core.mocks.DbTestUtil;
-import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
-import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager;
-import org.eclipse.osee.framework.skynet.core.utility.ElapsedTime;
-import org.eclipse.osee.support.test.util.TestUtil;
-import org.junit.Before;
-
-/**
- * This test is intended to be run against a demo database. It tests the purge logic by counting the rows of the version
- * and txs tables, then adds an Action, Workflow and 30 Tasks, deletes these objects and compares the row count. If
- * purge works properly, all rows should be equal.
- * 
- * @author Donald G. Dunne
- */
-public class AtsPurgeTest {
-
-   private final Map<String, Integer> preCreateActionCount = new HashMap<String, Integer>();
-   private final Map<String, Integer> postCreateActionCount = new HashMap<String, Integer>();
-   private final Map<String, Integer> postPurgeCount = new HashMap<String, Integer>();
-   List<String> tables = Arrays.asList("osee_attribute", "osee_artifact", "osee_relation_link", "osee_tx_details",
-      "osee_txs");
-
-   @Before
-   public void setUp() throws Exception {
-      // This test should only be run on test db
-      assertFalse(AtsUtil.isProductionDb());
-   }
-
-   @org.junit.Test
-   public void testPurgeArtifacts() throws Exception {
-      // Count rows in tables prior to purge
-      txPrune();
-      DbTestUtil.getTableRowCounts(preCreateActionCount, tables);
-
-      Set<Artifact> artsToPurge = new HashSet<Artifact>();
-
-      // Create Action, Workflow and Tasks
-      SkynetTransaction transaction = TransactionManager.createTransaction(AtsUtil.getAtsBranch(), "Purge Test");
-      Artifact actionArt =
-         ActionManager.createAction(
-            null,
-            getClass().getSimpleName(),
-            "description",
-            ChangeType.Improvement,
-            "2",
-            false,
-            null,
-            org.eclipse.osee.framework.jdk.core.util.Collections.castAll(
-               ActionableItemArtifact.class,
-               ArtifactQuery.getArtifactListFromTypeAndName(AtsArtifactTypes.ActionableItem, "SAW Test",
-                  AtsUtil.getAtsBranch())), new Date(), AtsUsers.getUser(), null, transaction);
-      actionArt.persist(transaction);
-      transaction.execute();
-
-      artsToPurge.add(actionArt);
-      artsToPurge.addAll(ActionManager.getTeams(actionArt));
-
-      for (int x = 0; x < 30; x++) {
-         TaskArtifact taskArt =
-            ActionManager.getFirstTeam(actionArt).createNewTask(getClass().getSimpleName() + x, new Date(),
-               AtsUsers.getUser());
-         taskArt.persist(getClass().getSimpleName());
-         artsToPurge.add(taskArt);
-      }
-
-      // Count rows and check that increased
-      DbTestUtil.getTableRowCounts(postCreateActionCount, tables);
-      TestUtil.checkThatIncreased(preCreateActionCount, postCreateActionCount);
-
-      // Purge Action, Workflow and Tasks
-      ElapsedTime time = new ElapsedTime("AtsPurgeTest");
-      Operations.executeWorkAndCheckStatus(new PurgeArtifacts(artsToPurge));
-      time.end();
-
-      // Count rows and check that same as when began
-      txPrune();
-      DbTestUtil.getTableRowCounts(postPurgeCount, tables);
-      TestUtil.checkThatEqual(preCreateActionCount, postPurgeCount);
-   }
-
-   private void txPrune() throws OseeCoreException {
-      Operations.executeWorkAndCheckStatus(new PurgeUnusedBackingDataAndTransactions(
-         NullOperationLogger.getSingleton(), AtsUtilCore.getAtsBranch().getId()));
-   }
-
-}
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/AtsQueryPerformanceTests.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/AtsQueryPerformanceTests.java
index 5c918995142..65b82d1471e 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/AtsQueryPerformanceTests.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/AtsQueryPerformanceTests.java
@@ -15,7 +15,7 @@ import static org.junit.Assert.assertTrue;
 import java.util.Arrays;
 import java.util.Collection;
 import org.eclipse.osee.ats.core.client.config.AtsBulkLoad;
-import org.eclipse.osee.ats.core.client.util.AtsUsers;
+import org.eclipse.osee.ats.core.client.util.AtsUsersClient;
 import org.eclipse.osee.ats.core.model.IAtsUser;
 import org.eclipse.osee.ats.world.search.MyWorldSearchItem;
 import org.eclipse.osee.ats.world.search.TeamWorldSearchItem;
@@ -54,7 +54,7 @@ public class AtsQueryPerformanceTests {
    @org.junit.Test
    public void testUserWorldSearch() throws Exception {
       AtsBulkLoad.loadConfig(true);
-      IAtsUser user = AtsUsers.getUserByName("Finkbeiner, Andrew M");
+      IAtsUser user = AtsUsersClient.getUserByName("Finkbeiner, Andrew M");
       assertNotNull("User does not exist", user);
       MyWorldSearchItem search = new MyWorldSearchItem();
       long startTime = System.currentTimeMillis();
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/DemoTestUtil.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/DemoTestUtil.java
index edb1bb6f84d..d920bc6a9be 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/DemoTestUtil.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/DemoTestUtil.java
@@ -27,7 +27,7 @@ import org.eclipse.osee.ats.core.client.config.TeamDefinitionManagerCore;
 import org.eclipse.osee.ats.core.client.task.TaskArtifact;
 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.util.AtsUsers;
+import org.eclipse.osee.ats.core.client.util.AtsUsersClient;
 import org.eclipse.osee.ats.core.client.workflow.ActionableItemManagerCore;
 import org.eclipse.osee.ats.core.client.workflow.ChangeType;
 import org.eclipse.osee.ats.internal.Activator;
@@ -98,7 +98,7 @@ public class DemoTestUtil {
       Artifact actionArt =
          ActionManager.createAction(null, title, "Description", ChangeType.Improvement, "2", false, null,
             ActionableItemManagerCore.getActionableItems(Arrays.asList(DemoActionableItems.SAW_Code.getName())),
-            new Date(), AtsUsers.getUser(), null, transaction);
+            new Date(), AtsUsersClient.getUser(), null, transaction);
 
       TeamWorkFlowArtifact teamArt = null;
       for (TeamWorkFlowArtifact team : ActionManager.getTeams(actionArt)) {
@@ -123,7 +123,7 @@ public class DemoTestUtil {
       Collection<TeamDefinitionArtifact> teamDefs = TeamDefinitionManagerCore.getImpactedTeamDefs(actionableItems);
 
       ActionManager.createTeamWorkflow(actionArt, teamDefs.iterator().next(), actionableItems,
-         Arrays.asList(AtsUsers.getUser()), transaction, new Date(), AtsUsers.getUser(), null);
+         Arrays.asList(AtsUsersClient.getUser()), transaction, new Date(), AtsUsersClient.getUser(), null);
 
       TeamWorkFlowArtifact teamArt = null;
       for (TeamWorkFlowArtifact team : ActionManager.getTeams(actionArt)) {
@@ -142,7 +142,7 @@ public class DemoTestUtil {
       for (int x = 1; x < numTasks + 1; x++) {
          names.add(title + " " + x);
       }
-      return teamArt.createTasks(names, Arrays.asList(AtsUsers.getUser()), new Date(), AtsUsers.getUser(), transaction);
+      return teamArt.createTasks(names, Arrays.asList(AtsUsersClient.getUser()), new Date(), AtsUsersClient.getUser(), transaction);
    }
 
    public static TeamWorkFlowArtifact getToolsTeamWorkflow() throws OseeCoreException {
@@ -208,7 +208,7 @@ public class DemoTestUtil {
          // Confirm user is Joe Smith
          Assert.assertTrue(
             "Authenticated user should be \"Joe Smith\" and is not.  Check that Demo Application Server is being run.",
-            AtsUsers.getUser().getUserId().equals("Joe Smith"));
+            AtsUsersClient.getUser().getUserId().equals("Joe Smith"));
       } catch (OseeAuthenticationException ex) {
          OseeLog.log(Activator.class, Level.SEVERE, ex);
          Assert.fail("Can't authenticate, either Demo Application Server is not running or Demo DbInit has not been performed");
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/SMATestUtil.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/SMATestUtil.java
index 1275cc8986d..2eb84b365b7 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/SMATestUtil.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/SMATestUtil.java
@@ -14,11 +14,10 @@ import java.util.Arrays;
 import java.util.Collection;
 import org.eclipse.osee.ats.core.client.type.AtsAttributeTypes;
 import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact;
+import org.eclipse.osee.ats.core.client.workflow.AtsWorkStateFactory;
 import org.eclipse.osee.ats.core.client.workflow.HoursSpentUtil;
 import org.eclipse.osee.ats.core.client.workflow.PercentCompleteTotalUtil;
-import org.eclipse.osee.ats.core.client.workflow.SMAState;
-import org.eclipse.osee.ats.core.workdef.StateDefinition;
-import org.eclipse.osee.ats.core.workflow.WorkPageType;
+import org.eclipse.osee.ats.core.model.impl.WorkStateImpl;
 import org.junit.Assert;
 
 /**
@@ -46,15 +45,8 @@ public class SMATestUtil {
             HoursSpentUtil.getHoursSpentTotal(awa), hoursSpent, 0.0);
 
          for (String xml : awa.getAttributesToStringList(AtsAttributeTypes.State)) {
-            SMAState smaState = new SMAState(awa, xml);
-            String pageName = smaState.getName();
-            StateDefinition stateDef = awa.getStateDefinitionByName(pageName);
-            if (stateDef != null) {
-               smaState.setWorkPageType(stateDef.getWorkPageType());
-            } else {
-               smaState.setWorkPageType(WorkPageType.Working);
-            }
-            boolean isCompletedCancelledState = isCompletedCancelledState(awa, smaState.getName());
+            WorkStateImpl state = AtsWorkStateFactory.getFromXml(xml);
+            boolean isCompletedCancelledState = isCompletedCancelledState(awa, state.getName());
             if (isCompletedCancelledState) {
                Assert.assertTrue("completed/cancelled ats.State [" + xml + "] wrong " + awa.getHumanReadableId(),
                   xml.endsWith(";;;"));