refactor: Remove ActionArtifact as subclass of Artifact

24 files changed, 101 insertions, 87 deletions

diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/ActionableItemsColumnTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/ActionableItemsColumnTest.java
index 159a23fc824..f6ef31ed62a 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/ActionableItemsColumnTest.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/ActionableItemsColumnTest.java
@@ -6,15 +6,15 @@
 package org.eclipse.osee.ats.test.column;
 
 import java.util.Collection;
-import org.junit.Assert;
-import org.eclipse.osee.ats.artifact.ActionArtifact;
 import org.eclipse.osee.ats.artifact.ActionableItemArtifact;
 import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact;
 import org.eclipse.osee.ats.column.ActionableItemsColumn;
 import org.eclipse.osee.ats.test.util.DemoTestUtil;
 import org.eclipse.osee.framework.logging.SevereLoggingMonitor;
+import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 import org.eclipse.osee.support.test.util.DemoWorkType;
 import org.eclipse.osee.support.test.util.TestUtil;
+import org.junit.Assert;
 
 /**
  * @tests ActionableItemsColumn
@@ -32,7 +32,7 @@ public class ActionableItemsColumnTest {
       Assert.assertEquals(1, aias.size());
       Assert.assertEquals("SAW Code", aias.iterator().next().getName());
 
-      ActionArtifact actionArt = codeArt.getParentActionArtifact();
+      Artifact actionArt = codeArt.getParentActionArtifact();
       aias = ActionableItemsColumn.getActionableItems(actionArt);
       Assert.assertEquals(4, aias.size());
 
@@ -47,7 +47,7 @@ public class ActionableItemsColumnTest {
          (TeamWorkFlowArtifact) DemoTestUtil.getUncommittedActionWorkflow(DemoWorkType.Code);
       Assert.assertEquals("SAW Code", ActionableItemsColumn.getActionableItemsStr(codeArt));
 
-      ActionArtifact actionArt = codeArt.getParentActionArtifact();
+      Artifact actionArt = codeArt.getParentActionArtifact();
 
       String results = ActionableItemsColumn.getActionableItemsStr(actionArt);
       Assert.assertTrue(results.contains("SAW Code"));
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/AssigneeColumnTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/AssigneeColumnTest.java
index 5cfce920209..b52b134acbc 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/AssigneeColumnTest.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/AssigneeColumnTest.java
@@ -7,15 +7,15 @@ package org.eclipse.osee.ats.test.column;
 
 import java.util.Arrays;
 import java.util.List;
-import org.junit.Assert;
-import org.eclipse.osee.ats.artifact.ActionArtifact;
 import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact;
 import org.eclipse.osee.ats.column.ActionableItemsColumn;
 import org.eclipse.osee.ats.column.AssigneeColumn;
 import org.eclipse.osee.ats.test.util.DemoTestUtil;
 import org.eclipse.osee.framework.logging.SevereLoggingMonitor;
+import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 import org.eclipse.osee.support.test.util.DemoWorkType;
 import org.eclipse.osee.support.test.util.TestUtil;
+import org.junit.Assert;
 
 /**
  * @tests AssigneeColumn
@@ -32,7 +32,7 @@ public class AssigneeColumnTest {
       Assert.assertEquals("Joe Smith",
          AssigneeColumn.getInstance().getColumnText(codeArt, AssigneeColumn.getInstance(), 0));
 
-      ActionArtifact actionArt = codeArt.getParentActionArtifact();
+      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)));
@@ -47,7 +47,7 @@ public class AssigneeColumnTest {
          (TeamWorkFlowArtifact) DemoTestUtil.getUncommittedActionWorkflow(DemoWorkType.Code);
       Assert.assertNotNull(ActionableItemsColumn.getInstance().getColumnImage(codeArt, AssigneeColumn.getInstance(), 0));
 
-      ActionArtifact actionArt = codeArt.getParentActionArtifact();
+      Artifact actionArt = codeArt.getParentActionArtifact();
       Assert.assertNotNull(ActionableItemsColumn.getInstance().getColumnImage(actionArt, AssigneeColumn.getInstance(),
          0));
 
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/BranchStatusColumnTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/BranchStatusColumnTest.java
index a871d3f16c8..7401f529908 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/BranchStatusColumnTest.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/BranchStatusColumnTest.java
@@ -5,15 +5,15 @@
  */
 package org.eclipse.osee.ats.test.column;
 
-import org.junit.Assert;
-import org.eclipse.osee.ats.artifact.ActionArtifact;
 import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact;
 import org.eclipse.osee.ats.column.AssigneeColumn;
 import org.eclipse.osee.ats.column.BranchStatusColumn;
 import org.eclipse.osee.ats.test.util.DemoTestUtil;
 import org.eclipse.osee.framework.logging.SevereLoggingMonitor;
+import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 import org.eclipse.osee.support.test.util.DemoWorkType;
 import org.eclipse.osee.support.test.util.TestUtil;
+import org.junit.Assert;
 
 /**
  * @tests BranchStatusColumn
@@ -34,7 +34,7 @@ public class BranchStatusColumnTest {
          (TeamWorkFlowArtifact) DemoTestUtil.getUncommittedActionWorkflow(DemoWorkType.Test);
       Assert.assertEquals("", BranchStatusColumn.getInstance().getColumnText(testArt, AssigneeColumn.getInstance(), 0));
 
-      ActionArtifact actionArt = reqArt.getParentActionArtifact();
+      Artifact actionArt = reqArt.getParentActionArtifact();
       Assert.assertEquals("Working",
          BranchStatusColumn.getInstance().getColumnText(actionArt, AssigneeColumn.getInstance(), 0));
 
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/CategoryColumnTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/CategoryColumnTest.java
index 9cf818b4313..7a4421b0fef 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/CategoryColumnTest.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/CategoryColumnTest.java
@@ -5,8 +5,6 @@
  */
 package org.eclipse.osee.ats.test.column;
 
