diff --git a/AzurePowershell.Test.targets b/AzurePowershell.Test.targets
index bac576918008..934eb39a61c1 100644
--- a/AzurePowershell.Test.targets
+++ b/AzurePowershell.Test.targets
@@ -214,7 +214,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"
@@ -273,7 +273,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
@@ -282,7 +282,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
@@ -290,7 +290,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
@@ -298,7 +298,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
@@ -306,7 +306,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
@@ -314,7 +314,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
@@ -322,7 +322,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" />
@@ -335,7 +335,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" />
@@ -344,7 +344,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" />
@@ -353,7 +353,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" />
@@ -362,7 +362,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" />
@@ -371,7 +371,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" />
@@ -380,7 +380,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" />
@@ -389,7 +389,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" />
@@ -401,7 +401,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
@@ -409,7 +409,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
@@ -417,7 +417,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