diff --git a/build.proj b/build.proj
index dadb3b4aaeed..aac52afe25fc 100644
--- a/build.proj
+++ b/build.proj
@@ -141,10 +141,10 @@
             PropertyName="SubTasks" />
     </CreateProperty>
     <CreateProperty
-        Value="@(BuildCsprojList->Split(`;`)->Count())">
+        Value="@(TestCsprojList->Split(`;`)->Count())">
         <Output
             TaskParameter="Value"
-            PropertyName="IsBuildListEmpty" />
+            PropertyName="IsTestListEmpty" />
     </CreateProperty>
   </Target>
 
@@ -311,13 +311,13 @@
     <Exec Command="$(PowerShellCoreCommandPrefix) &quot;. $(DockerTools)/CleanArtifacts.ps1 -Docker $(DockerRoot) &quot;" />
   </Target>
 
-  <Target Name="Test">
+  <Target Name="Test" DependsOnTargets="FilterBuild">
     <Message Importance="high" Text="Running check in tests..." />
     <MakeDir Directories="$(TestOutputDirectory)" ContinueOnError="false" />
 
     <!-- https://github.com/Microsoft/msbuild/issues/3157#issuecomment-378002971 -->
     <!-- https://github.com/xunit/xunit/issues/1154#issuecomment-405366373 -->
-    <Exec Command="dotnet test $(RepoArtifacts)Azure.PowerShell.sln --filter &quot;AcceptanceType=CheckIn%26RunType!=DesktopOnly&quot; --configuration $(Configuration) --framework $(TestFramework) --logger trx --results-directory &quot;$(TestOutputDirectory)&quot;" />
+    <Exec Command="dotnet test $(RepoArtifacts)Azure.PowerShell.sln --filter &quot;AcceptanceType=CheckIn%26RunType!=DesktopOnly&quot; --configuration $(Configuration) --framework $(TestFramework) --logger trx --results-directory &quot;$(TestOutputDirectory)&quot; --verbosity d" />
 
     <OnError ExecuteTargets="TestFailureErrorMessage" />
   </Target>
diff --git a/tools/CreateFilterMappings.ps1 b/tools/CreateFilterMappings.ps1
index 055ca25a7ca1..9aa977138f54 100644
--- a/tools/CreateFilterMappings.ps1
+++ b/tools/CreateFilterMappings.ps1
@@ -148,7 +148,7 @@ function Add-ProjectDependencies
         [string]$SolutionPath
     )
 
-    $CommonProjectsToIgnore = @("Authenticators", "ScenarioTest.ResourceManager", "TestFx", "Tests" )
+    $CommonProjectsToIgnore = @("ScenarioTest.ResourceManager", "TestFx", "Tests" )
 
     $ProjectDependencies = @()
     $Content = Get-Content -Path $SolutionPath