diff --git a/Cabazure.Messaging.sln b/Cabazure.Messaging.sln
index 8fce414..1838a2c 100644
--- a/Cabazure.Messaging.sln
+++ b/Cabazure.Messaging.sln
@@ -24,8 +24,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cabazure.Messaging.EventHub
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cabazure.Messaging.ServiceBus.Tests", "test\Cabazure.Messaging.ServiceBus.Tests\Cabazure.Messaging.ServiceBus.Tests.csproj", "{597FF3F6-A2F8-478F-B849-F8D8AE98C407}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cabazure.Messaging.Abstractions.Tests", "test\Cabazure.Messaging.Abstractions.Tests\Cabazure.Messaging.Abstractions.Tests.csproj", "{0A647DD5-B4B2-0BBE-FAC3-BE4D7DFE0099}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{DF7C0EAA-E46A-4072-AF77-D0FB2C9E434B}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "EventHub", "EventHub", "{E5E39E4F-A1D3-4BD3-982D-6A6035F5BCEE}"
@@ -83,10 +81,6 @@ Global
 		{597FF3F6-A2F8-478F-B849-F8D8AE98C407}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{597FF3F6-A2F8-478F-B849-F8D8AE98C407}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{597FF3F6-A2F8-478F-B849-F8D8AE98C407}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0A647DD5-B4B2-0BBE-FAC3-BE4D7DFE0099}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0A647DD5-B4B2-0BBE-FAC3-BE4D7DFE0099}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0A647DD5-B4B2-0BBE-FAC3-BE4D7DFE0099}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0A647DD5-B4B2-0BBE-FAC3-BE4D7DFE0099}.Release|Any CPU.Build.0 = Release|Any CPU
 		{34B407ED-5347-23DF-A4A5-A2423A43FEAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{34B407ED-5347-23DF-A4A5-A2423A43FEAB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{34B407ED-5347-23DF-A4A5-A2423A43FEAB}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -129,7 +123,6 @@ Global
 		{67DECDE1-4455-4F12-B5A0-76BE25016CD2} = {496B57FF-4EF2-443E-A65D-328D9DB49148}
 		{D916AC1D-E1B5-4325-A09A-D2EF1116C2A0} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
 		{597FF3F6-A2F8-478F-B849-F8D8AE98C407} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
-		{0A647DD5-B4B2-0BBE-FAC3-BE4D7DFE0099} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
 		{E5E39E4F-A1D3-4BD3-982D-6A6035F5BCEE} = {DF7C0EAA-E46A-4072-AF77-D0FB2C9E434B}
 		{34B407ED-5347-23DF-A4A5-A2423A43FEAB} = {E5E39E4F-A1D3-4BD3-982D-6A6035F5BCEE}
 		{1597B199-DAF5-3A73-A403-5CF78D51EC13} = {E5E39E4F-A1D3-4BD3-982D-6A6035F5BCEE}
diff --git a/test/Cabazure.Messaging.Abstractions.Tests/Cabazure.Messaging.Abstractions.Tests.csproj b/test/Cabazure.Messaging.Abstractions.Tests/Cabazure.Messaging.Abstractions.Tests.csproj
deleted file mode 100644
index 9135b1c..0000000
--- a/test/Cabazure.Messaging.Abstractions.Tests/Cabazure.Messaging.Abstractions.Tests.csproj
+++ /dev/null
@@ -1,21 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-    <IsPackable>false</IsPackable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="6.0.2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-    <PackageReference Include="xunit" Version="2.9.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Using Include="Xunit" />
-  </ItemGroup>
-
-</Project>
diff --git a/test/Cabazure.Messaging.Abstractions.Tests/UnitTest1.cs b/test/Cabazure.Messaging.Abstractions.Tests/UnitTest1.cs
deleted file mode 100644
index e9395c0..0000000
--- a/test/Cabazure.Messaging.Abstractions.Tests/UnitTest1.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace Cabazure.Messaging.Abstractions.Tests;
-
-public class UnitTest1
-{
-    [Fact]
-    public void Test1()
-    {
-
-    }
-}
diff --git a/test/Cabazure.Messaging.EventHub.Tests/Cabazure.Messaging.EventHub.Tests.csproj b/test/Cabazure.Messaging.EventHub.Tests/Cabazure.Messaging.EventHub.Tests.csproj
index 9135b1c..28cebe4 100644
--- a/test/Cabazure.Messaging.EventHub.Tests/Cabazure.Messaging.EventHub.Tests.csproj
+++ b/test/Cabazure.Messaging.EventHub.Tests/Cabazure.Messaging.EventHub.Tests.csproj
@@ -8,6 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Atc.Test" Version="1.1.4" />
     <PackageReference Include="coverlet.collector" Version="6.0.2" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
     <PackageReference Include="xunit" Version="2.9.2" />
@@ -15,6 +16,20 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\src\Cabazure.Messaging.EventHub\Cabazure.Messaging.EventHub.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Using Include="System.ComponentModel.DataAnnotations" />
+    <Using Include="Atc.Test" />
+    <Using Include="AutoFixture" />
+    <Using Include="AutoFixture.AutoNSubstitute" />
+    <Using Include="AutoFixture.Xunit2" />
+    <Using Include="FluentAssertions" />
+    <Using Include="NSubstitute" />
+    <Using Include="NSubstitute.ReturnsExtensions" />
+    <Using Include="NSubstitute.ExceptionExtensions" />
+    <Using Include="NSubstitute.ReceivedExtensions" />
     <Using Include="Xunit" />
   </ItemGroup>
 
diff --git a/test/Cabazure.Messaging.ServiceBus.Tests/Cabazure.Messaging.ServiceBus.Tests.csproj b/test/Cabazure.Messaging.ServiceBus.Tests/Cabazure.Messaging.ServiceBus.Tests.csproj
index 9135b1c..9edb7b6 100644
--- a/test/Cabazure.Messaging.ServiceBus.Tests/Cabazure.Messaging.ServiceBus.Tests.csproj
+++ b/test/Cabazure.Messaging.ServiceBus.Tests/Cabazure.Messaging.ServiceBus.Tests.csproj
@@ -8,6 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Atc.Test" Version="1.1.4" />
     <PackageReference Include="coverlet.collector" Version="6.0.2" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
     <PackageReference Include="xunit" Version="2.9.2" />
@@ -15,6 +16,20 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\src\Cabazure.Messaging.ServiceBus\Cabazure.Messaging.ServiceBus.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Using Include="System.ComponentModel.DataAnnotations" />
+    <Using Include="Atc.Test" />
+    <Using Include="AutoFixture" />
+    <Using Include="AutoFixture.AutoNSubstitute" />
+    <Using Include="AutoFixture.Xunit2" />
+    <Using Include="FluentAssertions" />
+    <Using Include="NSubstitute" />
+    <Using Include="NSubstitute.ReturnsExtensions" />
+    <Using Include="NSubstitute.ExceptionExtensions" />
+    <Using Include="NSubstitute.ReceivedExtensions" />
     <Using Include="Xunit" />
   </ItemGroup>