diff --git a/src/HPCCache/HPCCache.Test/Fixtures/HpcCacheTestFixture.cs b/src/HPCCache/HPCCache.Test/Fixtures/HpcCacheTestFixture.cs
index 8206f98b3b00..1cb1e3eedfb3 100644
--- a/src/HPCCache/HPCCache.Test/Fixtures/HpcCacheTestFixture.cs
+++ b/src/HPCCache/HPCCache.Test/Fixtures/HpcCacheTestFixture.cs
@@ -61,7 +61,6 @@ public HpcCacheTestFixture()
         {
             using (this.Context = new HpcCacheTestContext(this.GetType().Name))
             {
-                this.Context = new HpcCacheTestContext(this.GetType().Name);
                 try
                 {
                     StorageCacheManagementClient storagecacheMgmtClient = this.Context.GetClient<StorageCacheManagementClient>();
diff --git a/src/HPCCache/HPCCache.Test/Fixtures/StorageAccountFixture.cs b/src/HPCCache/HPCCache.Test/Fixtures/StorageAccountFixture.cs
index 4159c636d342..451309f1bf65 100644
--- a/src/HPCCache/HPCCache.Test/Fixtures/StorageAccountFixture.cs
+++ b/src/HPCCache/HPCCache.Test/Fixtures/StorageAccountFixture.cs
@@ -48,7 +48,6 @@ public StorageAccountFixture(HpcCacheTestFixture fixture)
             this.fixture = fixture;
             using (this.Context = new HpcCacheTestContext(this.GetType().Name))
             {
-                this.Context = new HpcCacheTestContext(this.GetType().Name);
                 this.StorageTarget = this.AddClfsStorageTarget(this.Context);
                 Match clfsTargetMatch = ClfsTargetRegex.Match(this.StorageTarget.Clfs.Target);
                 var storageAccountName = clfsTargetMatch.Groups["StorageAccountName"].Value;
diff --git a/src/Resources/Resources.Test/ScenarioTests/DenyAssignmentTests.cs b/src/Resources/Resources.Test/ScenarioTests/DenyAssignmentTests.cs
index 0c41e97f76be..f3b56018eeb7 100644
--- a/src/Resources/Resources.Test/ScenarioTests/DenyAssignmentTests.cs
+++ b/src/Resources/Resources.Test/ScenarioTests/DenyAssignmentTests.cs
@@ -20,7 +20,7 @@
 
 namespace Microsoft.Azure.Commands.Resources.Test.ScenarioTests
 {
-    public class DenyAssignmentTests : ResourceTestRunner
+    public class DenyAssignmentTests : ResourcesTestRunner
     {
         public XunitTracingInterceptor _logger;
 
diff --git a/src/Resources/Resources.Test/ScenarioTests/DeploymentScriptsTests.cs b/src/Resources/Resources.Test/ScenarioTests/DeploymentScriptsTests.cs
index b72b5a0d90a7..eda9bf45fabc 100644
--- a/src/Resources/Resources.Test/ScenarioTests/DeploymentScriptsTests.cs
+++ b/src/Resources/Resources.Test/ScenarioTests/DeploymentScriptsTests.cs
@@ -18,7 +18,7 @@
 
 namespace Microsoft.Azure.Commands.Resources.Test.ScenarioTests
 {
-    public class DeploymentScriptsTests : ResourceTestRunner
+    public class DeploymentScriptsTests : ResourcesTestRunner
     {
         public DeploymentScriptsTests(ITestOutputHelper output) : base(output)
         {
diff --git a/src/Resources/Resources.Test/ScenarioTests/DeploymentTests.cs b/src/Resources/Resources.Test/ScenarioTests/DeploymentTests.cs
index 0ffe7932a5b2..7c258ffb275a 100644
--- a/src/Resources/Resources.Test/ScenarioTests/DeploymentTests.cs
+++ b/src/Resources/Resources.Test/ScenarioTests/DeploymentTests.cs
@@ -19,7 +19,7 @@
 
 namespace Microsoft.Azure.Commands.Resources.Test.ScenarioTests
 {
-    public class DeploymentTests : ResourceTestRunner
+    public class DeploymentTests : ResourcesTestRunner
     {
         public DeploymentTests(ITestOutputHelper output) : base(output)
         {
diff --git a/src/Resources/Resources.Test/ScenarioTests/DeploymentWhatIfTests.cs b/src/Resources/Resources.Test/ScenarioTests/DeploymentWhatIfTests.cs
index 4fb6db3c67c5..da3cbe195ba9 100644
--- a/src/Resources/Resources.Test/ScenarioTests/DeploymentWhatIfTests.cs
+++ b/src/Resources/Resources.Test/ScenarioTests/DeploymentWhatIfTests.cs
@@ -18,7 +18,7 @@ namespace Microsoft.Azure.Commands.Resources.Test.ScenarioTests
     using Xunit;
     using Xunit.Abstractions;
 
-    public class DeploymentWhatIfTests : ResourceTestRunner
+    public class DeploymentWhatIfTests : ResourcesTestRunner
     {
         public DeploymentWhatIfTests(ITestOutputHelper output) : base(output)
         {
diff --git a/src/Resources/Resources.Test/ScenarioTests/InvokeResourceActionTests.cs b/src/Resources/Resources.Test/ScenarioTests/InvokeResourceActionTests.cs
index e376911a801c..36fd54727466 100644
--- a/src/Resources/Resources.Test/ScenarioTests/InvokeResourceActionTests.cs
+++ b/src/Resources/Resources.Test/ScenarioTests/InvokeResourceActionTests.cs
@@ -18,7 +18,7 @@
 
 namespace Microsoft.Azure.Commands.Resources.Test.ScenarioTests
 {
-    public class InvokeResourceActionTests : ResourceTestRunner
+    public class InvokeResourceActionTests : ResourcesTestRunner
     {
         public InvokeResourceActionTests(ITestOutputHelper output) : base(output)
         {
diff --git a/src/Resources/Resources.Test/ScenarioTests/LocationTests.cs b/src/Resources/Resources.Test/ScenarioTests/LocationTests.cs
index b24cda1ebe3a..90636ce46167 100644
--- a/src/Resources/Resources.Test/ScenarioTests/LocationTests.cs
+++ b/src/Resources/Resources.Test/ScenarioTests/LocationTests.cs
@@ -19,7 +19,7 @@
 
 namespace Microsoft.Azure.Commands.Resources.Test.ScenarioTests
 {
-    public class LocationTests: ResourceTestRunner
+    public class LocationTests: ResourcesTestRunner
     {
         public LocationTests(ITestOutputHelper output) : base(output)
         {
diff --git a/src/Resources/Resources.Test/ScenarioTests/ManagedApplicationDefinitionTests.cs b/src/Resources/Resources.Test/ScenarioTests/ManagedApplicationDefinitionTests.cs
index 61a1fb41c615..d7011b125f72 100644
--- a/src/Resources/Resources.Test/ScenarioTests/ManagedApplicationDefinitionTests.cs
+++ b/src/Resources/Resources.Test/ScenarioTests/ManagedApplicationDefinitionTests.cs
@@ -20,7 +20,7 @@
 
 namespace Microsoft.Azure.Commands.Resources.Test.ScenarioTests
 {
-    public class ManagedApplicationDefinitionTests : ResourceTestRunner
+    public class ManagedApplicationDefinitionTests : ResourcesTestRunner
     {
         public ManagedApplicationDefinitionTests(ITestOutputHelper output) : base(output)
         {
diff --git a/src/Resources/Resources.Test/ScenarioTests/ManagedApplicationTests.cs b/src/Resources/Resources.Test/ScenarioTests/ManagedApplicationTests.cs
index e4b02958e916..d0a68dd0cdc0 100644
--- a/src/Resources/Resources.Test/ScenarioTests/ManagedApplicationTests.cs
+++ b/src/Resources/Resources.Test/ScenarioTests/ManagedApplicationTests.cs
@@ -20,7 +20,7 @@
 
 namespace Microsoft.Azure.Commands.Resources.Test.ScenarioTests
 {
-    public class ManagedApplicationTests : ResourceTestRunner
+    public class ManagedApplicationTests : ResourcesTestRunner
     {
         public ManagedApplicationTests(ITestOutputHelper output) : base(output)
         {
diff --git a/src/Resources/Resources.Test/ScenarioTests/ManagementGroupsTests.cs b/src/Resources/Resources.Test/ScenarioTests/ManagementGroupsTests.cs
index 61dec8f09b90..ff1281f66698 100644
--- a/src/Resources/Resources.Test/ScenarioTests/ManagementGroupsTests.cs
+++ b/src/Resources/Resources.Test/ScenarioTests/ManagementGroupsTests.cs
@@ -18,7 +18,7 @@
 
 namespace Microsoft.Azure.Commands.Resources.Test.ScenarioTests
 {
-    public class ManagementGroupsTests : ResourceTestRunner
+    public class ManagementGroupsTests : ResourcesTestRunner
     {
         public ManagementGroupsTests(Xunit.Abstractions.ITestOutputHelper output) : base(output)
         {
diff --git a/src/Resources/Resources.Test/ScenarioTests/MoveResourceTest.cs b/src/Resources/Resources.Test/ScenarioTests/MoveResourceTest.cs
index 49ae587082a4..d1419decc63b 100644
--- a/src/Resources/Resources.Test/ScenarioTests/MoveResourceTest.cs
+++ b/src/Resources/Resources.Test/ScenarioTests/MoveResourceTest.cs
@@ -18,7 +18,7 @@ namespace Microsoft.Azure.Commands.Resources.Test.ScenarioTests
     using WindowsAzure.Commands.ScenarioTest;
     using Xunit;
     using Xunit.Abstractions;
-    public class MoveResourceTest : ResourceTestRunner
+    public class MoveResourceTest : ResourcesTestRunner
     {
         public MoveResourceTest(ITestOutputHelper output) : base(output)
         {
diff --git a/src/Resources/Resources.Test/ScenarioTests/PolicyAliasNamespaceMatchTest.cs b/src/Resources/Resources.Test/ScenarioTests/PolicyAliasNamespaceMatchTest.cs
index 2c4fb299c423..23ee567127a9 100644
--- a/src/Resources/Resources.Test/ScenarioTests/PolicyAliasNamespaceMatchTest.cs
+++ b/src/Resources/Resources.Test/ScenarioTests/PolicyAliasNamespaceMatchTest.cs
@@ -18,7 +18,7 @@
 
 namespace Microsoft.Azure.Commands.Resources.Test.ScenarioTests
 {
-    public class PolicyAliasNamespaceMatchTest : ResourceTestRunner
+    public class PolicyAliasNamespaceMatchTest : ResourcesTestRunner
     {
         public PolicyAliasNamespaceMatchTest(ITestOutputHelper output) : base(output)
         {
diff --git a/src/Resources/Resources.Test/ScenarioTests/PolicyTests.cs b/src/Resources/Resources.Test/ScenarioTests/PolicyTests.cs
index 855ccb328ce8..d9ba705f6191 100644
--- a/src/Resources/Resources.Test/ScenarioTests/PolicyTests.cs
+++ b/src/Resources/Resources.Test/ScenarioTests/PolicyTests.cs
@@ -18,7 +18,7 @@
 
 namespace Microsoft.Azure.Commands.Resources.Test.ScenarioTests
 {
-    public class PolicyTests : ResourceTestRunner
+    public class PolicyTests : ResourcesTestRunner
     {
         public PolicyTests(ITestOutputHelper output) : base(output)
         {
diff --git a/src/Resources/Resources.Test/ScenarioTests/ProviderFeatureTests.cs b/src/Resources/Resources.Test/ScenarioTests/ProviderFeatureTests.cs
index 7bcae0e161ec..27a412028568 100644
--- a/src/Resources/Resources.Test/ScenarioTests/ProviderFeatureTests.cs
+++ b/src/Resources/Resources.Test/ScenarioTests/ProviderFeatureTests.cs
@@ -19,7 +19,7 @@ namespace Microsoft.Azure.Commands.Resources.Test.ScenarioTests
     using Xunit;
     using Xunit.Abstractions;
 
-    public class ProviderFeatureTests : ResourceTestRunner
+    public class ProviderFeatureTests : ResourcesTestRunner
     {
         public ProviderFeatureTests(ITestOutputHelper output) : base(output)
         {
diff --git a/src/Resources/Resources.Test/ScenarioTests/ProviderTests.cs b/src/Resources/Resources.Test/ScenarioTests/ProviderTests.cs
index 65123e80eed7..f5577ec196d6 100644
--- a/src/Resources/Resources.Test/ScenarioTests/ProviderTests.cs
+++ b/src/Resources/Resources.Test/ScenarioTests/ProviderTests.cs
@@ -19,7 +19,7 @@ namespace Microsoft.Azure.Commands.Resources.Test.ScenarioTests
     using Xunit;
     using Xunit.Abstractions;
 
-    public class ProviderTests : ResourceTestRunner
+    public class ProviderTests : ResourcesTestRunner
     {
         public ProviderTests(ITestOutputHelper output) : base(output)
         {
diff --git a/src/Resources/Resources.Test/ScenarioTests/ResourceGroupTests.cs b/src/Resources/Resources.Test/ScenarioTests/ResourceGroupTests.cs
index a856751775fa..f26bfa135603 100644
--- a/src/Resources/Resources.Test/ScenarioTests/ResourceGroupTests.cs
+++ b/src/Resources/Resources.Test/ScenarioTests/ResourceGroupTests.cs
@@ -19,7 +19,7 @@
 
 namespace Microsoft.Azure.Commands.Resources.Test.ScenarioTests
 {
-    public class ResourceGroupTests : ResourceTestRunner
+    public class ResourceGroupTests : ResourcesTestRunner
     {
         public ResourceGroupTests(ITestOutputHelper output) : base(output)
         {
diff --git a/src/Resources/Resources.Test/ScenarioTests/ResourceLockTests.cs b/src/Resources/Resources.Test/ScenarioTests/ResourceLockTests.cs
index 0c06bcfc9b28..f5f9ad6432ac 100644
--- a/src/Resources/Resources.Test/ScenarioTests/ResourceLockTests.cs
+++ b/src/Resources/Resources.Test/ScenarioTests/ResourceLockTests.cs
@@ -20,7 +20,7 @@
 
 namespace Microsoft.Azure.Commands.Resources.Test.ScenarioTests
 {
-    public class ResourceLockTests : ResourceTestRunner
+    public class ResourceLockTests : ResourcesTestRunner
     {
         public ResourceLockTests(ITestOutputHelper output) : base(output)
         {
diff --git a/src/Resources/Resources.Test/ScenarioTests/ResourceManagementPrivateLinksTests.cs b/src/Resources/Resources.Test/ScenarioTests/ResourceManagementPrivateLinksTests.cs
index e9da24d7a517..e6081e66dee8 100644
--- a/src/Resources/Resources.Test/ScenarioTests/ResourceManagementPrivateLinksTests.cs
+++ b/src/Resources/Resources.Test/ScenarioTests/ResourceManagementPrivateLinksTests.cs
@@ -17,7 +17,7 @@
 
 namespace Microsoft.Azure.Commands.Resources.Test.ScenarioTests
 {
-    public class ResourceManagementPrivateLinksTests : ResourceTestRunner
+    public class ResourceManagementPrivateLinksTests : ResourcesTestRunner
     {
         public ResourceManagementPrivateLinksTests(Xunit.Abstractions.ITestOutputHelper output) : base(output)
         {
diff --git a/src/Resources/Resources.Test/ScenarioTests/ResourceTests.cs b/src/Resources/Resources.Test/ScenarioTests/ResourceTests.cs
index a14a37c29e0d..0c3e2ff9a6d9 100644
--- a/src/Resources/Resources.Test/ScenarioTests/ResourceTests.cs
+++ b/src/Resources/Resources.Test/ScenarioTests/ResourceTests.cs
@@ -20,7 +20,7 @@
 
 namespace Microsoft.Azure.Commands.Resources.Test.ScenarioTests
 {
-    public class ResourceTests : ResourceTestRunner
+    public class ResourceTests : ResourcesTestRunner
     {
         public ResourceTests(ITestOutputHelper output) : base(output)
         {
diff --git a/src/Resources/Resources.Test/ScenarioTests/ResourceTestRunner.cs b/src/Resources/Resources.Test/ScenarioTests/ResourcesTestRunner.cs
similarity index 98%
rename from src/Resources/Resources.Test/ScenarioTests/ResourceTestRunner.cs
rename to src/Resources/Resources.Test/ScenarioTests/ResourcesTestRunner.cs
index 725c3c1093b4..f669637587b8 100644
--- a/src/Resources/Resources.Test/ScenarioTests/ResourceTestRunner.cs
+++ b/src/Resources/Resources.Test/ScenarioTests/ResourcesTestRunner.cs
@@ -27,11 +27,11 @@
 
 namespace Microsoft.Azure.Commands.Resources.Test.ScenarioTests
 {
-    public class ResourceTestRunner
+    public class ResourcesTestRunner
     {
         protected readonly ITestRunner TestRunner;
 
-        protected ResourceTestRunner(ITestOutputHelper output)
+        protected ResourcesTestRunner(ITestOutputHelper output)
         {
             TestRunner = TestManager.CreateInstance(output)
                 .WithNewPsScriptFilename($"{GetType().Name}.ps1")
diff --git a/src/Resources/Resources.Test/ScenarioTests/RoleAssignmentTests.cs b/src/Resources/Resources.Test/ScenarioTests/RoleAssignmentTests.cs
index 8725b70dc717..5ebb1add7208 100644
--- a/src/Resources/Resources.Test/ScenarioTests/RoleAssignmentTests.cs
+++ b/src/Resources/Resources.Test/ScenarioTests/RoleAssignmentTests.cs
@@ -21,7 +21,7 @@
 
 namespace Microsoft.Azure.Commands.Resources.Test.ScenarioTests
 {
-    public class RoleAssignmentTests : ResourceTestRunner
+    public class RoleAssignmentTests : ResourcesTestRunner
     {
         public XunitTracingInterceptor _logger;
 
diff --git a/src/Resources/Resources.Test/ScenarioTests/RoleDefinitionTests.cs b/src/Resources/Resources.Test/ScenarioTests/RoleDefinitionTests.cs
index 6583b60008b7..3873a9882679 100644
--- a/src/Resources/Resources.Test/ScenarioTests/RoleDefinitionTests.cs
+++ b/src/Resources/Resources.Test/ScenarioTests/RoleDefinitionTests.cs
@@ -19,7 +19,7 @@
 
 namespace Microsoft.Azure.Commands.Resources.Test.ScenarioTests
 {
-    public class RoleDefinitionTests : ResourceTestRunner
+    public class RoleDefinitionTests : ResourcesTestRunner
     {
         public RoleDefinitionTests(ITestOutputHelper output) : base(output)
         {
diff --git a/src/Resources/Resources.Test/ScenarioTests/TagTests.cs b/src/Resources/Resources.Test/ScenarioTests/TagTests.cs
index d1b11ecaf867..9fd60f5df39f 100644
--- a/src/Resources/Resources.Test/ScenarioTests/TagTests.cs
+++ b/src/Resources/Resources.Test/ScenarioTests/TagTests.cs
@@ -18,7 +18,7 @@
 
 namespace Microsoft.Azure.Commands.Resources.Test.ScenarioTests
 {
-    public class TagTests : ResourceTestRunner
+    public class TagTests : ResourcesTestRunner
     {
         public TagTests(ITestOutputHelper output) : base(output)
         {
diff --git a/src/Resources/Resources.Test/ScenarioTests/TemplateSpecTests.cs b/src/Resources/Resources.Test/ScenarioTests/TemplateSpecTests.cs
index 751d89ca33f6..9f530efa1b2f 100644
--- a/src/Resources/Resources.Test/ScenarioTests/TemplateSpecTests.cs
+++ b/src/Resources/Resources.Test/ScenarioTests/TemplateSpecTests.cs
@@ -18,7 +18,7 @@
 
 namespace Microsoft.Azure.Commands.Resources.Test.ScenarioTests
 {
-    public class TemplateSpecTests : ResourceTestRunner
+    public class TemplateSpecTests : ResourcesTestRunner
     {
         public TemplateSpecTests(ITestOutputHelper output) : base(output)
         {