diff --git a/.vscode/.vscode/settings.json b/.vscode/.vscode/settings.json
new file mode 100644
index 00000000..183c0ebc
--- /dev/null
+++ b/.vscode/.vscode/settings.json
@@ -0,0 +1,6 @@
+{
+    "coverage-gutters.lcovname": "*.info",
+    "dotnet-test-explorer.addProblems": true,
+    "coverage-gutters.customizable.status-bar-toggler-watchCoverageAndVisibleEditors-enabled": true,
+    "dotnet-test-explorer.autoExpandTree": false
+}
diff --git a/Common.Build.props b/Common.Build.props
index 439e36a7..e684ef91 100644
--- a/Common.Build.props
+++ b/Common.Build.props
@@ -22,14 +22,15 @@
         <Microsoft_Extensions_Logging_Version>2.1.0</Microsoft_Extensions_Logging_Version>
         <Microsoft_Extensions_Hosting_Version>2.1.0</Microsoft_Extensions_Hosting_Version>
         <Microsoft_Extensions_Options_Version>2.1.0</Microsoft_Extensions_Options_Version>
-        <SourceLink_Version>2.8.1</SourceLink_Version>
+		<SourceLink_Version>2.8.3</SourceLink_Version>
+		<RSG_Testing_Version>0.8.0</RSG_Testing_Version>
         <Microsoft_NET_Test_Sdk_Version>15.7.2</Microsoft_NET_Test_Sdk_Version>
         <xunit_Version>2.3.1</xunit_Version>
-        <FluentAssertions_Version>5.3.2</FluentAssertions_Version>
+        <FluentAssertions_Version>5.4.1</FluentAssertions_Version>
         <FakeItEasy_Version>4.6.0</FakeItEasy_Version>
-        <Autofac_FakeItEasy_Version>5.0.0</Autofac_FakeItEasy_Version>
-        <Bogus_Version>22.1.2</Bogus_Version>
-        <RSG_Testing_Version>0.7.3</RSG_Testing_Version>
+        <Autofac_FakeItEasy_Version>5.0.1</Autofac_FakeItEasy_Version>
+        <Bogus_Version>22.1.3</Bogus_Version>
         <XunitXml_TestLogger_Version>2.0.0</XunitXml_TestLogger_Version>
+        <coverlet_Version>2.0.1</coverlet_Version>
     </PropertyGroup>
 </Project>
diff --git a/cakefile.cake b/cakefile.cake
index 3a061bdc..fe6b0159 100644
--- a/cakefile.cake
+++ b/cakefile.cake
@@ -1,4 +1,4 @@
-#load "nuget:?package=Rocket.Surgery.Cake.Library&version=0.4.2";
+#load "nuget:?package=Rocket.Surgery.Cake.Library&version=0.5.0";
 
 Task("Default")
     .IsDependentOn("dotnet");
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 7092310a..7b75ec33 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -9,6 +9,5 @@
         <PackageReference Include="Rocket.Surgery.Build.Metadata" Version="$(RSG_Build_Version)" PrivateAssets="All" />
         <PackageReference Include="SourceLink.Create.CommandLine" Version="$(SourceLink_Version)" PrivateAssets="All" />
 		<PackageReference Include="SourceLink.Copy.PdbFiles" Version="$(SourceLink_Version)" PrivateAssets="All" />
-        <DotNetCliToolReference Include="dotnet-sourcelink" Version="$(SourceLink_Version)" />
     </ItemGroup>
 </Project>
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
index 929f7bfe..1e3ee12c 100644
--- a/test/Directory.Build.props
+++ b/test/Directory.Build.props
@@ -4,5 +4,12 @@
         <IsPackable>false</IsPackable>
         <PreserveCompilationContext>true</PreserveCompilationContext>
         <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
+        <DebugType>full</DebugType>
+        <DebugSymbols>true</DebugSymbols>
+
+        <CollectCoverage>true</CollectCoverage>
+        <CoverletOutputFormat>json,lcov,cobertura</CoverletOutputFormat>
+        <CoverletOutputDirectory>$([System.IO.Path]::GetDirectoryName($([MSBuild]::GetPathOfFileAbove('Common.Build.props', '$(MSBuildThisFileDirectory)../'))))/coverage/</CoverletOutputDirectory>
+        <CoverletOutputName>$(MSBuildProjectName)-$(TargetFramework)</CoverletOutputName>
     </PropertyGroup>
 </Project>
diff --git a/test/Directory.Build.targets b/test/Directory.Build.targets
index 8ae553c5..51d02568 100644
--- a/test/Directory.Build.targets
+++ b/test/Directory.Build.targets
@@ -1,5 +1,6 @@
 <Project>
     <ItemGroup>
+		<PackageReference Include="Rocket.Surgery.Extensions.Testing" Version="$(RSG_Testing_Version)" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(Microsoft_NET_Test_Sdk_Version)" />
         <PackageReference Include="xunit.runner.visualstudio" Version="$(xunit_Version)" />
         <PackageReference Include="xunit" Version="$(xunit_Version)" />
@@ -8,8 +9,8 @@
         <PackageReference Include="FakeItEasy.Analyzer.CSharp" Version="$(FakeItEasy_Version)" />
         <PackageReference Include="Autofac.Extras.FakeItEasy" Version="$(Autofac_FakeItEasy_Version)" />
         <PackageReference Include="Bogus" Version="$(Bogus_Version)" />
-		<PackageReference Include="Rocket.Surgery.Extensions.Testing" Version="$(RSG_Testing_Version)" />
         <PackageReference Include="XunitXml.TestLogger" Version="$(XunitXml_TestLogger_Version)" />
+        <PackageReference Include="coverlet.msbuild" Version="$(coverlet_Version)" />
     </ItemGroup>
     <ItemGroup>
         <Content Include="xunit.runner.json">