bts_ATS161131]: Move getAtsBranch to AtsClient and AtsServer

Change-Id: I0935dc3938fe85599079b222a6a6af2d3e32733f

29 files changed, 100 insertions, 105 deletions

diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/PopulateDemoActionsTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/PopulateDemoActionsTest.java
index 672ddd45214..47b251a12e9 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/PopulateDemoActionsTest.java
+++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/PopulateDemoActionsTest.java
@@ -66,7 +66,7 @@ public class PopulateDemoActionsTest {
    @AfterClass
    public static void cleanup() throws OseeCoreException {
       IAtsChangeSet changes = AtsClientService.get().createChangeSet("Cleanup PopulateDemoActionsTest");
-      for (Artifact art : ArtifactQuery.getArtifactListFromName("Auto-created", AtsUtilCore.getAtsBranch(),
+      for (Artifact art : ArtifactQuery.getArtifactListFromName("Auto-created", AtsClientService.get().getAtsBranch(),
          DeletionFlag.EXCLUDE_DELETED, QueryOption.CONTAINS_MATCH_OPTIONS)) {
          changes.deleteArtifact(art);
       }
@@ -84,7 +84,7 @@ public class PopulateDemoActionsTest {
       // {@link DemoDbActionData.getReqSawActionsData()} - 1
       String title = "SAW (committed) Reqt Changes for Diagram View";
       ActionArtifact action = (ActionArtifact) ArtifactQuery.getArtifactFromTypeAndName(AtsArtifactTypes.Action, title,
-         AtsUtilCore.getAtsBranch());
+         AtsClientService.get().getAtsBranch());
       Assert.assertNotNull(action);
 
       // test teams
@@ -149,7 +149,7 @@ public class PopulateDemoActionsTest {
       // {@link DemoDbActionData.getReqSawActionsData()} - 2
       String title = "SAW (uncommitted) More Reqt Changes for Diagram View";
       ActionArtifact action = (ActionArtifact) ArtifactQuery.getArtifactFromTypeAndName(AtsArtifactTypes.Action, title,
-         AtsUtilCore.getAtsBranch());
+         AtsClientService.get().getAtsBranch());
       Assert.assertNotNull(action);
       Assert.assertEquals(4, action.getTeams().size());
       TeamWorkFlowArtifact codeTeam = null, designTeam = null;
@@ -213,7 +213,7 @@ public class PopulateDemoActionsTest {
       // {@link DemoDbActionData.getReqSawActionsData()} - 3
       String title = "SAW (no-branch) Even More Requirement Changes for Diagram View";
       ActionArtifact action = (ActionArtifact) ArtifactQuery.getArtifactFromTypeAndName(AtsArtifactTypes.Action, title,
-         AtsUtilCore.getAtsBranch());
+         AtsClientService.get().getAtsBranch());
       Assert.assertNotNull(action);
       Assert.assertEquals(4, action.getTeams().size());
       Assert.assertEquals(4, action.getTeams().size());
@@ -257,7 +257,7 @@ public class PopulateDemoActionsTest {
       // {@link DemoDbActionData.getReqSawActionsData()} - 4
       String title = "SAW (uncommitted-conflicted) More Requirement Changes for Diagram View";
       ActionArtifact action = (ActionArtifact) ArtifactQuery.getArtifactFromTypeAndName(AtsArtifactTypes.Action, title,
-         AtsUtilCore.getAtsBranch());
+         AtsClientService.get().getAtsBranch());
       Assert.assertNotNull(action);
       Assert.assertEquals(1, action.getTeams().size());
       TeamWorkFlowArtifact teamArt = action.getTeams().iterator().next();
@@ -270,7 +270,7 @@ public class PopulateDemoActionsTest {
    public void testWorkaroundForGraphViewBld1Action() throws OseeCoreException {
       String title = "Workaround for Graph View for SAW_Bld_1";
       ActionArtifact action = (ActionArtifact) ArtifactQuery.getArtifactFromTypeAndName(AtsArtifactTypes.Action, title,
-         AtsUtilCore.getAtsBranch());
+         AtsClientService.get().getAtsBranch());
       Assert.assertNotNull(action);
       Assert.assertEquals(1, action.getTeams().size());
       TeamWorkFlowArtifact teamArt = action.getTeams().iterator().next();
@@ -283,7 +283,7 @@ public class PopulateDemoActionsTest {
    public void testWorkaroundForGraphViewBld2Action() throws OseeCoreException {
       String title = "Workaround for Graph View for SAW_Bld_2";
       ActionArtifact action = (ActionArtifact) ArtifactQuery.getArtifactFromTypeAndName(AtsArtifactTypes.Action, title,
-         AtsUtilCore.getAtsBranch());
+         AtsClientService.get().getAtsBranch());
       Assert.assertNotNull(action);
       Assert.assertEquals(1, action.getTeams().size());
       TeamWorkFlowArtifact teamArt = action.getTeams().iterator().next();
@@ -296,7 +296,7 @@ public class PopulateDemoActionsTest {
    public void testWorkaroundForGraphViewBld3Action() throws OseeCoreException {
       String title = "Workaround for Graph View for SAW_Bld_3";
       ActionArtifact action = (ActionArtifact) ArtifactQuery.getArtifactFromTypeAndName(AtsArtifactTypes.Action, title,
-         AtsUtilCore.getAtsBranch());
+         AtsClientService.get().getAtsBranch());
       Assert.assertNotNull(action);
       Assert.assertEquals(1, action.getTeams().size());
       TeamWorkFlowArtifact teamArt = action.getTeams().iterator().next();
@@ -309,7 +309,7 @@ public class PopulateDemoActionsTest {
    public void testWorkingWithDiagramTreeBld1Action() throws OseeCoreException {
       String title = "Working with Diagram Tree for SAW_Bld_1";
       ActionArtifact action = (ActionArtifact) ArtifactQuery.getArtifactFromTypeAndName(AtsArtifactTypes.Action, title,
-         AtsUtilCore.getAtsBranch());
+         AtsClientService.get().getAtsBranch());
       Assert.assertNotNull(action);
       Assert.assertEquals(1, action.getTeams().size());
       TeamWorkFlowArtifact teamArt = action.getTeams().iterator().next();
@@ -322,7 +322,7 @@ public class PopulateDemoActionsTest {
    public void testWorkingWithDiagramTreeBld2Action() throws OseeCoreException {
       String title = "Working with Diagram Tree for SAW_Bld_2";
       ActionArtifact action = (ActionArtifact) ArtifactQuery.getArtifactFromTypeAndName(AtsArtifactTypes.Action, title,
-         AtsUtilCore.getAtsBranch());
+         AtsClientService.get().getAtsBranch());
       Assert.assertNotNull(action);
       Assert.assertEquals(1, action.getTeams().size());
       TeamWorkFlowArtifact teamArt = action.getTeams().iterator().next();
@@ -335,7 +335,7 @@ public class PopulateDemoActionsTest {
    public void testWorkingWithDiagramTreeBld3Action() throws OseeCoreException {
       String title = "Working with Diagram Tree for SAW_Bld_3";
       ActionArtifact action = (ActionArtifact) ArtifactQuery.getArtifactFromTypeAndName(AtsArtifactTypes.Action, title,
-         AtsUtilCore.getAtsBranch());
+         AtsClientService.get().getAtsBranch());
       Assert.assertNotNull(action);
       Assert.assertEquals(1, action.getTeams().size());
       TeamWorkFlowArtifact teamArt = action.getTeams().iterator().next();
@@ -348,7 +348,7 @@ public class PopulateDemoActionsTest {
    public void testButton2DoesntWorkOnHelpAction() throws OseeCoreException {
       String title = "Button S doesn't work on help";
       ActionArtifact action = (ActionArtifact) ArtifactQuery.getArtifactFromTypeAndName(AtsArtifactTypes.Action, title,
-         AtsUtilCore.getAtsBranch());
+         AtsClientService.get().getAtsBranch());
       Assert.assertNotNull(action);
       Assert.assertEquals(1, action.getTeams().size());
       TeamWorkFlowArtifact teamArt = action.getTeams().iterator().next();
@@ -369,7 +369,7 @@ public class PopulateDemoActionsTest {
    public void testButtonWDoesntWorkOnSituationPageAction() throws OseeCoreException {
       String title = "Button W doesn't work on Situation Page";
       ActionArtifact action = (ActionArtifact) ArtifactQuery.getArtifactFromTypeAndName(AtsArtifactTypes.Action, title,
-         AtsUtilCore.getAtsBranch());
+         AtsClientService.get().getAtsBranch());
       Assert.assertNotNull(action);
       Assert.assertEquals(1, action.getTeams().size());
       TeamWorkFlowArtifact teamArt = action.getTeams().iterator().next();
@@ -390,7 +390,7 @@ public class PopulateDemoActionsTest {
    public void testCantLoadDiagramTreeAction() throws OseeCoreException {
       String title = "Can't load Diagram Tree";
       ActionArtifact action = (ActionArtifact) ArtifactQuery.getArtifactFromTypeAndName(AtsArtifactTypes.Action, title,
-         AtsUtilCore.getAtsBranch());
+         AtsClientService.get().getAtsBranch());
       Assert.assertNotNull(action);
       Assert.assertEquals(1, action.getTeams().size());
       TeamWorkFlowArtifact teamArt = action.getTeams().iterator().next();
@@ -403,7 +403,7 @@ public class PopulateDemoActionsTest {
    public void testCantSeeTheGraphViewAction() throws OseeCoreException {
       String title = "Can't see the Graph View";
       ActionArtifact action = (ActionArtifact) ArtifactQuery.getArtifactFromTypeAndName(AtsArtifactTypes.Action, title,
-         AtsUtilCore.getAtsBranch());
+         AtsClientService.get().getAtsBranch());
       Assert.assertNotNull(action);
       Assert.assertEquals(1, action.getTeams().size());
       TeamWorkFlowArtifact teamArt = action.getTeams().iterator().next();
@@ -417,7 +417,7 @@ public class PopulateDemoActionsTest {
    public void testProblemInDiagramTreeAction() throws OseeCoreException {
       String title = "Problem in Diagram Tree";
       ActionArtifact action = (ActionArtifact) ArtifactQuery.getArtifactFromTypeAndName(AtsArtifactTypes.Action, title,
-         AtsUtilCore.getAtsBranch());
+         AtsClientService.get().getAtsBranch());
       Assert.assertNotNull(action);
       Assert.assertEquals(1, action.getTeams().size());
       TeamWorkFlowArtifact teamArt = action.getTeams().iterator().next();
@@ -431,7 +431,7 @@ public class PopulateDemoActionsTest {
    public void testProblemWithTheGraphViewAction() throws OseeCoreException {
       String title = "Problem with the Graph View";
       ActionArtifact action = (ActionArtifact) ArtifactQuery.getArtifactFromTypeAndName(AtsArtifactTypes.Action, title,
-         AtsUtilCore.getAtsBranch());
+         AtsClientService.get().getAtsBranch());
       Assert.assertNotNull(action);
       Assert.assertEquals(1, action.getTeams().size());
       TeamWorkFlowArtifact teamArt = action.getTeams().iterator().next();
@@ -445,7 +445,7 @@ public class PopulateDemoActionsTest {
    public void testProblemWithTheUserWindowAction() throws OseeCoreException {
       String title = "Problem with the user window";
       ActionArtifact action = (ActionArtifact) ArtifactQuery.getArtifactFromTypeAndName(AtsArtifactTypes.Action, title,
-         AtsUtilCore.getAtsBranch());
+         AtsClientService.get().getAtsBranch());
       Assert.assertNotNull(action);
       Assert.assertEquals(1, action.getTeams().size());
       TeamWorkFlowArtifact teamArt = action.getTeams().iterator().next();
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/access/AtsBranchAccessManagerTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/access/AtsBranchAccessManagerTest.java
index 418cb68b71e..10517b635ac 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/access/AtsBranchAccessManagerTest.java
+++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/access/AtsBranchAccessManagerTest.java
@@ -18,7 +18,6 @@ import org.eclipse.osee.ats.client.integration.tests.AtsClientService;
 import org.eclipse.osee.ats.client.integration.tests.util.DemoTestUtil;
 import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact;
 import org.eclipse.osee.ats.core.config.ActionableItems;
-import org.eclipse.osee.ats.core.util.AtsUtilCore;
 import org.eclipse.osee.ats.demo.api.DemoActionableItems;
 import org.eclipse.osee.ats.demo.api.DemoWorkType;
 import org.eclipse.osee.framework.core.data.BranchId;
@@ -41,7 +40,7 @@ public class AtsBranchAccessManagerTest {
    @Test
    public void testIsApplicable() throws OseeCoreException {
       AtsBranchAccessManager mgr = new AtsBranchAccessManager();
-      Assert.assertFalse(mgr.isApplicable(AtsUtilCore.getAtsBranch()));
+      Assert.assertFalse(mgr.isApplicable(AtsClientService.get().getAtsBranch()));
       Assert.assertFalse(mgr.isApplicable(SAW_Bld_1));
 
       TeamWorkFlowArtifact teamArt =
@@ -60,7 +59,7 @@ public class AtsBranchAccessManagerTest {
       TeamWorkFlowArtifact teamArt =
          (TeamWorkFlowArtifact) DemoTestUtil.getUncommittedActionWorkflow(DemoWorkType.Requirements);
       SkynetTransaction transaction =
-         TransactionManager.createTransaction(AtsUtilCore.getAtsBranch(), "testGetContextIdArtifact cleanup");
+         TransactionManager.createTransaction(AtsClientService.get().getAtsBranch(), "testGetContextIdArtifact cleanup");
       Artifact teamDefArt = AtsClientService.get().getConfigArtifact(teamArt.getTeamDefinition());
       teamDefArt.deleteAttributes(CoreAttributeTypes.AccessContextId);
       teamDefArt.persist(transaction);
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/DuplicateWorkflowActionTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/DuplicateWorkflowActionTest.java
index 1ccbab9a390..1ee669bafdd 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/DuplicateWorkflowActionTest.java
+++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/DuplicateWorkflowActionTest.java
@@ -29,7 +29,6 @@ import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil
 import org.eclipse.osee.ats.core.client.action.ActionManager;
 import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact;
 import org.eclipse.osee.ats.core.users.AtsCoreUsers;
-import org.eclipse.osee.ats.core.util.AtsUtilCore;
 import org.eclipse.osee.ats.demo.api.DemoUsers;
 import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
 import org.eclipse.osee.framework.skynet.core.UserManager;
@@ -71,7 +70,7 @@ public class DuplicateWorkflowActionTest extends AbstractAtsActionRunTest {
 
       // duplicate workflow
       dupArt =
-         (TeamWorkFlowArtifact) teamWf.duplicate(AtsUtilCore.getAtsBranch(), Arrays.asList(AtsAttributeTypes.AtsId));
+         (TeamWorkFlowArtifact) teamWf.duplicate(AtsClientService.get().getAtsBranch(), Arrays.asList(AtsAttributeTypes.AtsId));
       dupArt.initializeNewStateMachine(assignees, new Date(), AtsCoreUsers.SYSTEM_USER, changes);
 
       changes.add(dupArt);
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/NewGoalTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/NewGoalTest.java
index 64259f7ddf5..3e4bf1d3e30 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/NewGoalTest.java
+++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/NewGoalTest.java
@@ -11,7 +11,7 @@
 package org.eclipse.osee.ats.client.integration.tests.ats.actions;
 
 import org.eclipse.osee.ats.actions.NewGoal;
-import org.eclipse.osee.ats.core.util.AtsUtilCore;
+import org.eclipse.osee.ats.client.integration.tests.AtsClientService;
 import org.eclipse.osee.framework.core.enums.DeletionFlag;
 import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
@@ -30,9 +30,9 @@ public class NewGoalTest extends AbstractAtsActionRunTest {
    @AfterClass
    public static void cleanup() throws OseeCoreException {
       SkynetTransaction transaction =
-         TransactionManager.createTransaction(AtsUtilCore.getAtsBranch(), NewGoalTest.class.getSimpleName());
+         TransactionManager.createTransaction(AtsClientService.get().getAtsBranch(), NewGoalTest.class.getSimpleName());
       for (Artifact art : ArtifactQuery.getArtifactListFromName(NewGoalTest.class.getSimpleName(),
-         AtsUtilCore.getAtsBranch(), DeletionFlag.EXCLUDE_DELETED)) {
+         AtsClientService.get().getAtsBranch(), DeletionFlag.EXCLUDE_DELETED)) {
          art.deleteAndPersist(transaction);
       }
       transaction.execute();
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/column/CategoryColumnTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/column/CategoryColumnTest.java
index 88355363a2f..d0667c9470a 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/column/CategoryColumnTest.java
+++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/column/CategoryColumnTest.java
@@ -11,10 +11,10 @@
 package org.eclipse.osee.ats.client.integration.tests.ats.column;
 
 import org.eclipse.osee.ats.api.data.AtsAttributeTypes;
+import org.eclipse.osee.ats.client.integration.tests.AtsClientService;
 import org.eclipse.osee.ats.client.integration.tests.util.DemoTestUtil;
 import org.eclipse.osee.ats.column.CategoryColumn;
 import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact;
-import org.eclipse.osee.ats.core.util.AtsUtilCore;
 import org.eclipse.osee.ats.demo.api.DemoWorkType;
 import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
 import org.eclipse.osee.framework.logging.SevereLoggingMonitor;
@@ -42,7 +42,7 @@ public class CategoryColumnTest {
       TeamWorkFlowArtifact testArt =
          (TeamWorkFlowArtifact) DemoTestUtil.getUncommittedActionWorkflow(DemoWorkType.Test);
       SkynetTransaction transaction =
-         TransactionManager.createTransaction(AtsUtilCore.getAtsBranch(), CategoryColumnTest.class.getSimpleName());
+         TransactionManager.createTransaction(AtsClientService.get().getAtsBranch(), CategoryColumnTest.class.getSimpleName());
       codeArt.deleteAttributes(AtsAttributeTypes.Category1);
       codeArt.persist(transaction);
       reqArt.deleteAttributes(AtsAttributeTypes.Category1);
@@ -74,7 +74,7 @@ public class CategoryColumnTest {
          CategoryColumn.getCategory1Instance().getColumnText(actionArt, CategoryColumn.getCategory1Instance(), 0));
 
       SkynetTransaction transaction =
-         TransactionManager.createTransaction(AtsUtilCore.getAtsBranch(), CategoryColumnTest.class.getSimpleName());
+         TransactionManager.createTransaction(AtsClientService.get().getAtsBranch(), CategoryColumnTest.class.getSimpleName());
       codeArt.addAttribute(AtsAttributeTypes.Category1, "this");
       codeArt.persist(transaction);
       reqArt.addAttribute(AtsAttributeTypes.Category1, "that");
@@ -98,7 +98,7 @@ public class CategoryColumnTest {
       Assert.assertTrue(actionArtStr.contains("the other"));
 
       transaction =
-         TransactionManager.createTransaction(AtsUtilCore.getAtsBranch(), CategoryColumnTest.class.getSimpleName());
+         TransactionManager.createTransaction(AtsClientService.get().getAtsBranch(), CategoryColumnTest.class.getSimpleName());
       codeArt.deleteAttributes(AtsAttributeTypes.Category1);
       codeArt.persist(transaction);
       reqArt.deleteSoleAttribute(AtsAttributeTypes.Category1);
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/ActionableItemResourceTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/ActionableItemResourceTest.java
index 877ecbbfc67..e3f19b50d65 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/ActionableItemResourceTest.java
+++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/ActionableItemResourceTest.java
@@ -13,7 +13,7 @@ package org.eclipse.osee.ats.client.integration.tests.ats.config;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import org.eclipse.osee.ats.api.data.AtsArtifactTypes;
-import org.eclipse.osee.ats.core.util.AtsUtilCore;
+import org.eclipse.osee.ats.client.integration.tests.AtsClientService;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
 import org.junit.Assert;
@@ -64,7 +64,7 @@ public class ActionableItemResourceTest extends AbstractConfigurationRestTest {
 
    private Artifact getSawCodeAi() {
       return ArtifactQuery.getArtifactFromTypeAndName(AtsArtifactTypes.ActionableItem, "SAW Code",
-         AtsUtilCore.getAtsBranch());
+         AtsClientService.get().getAtsBranch());
    }
 
 }
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/AtsBranchConfigurationTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/AtsBranchConfigurationTest.java
index 8532ac1997b..99219aa23d5 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/AtsBranchConfigurationTest.java
+++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/AtsBranchConfigurationTest.java
@@ -31,7 +31,6 @@ import org.eclipse.osee.ats.core.client.action.ActionManager;
 import org.eclipse.osee.ats.core.client.branch.AtsBranchUtil;
 import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact;
 import org.eclipse.osee.ats.core.config.ActionableItems;
-import org.eclipse.osee.ats.core.util.AtsUtilCore;
 import org.eclipse.osee.ats.core.workflow.state.TeamState;
 import org.eclipse.osee.ats.core.workflow.transition.TeamWorkFlowManager;
 import org.eclipse.osee.ats.editor.WorkflowEditor;
@@ -321,10 +320,10 @@ public class AtsBranchConfigurationTest {
    public static void cleanupBranchTest(IOseeBranch branch) throws Exception {
       String namespace = "org.branchTest." + branch.getName().toLowerCase();
       Artifact aArt = ArtifactQuery.checkArtifactFromTypeAndName(AtsArtifactTypes.Action,
-         branch.getName() + " Req Changes", AtsUtilCore.getAtsBranch());
+         branch.getName() + " Req Changes", AtsClientService.get().getAtsBranch());
       if (aArt != null) {
          SkynetTransaction transaction =
-            TransactionManager.createTransaction(AtsUtilCore.getAtsBranch(), "Branch Configuration Test");
+            TransactionManager.createTransaction(AtsClientService.get().getAtsBranch(), "Branch Configuration Test");
          for (TeamWorkFlowArtifact teamArt : ActionManager.getTeams(aArt)) {
             WorkflowEditor.close(Collections.singleton(teamArt), false);
             teamArt.deleteAndPersist(transaction, true);
@@ -335,7 +334,7 @@ public class AtsBranchConfigurationTest {
 
       // Delete VersionArtifacts
       SkynetTransaction transaction =
-         TransactionManager.createTransaction(AtsUtilCore.getAtsBranch(), "Branch Configuration Test");
+         TransactionManager.createTransaction(AtsClientService.get().getAtsBranch(), "Branch Configuration Test");
       for (IAtsVersion version : AtsClientService.get().getQueryService().createQuery(
          AtsArtifactTypes.Version).getItems(IAtsVersion.class)) {
          if (version.getName().contains(branch.getName())) {
@@ -349,9 +348,9 @@ public class AtsBranchConfigurationTest {
       transaction.execute();
 
       // Delete Team Definitions
-      transaction = TransactionManager.createTransaction(AtsUtilCore.getAtsBranch(), "Branch Configuration Test");
+      transaction = TransactionManager.createTransaction(AtsClientService.get().getAtsBranch(), "Branch Configuration Test");
       for (Artifact teamDefArt : ArtifactQuery.getArtifactListFromTypeAndName(AtsArtifactTypes.TeamDefinition,
-         branch.getName(), AtsUtilCore.getAtsBranch())) {
+         branch.getName(), AtsClientService.get().getAtsBranch())) {
          teamDefArt.deleteAndPersist(transaction, false);
          IAtsTeamDefinition soleByUuid = AtsClientService.get().getCache().getAtsObject(teamDefArt.getId());
          if (soleByUuid != null) {
@@ -361,9 +360,9 @@ public class AtsBranchConfigurationTest {
       transaction.execute();
 
       // Delete AIs
-      transaction = TransactionManager.createTransaction(AtsUtilCore.getAtsBranch(), "Branch Configuration Test");
+      transaction = TransactionManager.createTransaction(AtsClientService.get().getAtsBranch(), "Branch Configuration Test");
       for (Artifact aiaArt : ArtifactQuery.getArtifactListFromTypeAndName(AtsArtifactTypes.ActionableItem,
-         branch.getName(), AtsUtilCore.getAtsBranch())) {
+         branch.getName(), AtsClientService.get().getAtsBranch())) {
          for (Artifact childArt : aiaArt.getChildren()) {
             childArt.deleteAndPersist(transaction, false);
             IAtsActionableItem soleByUuid = AtsClientService.get().getCache().getAtsObject(childArt.getId());
@@ -383,9 +382,9 @@ public class AtsBranchConfigurationTest {
 
       // Work Definition
       Collection<Artifact> arts =
-         ArtifactQuery.getArtifactListFromType(AtsArtifactTypes.WorkDefinition, AtsUtilCore.getAtsBranch());
+         ArtifactQuery.getArtifactListFromType(AtsArtifactTypes.WorkDefinition, AtsClientService.get().getAtsBranch());
       if (arts.size() > 0) {
-         transaction = TransactionManager.createTransaction(AtsUtilCore.getAtsBranch(), "Branch Configuration Test");
+         transaction = TransactionManager.createTransaction(AtsClientService.get().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.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/ProgramResourceTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/ProgramResourceTest.java
index ee2a8b6013b..71b0dda59d9 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/ProgramResourceTest.java
+++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/ProgramResourceTest.java
@@ -13,7 +13,7 @@ package org.eclipse.osee.ats.client.integration.tests.ats.config;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import org.eclipse.osee.ats.api.data.AtsArtifactTypes;
-import org.eclipse.osee.ats.core.util.AtsUtilCore;
+import org.eclipse.osee.ats.client.integration.tests.AtsClientService;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
 import org.junit.Assert;
@@ -64,7 +64,7 @@ public class ProgramResourceTest extends AbstractConfigurationRestTest {
 
    private Artifact getSawProgram() {
       return ArtifactQuery.getArtifactFromTypeAndName(AtsArtifactTypes.Program, "SAW Program",
-         AtsUtilCore.getAtsBranch());
+         AtsClientService.get().getAtsBranch());
    }
 
 }
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/TeamResourceTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/TeamResourceTest.java
index f07340f847d..4870c704bd2 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/TeamResourceTest.java
+++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/TeamResourceTest.java
@@ -12,7 +12,7 @@ package org.eclipse.osee.ats.client.integration.tests.ats.config;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
-import org.eclipse.osee.ats.core.util.AtsUtilCore;
+import org.eclipse.osee.ats.client.integration.tests.AtsClientService;
 import org.eclipse.osee.ats.demo.api.DemoTeam;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
@@ -67,6 +67,6 @@ public class TeamResourceTest extends AbstractConfigurationRestTest {
    }
 
    private Artifact getSawSwTeamDef() {
-      return ArtifactQuery.getArtifactFromToken(DemoTeam.SAW_SW.getTeamDefToken(), AtsUtilCore.getAtsBranch());
+      return ArtifactQuery.getArtifactFromToken(DemoTeam.SAW_SW.getTeamDefToken(), AtsClientService.get().getAtsBranch());
    }
 }
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/VersionResourceTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/VersionResourceTest.java
index 86d118768f5..b3750c0a589 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/VersionResourceTest.java
+++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/VersionResourceTest.java
@@ -13,7 +13,7 @@ package org.eclipse.osee.ats.client.integration.tests.ats.config;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import org.eclipse.osee.ats.api.data.AtsArtifactTypes;
-import org.eclipse.osee.ats.core.util.AtsUtilCore;
+import org.eclipse.osee.ats.client.integration.tests.AtsClientService;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
 import org.junit.Assert;
@@ -64,7 +64,7 @@ public class VersionResourceTest extends AbstractConfigurationRestTest {
 
    private Artifact getSawBld1() {
       return ArtifactQuery.getArtifactFromTypeAndName(AtsArtifactTypes.Version, "SAW_Bld_1",
-         AtsUtilCore.getAtsBranch());
+         AtsClientService.get().getAtsBranch());
    }
 
 }
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/AtsTestUtil.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/AtsTestUtil.java
index 369c01a3abf..f43bc8fc956 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/AtsTestUtil.java
+++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/AtsTestUtil.java
@@ -59,7 +59,6 @@ import org.eclipse.osee.ats.core.client.review.ReviewManager;
 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.util.AtsUtilClient;
-import org.eclipse.osee.ats.core.util.AtsUtilCore;
 import org.eclipse.osee.ats.core.workdef.SimpleDecisionReviewOption;
 import org.eclipse.osee.ats.core.workflow.state.StateTypeAdapter;
 import org.eclipse.osee.ats.core.workflow.transition.TransitionFactory;
@@ -380,7 +379,7 @@ public class AtsTestUtil {
    public static void importWorkDefinition(JaxAtsWorkDef jaxWorkDef) throws Exception {
       AtsClientService.getConfigEndpoint().storeWorkDef(jaxWorkDef);
       Artifact workDefArt = ArtifactQuery.getArtifactFromTypeAndName(AtsArtifactTypes.WorkDefinition, WORK_DEF_NAME,
-         AtsUtilCore.getAtsBranch());
+         AtsClientService.get().getAtsBranch());
       workDefArt.reloadAttributesAndRelations();
       AtsClientService.get().getWorkDefinitionAdmin().clearCaches();
       XResultData results = new XResultData();
@@ -520,7 +519,7 @@ public class AtsTestUtil {
       deleteTeamWf(teamArt3);
       deleteTeamWf(teamArt4);
 
-      SkynetTransaction transaction = TransactionManager.createTransaction(AtsUtilCore.getAtsBranch(),
+      SkynetTransaction transaction = TransactionManager.createTransaction(AtsClientService.get().getAtsBranch(),
          AtsTestUtil.class.getSimpleName() + " - cleanup config");
       for (IAtsConfigObject config : Arrays.asList(teamDef, testAi, testAi2, testAi3, testAi4)) {
          if (config != null && config.getStoreObject() instanceof Artifact) {
@@ -531,7 +530,7 @@ public class AtsTestUtil {
 
       try {
          Artifact workDefArt = ArtifactQuery.getArtifactFromTypeAndName(AtsArtifactTypes.WorkDefinition, WORK_DEF_NAME,
-            AtsUtilCore.getAtsBranch());
+            AtsClientService.get().getAtsBranch());
          if (workDefArt != null) {
             workDefArt.deleteAndPersist(transaction);
          }
@@ -576,7 +575,7 @@ public class AtsTestUtil {
    public static void cleanupSimpleTest(Collection<String> titles) throws Exception {
       List<Artifact> artifacts = new ArrayList<>();
       for (String title : titles) {
-         artifacts.addAll(ArtifactQuery.getArtifactListFromName(title, AtsUtilCore.getAtsBranch(), EXCLUDE_DELETED,
+         artifacts.addAll(ArtifactQuery.getArtifactListFromName(title, AtsClientService.get().getAtsBranch(), EXCLUDE_DELETED,
             QueryOption.CONTAINS_MATCH_OPTIONS));
       }
       Operations.executeWorkAndCheckStatus(new PurgeArtifacts(artifacts));
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/action/AutoAddActionToGoalTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/action/AutoAddActionToGoalTest.java
index 2b636f17963..ce353bd7c19 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/action/AutoAddActionToGoalTest.java
+++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/action/AutoAddActionToGoalTest.java
@@ -48,8 +48,8 @@ public class AutoAddActionToGoalTest {
       AtsTestUtil.cleanup();
 
       SkynetTransaction transaction =
-         TransactionManager.createTransaction(AtsUtilCore.getAtsBranch(), "AutoAddActionToGoalTest - cleanup");
-      for (Artifact art : ArtifactQuery.getArtifactListFromName("AutoAddActionToGoalTest", AtsUtilCore.getAtsBranch(),
+         TransactionManager.createTransaction(AtsClientService.get().getAtsBranch(), "AutoAddActionToGoalTest - cleanup");
+      for (Artifact art : ArtifactQuery.getArtifactListFromName("AutoAddActionToGoalTest", AtsClientService.get().getAtsBranch(),
          DeletionFlag.EXCLUDE_DELETED, QueryOption.CONTAINS_MATCH_OPTIONS)) {
          art.deleteAndPersist(transaction);
       }
@@ -167,7 +167,7 @@ public class AutoAddActionToGoalTest {
 
       AtsTestUtil.cleanup();
       SkynetTransaction transaction =
-         TransactionManager.createTransaction(AtsUtilCore.getAtsBranch(), getClass().getSimpleName());
+         TransactionManager.createTransaction(AtsClientService.get().getAtsBranch(), getClass().getSimpleName());
       testAI2Art.deleteAndPersist(transaction);
       goalArt.deleteAndPersist(transaction);
       transaction.execute();
@@ -217,7 +217,7 @@ public class AutoAddActionToGoalTest {
       AtsTestUtil.cleanup();
 
       SkynetTransaction transaction =
-         TransactionManager.createTransaction(AtsUtilCore.getAtsBranch(), getClass().getSimpleName());
+         TransactionManager.createTransaction(AtsClientService.get().getAtsBranch(), getClass().getSimpleName());
       testAI2.deleteAndPersist(transaction);
       testAI3.deleteAndPersist(transaction);
       goalArt.deleteAndPersist(transaction);
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/review/PeerToPeerReviewManagerTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/review/PeerToPeerReviewManagerTest.java
index 22288ffe71d..6031c39c9d4 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/review/PeerToPeerReviewManagerTest.java
+++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/review/PeerToPeerReviewManagerTest.java
@@ -44,10 +44,10 @@ public class PeerToPeerReviewManagerTest extends PeerToPeerReviewManager {
    @AfterClass
    public static void cleanup() throws Exception {
       AtsTestUtil.cleanup();
-      SkynetTransaction transaction = TransactionManager.createTransaction(AtsUtilCore.getAtsBranch(),
+      SkynetTransaction transaction = TransactionManager.createTransaction(AtsClientService.get().getAtsBranch(),
          PeerToPeerReviewManagerTest.class.getSimpleName());
       for (Artifact art : ArtifactQuery.getArtifactListFromTypeAndName(AtsArtifactTypes.PeerToPeerReview,
-         "PeerToPeerReviewManagerTest", AtsUtilCore.getAtsBranch(), QueryOption.CONTAINS_MATCH_OPTIONS)) {
+         "PeerToPeerReviewManagerTest", AtsClientService.get().getAtsBranch(), QueryOption.CONTAINS_MATCH_OPTIONS)) {
          if (art.getName().contains("StandAlone")) {
             art.deleteAndPersist(transaction);
          }
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/workflow/ConvertWorkflowStatesOperationTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/workflow/ConvertWorkflowStatesOperationTest.java
index accb16e3fdd..72cd54639fc 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/workflow/ConvertWorkflowStatesOperationTest.java
+++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/workflow/ConvertWorkflowStatesOperationTest.java
@@ -16,9 +16,9 @@ import java.util.List;
 import java.util.Map;
 import org.eclipse.osee.ats.api.data.AtsArtifactTypes;
 import org.eclipse.osee.ats.api.data.AtsAttributeTypes;
+import org.eclipse.osee.ats.client.integration.tests.AtsClientService;
 import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact;
 import org.eclipse.osee.ats.core.client.workflow.ConvertWorkflowStatesOperation;
-import org.eclipse.osee.ats.core.util.AtsUtilCore;
 import org.eclipse.osee.framework.core.enums.QueryOption;
 import org.eclipse.osee.framework.core.operation.Operations;
 import org.eclipse.osee.framework.core.util.XResultData;
@@ -36,7 +36,7 @@ import org.junit.Test;
 
 /**
  * Test case for {@link ConvertWorkflowStatesOperation}
- * 
+ *
  * @author Donald G. Dunne
  */
 public class ConvertWorkflowStatesOperationTest {
@@ -44,10 +44,11 @@ public class ConvertWorkflowStatesOperationTest {
    @BeforeClass
    @AfterClass
    public static void cleanup() throws OseeCoreException {
-      SkynetTransaction transaction =
-         TransactionManager.createTransaction(AtsUtilCore.getAtsBranch(), "ConvertWorkflowStatesOperationTest.cleanup");
+      SkynetTransaction transaction = TransactionManager.createTransaction(AtsClientService.get().getAtsBranch(),
+         "ConvertWorkflowStatesOperationTest.cleanup");
       for (Artifact art : ArtifactQuery.getArtifactListFromTypeAndName(AtsArtifactTypes.TeamWorkflow,
-         "ConvertWorkflowStatesOperationTest", AtsUtilCore.getAtsBranch(), QueryOption.CONTAINS_MATCH_OPTIONS)) {
+         "ConvertWorkflowStatesOperationTest", AtsClientService.get().getAtsBranch(),
+         QueryOption.CONTAINS_MATCH_OPTIONS)) {
          art.deleteAndPersist(transaction);
       }
       transaction.execute();
@@ -87,8 +88,8 @@ public class ConvertWorkflowStatesOperationTest {
       fromStateToStateMap.put("Analyze", "NewAnalyze");
 
       List<AbstractWorkflowArtifact> workflows = new ArrayList<>();
-      Artifact teamWf = ArtifactTypeManager.addArtifact(AtsArtifactTypes.TeamWorkflow, AtsUtilCore.getAtsBranch(),
-         "ConvertWorkflowStatesOperationTest.testDoWork");
+      Artifact teamWf = ArtifactTypeManager.addArtifact(AtsArtifactTypes.TeamWorkflow,
+         AtsClientService.get().getAtsBranch(), "ConvertWorkflowStatesOperationTest.testDoWork");
       teamWf.addAttribute(AtsAttributeTypes.CurrentState, "Endorse;");
       teamWf.addAttribute(AtsAttributeTypes.State, "Analyze;");
       teamWf.addAttribute(AtsAttributeTypes.State, "Endorse;");
@@ -126,8 +127,8 @@ public class ConvertWorkflowStatesOperationTest {
       fromStateToStateMap.put("Endorse", "NewEndorse");
 
       List<AbstractWorkflowArtifact> workflows = new ArrayList<>();
-      Artifact teamWf = ArtifactTypeManager.addArtifact(AtsArtifactTypes.TeamWorkflow, AtsUtilCore.getAtsBranch(),
-         "ConvertWorkflowStatesOperationTest.testDoWork_persist");
+      Artifact teamWf = ArtifactTypeManager.addArtifact(AtsArtifactTypes.TeamWorkflow,
+         AtsClientService.get().getAtsBranch(), "ConvertWorkflowStatesOperationTest.testDoWork_persist");
       teamWf.addAttribute(AtsAttributeTypes.CurrentState, "Endorse;");
       workflows.add((AbstractWorkflowArtifact) teamWf);
 
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/editor/WfeEditorAddSupportingArtifactsTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/editor/WfeEditorAddSupportingArtifactsTest.java
index 1fabb509c50..90830df525f 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/editor/WfeEditorAddSupportingArtifactsTest.java
+++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/editor/WfeEditorAddSupportingArtifactsTest.java
@@ -11,9 +11,9 @@
 package org.eclipse.osee.ats.client.integration.tests.ats.editor;
 
 import java.util.Arrays;
+import org.eclipse.osee.ats.client.integration.tests.AtsClientService;
 import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil;
 import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact;
-import org.eclipse.osee.ats.core.util.AtsUtilCore;
 import org.eclipse.osee.ats.editor.WfeEditorAddSupportingArtifacts;
 import org.eclipse.osee.framework.core.enums.CoreArtifactTokens;
 import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
@@ -41,7 +41,7 @@ public class WfeEditorAddSupportingArtifactsTest {
       TeamWorkFlowArtifact teamWf = AtsTestUtil.getTeamWf();
 
       Artifact rootArt =
-         ArtifactQuery.getArtifactFromToken(CoreArtifactTokens.DefaultHierarchyRoot, AtsUtilCore.getAtsBranch());
+         ArtifactQuery.getArtifactFromToken(CoreArtifactTokens.DefaultHierarchyRoot, AtsClientService.get().getAtsBranch());
       Artifact firstArt = null, secondArt = null;
       for (Artifact child : rootArt.getChildren()) {
          if (firstArt == null) {
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/editor/WfePrintTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/editor/WfePrintTest.java
index fc94d4761e0..2c9f4e5aa82 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/editor/WfePrintTest.java
+++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/editor/WfePrintTest.java
@@ -11,12 +11,12 @@
 package org.eclipse.osee.ats.client.integration.tests.ats.editor;
 
 import org.eclipse.osee.ats.api.data.AtsArtifactTypes;
+import org.eclipse.osee.ats.client.integration.tests.AtsClientService;
 import org.eclipse.osee.ats.core.client.review.DecisionReviewArtifact;
 import org.eclipse.osee.ats.core.client.review.PeerToPeerReviewArtifact;
 import org.eclipse.osee.ats.core.client.review.ReviewManager;
 import org.eclipse.osee.ats.core.client.task.TaskArtifact;
 import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact;
-import org.eclipse.osee.ats.core.util.AtsUtilCore;
 import org.eclipse.osee.ats.demo.api.DemoArtifactTypes;
 import org.eclipse.osee.ats.editor.WfePrint;
 import org.eclipse.osee.framework.core.util.XResultData;
@@ -42,7 +42,7 @@ public class WfePrintTest {
 
       TeamWorkFlowArtifact teamArt =
          (TeamWorkFlowArtifact) ArtifactQuery.getArtifactFromTypeAndName(DemoArtifactTypes.DemoCodeTeamWorkflow,
-            "SAW (uncommitted) More Reqt Changes for Diagram View", AtsUtilCore.getAtsBranch());
+            "SAW (uncommitted) More Reqt Changes for Diagram View", AtsClientService.get().getAtsBranch());
       Assert.assertNotNull(teamArt);
 
       WfePrint smaPrint = new WfePrint(teamArt);
@@ -74,7 +74,7 @@ public class WfePrintTest {
       Assert.assertTrue(XResultDataUI.getReport(resultData, "report").getManipulatedHtml().length() > 2600);
 
       teamArt = (TeamWorkFlowArtifact) ArtifactQuery.getArtifactFromTypeAndName(AtsArtifactTypes.TeamWorkflow,
-         "Button S doesn't work on help", AtsUtilCore.getAtsBranch());
+         "Button S doesn't work on help", AtsClientService.get().getAtsBranch());
       Assert.assertNotNull(teamArt);
       DecisionReviewArtifact decArt = (DecisionReviewArtifact) ReviewManager.getReviews(teamArt).iterator().next();
       smaPrint = new WfePrint(decArt);
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/editor/stateItem/AtsDecisionReviewDecisionStateItemTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/editor/stateItem/AtsDecisionReviewDecisionStateItemTest.java
index 35fab706844..bd1e088d0dc 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/editor/stateItem/AtsDecisionReviewDecisionStateItemTest.java
+++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/editor/stateItem/AtsDecisionReviewDecisionStateItemTest.java
@@ -52,7 +52,7 @@ public class AtsDecisionReviewDecisionStateItemTest {
       if (decRevArt == null) {
          // setup fake review artifact with decision options set
          decRevArt = (DecisionReviewArtifact) ArtifactTypeManager.addArtifact(AtsArtifactTypes.DecisionReview,
-            AtsUtilCore.getAtsBranch());
+            AtsClientService.get().getAtsBranch());
          decRevArt.setName(getClass().getSimpleName());
          decRevArt.setSoleAttributeValue(AtsAttributeTypes.DecisionReviewOptions,
             DecisionReviewManager.getDecisionReviewOptionsString(
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/editor/stateItem/AtsDecisionReviewPrepareStateItemTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/editor/stateItem/AtsDecisionReviewPrepareStateItemTest.java
index 3c9ac547f49..074bf1ea086 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/editor/stateItem/AtsDecisionReviewPrepareStateItemTest.java
+++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/editor/stateItem/AtsDecisionReviewPrepareStateItemTest.java
@@ -49,7 +49,7 @@ public class AtsDecisionReviewPrepareStateItemTest {
       if (decRevArt == null) {
          // setup fake review artifact with decision options set
          decRevArt = (DecisionReviewArtifact) ArtifactTypeManager.addArtifact(AtsArtifactTypes.DecisionReview,
-            AtsUtilCore.getAtsBranch());
+            AtsClientService.get().getAtsBranch());
          decRevArt.setName(getClass().getSimpleName());
          decRevArt.persist(getClass().getSimpleName());
       }
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/editor/stateItem/AtsPeerToPeerReviewPrepareStateItemTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/editor/stateItem/AtsPeerToPeerReviewPrepareStateItemTest.java
index 7618170aed0..9d0384a670a 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/editor/stateItem/AtsPeerToPeerReviewPrepareStateItemTest.java
+++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/editor/stateItem/AtsPeerToPeerReviewPrepareStateItemTest.java
@@ -54,7 +54,7 @@ public class AtsPeerToPeerReviewPrepareStateItemTest {
       if (peerRevArt == null) {
          // setup fake review artifact with decision options set
          peerRevArt = (PeerToPeerReviewArtifact) ArtifactTypeManager.addArtifact(AtsArtifactTypes.PeerToPeerReview,
-            AtsUtilCore.getAtsBranch());
+            AtsClientService.get().getAtsBranch());
          peerRevArt.setName(getClass().getSimpleName());
          // Setup actionable item so don't get error that there is no parent team workflow
          IAtsChangeSet changes = AtsClientService.get().getStoreService().createAtsChangeSet(getClass().getSimpleName(),
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/navigate/SubscribeUtilityTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/navigate/SubscribeUtilityTest.java
index eeb75baec75..7e6ede2355e 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/navigate/SubscribeUtilityTest.java
+++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/navigate/SubscribeUtilityTest.java
@@ -14,7 +14,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import org.eclipse.osee.ats.api.data.AtsArtifactTypes;
-import org.eclipse.osee.ats.core.util.AtsUtilCore;
+import org.eclipse.osee.ats.client.integration.tests.AtsClientService;
 import org.eclipse.osee.ats.demo.api.DemoArtifactToken;
 import org.eclipse.osee.ats.demo.api.DemoUsers;
 import org.eclipse.osee.ats.navigate.SubscribeUtility;
@@ -49,8 +49,8 @@ public class SubscribeUtilityTest {
          alexUserArt.getRelatedArtifactsCount(CoreRelationTypes.Users_Artifact));
 
       // Subscribe to 2 team definitions
-      Artifact cisCodeTeam = ArtifactQuery.getArtifactFromToken(DemoArtifactToken.CIS_Code, AtsUtilCore.getAtsBranch());
-      Artifact cisSwTeam = ArtifactQuery.getArtifactFromToken(DemoArtifactToken.CIS_SW, AtsUtilCore.getAtsBranch());
+      Artifact cisCodeTeam = ArtifactQuery.getArtifactFromToken(DemoArtifactToken.CIS_Code, AtsClientService.get().getAtsBranch());
+      Artifact cisSwTeam = ArtifactQuery.getArtifactFromToken(DemoArtifactToken.CIS_SW, AtsClientService.get().getAtsBranch());
 
       SubscribeUtility.setSubcriptionsAndPersist(alexUserArt, CoreRelationTypes.Users_Artifact,
          Arrays.asList(cisCodeTeam, cisSwTeam), AtsArtifactTypes.TeamDefinition, getClass().getSimpleName());
@@ -60,7 +60,7 @@ public class SubscribeUtilityTest {
       Assert.assertFalse("User artifact changes should be persisted", alexUserArt.isDirty());
 
       // Remove one, add another
-      Artifact cisTestTeam = ArtifactQuery.getArtifactFromToken(DemoArtifactToken.CIS_Test, AtsUtilCore.getAtsBranch());
+      Artifact cisTestTeam = ArtifactQuery.getArtifactFromToken(DemoArtifactToken.CIS_Test, AtsClientService.get().getAtsBranch());
 
       SubscribeUtility.setSubcriptionsAndPersist(alexUserArt, CoreRelationTypes.Users_Artifact,
          Arrays.asList(cisCodeTeam, cisTestTeam), AtsArtifactTypes.TeamDefinition, getClass().getSimpleName());
@@ -79,7 +79,7 @@ public class SubscribeUtilityTest {
    }
 
    private static Artifact getAlexUserArtifact() throws OseeCoreException {
-      return ArtifactQuery.getArtifactFromToken(DemoUsers.Alex_Kay, AtsUtilCore.getAtsBranch());
+      return ArtifactQuery.getArtifactFromToken(DemoUsers.Alex_Kay, AtsClientService.get().getAtsBranch());
    }
 
 }
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/resource/ActionResourceTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/resource/ActionResourceTest.java
index 12e5638ab02..33869512e8d 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/resource/ActionResourceTest.java
+++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/resource/ActionResourceTest.java
@@ -26,9 +26,9 @@ import javax.ws.rs.core.Response.Status;
 import javax.ws.rs.core.UriBuilder;
 import org.eclipse.osee.ats.api.data.AtsAttributeTypes;
 import org.eclipse.osee.ats.client.demo.DemoUtil;
+import org.eclipse.osee.ats.client.integration.tests.AtsClientService;
 import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact;
 import org.eclipse.osee.ats.core.util.AtsObjects;
-import org.eclipse.osee.ats.core.util.AtsUtilCore;
 import org.eclipse.osee.framework.core.client.OseeClientProperties;
 import org.eclipse.osee.framework.jdk.core.util.Collections;
 import org.eclipse.osee.framework.jdk.core.util.Lib;
@@ -192,7 +192,7 @@ public class ActionResourceTest extends AbstractRestTest {
 
       TeamWorkFlowArtifact teamArt =
          (TeamWorkFlowArtifact) ArtifactQuery.getArtifactFromAttribute(AtsAttributeTypes.AtsId, atsId,
-            AtsUtilCore.getAtsBranch());
+            AtsClientService.get().getAtsBranch());
       Assert.assertNotNull(teamArt);
 
       // Cleanup test
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/resource/StateResourceTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/resource/StateResourceTest.java
index 3bcd16edb69..bb002d1a2ae 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/resource/StateResourceTest.java
+++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/resource/StateResourceTest.java
@@ -29,7 +29,6 @@ import org.eclipse.osee.ats.core.client.action.ActionArtifact;
 import org.eclipse.osee.ats.core.client.action.ActionManager;
 import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact;
 import org.eclipse.osee.ats.core.config.ActionableItems;
-import org.eclipse.osee.ats.core.util.AtsUtilCore;
 import org.eclipse.osee.ats.demo.api.DemoActionableItems;
 import org.eclipse.osee.ats.demo.api.DemoUsers;
 import org.eclipse.osee.framework.core.client.OseeClientProperties;
@@ -52,7 +51,7 @@ public class StateResourceTest extends AbstractRestTest {
    public void tearDown() {
       IAtsChangeSet changes = AtsClientService.get().createChangeSet(StateResourceTest.class.getName() + " - cleanup");
       changes.addToDelete(ArtifactQuery.getArtifactListFromName(StateResourceTest.class.getName(),
-         AtsUtilCore.getAtsBranch(), DeletionFlag.EXCLUDE_DELETED));
+         AtsClientService.get().getAtsBranch(), DeletionFlag.EXCLUDE_DELETED));
       if (!changes.isEmpty()) {
          changes.execute();
       }
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/resource/WordUpdateEndpointImplTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/resource/WordUpdateEndpointImplTest.java
index 82e2e8e5c07..ecd379fe18b 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/resource/WordUpdateEndpointImplTest.java
+++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/resource/WordUpdateEndpointImplTest.java
@@ -18,7 +18,6 @@ import org.eclipse.osee.ats.api.util.IAtsChangeSet;
 import org.eclipse.osee.ats.client.integration.tests.AtsClientService;
 import org.eclipse.osee.ats.client.integration.tests.DirtyArtifactCacheTest;
 import org.eclipse.osee.ats.core.users.AtsCoreUsers;
-import org.eclipse.osee.ats.core.util.AtsUtilCore;
 import org.eclipse.osee.define.report.api.WordArtifactChange;
 import org.eclipse.osee.define.report.api.WordUpdateChange;
 import org.eclipse.osee.define.report.api.WordUpdateData;
@@ -53,7 +52,7 @@ public class WordUpdateEndpointImplTest extends AbstractRestTest {
    @AfterClass
    public static void cleanup() {
       List<Artifact> teamWorkflows = ArtifactQuery.getArtifactListFromTypeAndName(AtsArtifactTypes.TeamWorkflow,
-         "Safety", AtsUtilCore.getAtsBranch(), QueryOption.CONTAINS_MATCH_OPTIONS);
+         "Safety", AtsClientService.get().getAtsBranch(), QueryOption.CONTAINS_MATCH_OPTIONS);
       IAtsChangeSet changes = AtsClientService.get().getStoreService().createAtsChangeSet(
          WordUpdateEndpointImplTest.class.getSimpleName(), AtsCoreUsers.SYSTEM_USER);
       for (Artifact teamArt : teamWorkflows) {
@@ -108,7 +107,7 @@ public class WordUpdateEndpointImplTest extends AbstractRestTest {
 
    private void validateSafetyTeamWFExists() {
       List<Artifact> teamWorkflows = ArtifactQuery.getArtifactListFromTypeAndName(AtsArtifactTypes.TeamWorkflow,
-         "Safety Workflow", AtsUtilCore.getAtsBranch(), QueryOption.CONTAINS_MATCH_OPTIONS);
+         "Safety Workflow", AtsClientService.get().getAtsBranch(), QueryOption.CONTAINS_MATCH_OPTIONS);
       Assert.assertFalse(teamWorkflows.isEmpty());
    }
 
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/util/AbstractImageManagerTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/util/AbstractImageManagerTest.java
index c8b5738e2d0..6fc805bbf13 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/util/AbstractImageManagerTest.java
+++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/util/AbstractImageManagerTest.java
@@ -20,7 +20,7 @@ import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.osee.ats.core.util.AtsUtilCore;
+import org.eclipse.osee.ats.client.integration.tests.AtsClientService;
 import org.eclipse.osee.framework.core.data.ArtifactId;
 import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
 import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException;
@@ -106,7 +106,7 @@ public abstract class AbstractImageManagerTest {
    @org.junit.Test
    public void testGetImageByArtifact() throws Exception {
       ArtifactId folder = ArtifactQuery.getArtifactFromTypeAndNameNoException(CoreArtifactTypes.Folder, "User Groups",
-         AtsUtilCore.getAtsBranch());
+         AtsClientService.get().getAtsBranch());
       assertTrue("Image returned not a folder image.",
          ArtifactImageManager.getImage((Artifact) folder).equals(ImageManager.getImage(PluginUiImage.FOLDER)));
    }
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/util/AtsChangeSetTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/util/AtsChangeSetTest.java
index 1192b018cd5..a6077aeda60 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/util/AtsChangeSetTest.java
+++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/util/AtsChangeSetTest.java
@@ -44,16 +44,16 @@ public class AtsChangeSetTest {
    public void setup() {
 
       SkynetTransaction transaction =
-         TransactionManager.createTransaction(AtsUtilCore.getAtsBranch(), getClass().getSimpleName());
+         TransactionManager.createTransaction(AtsClientService.get().getAtsBranch(), getClass().getSimpleName());
 
       folderArt =
-         ArtifactTypeManager.addArtifact(CoreArtifactTypes.Folder, AtsUtilCore.getAtsBranch(), "AtsChangeSetTest");
+         ArtifactTypeManager.addArtifact(CoreArtifactTypes.Folder, AtsClientService.get().getAtsBranch(), "AtsChangeSetTest");
       folderArt.setSoleAttributeValue(CoreAttributeTypes.StaticId, "my static id");
       folderArt.persist(transaction);
 
       for (int x = 0; x < 4; x++) {
          Artifact genDocArt = ArtifactTypeManager.addArtifact(CoreArtifactTypes.GeneralDocument,
-            AtsUtilCore.getAtsBranch(), "Art " + x + " AtsChangeSetTest");
+            AtsClientService.get().getAtsBranch(), "Art " + x + " AtsChangeSetTest");
          genDocArt.persist(transaction);
          genDocArts.add(genDocArt);
       }
@@ -64,9 +64,9 @@ public class AtsChangeSetTest {
    @After
    public void cleanup() {
       SkynetTransaction transaction =
-         TransactionManager.createTransaction(AtsUtilCore.getAtsBranch(), getClass().getSimpleName());
+         TransactionManager.createTransaction(AtsClientService.get().getAtsBranch(), getClass().getSimpleName());
       for (Artifact artifact : ArtifactQuery.getArtifactListFromName(getClass().getSimpleName(),
-         AtsUtilCore.getAtsBranch(), EXCLUDE_DELETED, QueryOption.CONTAINS_MATCH_OPTIONS)) {
+         AtsClientService.get().getAtsBranch(), EXCLUDE_DELETED, QueryOption.CONTAINS_MATCH_OPTIONS)) {
          artifact.deleteAndPersist(transaction);
       }
       transaction.execute();
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/util/AtsDeleteManagerTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/util/AtsDeleteManagerTest.java
index 7ccc933d99c..5bf1e2a9e9e 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/util/AtsDeleteManagerTest.java
+++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/util/AtsDeleteManagerTest.java
@@ -162,7 +162,7 @@ public class AtsDeleteManagerTest {
    }
 
    private void verifyExists(TestNames testName, int expectedNumActions, int expectedNumCodeWorkflows, int expectedNumReqWorkflows, int expectedNumTasks, int expectedNumReviews) throws OseeCoreException {
-      List<Artifact> artifacts = ArtifactQuery.getArtifactListFromName(testName.toString(), AtsUtilCore.getAtsBranch(),
+      List<Artifact> artifacts = ArtifactQuery.getArtifactListFromName(testName.toString(), AtsClientService.get().getAtsBranch(),
          EXCLUDE_DELETED, QueryOption.CONTAINS_MATCH_OPTIONS);
       CountingMap<IArtifactType> countMap = new CountingMap<>();
       for (Artifact artifact : artifacts) {
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/util/CreateActionUsingAllActionableItemsTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/util/CreateActionUsingAllActionableItemsTest.java
index dffb69cbe0d..94d7b8b4c63 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/util/CreateActionUsingAllActionableItemsTest.java
+++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/util/CreateActionUsingAllActionableItemsTest.java
@@ -10,9 +10,9 @@
  *******************************************************************************/
 package org.eclipse.osee.ats.client.integration.tests.ats.util;
 
+import org.eclipse.osee.ats.client.integration.tests.AtsClientService;
 import org.eclipse.osee.ats.core.client.action.ActionArtifact;
 import org.eclipse.osee.ats.core.client.config.AtsBulkLoad;
-import org.eclipse.osee.ats.core.util.AtsUtilCore;
 import org.eclipse.osee.ats.util.CreateActionUsingAllActionableItems;
 import org.eclipse.osee.framework.core.enums.DeletionFlag;
 import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
@@ -28,7 +28,7 @@ import org.junit.BeforeClass;
 
 /**
  * Test for {@link CreateActionUsingAllActionableItems}
- * 
+ *
  * @author Donald G. Dunne
  */
 public class CreateActionUsingAllActionableItemsTest {
@@ -37,10 +37,10 @@ public class CreateActionUsingAllActionableItemsTest {
    @AfterClass
    public static void cleanup() throws OseeCoreException {
       AtsBulkLoad.reloadConfig(true);
-      SkynetTransaction transaction = TransactionManager.createTransaction(AtsUtilCore.getAtsBranch(),
+      SkynetTransaction transaction = TransactionManager.createTransaction(AtsClientService.get().getAtsBranch(),
          CreateActionUsingAllActionableItemsTest.class.getSimpleName());
       for (Artifact art : ArtifactQuery.getArtifactListFromName("Big Action Test - Delete Me",
-         AtsUtilCore.getAtsBranch(), DeletionFlag.EXCLUDE_DELETED)) {
+         AtsClientService.get().getAtsBranch(), DeletionFlag.EXCLUDE_DELETED)) {
          art.deleteAndPersist(transaction);
       }
       transaction.execute();
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/util/ImportActionsViaSpreadsheetTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/util/ImportActionsViaSpreadsheetTest.java
index 2a54554273a..6d715c6ec83 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/util/ImportActionsViaSpreadsheetTest.java
+++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/util/ImportActionsViaSpreadsheetTest.java
@@ -61,7 +61,7 @@ public class ImportActionsViaSpreadsheetTest {
 
       for (String title : ActionTitles) {
          List<Artifact> arts =
-            ArtifactQuery.getArtifactListFromName(title, AtsUtilCore.getAtsBranch(), EXCLUDE_DELETED);
+            ArtifactQuery.getArtifactListFromName(title, AtsClientService.get().getAtsBranch(), EXCLUDE_DELETED);
          Assert.assertEquals(String.format("Action [%s] should have been purged before test start.", title), 0,
             arts.size());
       }
@@ -78,7 +78,7 @@ public class ImportActionsViaSpreadsheetTest {
       Assert.assertEquals("No errors should be reported", "", rd.toString());
 
       List<Artifact> arts =
-         ArtifactQuery.getArtifactListFromName(FIRST_ACTION_TITLE, AtsUtilCore.getAtsBranch(), EXCLUDE_DELETED);
+         ArtifactQuery.getArtifactListFromName(FIRST_ACTION_TITLE, AtsClientService.get().getAtsBranch(), EXCLUDE_DELETED);
       Assert.assertEquals("One Action and 3 Team Workflows should be created", 4, arts.size());
       int codeCount = 0, testCount = 0;
       TeamWorkFlowArtifact testWf = null;
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/util/DemoTestUtil.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/util/DemoTestUtil.java
index 9c6f24e16a7..0b797eedba6 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/util/DemoTestUtil.java
+++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/util/DemoTestUtil.java
@@ -158,7 +158,7 @@ public class DemoTestUtil {
    public static TeamWorkFlowArtifact getToolsTeamWorkflow() throws OseeCoreException {
       if (toolsTeamWorkflow == null) {
          for (Artifact art : ArtifactQuery.getArtifactListFromName("Button S doesn't work on help",
-            AtsUtilCore.getAtsBranch(), EXCLUDE_DELETED)) {
+            AtsClientService.get().getAtsBranch(), EXCLUDE_DELETED)) {
             if (art.isOfType(AtsArtifactTypes.TeamWorkflow)) {
                toolsTeamWorkflow = (TeamWorkFlowArtifact) art;
             }
@@ -171,7 +171,7 @@ public class DemoTestUtil {
       if (unCommittedWorkflows == null) {
          unCommittedWorkflows = new HashMap<>();
          for (Artifact art : ArtifactQuery.getArtifactListFromName(
-            "SAW (uncommitted) More Reqt Changes for Diagram View", AtsUtilCore.getAtsBranch(), EXCLUDE_DELETED)) {
+            "SAW (uncommitted) More Reqt Changes for Diagram View", AtsClientService.get().getAtsBranch(), EXCLUDE_DELETED)) {
             if (art.isOfType(DemoArtifactTypes.DemoCodeTeamWorkflow)) {
                unCommittedWorkflows.put(DemoWorkType.Code, art);
             } else if (art.isOfType(DemoArtifactTypes.DemoTestTeamWorkflow)) {
@@ -190,7 +190,7 @@ public class DemoTestUtil {
       if (committedWorkflows == null) {
          committedWorkflows = new HashMap<>();
          for (Artifact art : ArtifactQuery.getArtifactListFromName("SAW (committed) Reqt Changes for Diagram View",
-            AtsUtilCore.getAtsBranch(), EXCLUDE_DELETED)) {
+            AtsClientService.get().getAtsBranch(), EXCLUDE_DELETED)) {
             if (art.isOfType(DemoArtifactTypes.DemoCodeTeamWorkflow)) {
                committedWorkflows.put(DemoWorkType.Code, art);
             } else if (art.isOfType(DemoArtifactTypes.DemoTestTeamWorkflow)) {