-import org.junit.Assert;
-import org.eclipse.osee.ats.artifact.ActionArtifact;
 import org.eclipse.osee.ats.artifact.AtsAttributeTypes;
 import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact;
 import org.eclipse.osee.ats.column.CategoryColumn;
@@ -14,10 +12,12 @@ import org.eclipse.osee.ats.test.util.DemoTestUtil;
 import org.eclipse.osee.ats.util.AtsUtil;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.logging.SevereLoggingMonitor;
+import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
 import org.eclipse.osee.support.test.util.DemoWorkType;
 import org.eclipse.osee.support.test.util.TestUtil;
 import org.junit.AfterClass;
+import org.junit.Assert;
 import org.junit.BeforeClass;
 
 /**
@@ -56,7 +56,7 @@ public class CategoryColumnTest {
          (TeamWorkFlowArtifact) DemoTestUtil.getUncommittedActionWorkflow(DemoWorkType.Requirements);
       TeamWorkFlowArtifact testArt =
          (TeamWorkFlowArtifact) DemoTestUtil.getUncommittedActionWorkflow(DemoWorkType.Test);
-      ActionArtifact actionArt = codeArt.getParentActionArtifact();
+      Artifact actionArt = codeArt.getParentActionArtifact();
 
       Assert.assertEquals("",
          CategoryColumn.getCategory1Instance().getColumnText(codeArt, CategoryColumn.getCategory1Instance(), 0));
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/ChangeTypeColumnTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/ChangeTypeColumnTest.java
index e10344d2a2b..b4dd2418b07 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/ChangeTypeColumnTest.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/ChangeTypeColumnTest.java
@@ -5,8 +5,6 @@
  */
 package org.eclipse.osee.ats.test.column;
 
-import org.junit.Assert;
-import org.eclipse.osee.ats.artifact.ActionArtifact;
 import org.eclipse.osee.ats.artifact.AtsAttributeTypes;
 import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact;
 import org.eclipse.osee.ats.column.ChangeTypeColumn;
@@ -14,11 +12,13 @@ import org.eclipse.osee.ats.test.util.DemoTestUtil;
 import org.eclipse.osee.ats.util.AtsUtil;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.logging.SevereLoggingMonitor;
+import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
 import org.eclipse.osee.framework.ui.skynet.util.ChangeType;
 import org.eclipse.osee.support.test.util.DemoWorkType;
 import org.eclipse.osee.support.test.util.TestUtil;
 import org.junit.AfterClass;
+import org.junit.Assert;
 import org.junit.BeforeClass;
 
 /**
@@ -48,7 +48,7 @@ public class ChangeTypeColumnTest {
       Assert.assertEquals(ChangeType.Problem, ChangeTypeColumn.getChangeType(codeArt));
       Assert.assertNotNull(ChangeTypeColumn.getInstance().getColumnImage(codeArt, ChangeTypeColumn.getInstance(), 0));
 
-      ActionArtifact actionArt = codeArt.getParentActionArtifact();
+      Artifact actionArt = codeArt.getParentActionArtifact();
       Assert.assertEquals(ChangeType.Problem, ChangeTypeColumn.getChangeType(actionArt));
 
       // clear our req change type
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/CreatedDateColumnTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/CreatedDateColumnTest.java
index 6fd603ee453..80fca4ac69e 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/CreatedDateColumnTest.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/CreatedDateColumnTest.java
@@ -6,16 +6,16 @@
 package org.eclipse.osee.ats.test.column;
 
 import java.util.Date;
-import org.junit.Assert;
-import org.eclipse.osee.ats.artifact.ActionArtifact;
 import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact;
 import org.eclipse.osee.ats.column.AssigneeColumn;
 import org.eclipse.osee.ats.column.CreatedDateColumn;
 import org.eclipse.osee.ats.test.util.DemoTestUtil;
 import org.eclipse.osee.framework.jdk.core.util.DateUtil;
 import org.eclipse.osee.framework.logging.SevereLoggingMonitor;
+import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 import org.eclipse.osee.support.test.util.DemoWorkType;
 import org.eclipse.osee.support.test.util.TestUtil;
+import org.junit.Assert;
 
 /**
  * @tests CreatedDateColumn
@@ -34,7 +34,7 @@ public class CreatedDateColumnTest {
       Assert.assertNotNull(date);
       Assert.assertEquals(DateUtil.getMMDDYYHHMM(date), CreatedDateColumn.getDateStr(codeArt));
 
-      ActionArtifact actionArt = codeArt.getParentActionArtifact();
+      Artifact actionArt = codeArt.getParentActionArtifact();
       Assert.assertEquals(DateUtil.getMMDDYYHHMM(date), CreatedDateColumn.getDateStr(actionArt));
 
       TestUtil.severeLoggingEnd(loggingMonitor);
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/DescriptionColumnTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/DescriptionColumnTest.java
index 4ef1f8aa43e..4ad7068421a 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/DescriptionColumnTest.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/DescriptionColumnTest.java
@@ -5,15 +5,15 @@
  */
 package org.eclipse.osee.ats.test.column;
 
-import org.junit.Assert;
-import org.eclipse.osee.ats.artifact.ActionArtifact;
 import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact;
 import org.eclipse.osee.ats.column.AssigneeColumn;
 import org.eclipse.osee.ats.column.DescriptionColumn;
 import org.eclipse.osee.ats.test.util.DemoTestUtil;
 import org.eclipse.osee.framework.logging.SevereLoggingMonitor;
