diff --git a/Directory.Build.props b/Directory.Build.props
index 95cadcd57..c8c0fe6f9 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -61,15 +61,6 @@
     <DefineConstants>$(DefineConstants);SUPPORTS_EXTENDED_INTRINSICS</DefineConstants>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)' == 'Release'">
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-  </PropertyGroup>
-
-  <!--TODO: Check what this is testing for and why does it fail?-->
-  <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-  </PropertyGroup>
-
   <!-- Default settings that explicitly differ from the Sdk.targets defaults-->
   <PropertyGroup>
     <Authors>Six Labors and contributors</Authors>
diff --git a/Directory.Build.targets b/Directory.Build.targets
index 349ee4b3d..f6f852b93 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -14,13 +14,6 @@
   <PropertyGroup>
     <DefineConstants>$(DefineConstants);$(OS)</DefineConstants>
   </PropertyGroup>
-
-  <!-- Tool versions for tool references across all projects -->
-  <ItemGroup>
-    <!--dotnet tools does not have an x86 runner. You have to use separate SDKs-->
-    <!--https://github.com/actions/setup-dotnet/issues/72-->
-    <DotNetCliToolReference Update="dotnet-xunit" Version="2.3.1" />
-  </ItemGroup>
   
   <!-- Package versions for package references across all projects -->
   <ItemGroup>
