diff --git a/AzurePowershell.Test.targets b/AzurePowershell.Test.targets
index 02c15e5f4083..ab6484c15da1 100644
--- a/AzurePowershell.Test.targets
+++ b/AzurePowershell.Test.targets
@@ -216,7 +216,7 @@
   </Target>
 
   <!-- Run the scenario tests -->
-  <Target Name="ScenarioTest" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
+  <Target Name="ScenarioTest" DependsOnTargets="Clean;Build;BeforeRunTests">
     <Message Importance="high" Text="Running scenario tests..." />
     <MSBuild Targets="InvokeMSTest"
       Properties="_testAssembly=$(ScenarioTestDebug);_testSettings=$(TestSettings);_testFilter=$(ScenarioTestFilter);_testResult=$(TestOutputDirectory)\ScenarioTestDebug.trx"
@@ -275,7 +275,7 @@
       IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
   </Target>
 
-  <Target Name="RunOneSDKCIT" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
+  <Target Name="RunOneSDKCIT" DependsOnTargets="Clean;Build;BeforeRunTests">
     <Message Importance="high" Text="Running CIT Scenario tests..." />
     <Delete Files="$(TestOutputDirectory)\RunOneSDKCITDebug.trx" />
     <Exec
@@ -284,7 +284,7 @@
   </Target>
   
   <!-- Run the AzureRT tests -->
-  <Target Name="AzureRTBVTs" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
+  <Target Name="AzureRTBVTs" DependsOnTargets="Clean;Build;BeforeRunTests">
     <Message Importance="high" Text="Running AzureRT BVT tests..." />
     <Delete Files="$(TestOutputDirectory)\RTBVTDebug.trx" />
     <Exec
@@ -292,7 +292,7 @@
       ContinueOnError="false" />
   </Target>
 
-  <Target Name="AzureRTOne" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
+  <Target Name="AzureRTOne" DependsOnTargets="Clean;Build;BeforeRunTests">
     <Message Importance="high" Text="Running a specific tests..." />
     <Delete Files="$(TestOutputDirectory)\RTFunctionalDebug.trx" />
     <Exec
@@ -300,7 +300,7 @@
       ContinueOnError="false" />
   </Target>
 
-  <Target Name="AzureRTRepeat" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
+  <Target Name="AzureRTRepeat" DependsOnTargets="Clean;Build;BeforeRunTests">
     <Message Importance="high" Text="Running a specific tests..." />
     <Delete Files="$(TestOutputDirectory)\RTFunctionalDebug.trx" />
     <Exec
@@ -308,7 +308,7 @@
       ContinueOnError="false" />
   </Target>
 
-  <Target Name="AzureRTMulti" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
+  <Target Name="AzureRTMulti" DependsOnTargets="Clean;Build;BeforeRunTests">
     <Message Importance="high" Text="Running tests:" />
     <Delete Files="$(TestOutputDirectory)\RTFunctionalDebug.trx" />
     <Exec
@@ -316,7 +316,7 @@
       ContinueOnError="false" />
   </Target>
 
-  <Target Name="AzureRTAll" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
+  <Target Name="AzureRTAll" DependsOnTargets="Clean;Build;BeforeRunTests">
     <Message Importance="high" Text="Running AzureRT all tests..." />
     <Delete Files="$(TestOutputDirectory)\RTDebug.trx" />
     <Exec
@@ -324,7 +324,7 @@
       ContinueOnError="false" />
   </Target>
 
-  <Target Name="AzureRTAllFast" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
+  <Target Name="AzureRTAllFast" DependsOnTargets="Clean;Build;BeforeRunTests">
     <Message Importance="high" Text="Running AzureRT all tests..." />
 
     <Delete Files="$(TestOutputDirectory)\RTSequentialDebug.trx" />
@@ -337,7 +337,7 @@
       ContinueOnError="false" />
   </Target>
 
-  <Target Name="AzureRTSeq" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
+  <Target Name="AzureRTSeq" DependsOnTargets="Clean;Build;BeforeRunTests">
     <Message Importance="high" Text="Running AzureRT all tests..." />
 
     <Delete Files="$(TestOutputDirectory)\RTSequentialDebug.trx" />