+import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 import org.eclipse.osee.support.test.util.DemoWorkType;
 import org.eclipse.osee.support.test.util.TestUtil;
+import org.junit.Assert;
 
 /**
  * @tests DescriptionColumn
@@ -30,7 +30,7 @@ public class DescriptionColumnTest {
       Assert.assertEquals("Problem with the Diagram View",
          DescriptionColumn.getInstance().getColumnText(reqArt, AssigneeColumn.getInstance(), 0));
 
-      ActionArtifact actionArt = reqArt.getParentActionArtifact();
+      Artifact actionArt = reqArt.getParentActionArtifact();
       Assert.assertEquals("Problem with the Diagram View",
          DescriptionColumn.getInstance().getColumnText(actionArt, AssigneeColumn.getInstance(), 0));
 
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/EstimatedHoursColumnTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/EstimatedHoursColumnTest.java
index f5120d34364..be1f4ab532d 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/EstimatedHoursColumnTest.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/EstimatedHoursColumnTest.java
@@ -6,7 +6,6 @@
 package org.eclipse.osee.ats.test.column;
 
 import java.util.Date;
-import org.eclipse.osee.ats.artifact.ActionArtifact;
 import org.eclipse.osee.ats.artifact.AtsAttributeTypes;
 import org.eclipse.osee.ats.artifact.PeerToPeerReviewArtifact;
 import org.eclipse.osee.ats.artifact.TaskArtifact;
@@ -17,6 +16,7 @@ import org.eclipse.osee.ats.util.AtsUtil;
 import org.eclipse.osee.ats.util.widgets.ReviewManager;
 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.transaction.SkynetTransaction;
 import org.eclipse.osee.support.test.util.TestUtil;
 import org.junit.AfterClass;
@@ -44,7 +44,7 @@ public class EstimatedHoursColumnTest {
       TeamWorkFlowArtifact teamArt1 =
          DemoTestUtil.createSimpleAction(EstimatedHoursColumnTest.class.getSimpleName(), transaction);
 
-      ActionArtifact actionArt = teamArt1.getParentActionArtifact();
+      Artifact actionArt = teamArt1.getParentActionArtifact();
       TeamWorkFlowArtifact teamArt2 =
          DemoTestUtil.addTeamWorkflow(actionArt, EstimatedHoursColumnTest.class.getSimpleName(), transaction);
       TaskArtifact taskArt1 =
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/GroupsColumnTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/GroupsColumnTest.java
index 03a37310ec7..8f34e8ae509 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/GroupsColumnTest.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/GroupsColumnTest.java
@@ -5,15 +5,15 @@
  */
 package org.eclipse.osee.ats.test.column;
 
-import org.junit.Assert;
-import org.eclipse.osee.ats.artifact.ActionArtifact;
 import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact;
 import org.eclipse.osee.ats.column.AssigneeColumn;
 import org.eclipse.osee.ats.column.GroupsColumn;
 import org.eclipse.osee.ats.test.util.DemoTestUtil;
 import org.eclipse.osee.framework.logging.SevereLoggingMonitor;
+import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 import org.eclipse.osee.support.test.util.DemoWorkType;
 import org.eclipse.osee.support.test.util.TestUtil;
+import org.junit.Assert;
 
 /**
  * @tests GroupsColumn
@@ -30,7 +30,7 @@ public class GroupsColumnTest {
       Assert.assertEquals("Test Group",
          GroupsColumn.getInstance().getColumnText(reqArt, AssigneeColumn.getInstance(), 0));
 
-      ActionArtifact actionArt = reqArt.getParentActionArtifact();
+      Artifact actionArt = reqArt.getParentActionArtifact();
       Assert.assertEquals("Test Group",
          GroupsColumn.getInstance().getColumnText(actionArt, AssigneeColumn.getInstance(), 0));
 
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/NumberOfTasksAndInWorkTasksColumnsTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/NumberOfTasksAndInWorkTasksColumnsTest.java
index e5f68f4143d..b80d252e0ad 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/NumberOfTasksAndInWorkTasksColumnsTest.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/NumberOfTasksAndInWorkTasksColumnsTest.java
@@ -6,8 +6,6 @@
 package org.eclipse.osee.ats.test.column;
 
 import java.util.Collection;
-import org.junit.Assert;
-import org.eclipse.osee.ats.artifact.ActionArtifact;
 import org.eclipse.osee.ats.artifact.TaskArtifact;
 import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact;
 import org.eclipse.osee.ats.column.NumberOfTasksColumn;
@@ -17,9 +15,11 @@ import org.eclipse.osee.ats.util.AtsUtil;
 import org.eclipse.osee.ats.util.TransitionOption;
 import org.eclipse.osee.framework.logging.SevereLoggingMonitor;
 import org.eclipse.osee.framework.skynet.core.User;
+import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
 import org.eclipse.osee.support.test.util.DemoWorkType;
 import org.eclipse.osee.support.test.util.TestUtil;
+import org.junit.Assert;
 
 /**
  * @tests NumberOfTasksColumn
@@ -61,7 +61,7 @@ public class NumberOfTasksAndInWorkTasksColumnsTest {
       Assert.assertEquals("", NumberOfTasksColumn.getInstance().getColumnText(testArt, null, 0));
       Assert.assertEquals("", NumberOfTasksRemainingColumn.getInstance().getColumnText(testArt, null, 0));
 
-      ActionArtifact actionArt = codeArt.getParentActionArtifact();
+      Artifact actionArt = codeArt.getParentActionArtifact();
       Assert.assertEquals("6", NumberOfTasksColumn.getInstance().getColumnText(actionArt, null, 0));
 
       TestUtil.severeLoggingEnd(loggingMonitor);
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/OriginatorColumnTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/OriginatorColumnTest.java
index 8e652e18873..43ac59241a8 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/OriginatorColumnTest.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/OriginatorColumnTest.java
@@ -5,17 +5,17 @@
  */
 package org.eclipse.osee.ats.test.column;
 