diff --git a/ImageSharp.sln b/ImageSharp.sln
index 6a80589d8..eb6c617d0 100644
--- a/ImageSharp.sln
+++ b/ImageSharp.sln
@@ -51,12 +51,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{56801022
 		tests\Directory.Build.targets = tests\Directory.Build.targets
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CodeCoverage", "CodeCoverage", "{D4C5EC58-F8E6-4636-B9EE-C99D2578E5C6}"
-	ProjectSection(SolutionItems) = preProject
-		tests\CodeCoverage\CodeCoverage.cmd = tests\CodeCoverage\CodeCoverage.cmd
-		tests\CodeCoverage\packages.config = tests\CodeCoverage\packages.config
-	EndProjectSection
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Images", "Images", "{FA55F5DE-11A6-487D-ABA4-BC93A02717DD}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Input", "Input", "{9DA226A1-8656-49A8-A58A-A8B5C081AD66}"
@@ -405,7 +399,6 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 		{FBE8C1AD-5AEC-4514-9B64-091D8E145865} = {1799C43E-5C54-4A8F-8D64-B1475241DB0D}
 		{2AA31A1F-142C-43F4-8687-09ABCA4B3A26} = {815C0625-CD3D-440F-9F80-2D83856AB7AE}
-		{D4C5EC58-F8E6-4636-B9EE-C99D2578E5C6} = {56801022-D71A-4FBE-BC5B-CBA08E2284EC}
 		{FA55F5DE-11A6-487D-ABA4-BC93A02717DD} = {56801022-D71A-4FBE-BC5B-CBA08E2284EC}
 		{9DA226A1-8656-49A8-A58A-A8B5C081AD66} = {FA55F5DE-11A6-487D-ABA4-BC93A02717DD}
 		{1A82C5F6-90E0-4E97-BE16-A825C046B493} = {9DA226A1-8656-49A8-A58A-A8B5C081AD66}
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 6fbbb7c91..e94848675 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -22,6 +22,10 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(Configuration)' == 'Release'">
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+
   <ItemGroup>
     <AdditionalFiles Include="$(MSBuildThisFileDirectory)..\shared-infrastructure\stylecop.json" />
   </ItemGroup>
diff --git a/test.ps1 b/test.ps1
index 307d00469..61995ca7f 100644
--- a/test.ps1
+++ b/test.ps1
@@ -11,11 +11,11 @@ param(
 
 if ($codecov -eq 'true') {
 
-  # xunit doesn't understand the CollectCoverage params so use dotnet test
+  # xunit doesn't understand custom params so use dotnet test
   # Coverage tests are run in debug because the coverage tools are triggering a JIT error in filter processors
   # that causes the blue component of transformed values to be corrupted.
   dotnet clean -c Debug
-  dotnet test -c Debug -f $targetFramework /p:codecov=true /p:CollectCoverage=true /p:CoverletOutputFormat=opencover /p:CoverletOutput='../../../coverage.xml'
+  dotnet test -c Debug -f $targetFramework /p:codecov=true
 }
 else {
 
diff --git a/tests/Directory.Build.targets b/tests/Directory.Build.targets
index f7b70fe94..5c8f45e26 100644
--- a/tests/Directory.Build.targets
+++ b/tests/Directory.Build.targets
@@ -15,11 +15,34 @@
   </PropertyGroup>
 
   <Import Project="$(MSBuildThisFileDirectory)..\Directory.Build.targets" />
-  
+
+  <!-- Tool versions for tool references across all projects -->
+  <ItemGroup>
+    <!--dotnet tools does not have an x86 runner. You have to use separate SDKs-->
+    <!--https://github.com/actions/setup-dotnet/issues/72-->
+    <DotNetCliToolReference Update="dotnet-xunit" Version="2.3.1" />
+  </ItemGroup>
+
+  <!--Code coverage specific settings-->
+  <!--https://github.com/tonerdo/coverlet-->
+  <PropertyGroup Condition="'$(codecov)' == 'true'">
+    <DebugType>full</DebugType>
+    <CollectCoverage>true</CollectCoverage>
+    <UseSourceLink>true</UseSourceLink>
+    <CoverletOutputFormat>opencover</CoverletOutputFormat>
+    <!--Ouput injects target framework into name despite explicit config. See build yml-->
+    <CoverletOutput>$(MSBuildThisFileDirectory)..\coverage.xml</CoverletOutput>
+    <!--Used by coverlet dues to reference issues with SixLabors.Core-->
+    <!--https://github.com/tonerdo/coverlet/blob/master/Documentation/KnowIssues.md#4-failed-to-resolve-assembly-during-instrumentation-->
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+  </PropertyGroup>
+
   <ItemGroup>
     <!--Test Dependencies-->
     <PackageReference Update="BenchmarkDotNet" Version="0.12.0" />
     <PackageReference Update="Colourful" Version="2.0.3" />
+    <PackageReference Update="coverlet.collector" Version="1.1.0"/>
+    <PackageReference Update="coverlet.msbuild" Version="2.8.0" />
     <PackageReference Update="Magick.NET-Q16-AnyCPU" Version="7.14.4" />
     <PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.4.0" />
     <PackageReference Update="Moq" Version="4.10.0" />
@@ -29,5 +52,5 @@
     <PackageReference Update="xunit" Version="2.3.1" />
     <PackageReference Update="xunit.runner.visualstudio" Version="2.3.1" />
   </ItemGroup>
-  
+
 </Project>
diff --git a/tests/ImageSharp.Tests/ImageSharp.Tests.csproj b/tests/ImageSharp.Tests/ImageSharp.Tests.csproj
index 6a78ef21e..d09ab9d0b 100644
--- a/tests/ImageSharp.Tests/ImageSharp.Tests.csproj
+++ b/tests/ImageSharp.Tests/ImageSharp.Tests.csproj
@@ -5,28 +5,22 @@
     <TargetFrameworks>netcoreapp2.1;net462;net472</TargetFrameworks>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <LangVersion>latest</LangVersion>
-    <DebugType Condition="$(codecov) != ''">full</DebugType>
-    <DebugType Condition="$(codecov) == ''">portable</DebugType>
     <DebugSymbols>True</DebugSymbols>
     <AssemblyName>SixLabors.ImageSharp.Tests</AssemblyName>
     <Platforms>AnyCPU;x64;x86</Platforms>
     <RootNamespace>SixLabors.ImageSharp.Tests</RootNamespace>
-    <!--Used by coverlet dues to reference issueswith SixLabors.Core-->
-    <!--https://github.com/tonerdo/coverlet/blob/master/Documentation/KnowIssues.md#4-failed-to-resolve-assembly-during-instrumentation-->
-    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
 
   <ItemGroup>
     <DotNetCliToolReference Include="dotnet-xunit" />
   </ItemGroup>
-  
+
   <ItemGroup>
+    <PackageReference Include="coverlet.collector"/>
+    <PackageReference Include="coverlet.msbuild" />
     <PackageReference Include="Magick.NET-Q16-AnyCPU" />
     <PackageReference Include="Moq" />
     <PackageReference Include="System.Drawing.Common" />
-
-    <PackageReference Include="coverlet.collector" Version="1.1.0"/>
-    <PackageReference Include="coverlet.msbuild" Version="2.8.0" />
   </ItemGroup>
 
   <ItemGroup>