diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/BatchAccountTests.cs b/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/BatchAccountTests.cs
index a9647fb2c2e4..6904fb368a33 100644
--- a/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/BatchAccountTests.cs
+++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/BatchAccountTests.cs
@@ -20,49 +20,42 @@ namespace Microsoft.Azure.Commands.Batch.Test.ScenarioTests
     public class BatchAccountTests : WindowsAzure.Commands.Test.Utilities.Common.RMTestBase
     {
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetNonExistingBatchAccount()
         {
             BatchController.NewInstance.RunPsTest("Test-GetNonExistingBatchAccount");
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestCreatesNewBatchAccount()
         {
             BatchController.NewInstance.RunPsTest("Test-CreatesNewBatchAccount");
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestCreateExistingBatchAccount()
         {
             BatchController.NewInstance.RunPsTest("Test-CreateExistingBatchAccount");
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestUpdatesExistingBatchAccount()
         {
             BatchController.NewInstance.RunPsTest("Test-UpdatesExistingBatchAccount");
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetBatchAccountsUnderResourceGroups()
         {
             BatchController.NewInstance.RunPsTest("Test-GetBatchAccountsUnderResourceGroups");
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestCreateAndRemoveBatchAccountViaPiping()
         {
             BatchController.NewInstance.RunPsTest("Test-CreateAndRemoveBatchAccountViaPiping");
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestBatchAccountKeys()
         {
             BatchController.NewInstance.RunPsTest("Test-BatchAccountKeys");
diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/CertificateTests.cs b/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/CertificateTests.cs
index 662eb9211751..b00bc85eb946 100644
--- a/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/CertificateTests.cs
+++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/CertificateTests.cs
@@ -38,7 +38,6 @@ public void TestAddCertificate()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetCertificateByThumbprint()
         {
             BatchController controller = BatchController.NewInstance;
@@ -60,7 +59,6 @@ public void TestGetCertificateByThumbprint()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestListCertificatesByFilter()
         {
             BatchController controller = BatchController.NewInstance;
@@ -114,7 +112,6 @@ public void TestGetAndListCertificatesWithSelect()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestListCertificatesWithMaxCount()
         {
             BatchController controller = BatchController.NewInstance;
@@ -140,7 +137,6 @@ public void TestListCertificatesWithMaxCount()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestListAllCertificates()
         {
             BatchController controller = BatchController.NewInstance;
@@ -185,7 +181,6 @@ public void TestDeleteCertificate()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestCancelCertificateDelete()
         {
             BatchController controller = BatchController.NewInstance;
diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/ComputeNodeTests.cs b/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/ComputeNodeTests.cs
index d8f1c60b4499..b7620f6a66ca 100644
--- a/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/ComputeNodeTests.cs
+++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/ComputeNodeTests.cs
@@ -30,7 +30,6 @@ public class ComputeNodeTests : WindowsAzure.Commands.Test.Utilities.Common.RMTe
         private const string poolId = ScenarioTestHelpers.SharedPool;
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetComputeNodeById()
         {
             BatchController controller = BatchController.NewInstance;
@@ -38,7 +37,6 @@ public void TestGetComputeNodeById()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestListComputeNodesByFilter()
         {
             BatchController controller = BatchController.NewInstance;
@@ -77,7 +75,6 @@ public void TestGetAndListComputeNodesWithSelect()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestListComputeNodesWithMaxCount()
         {
             BatchController controller = BatchController.NewInstance;
@@ -86,7 +83,6 @@ public void TestListComputeNodesWithMaxCount()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestListAllComputeNodes()
         {
             BatchController controller = BatchController.NewInstance;
@@ -105,7 +101,6 @@ public void TestListAllComputeNodes()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestListComputeNodePipeline()
         {
             BatchController controller = BatchController.NewInstance;
@@ -124,7 +119,6 @@ public void TestListComputeNodePipeline()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestRemoveComputeNodeById()
         {
             TestRemoveComputeNode(false, TestUtilities.GetCurrentMethodName());
@@ -138,7 +132,6 @@ public void TestRemoveComputeNodePipeline()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestRemoveMultipleComputeNodes()
         {
             BatchController controller = BatchController.NewInstance;
@@ -166,42 +159,36 @@ public void TestRemoveMultipleComputeNodes()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestRebootComputeNodeById()
         {
             TestRebootComputeNode(false, TestUtilities.GetCurrentMethodName());
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestRebootComputeNodePipeline()
         {
             TestRebootComputeNode(true, TestUtilities.GetCurrentMethodName());
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestReimageComputeNodeById()
         {
             TestReimageComputeNode(false, TestUtilities.GetCurrentMethodName());
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestReimageComputeNodePipeline()
         {
             TestReimageComputeNode(true, TestUtilities.GetCurrentMethodName());
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestDisableAndEnableComputeNodeSchedulingById()
         {
             TestDisableAndEnableComputeNodeScheduling(false, TestUtilities.GetCurrentMethodName());
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestDisableAndEnableComputeNodeSchedulingPipeline()
         {
             TestDisableAndEnableComputeNodeScheduling(true, TestUtilities.GetCurrentMethodName());
diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/ComputeNodeUserTests.cs b/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/ComputeNodeUserTests.cs
index 03cbc8d882c1..2532c0369f2a 100644
--- a/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/ComputeNodeUserTests.cs
+++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/ComputeNodeUserTests.cs
@@ -31,7 +31,6 @@ public class ComputeNodeUserTests : WindowsAzure.Commands.Test.Utilities.Common.
         private const string poolId = ScenarioTestHelpers.SharedPool;
         
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestCreateComputeNodeUser()
         {
             BatchController controller = BatchController.NewInstance;
@@ -73,7 +72,6 @@ public void TestCreateComputeNodeUserPipeline()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestUpdateComputeNodeUser()
         {
             BatchController controller = BatchController.NewInstance;
diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/FileTests.cs b/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/FileTests.cs
index ae4621d13f4a..d25cc14fa90e 100644
--- a/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/FileTests.cs
+++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/FileTests.cs
@@ -34,7 +34,6 @@ public class FileTests : WindowsAzure.Commands.Test.Utilities.Common.RMTestBase
         private const string startTaskStdOutContent = ScenarioTestHelpers.SharedPoolStartTaskStdOutContent;
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetNodeFileByTaskByName()
         {
             BatchController controller = BatchController.NewInstance;
@@ -60,7 +59,6 @@ public void TestGetNodeFileByTaskByName()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestListNodeFilesByTaskByFilter()
         {
             BatchController controller = BatchController.NewInstance;
@@ -87,7 +85,6 @@ public void TestListNodeFilesByTaskByFilter()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestListNodeFilesByTaskWithMaxCount()
         {
             BatchController controller = BatchController.NewInstance;
@@ -113,7 +110,6 @@ public void TestListNodeFilesByTaskWithMaxCount()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestListAllNodeFilesByTask()
         {
             BatchController controller = BatchController.NewInstance;
@@ -139,7 +135,6 @@ public void TestListAllNodeFilesByTask()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestListNodeFilesByTaskRecursive()
         {
             BatchController controller = BatchController.NewInstance;
@@ -165,7 +160,6 @@ public void TestListNodeFilesByTaskRecursive()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestListNodeFileByTaskPipeline()
         {
             BatchController controller = BatchController.NewInstance;
@@ -191,7 +185,6 @@ public void TestListNodeFileByTaskPipeline()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetNodeFileContentByTaskByName()
         {
             BatchController controller = BatchController.NewInstance;
@@ -219,7 +212,6 @@ public void TestGetNodeFileContentByTaskByName()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetNodeFileContentByTaskPipeline()
         {
             BatchController controller = BatchController.NewInstance;
@@ -247,7 +239,6 @@ public void TestGetNodeFileContentByTaskPipeline()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetNodeFileByComputeNodeByName()
         {
             BatchController controller = BatchController.NewInstance;
@@ -267,7 +258,6 @@ public void TestGetNodeFileByComputeNodeByName()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestListNodeFilesByComputeNodeByFilter()
         {
             BatchController controller = BatchController.NewInstance;
@@ -288,7 +278,6 @@ public void TestListNodeFilesByComputeNodeByFilter()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestListNodeFilesByComputeNodeWithMaxCount()
         {
             BatchController controller = BatchController.NewInstance;
@@ -308,7 +297,6 @@ public void TestListNodeFilesByComputeNodeWithMaxCount()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestListAllNodeFilesByComputeNode()
         {
             BatchController controller = BatchController.NewInstance;
@@ -328,7 +316,6 @@ public void TestListAllNodeFilesByComputeNode()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestListNodeFilesByComputeNodeRecursive()
         {
             BatchController controller = BatchController.NewInstance;
@@ -369,7 +356,6 @@ public void TestListNodeFileByComputeNodePipeline()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetNodeFileContentByComputeNodeByName()
         {
             BatchController controller = BatchController.NewInstance;
@@ -388,7 +374,6 @@ public void TestGetNodeFileContentByComputeNodeByName()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetNodeFileContentByComputeNodeByPipeline()
         {
             BatchController controller = BatchController.NewInstance;
@@ -407,7 +392,6 @@ public void TestGetNodeFileContentByComputeNodeByPipeline()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetRemoteDesktopProtocolFileById()
         {
             BatchController controller = BatchController.NewInstance;
@@ -426,7 +410,6 @@ public void TestGetRemoteDesktopProtocolFileById()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetRemoteDesktopProtocolFilePipeline()
         {
             BatchController controller = BatchController.NewInstance;
@@ -452,21 +435,18 @@ public void TestDeleteNodeFileByTaskByName()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestDeleteNodeFileByTaskByPipeline()
         {
             TestDeleteNodeFileByTask(true, TestUtilities.GetCurrentMethodName());
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestDeleteNodeFileByComputeNodeByName()
         {
             TestDeleteNodeFileByComputeNode(false, TestUtilities.GetCurrentMethodName());
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestDeleteNodeFileByComputeNodeByPipeline()
         {
             TestDeleteNodeFileByComputeNode(true, TestUtilities.GetCurrentMethodName());
diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/JobScheduleTests.cs b/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/JobScheduleTests.cs
index 8452b5d44e93..12bcdacadc97 100644
--- a/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/JobScheduleTests.cs
+++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/JobScheduleTests.cs
@@ -35,7 +35,6 @@ public void TestNewJobSchedule()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetJobScheduleById()
         {
             BatchController controller = BatchController.NewInstance;
@@ -57,7 +56,6 @@ public void TestGetJobScheduleById()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestListJobSchedulesByFilter()
         {
             BatchController controller = BatchController.NewInstance;
@@ -109,7 +107,6 @@ public void TestGetAndListJobSchedulesWithSelect()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestListJobSchedulesWithMaxCount()
         {
             BatchController controller = BatchController.NewInstance;
@@ -138,7 +135,6 @@ public void TestListJobSchedulesWithMaxCount()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestListAllJobSchedules()
         {
             BatchController controller = BatchController.NewInstance;
@@ -167,7 +163,6 @@ public void TestListAllJobSchedules()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestUpdateJobSchedule()
         {
             BatchController controller = BatchController.NewInstance;
@@ -190,7 +185,6 @@ public void TestUpdateJobSchedule()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestDeleteJobSchedule()
         {
             BatchController controller = BatchController.NewInstance;
@@ -230,7 +224,6 @@ public void TestDeleteJobSchedulePipeline()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestDisableAndEnableJobSchedule()
         {
             BatchController controller = BatchController.NewInstance;
@@ -253,14 +246,12 @@ public void TestDisableAndEnableJobSchedule()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestTerminateJobScheduleById()
         {
             TestTerminateJobSchedule(false);
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestTerminateJobSchedulePipeline()
         {
             TestTerminateJobSchedule(true);
diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/JobTests.cs b/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/JobTests.cs
index b83ed1806422..fb0bc640db66 100644
--- a/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/JobTests.cs
+++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/JobTests.cs
@@ -37,7 +37,6 @@ public void TestNewJob()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetJobById()
         {
             BatchController controller = BatchController.NewInstance;
@@ -59,7 +58,6 @@ public void TestGetJobById()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestListJobsByFilter()
         {
             BatchController controller = BatchController.NewInstance;
@@ -113,7 +111,6 @@ public void TestGetAndListJobsWithSelect()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestListJobsWithMaxCount()
         {
             BatchController controller = BatchController.NewInstance;
@@ -142,7 +139,6 @@ public void TestListJobsWithMaxCount()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestListAllJobs()
         {
             BatchController controller = BatchController.NewInstance;
@@ -171,7 +167,6 @@ public void TestListAllJobs()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestListJobsUnderSchedule()
         {
             BatchController controller = BatchController.NewInstance;
@@ -205,7 +200,6 @@ public void TestListJobsUnderSchedule()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestUpdateJob()
         {
             BatchController controller = BatchController.NewInstance;
@@ -234,7 +228,6 @@ public void TestDeleteJob()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestDeleteJobPipeline()
         {
             BatchController controller = BatchController.NewInstance;
@@ -254,7 +247,6 @@ public void TestDeleteJobPipeline()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestDisableAndEnableJob()
         {
             BatchController controller = BatchController.NewInstance;
@@ -277,14 +269,12 @@ public void TestDisableAndEnableJob()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestTerminateJobById()
         {
             TestTerminateJob(false);
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestTerminateJobPipeline()
         {
             TestTerminateJob(true);
diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/PoolTests.cs b/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/PoolTests.cs
index 2b60d290c5e4..57bd632a8981 100644
--- a/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/PoolTests.cs
+++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/PoolTests.cs
@@ -40,7 +40,6 @@ public void TestNewPool()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetPoolById()
         {
             BatchController controller = BatchController.NewInstance;
@@ -62,7 +61,6 @@ public void TestGetPoolById()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestListPoolsByFilter()
         {
             BatchController controller = BatchController.NewInstance;
@@ -100,7 +98,6 @@ public void TestGetAndListPoolsWithSelect()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestListPoolsWithMaxCount()
         {
             BatchController controller = BatchController.NewInstance;
@@ -129,7 +126,6 @@ public void TestListPoolsWithMaxCount()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestListAllPools()
         {
             BatchController controller = BatchController.NewInstance;
@@ -161,7 +157,6 @@ public void TestListAllPools()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestUpdatePool()
         {
             BatchController controller = BatchController.NewInstance;
@@ -184,7 +179,6 @@ public void TestUpdatePool()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestDeletePool()
         {
             BatchController controller = BatchController.NewInstance;
@@ -224,7 +218,6 @@ public void TestDeletePoolPipeline()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestResizePoolById()
         {
             BatchController controller = BatchController.NewInstance;
@@ -242,7 +235,6 @@ public void TestResizePoolById()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestResizePoolByPipeline()
         {
             BatchController controller = BatchController.NewInstance;
@@ -260,7 +252,6 @@ public void TestResizePoolByPipeline()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestStopResizePoolById()
         {
             BatchController controller = BatchController.NewInstance;
@@ -278,7 +269,6 @@ public void TestStopResizePoolById()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestStopResizePoolByPipeline()
         {
             BatchController controller = BatchController.NewInstance;
@@ -296,7 +286,6 @@ public void TestStopResizePoolByPipeline()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestEnableAutoScaleById()
         {
             BatchController controller = BatchController.NewInstance;
@@ -319,7 +308,6 @@ public void TestEnableAutoScaleById()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestEnableAutoScaleByPipeline()
         {
             BatchController controller = BatchController.NewInstance;
@@ -342,7 +330,6 @@ public void TestEnableAutoScaleByPipeline()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestDisableAutoScaleById()
         {
             BatchController controller = BatchController.NewInstance;
@@ -362,7 +349,6 @@ public void TestDisableAutoScaleById()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestDisableAutoScaleByPipeline()
         {
             BatchController controller = BatchController.NewInstance;
@@ -382,7 +368,6 @@ public void TestDisableAutoScaleByPipeline()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestEvaluateAutoScaleById()
         {
             BatchController controller = BatchController.NewInstance;
@@ -404,7 +389,6 @@ public void TestEvaluateAutoScaleById()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestEvaluateAutoScaleByPipeline()
         {
             BatchController controller = BatchController.NewInstance;
@@ -426,14 +410,12 @@ public void TestEvaluateAutoScaleByPipeline()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestChangeOSVersionById()
         {
             TestChangeOSVersion(false);
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestChangeOSVersionPipeline()
         {
             TestChangeOSVersion(true);
diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/TaskTests.cs b/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/TaskTests.cs
index 246d746676a8..6895d10af584 100644
--- a/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/TaskTests.cs
+++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/TaskTests.cs
@@ -51,7 +51,6 @@ public void TestCreateTask()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetTaskById()
         {
             BatchController controller = BatchController.NewInstance;
@@ -75,7 +74,6 @@ public void TestGetTaskById()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestListTasksByFilter()
         {
             BatchController controller = BatchController.NewInstance;
@@ -129,7 +127,6 @@ public void TestGetAndListTasksWithSelect()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestListTasksWithMaxCount()
         {
             BatchController controller = BatchController.NewInstance;
@@ -158,7 +155,6 @@ public void TestListTasksWithMaxCount()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestListAllTasks()
         {
             BatchController controller = BatchController.NewInstance;
@@ -187,7 +183,6 @@ public void TestListAllTasks()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestListTaskPipeline()
         {
             BatchController controller = BatchController.NewInstance;
@@ -211,7 +206,6 @@ public void TestListTaskPipeline()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestUpdateTask()
         {
             BatchController controller = BatchController.NewInstance;
@@ -262,7 +256,6 @@ public void TestDeleteTask()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestDeleteTaskPipeline()
         {
             BatchController controller = BatchController.NewInstance;
@@ -287,7 +280,6 @@ public void TestDeleteTaskPipeline()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestTerminateTask()
         {
             BatchController controller = BatchController.NewInstance;
@@ -314,7 +306,6 @@ public void TestTerminateTask()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestListSubtasksWithMaxCount()
         {
             BatchController controller = BatchController.NewInstance;
@@ -342,7 +333,6 @@ public void TestListSubtasksWithMaxCount()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestListAllSubtasks()
         {
             BatchController controller = BatchController.NewInstance;