-import org.junit.Assert;
-import org.eclipse.osee.ats.artifact.ActionArtifact;
 import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact;
 import org.eclipse.osee.ats.column.AssigneeColumn;
 import org.eclipse.osee.ats.column.OriginatorColumn;
 import org.eclipse.osee.ats.test.util.DemoTestUtil;
 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.support.test.util.DemoUsers;
 import org.eclipse.osee.support.test.util.DemoWorkType;
 import org.eclipse.osee.support.test.util.TestUtil;
+import org.junit.Assert;
 
 /**
  * @tests OriginatorColumn
@@ -32,7 +32,7 @@ public class OriginatorColumnTest {
       Assert.assertEquals(UserManager.getUser(DemoUsers.Joe_Smith).getName(),
          OriginatorColumn.getInstance().getColumnText(reqArt, AssigneeColumn.getInstance(), 0));
 
-      ActionArtifact actionArt = reqArt.getParentActionArtifact();
+      Artifact actionArt = reqArt.getParentActionArtifact();
       Assert.assertEquals(UserManager.getUser(DemoUsers.Joe_Smith).getName(),
          OriginatorColumn.getInstance().getColumnText(actionArt, AssigneeColumn.getInstance(), 0));
 
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/ParentStateAndIdColumnTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/ParentStateAndIdColumnTest.java
index bf1caa0eac1..3a9cc33ce43 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/ParentStateAndIdColumnTest.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/ParentStateAndIdColumnTest.java
@@ -5,8 +5,6 @@
  */
 package org.eclipse.osee.ats.test.column;
 
-import org.junit.Assert;
-import org.eclipse.osee.ats.artifact.ActionArtifact;
 import org.eclipse.osee.ats.artifact.PeerToPeerReviewArtifact;
 import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact;
 import org.eclipse.osee.ats.column.AssigneeColumn;
@@ -16,8 +14,10 @@ import org.eclipse.osee.ats.test.util.DemoTestUtil;
 import org.eclipse.osee.ats.util.AtsRelationTypes;
 import org.eclipse.osee.ats.util.TeamState;
 import org.eclipse.osee.framework.logging.SevereLoggingMonitor;
+import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 import org.eclipse.osee.support.test.util.DemoWorkType;
 import org.eclipse.osee.support.test.util.TestUtil;
+import org.junit.Assert;
 
 /**
  * @tests ParentStateColumn
@@ -32,7 +32,7 @@ public class ParentStateAndIdColumnTest {
 
       TeamWorkFlowArtifact codeArt =
          (TeamWorkFlowArtifact) DemoTestUtil.getUncommittedActionWorkflow(DemoWorkType.Code);
-      ActionArtifact actionArt = codeArt.getParentActionArtifact();
+      Artifact actionArt = codeArt.getParentActionArtifact();
 
       Assert.assertEquals("", ParentStateColumn.getInstance().getColumnText(codeArt, AssigneeColumn.getInstance(), 0));
       Assert.assertEquals(actionArt.getHumanReadableId(),
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/PriorityColumnTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/PriorityColumnTest.java
index 373e502edf1..70cc7c2b0ad 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/PriorityColumnTest.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/PriorityColumnTest.java
@@ -5,8 +5,6 @@
  */
 package org.eclipse.osee.ats.test.column;
 
-import org.junit.Assert;
-import org.eclipse.osee.ats.artifact.ActionArtifact;
 import org.eclipse.osee.ats.artifact.PeerToPeerReviewArtifact;
 import org.eclipse.osee.ats.artifact.TaskArtifact;
 import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact;
@@ -15,8 +13,10 @@ import org.eclipse.osee.ats.column.PriorityColumn;
 import org.eclipse.osee.ats.test.util.DemoTestUtil;
 import org.eclipse.osee.ats.util.AtsRelationTypes;
 import org.eclipse.osee.framework.logging.SevereLoggingMonitor;
+import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 import org.eclipse.osee.support.test.util.DemoWorkType;
 import org.eclipse.osee.support.test.util.TestUtil;
+import org.junit.Assert;
 
 /**
  * @tests PriorityColumn
@@ -44,7 +44,7 @@ public class PriorityColumnTest {
          (TaskArtifact) codeArt.getRelatedArtifacts(AtsRelationTypes.SmaToTask_Task).iterator().next();
       Assert.assertEquals("", PriorityColumn.getInstance().getColumnText(taskArt, AssigneeColumn.getInstance(), 0));
 
-      ActionArtifact actionArt = reqArt.getParentActionArtifact();
+      Artifact actionArt = reqArt.getParentActionArtifact();
       Assert.assertEquals("1", PriorityColumn.getInstance().getColumnText(actionArt, AssigneeColumn.getInstance(), 0));
 
       TestUtil.severeLoggingEnd(loggingMonitor);
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/RelatedToStateColumnTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/RelatedToStateColumnTest.java
index beb86e9ed87..caab210ea2f 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/RelatedToStateColumnTest.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/RelatedToStateColumnTest.java
@@ -5,8 +5,6 @@
  */
 package org.eclipse.osee.ats.test.column;
 
-import org.junit.Assert;
-import org.eclipse.osee.ats.artifact.ActionArtifact;
 import org.eclipse.osee.ats.artifact.PeerToPeerReviewArtifact;
 import org.eclipse.osee.ats.artifact.TaskArtifact;
 import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact;