@@ -346,7 +346,7 @@
       ContinueOnError="true" />
   </Target>
 
-  <Target Name="AzureRTNetwork" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
+  <Target Name="AzureRTNetwork" DependsOnTargets="Clean;Build;BeforeRunTests">
     <Message Importance="high" Text="Running AzureRT all tests..." />
 
     <Delete Files="$(TestOutputDirectory)\RTSequentialDebug.trx" />
@@ -355,7 +355,7 @@
       ContinueOnError="false" />
   </Target>
 
-  <Target Name="AzureRTUploadSeq" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
+  <Target Name="AzureRTUploadSeq" DependsOnTargets="Clean;Build;BeforeRunTests">
     <Message Importance="high" Text="Running AzureRT all tests..." />
 
     <Delete Files="$(TestOutputDirectory)\RTSequentialDebug.trx" />
@@ -364,7 +364,7 @@
       ContinueOnError="false" />
   </Target>
 
-  <Target Name="AzureRTPar" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
+  <Target Name="AzureRTPar" DependsOnTargets="Clean;Build;BeforeRunTests">
     <Message Importance="high" Text="Running AzureRT all tests..." />
 
     <Delete Files="$(TestOutputDirectory)\RTDebug.trx" />
@@ -373,7 +373,7 @@
       ContinueOnError="false" />
   </Target>
 
-  <Target Name="AzureRTFunctional" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
+  <Target Name="AzureRTFunctional" DependsOnTargets="Clean;Build;BeforeRunTests">
     <Message Importance="high" Text="Running AzureRT Functional tests..." />
 
     <Delete Files="$(TestOutputDirectory)\RTFunctionalDebug.trx" />
@@ -382,7 +382,7 @@
       ContinueOnError="false" />
   </Target>
 
-  <Target Name="AzureRTScenario" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
+  <Target Name="AzureRTScenario" DependsOnTargets="Clean;Build;BeforeRunTests">
     <Message Importance="high" Text="Running AzureRT Scenario tests..." />
 
     <Delete Files="$(TestOutputDirectory)\RTScenarioDebug.trx" />
@@ -391,7 +391,7 @@
       ContinueOnError="false" />
   </Target>
 
-  <Target Name="AzureRTAllPreview" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
+  <Target Name="AzureRTAllPreview" DependsOnTargets="Clean;Build;BeforeRunTests">
     <Message Importance="high" Text="Running AzureRT all tests..." />
     <Delete Files="$(TestOutputDirectory)\RTAddVhdDebug.trx" />
     <Delete Files="$(TestOutputDirectory)\RTDebug.trx" />
@@ -403,7 +403,7 @@
       ContinueOnError="false" />
   </Target>
 
-  <Target Name="AzureRTPreview" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
+  <Target Name="AzureRTPreview" DependsOnTargets="Clean;Build;BeforeRunTests">
     <Message Importance="high" Text="Running AzureRT all tests..." />
     <Delete Files="$(TestOutputDirectory)\RTPreviewDebug.trx" />
     <Exec
@@ -411,7 +411,7 @@
       ContinueOnError="false" />
   </Target>
 
-  <Target Name="AzureRTCleanUp" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
+  <Target Name="AzureRTCleanUp" DependsOnTargets="Clean;Build;BeforeRunTests">
     <Message Importance="high" Text="Running AzureRT clean up tests..." />
     <Delete Files="$(TestOutputDirectory)\RTCleanUpDebug.trx" />
     <Exec
@@ -419,7 +419,7 @@
       ContinueOnError="false" />
   </Target>
 
-  <Target Name="ComputeCodeCoverage" DependsOnTargets="ForceRestorePackages;Clean;BuildDebug">
+  <Target Name="ComputeCodeCoverage" DependsOnTargets="RestoreNugetPackages;Clean;Build">
     <Message Importance="high" Text="Gathering Code Coverage data from Compute tests..." />
     <Delete Files="Project.covarage" />
     <Exec