@@ -15,8 +13,10 @@ import org.eclipse.osee.ats.column.RelatedToStateColumn;
 import org.eclipse.osee.ats.test.util.DemoTestUtil;
 import org.eclipse.osee.ats.util.AtsRelationTypes;
 import org.eclipse.osee.framework.logging.SevereLoggingMonitor;
+import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 import org.eclipse.osee.support.test.util.DemoWorkType;
 import org.eclipse.osee.support.test.util.TestUtil;
+import org.junit.Assert;
 
 /**
  * @tests RelatedToStateColumn
@@ -46,7 +46,7 @@ public class RelatedToStateColumnTest {
       TeamWorkFlowArtifact reqArt = (TeamWorkFlowArtifact) DemoTestUtil.getUncommittedActionWorkflow(DemoWorkType.Code);
       Assert.assertEquals("", RelatedToStateColumn.getInstance().getColumnText(reqArt, AssigneeColumn.getInstance(), 0));
 
-      ActionArtifact actionArt = reqArt.getParentActionArtifact();
+      Artifact actionArt = reqArt.getParentActionArtifact();
       Assert.assertEquals("",
          RelatedToStateColumn.getInstance().getColumnText(actionArt, AssigneeColumn.getInstance(), 0));
 
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/StateColumnTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/StateColumnTest.java
index 6ee50d6aa6b..dd314102d41 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/StateColumnTest.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/StateColumnTest.java
@@ -5,16 +5,16 @@
  */
 package org.eclipse.osee.ats.test.column;
 
-import org.junit.Assert;
-import org.eclipse.osee.ats.artifact.ActionArtifact;
 import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact;
 import org.eclipse.osee.ats.column.AssigneeColumn;
 import org.eclipse.osee.ats.column.StateColumn;
 import org.eclipse.osee.ats.test.util.DemoTestUtil;
 import org.eclipse.osee.ats.util.TeamState;
 import org.eclipse.osee.framework.logging.SevereLoggingMonitor;
+import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 import org.eclipse.osee.support.test.util.DemoWorkType;
 import org.eclipse.osee.support.test.util.TestUtil;
+import org.junit.Assert;
 
 /**
  * @tests StateColumn
@@ -31,7 +31,7 @@ public class StateColumnTest {
       Assert.assertEquals(TeamState.Implement.getPageName(),
          StateColumn.getInstance().getColumnText(reqArt, AssigneeColumn.getInstance(), 0));
 
-      ActionArtifact actionArt = reqArt.getParentActionArtifact();
+      Artifact actionArt = reqArt.getParentActionArtifact();
       Assert.assertEquals(TeamState.Implement.getPageName(),
          StateColumn.getInstance().getColumnText(actionArt, AssigneeColumn.getInstance(), 0));
 
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/TargetedVersionColumnTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/TargetedVersionColumnTest.java
index e64c656f659..69c40fbc5a2 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/TargetedVersionColumnTest.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/TargetedVersionColumnTest.java
@@ -5,16 +5,16 @@
  */
 package org.eclipse.osee.ats.test.column;
 
-import org.junit.Assert;
-import org.eclipse.osee.ats.artifact.ActionArtifact;
 import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact;
 import org.eclipse.osee.ats.column.AssigneeColumn;
 import org.eclipse.osee.ats.column.TargetedVersionColumn;
 import org.eclipse.osee.ats.test.util.DemoTestUtil;
 import org.eclipse.osee.framework.logging.SevereLoggingMonitor;
+import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 import org.eclipse.osee.support.test.util.DemoSawBuilds;
 import org.eclipse.osee.support.test.util.DemoWorkType;
 import org.eclipse.osee.support.test.util.TestUtil;
+import org.junit.Assert;
 
 /**
  * @tests TargetedVersionColumn
@@ -36,7 +36,7 @@ public class TargetedVersionColumnTest {
       Assert.assertEquals(DemoSawBuilds.SAW_Bld_2.getName(),
          TargetedVersionColumn.getInstance().getColumnText(codeArt, AssigneeColumn.getInstance(), 0));
 
-      ActionArtifact actionArt = reqArt.getParentActionArtifact();
+      Artifact actionArt = reqArt.getParentActionArtifact();
       Assert.assertEquals(DemoSawBuilds.SAW_Bld_2.getName(),
          TargetedVersionColumn.getInstance().getColumnText(actionArt, AssigneeColumn.getInstance(), 0));
 
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/TeamColumnTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/TeamColumnTest.java
index 9a36ff98604..abfaa277fe3 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/TeamColumnTest.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/TeamColumnTest.java
@@ -5,15 +5,15 @@
  */
 package org.eclipse.osee.ats.test.column;
 
-import org.junit.Assert;
-import org.eclipse.osee.ats.artifact.ActionArtifact;
 import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact;
 import org.eclipse.osee.ats.column.AssigneeColumn;
 import org.eclipse.osee.ats.column.TeamColumn;
 import org.eclipse.osee.ats.test.util.DemoTestUtil;
 import org.eclipse.osee.framework.logging.SevereLoggingMonitor;
+import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 import org.eclipse.osee.support.test.util.DemoWorkType;
 import org.eclipse.osee.support.test.util.TestUtil;
+import org.junit.Assert;
 
 /**
  * @tests TeamColumn
@@ -34,7 +34,7 @@ public class TeamColumnTest {
          (TeamWorkFlowArtifact) DemoTestUtil.getUncommittedActionWorkflow(DemoWorkType.Code);
       Assert.assertEquals("SAW Code", TeamColumn.getInstance().getColumnText(codeArt, AssigneeColumn.getInstance(), 0));
 
-      ActionArtifact actionArt = reqArt.getParentActionArtifact();
+      Artifact actionArt = reqArt.getParentActionArtifact();
       Assert.assertEquals("", TeamColumn.getInstance().getColumnText(actionArt, AssigneeColumn.getInstance(), 0));
 
       TestUtil.severeLoggingEnd(loggingMonitor);
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/TypeColumnTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/TypeColumnTest.java
index bf9c068ca59..bfd9ebfb6b7 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/TypeColumnTest.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/TypeColumnTest.java
@@ -5,15 +5,15 @@
  */
 package org.eclipse.osee.ats.test.column;
 
-import org.junit.Assert;
-import org.eclipse.osee.ats.artifact.ActionArtifact;
 import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact;
 import org.eclipse.osee.ats.column.AssigneeColumn;
 import org.eclipse.osee.ats.column.TypeColumn;
 import org.eclipse.osee.ats.test.util.DemoTestUtil;
 import org.eclipse.osee.framework.logging.SevereLoggingMonitor;
+import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 import org.eclipse.osee.support.test.util.DemoWorkType;
 import org.eclipse.osee.support.test.util.TestUtil;
+import org.junit.Assert;
 
 /**
  * @tests TypeColumn
@@ -35,7 +35,7 @@ public class TypeColumnTest {
       Assert.assertEquals("SAW Code Workflow",
          TypeColumn.getInstance().getColumnText(codeArt, AssigneeColumn.getInstance(), 0));
 
-      ActionArtifact actionArt = reqArt.getParentActionArtifact();
+      Artifact actionArt = reqArt.getParentActionArtifact();
       Assert.assertEquals("Action", TypeColumn.getInstance().getColumnText(actionArt, AssigneeColumn.getInstance(), 0));
 
       TestUtil.severeLoggingEnd(loggingMonitor);
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/config/AtsBranchConfigurationTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/config/AtsBranchConfigurationTest.java
index 07e05f423aa..03a7fc3d84b 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/config/AtsBranchConfigurationTest.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/config/AtsBranchConfigurationTest.java
@@ -16,7 +16,6 @@ import java.util.Collections;
 import java.util.Date;
 import java.util.logging.Level;
 import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.osee.ats.artifact.ActionArtifact;
 import org.eclipse.osee.ats.artifact.ActionableItemArtifact;
 import org.eclipse.osee.ats.artifact.AtsAttributeTypes;
 import org.eclipse.osee.ats.artifact.TeamDefinitionArtifact;
@@ -142,16 +141,16 @@ public class AtsBranchConfigurationTest {
       Assert.assertFalse(selectedActionableItems.isEmpty());
 
       SkynetTransaction transaction = new SkynetTransaction(AtsUtil.getAtsBranch(), "Branch Configuration Test");
-      ActionArtifact actionArt =
+      Artifact actionArt =
          ActionManager.createAction(null, BRANCH_VIA_VERSIONS.getName() + " Req Changes", "description",
-            ChangeType.Problem, "1", false, null, selectedActionableItems, new Date(), UserManager.getUser(),
-            null, transaction);
-      actionArt.getTeamWorkFlowArtifacts().iterator().next().addRelation(
+            ChangeType.Problem, "1", false, null, selectedActionableItems, new Date(), UserManager.getUser(), null,
+            transaction);
+      ActionManager.getTeams(actionArt).iterator().next().addRelation(
          AtsRelationTypes.TeamWorkflowTargetedForVersion_Version, verArtToTarget);
-      actionArt.getTeamWorkFlowArtifacts().iterator().next().persist(transaction);
+      ActionManager.getTeams(actionArt).iterator().next().persist(transaction);
       transaction.execute();
 
-      final TeamWorkFlowArtifact teamWf = actionArt.getTeamWorkFlowArtifacts().iterator().next();
+      final TeamWorkFlowArtifact teamWf = ActionManager.getTeams(actionArt).iterator().next();
       TeamWorkflowManager dtwm = new TeamWorkflowManager(teamWf);
 
       // Transition to desired state
@@ -238,12 +237,12 @@ public class AtsBranchConfigurationTest {
       SkynetTransaction transaction =
          new SkynetTransaction(AtsUtil.getAtsBranch(), "Test branch via team definition: create action");
       String actionTitle = BRANCH_VIA_TEAM_DEFINITION.getName() + " Req Changes";
-      ActionArtifact actionArt =
+      Artifact actionArt =
          ActionManager.createAction(null, actionTitle, "description", ChangeType.Problem, "1", false, null,
             selectedActionableItems, new Date(), UserManager.getUser(), null, transaction);
       transaction.execute();
 
-      final TeamWorkFlowArtifact teamWf = actionArt.getTeamWorkFlowArtifacts().iterator().next();
+      final TeamWorkFlowArtifact teamWf = ActionManager.getTeams(actionArt).iterator().next();
       TeamWorkflowManager dtwm = new TeamWorkflowManager(teamWf);
 
       // Transition to desired state
@@ -281,12 +280,12 @@ public class AtsBranchConfigurationTest {
    public static void cleanupBranchTest(IOseeBranch testType) throws Exception {
       String namespace = "org.branchTest." + testType.getName().toLowerCase();
       OseeLog.log(AtsPlugin.class, Level.INFO, "Cleanup from previous run of ATS for team " + namespace);
-      ActionArtifact aArt =
-         (ActionArtifact) ArtifactQuery.checkArtifactFromTypeAndName(AtsArtifactTypes.Action,
-            testType.getName() + " Req Changes", AtsUtil.getAtsBranch());
+      Artifact aArt =
+         ArtifactQuery.checkArtifactFromTypeAndName(AtsArtifactTypes.Action, testType.getName() + " Req Changes",
+            AtsUtil.getAtsBranch());
       if (aArt != null) {
          SkynetTransaction transaction = new SkynetTransaction(AtsUtil.getAtsBranch(), "Branch Configuration Test");
-         for (TeamWorkFlowArtifact teamArt : aArt.getTeamWorkFlowArtifacts()) {
+         for (TeamWorkFlowArtifact teamArt : ActionManager.getTeams(aArt)) {
             SMAEditor.close(Collections.singleton(teamArt), false);
             teamArt.deleteAndPersist(transaction, true);
          }
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/navigate/AtsNavigateItemsToWorldViewTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/navigate/AtsNavigateItemsToWorldViewTest.java
index 6ac2499ef8a..dd48caf1766 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/navigate/AtsNavigateItemsToWorldViewTest.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/navigate/AtsNavigateItemsToWorldViewTest.java
@@ -23,7 +23,6 @@ import org.eclipse.jface.viewers.ITableLabelProvider;
 import org.eclipse.nebula.widgets.xviewer.XViewer;
 import org.eclipse.nebula.widgets.xviewer.XViewerColumn;
 import org.eclipse.osee.ats.artifact.AbstractWorkflowArtifact;
-import org.eclipse.osee.ats.artifact.ActionArtifact;
 import org.eclipse.osee.ats.artifact.ActionableItemArtifact;
 import org.eclipse.osee.ats.artifact.AtsAttributeTypes;
 import org.eclipse.osee.ats.artifact.DecisionReviewArtifact;
@@ -344,7 +343,7 @@ public class AtsNavigateItemsToWorldViewTest {
       WorldEditor worldEditor = getSingleEditorOrFail();
       Collection<Artifact> arts = worldEditor.getLoadedArtifacts();
 
-      NavigateTestUtil.testExpectedVersusActual(item.getName() + " Actions", arts, ActionArtifact.class, 2);
+      NavigateTestUtil.testExpectedVersusActual(item.getName() + " Actions", arts, AtsArtifactTypes.Action, 2);
       NavigateTestUtil.testExpectedVersusActual(item.getName() + " Teams", arts, TeamWorkFlowArtifact.class, 7);
       NavigateTestUtil.testExpectedVersusActual(item.getName() + " Tasks", arts, TaskArtifact.class,
          DemoTestUtil.getNumTasks());
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/util/AtsDeleteManagerTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/util/AtsDeleteManagerTest.java
index 3eed80f885f..5eb8a65e4da 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/util/AtsDeleteManagerTest.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/util/AtsDeleteManagerTest.java
@@ -16,7 +16,6 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
-import org.eclipse.osee.ats.artifact.ActionArtifact;
 import org.eclipse.osee.ats.artifact.ActionableItemArtifact;
 import org.eclipse.osee.ats.artifact.DecisionReviewArtifact;
 import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact;
@@ -198,12 +197,12 @@ public class AtsDeleteManagerTest {
    private TeamWorkFlowArtifact createAction(TestNames testName, Collection<ActionableItemArtifact> actionableItems, SkynetTransaction transaction) throws OseeCoreException {
       Date createdDate = new Date();
       User createdBy = UserManager.getUser();
-      ActionArtifact actionArt =
+      Artifact actionArt =
          ActionManager.createAction(null, testName.name(), "Description", ChangeType.Improvement, "2", false, null,
             actionableItems, createdDate, createdBy, null, transaction);
 
       TeamWorkFlowArtifact teamArt = null;
-      for (TeamWorkFlowArtifact team : actionArt.getTeamWorkFlowArtifacts()) {
+      for (TeamWorkFlowArtifact team : ActionManager.getTeams(actionArt)) {
          if (team.getTeamDefinition().getName().contains("Code")) {
             teamArt = team;
          }
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/util/AtsPurgeTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/util/AtsPurgeTest.java
index cecc60f403c..81a29e1c5b2 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/util/AtsPurgeTest.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/util/AtsPurgeTest.java
@@ -18,7 +18,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import org.eclipse.osee.ats.artifact.ActionArtifact;
 import org.eclipse.osee.ats.artifact.ActionableItemArtifact;
 import org.eclipse.osee.ats.artifact.TaskArtifact;
 import org.eclipse.osee.ats.util.ActionManager;
@@ -64,7 +63,7 @@ public class AtsPurgeTest {
 
       // Create Action, Workflow and Tasks
       SkynetTransaction transaction = new SkynetTransaction(AtsUtil.getAtsBranch(), "Purge Test");
-      ActionArtifact actionArt =
+      Artifact actionArt =
          ActionManager.createAction(
             null,
             getClass().getSimpleName(),
@@ -81,12 +80,12 @@ public class AtsPurgeTest {
       transaction.execute();
 
       artsToPurge.add(actionArt);
-      artsToPurge.addAll(actionArt.getTeamWorkFlowArtifacts());
+      artsToPurge.addAll(ActionManager.getTeams(actionArt));
 
       for (int x = 0; x < 30; x++) {
          TaskArtifact taskArt =
-            actionArt.getTeamWorkFlowArtifacts().iterator().next().createNewTask(getClass().getSimpleName() + x,
-               new Date(), UserManager.getUser());
+            ActionManager.getFirstTeam(actionArt).createNewTask(getClass().getSimpleName() + x, new Date(),
+               UserManager.getUser());
          taskArt.persist();
          artsToPurge.add(taskArt);
       }
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/util/DemoTestUtil.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/util/DemoTestUtil.java
index 59a550a1c1b..5266ad9e926 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/util/DemoTestUtil.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/util/DemoTestUtil.java
@@ -20,8 +20,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.logging.Level;
-import org.junit.Assert;
-import org.eclipse.osee.ats.artifact.ActionArtifact;
 import org.eclipse.osee.ats.artifact.ActionableItemArtifact;
 import org.eclipse.osee.ats.artifact.TaskArtifact;
 import org.eclipse.osee.ats.artifact.TeamDefinitionArtifact;
@@ -50,6 +48,7 @@ import org.eclipse.osee.support.test.util.DemoSawBuilds;
 import org.eclipse.osee.support.test.util.DemoUsers;
 import org.eclipse.osee.support.test.util.DemoWorkType;
 import org.eclipse.osee.support.test.util.TestUtil;
+import org.junit.Assert;
 
 /**
  * @author Donald G. Dunne
@@ -97,13 +96,13 @@ public class DemoTestUtil {
     * Creates an action with the name title and demo code workflow
     */
    public static TeamWorkFlowArtifact createSimpleAction(String title, SkynetTransaction transaction) throws OseeCoreException {
-      ActionArtifact actionArt =
+      Artifact actionArt =
          ActionManager.createAction(null, title, "Description", ChangeType.Improvement, "2", false, null,
             ActionableItemArtifact.getActionableItems(Arrays.asList(DemoActionableItems.SAW_Code.getName())),
             new Date(), UserManager.getUser(), null, transaction);
 
       TeamWorkFlowArtifact teamArt = null;
-      for (TeamWorkFlowArtifact team : actionArt.getTeamWorkFlowArtifacts()) {
+      for (TeamWorkFlowArtifact team : ActionManager.getTeams(actionArt)) {
          if (team.getTeamDefinition().getName().contains("Code")) {
             teamArt = team;
          }
@@ -111,15 +110,15 @@ public class DemoTestUtil {
       return teamArt;
    }
 
-   public static Set<ActionableItemArtifact> getActionableItems(DemoActionableItems demoAI) throws OseeCoreException {
+   public static Set<ActionableItemArtifact> getActionableItems(DemoActionableItems demoAI) {
       return ActionableItemArtifact.getActionableItems(Arrays.asList(demoAI.getName()));
    }
 
-   public static ActionableItemArtifact getActionableItem(DemoActionableItems demoAI) throws OseeCoreException {
+   public static ActionableItemArtifact getActionableItem(DemoActionableItems demoAI) {
       return getActionableItems(demoAI).iterator().next();
    }
 
-   public static TeamWorkFlowArtifact addTeamWorkflow(ActionArtifact actionArt, String title, SkynetTransaction transaction) throws OseeCoreException {
+   public static TeamWorkFlowArtifact addTeamWorkflow(Artifact actionArt, String title, SkynetTransaction transaction) throws OseeCoreException {
       Set<ActionableItemArtifact> actionableItems = getActionableItems(DemoActionableItems.SAW_Test);
       ;
       Collection<TeamDefinitionArtifact> teamDefs = TeamDefinitionArtifact.getImpactedTeamDefs(actionableItems);
@@ -128,7 +127,7 @@ public class DemoTestUtil {
          Arrays.asList(UserManager.getUser()), transaction, new Date(), UserManager.getUser(), null);
 
       TeamWorkFlowArtifact teamArt = null;
-      for (TeamWorkFlowArtifact team : actionArt.getTeamWorkFlowArtifacts()) {
+      for (TeamWorkFlowArtifact team : ActionManager.getTeams(actionArt)) {
          if (team.getTeamDefinition().getName().contains("Test")) {
             teamArt = team;
          }
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/util/NavigateTestUtil.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/util/NavigateTestUtil.java
index 039ebbf1bf2..53ce2801399 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/util/NavigateTestUtil.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/util/NavigateTestUtil.java
@@ -13,14 +13,15 @@ package org.eclipse.osee.ats.test.util;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.logging.Level;
-import org.junit.Assert;
 import org.eclipse.osee.ats.internal.AtsPlugin;
 import org.eclipse.osee.ats.navigate.AtsNavigateViewItems;
+import org.eclipse.osee.framework.core.data.IArtifactType;
 import org.eclipse.osee.framework.jdk.core.type.HashCollection;
 import org.eclipse.osee.framework.logging.OseeLog;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem;
 import org.eclipse.swt.widgets.TreeItem;
+import org.junit.Assert;
 
 /**
  * @author Donald G. Dunne
@@ -101,6 +102,14 @@ public final class NavigateTestUtil {
       compare(expectedNumOfType, actualNumOfType, expectedStr);
    }
 
+   public static void testExpectedVersusActual(String name, Collection<? extends Artifact> arts, IArtifactType artType, int expectedNumOfType) {
+      int actualNumOfType = numOfType(arts, artType);
+      String expectedStr =
+         String.format("\"%s\"   Expected: %s   Found: %s   Of Type: %s", name, expectedNumOfType, actualNumOfType,
+            artType);
+      compare(expectedNumOfType, actualNumOfType, expectedStr);
+   }
+
    public static void testExpectedVersusActual(String testStr, int expected, int actual) {
       String expectedStr = String.format("%sExpected: %s   Found: %s", testStr, expected, actual);
       compare(expected, actual, expectedStr);
@@ -139,6 +148,16 @@ public final class NavigateTestUtil {
       return num;
    }
 
+   public static int numOfType(Collection<? extends Artifact> arts, IArtifactType artType) {
+      int num = 0;
+      for (Artifact art : arts) {
+         if (art.isOfType(artType)) {
+            num++;
+         }
+      }
+      return num;
+   }
+
    public static void getAllArtifactChildren(TreeItem items[], Collection<Artifact> children) {
       for (TreeItem item : items) {
          if (item.getData() instanceof Artifact) {