diff --git a/Brighter.sln b/Brighter.sln
index 69963d8327..9ff12ed0fa 100644
--- a/Brighter.sln
+++ b/Brighter.sln
@@ -71,7 +71,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AWSTaskQueue", "AWSTaskQueu
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Paramore.Brighter.DynamoDb", "src\Paramore.Brighter.DynamoDb\Paramore.Brighter.DynamoDb.csproj", "{7F0CDB19-93C6-4C97-A77E-CEFAEB842BB1}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Paramore.Brighter.RMQ.Tests", "tests\Paramore.Brighter.RMQ.Tests\Paramore.Brighter.RMQ.Tests.csproj", "{6494BB0C-728D-43CB-B3DA-E56E8D0E4938}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Paramore.Brighter.RMQ.Async.Tests", "tests\Paramore.Brighter.RMQ.Async.Tests\Paramore.Brighter.RMQ.Async.Tests.csproj", "{6494BB0C-728D-43CB-B3DA-E56E8D0E4938}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Paramore.Brighter.AWS.Tests", "tests\Paramore.Brighter.AWS.Tests\Paramore.Brighter.AWS.Tests.csproj", "{FDD6E413-2BC4-4450-A9A6-E8BD2EF86052}"
 EndProject
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessageDispatch/When_building_a_dispatcher.cs b/tests/Paramore.Brighter.RMQ.Async.Tests/MessageDispatch/When_building_a_dispatcher.cs
similarity index 97%
rename from tests/Paramore.Brighter.RMQ.Tests/MessageDispatch/When_building_a_dispatcher.cs
rename to tests/Paramore.Brighter.RMQ.Async.Tests/MessageDispatch/When_building_a_dispatcher.cs
index 24c4526546..d8065eaac4 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessageDispatch/When_building_a_dispatcher.cs
+++ b/tests/Paramore.Brighter.RMQ.Async.Tests/MessageDispatch/When_building_a_dispatcher.cs
@@ -6,13 +6,13 @@
 using Paramore.Brighter.Extensions.DependencyInjection;
 using Paramore.Brighter.MessagingGateway.RMQ.Async;
 using Paramore.Brighter.Observability;
-using Paramore.Brighter.RMQ.Tests.TestDoubles;
+using Paramore.Brighter.RMQ.Async.Tests.TestDoubles;
 using Paramore.Brighter.ServiceActivator;
 using Polly;
 using Polly.Registry;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessageDispatch;
+namespace Paramore.Brighter.RMQ.Async.Tests.MessageDispatch;
 
 [Collection("CommandProcessor")]
 public class DispatchBuilderTests : IDisposable
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessageDispatch/When_building_a_dispatcher_async.cs b/tests/Paramore.Brighter.RMQ.Async.Tests/MessageDispatch/When_building_a_dispatcher_async.cs
similarity index 97%
rename from tests/Paramore.Brighter.RMQ.Tests/MessageDispatch/When_building_a_dispatcher_async.cs
rename to tests/Paramore.Brighter.RMQ.Async.Tests/MessageDispatch/When_building_a_dispatcher_async.cs
index a8c1051ece..b3cd48f347 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessageDispatch/When_building_a_dispatcher_async.cs
+++ b/tests/Paramore.Brighter.RMQ.Async.Tests/MessageDispatch/When_building_a_dispatcher_async.cs
@@ -6,13 +6,13 @@
 using Paramore.Brighter.Extensions.DependencyInjection;
 using Paramore.Brighter.MessagingGateway.RMQ.Async;
 using Paramore.Brighter.Observability;
-using Paramore.Brighter.RMQ.Tests.TestDoubles;
+using Paramore.Brighter.RMQ.Async.Tests.TestDoubles;
 using Paramore.Brighter.ServiceActivator;
 using Polly;
 using Polly.Registry;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessageDispatch;
+namespace Paramore.Brighter.RMQ.Async.Tests.MessageDispatch;
 
 [Collection("CommandProcessor")]
 public class DispatchBuilderTestsAsync : IDisposable
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessageDispatch/When_building_a_dispatcher_with_named_gateway.cs b/tests/Paramore.Brighter.RMQ.Async.Tests/MessageDispatch/When_building_a_dispatcher_with_named_gateway.cs
similarity index 96%
rename from tests/Paramore.Brighter.RMQ.Tests/MessageDispatch/When_building_a_dispatcher_with_named_gateway.cs
rename to tests/Paramore.Brighter.RMQ.Async.Tests/MessageDispatch/When_building_a_dispatcher_with_named_gateway.cs
index 8f319fd2dc..83562a81b7 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessageDispatch/When_building_a_dispatcher_with_named_gateway.cs
+++ b/tests/Paramore.Brighter.RMQ.Async.Tests/MessageDispatch/When_building_a_dispatcher_with_named_gateway.cs
@@ -4,13 +4,13 @@
 using Paramore.Brighter.Extensions.DependencyInjection;
 using Paramore.Brighter.MessagingGateway.RMQ.Async;
 using Paramore.Brighter.Observability;
-using Paramore.Brighter.RMQ.Tests.TestDoubles;
+using Paramore.Brighter.RMQ.Async.Tests.TestDoubles;
 using Paramore.Brighter.ServiceActivator;
 using Polly;
 using Polly.Registry;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessageDispatch;
+namespace Paramore.Brighter.RMQ.Async.Tests.MessageDispatch;
 
 [Collection("CommandProcessor")]
 public class DispatchBuilderWithNamedGateway : IDisposable
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessageDispatch/When_building_a_dispatcher_with_named_gateway_async.cs b/tests/Paramore.Brighter.RMQ.Async.Tests/MessageDispatch/When_building_a_dispatcher_with_named_gateway_async.cs
similarity index 96%
rename from tests/Paramore.Brighter.RMQ.Tests/MessageDispatch/When_building_a_dispatcher_with_named_gateway_async.cs
rename to tests/Paramore.Brighter.RMQ.Async.Tests/MessageDispatch/When_building_a_dispatcher_with_named_gateway_async.cs
index 3d97719daf..4bf292c2dc 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessageDispatch/When_building_a_dispatcher_with_named_gateway_async.cs
+++ b/tests/Paramore.Brighter.RMQ.Async.Tests/MessageDispatch/When_building_a_dispatcher_with_named_gateway_async.cs
@@ -4,13 +4,13 @@
 using Paramore.Brighter.Extensions.DependencyInjection;
 using Paramore.Brighter.MessagingGateway.RMQ.Async;
 using Paramore.Brighter.Observability;
-using Paramore.Brighter.RMQ.Tests.TestDoubles;
+using Paramore.Brighter.RMQ.Async.Tests.TestDoubles;
 using Paramore.Brighter.ServiceActivator;
 using Polly;
 using Polly.Registry;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessageDispatch;
+namespace Paramore.Brighter.RMQ.Async.Tests.MessageDispatch;
 
 [Collection("CommandProcessor")]
 public class DispatchBuilderWithNamedGatewayAsync : IDisposable
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_a_message_consumer_reads_multiple_messages_async.cs b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Proactor/When_a_message_consumer_reads_multiple_messages_async.cs
similarity index 97%
rename from tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_a_message_consumer_reads_multiple_messages_async.cs
rename to tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Proactor/When_a_message_consumer_reads_multiple_messages_async.cs
index dc9a46c510..1e99893855 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_a_message_consumer_reads_multiple_messages_async.cs
+++ b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Proactor/When_a_message_consumer_reads_multiple_messages_async.cs
@@ -4,7 +4,7 @@
 using Paramore.Brighter.MessagingGateway.RMQ.Async;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Proactor;
+namespace Paramore.Brighter.RMQ.Async.Tests.MessagingGateway.Proactor;
 
 [Trait("Category", "RMQ")]
 public class RMQBufferedConsumerTestsAsync : IDisposable, IAsyncDisposable
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_a_message_consumer_throws_an_already_closed_exception_when_connecting_async.cs b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Proactor/When_a_message_consumer_throws_an_already_closed_exception_when_connecting_async.cs
similarity index 95%
rename from tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_a_message_consumer_throws_an_already_closed_exception_when_connecting_async.cs
rename to tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Proactor/When_a_message_consumer_throws_an_already_closed_exception_when_connecting_async.cs
index 15927f16e3..85269650a0 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_a_message_consumer_throws_an_already_closed_exception_when_connecting_async.cs
+++ b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Proactor/When_a_message_consumer_throws_an_already_closed_exception_when_connecting_async.cs
@@ -2,11 +2,11 @@
 using System.Threading.Tasks;
 using FluentAssertions;
 using Paramore.Brighter.MessagingGateway.RMQ.Async;
-using Paramore.Brighter.RMQ.Tests.TestDoubles;
+using Paramore.Brighter.RMQ.Async.Tests.TestDoubles;
 using RabbitMQ.Client.Exceptions;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Proactor;
+namespace Paramore.Brighter.RMQ.Async.Tests.MessagingGateway.Proactor;
 
 [Trait("Category", "RMQ")]
 public class AsyncRmqMessageConsumerConnectionClosedTests : IDisposable, IAsyncDisposable
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_a_message_consumer_throws_an_not_supported_exception_when_connecting_async.cs b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Proactor/When_a_message_consumer_throws_an_not_supported_exception_when_connecting_async.cs
similarity index 96%
rename from tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_a_message_consumer_throws_an_not_supported_exception_when_connecting_async.cs
rename to tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Proactor/When_a_message_consumer_throws_an_not_supported_exception_when_connecting_async.cs
index 87d867aa06..49473358f8 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_a_message_consumer_throws_an_not_supported_exception_when_connecting_async.cs
+++ b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Proactor/When_a_message_consumer_throws_an_not_supported_exception_when_connecting_async.cs
@@ -26,10 +26,10 @@ THE SOFTWARE. */
 using System.Threading.Tasks;
 using FluentAssertions;
 using Paramore.Brighter.MessagingGateway.RMQ.Async;
-using Paramore.Brighter.RMQ.Tests.TestDoubles;
+using Paramore.Brighter.RMQ.Async.Tests.TestDoubles;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Proactor;
+namespace Paramore.Brighter.RMQ.Async.Tests.MessagingGateway.Proactor;
 
 [Trait("Category", "RMQ")]
 
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_a_message_consumer_throws_an_operation_interrupted_exception_when_connecting_async.cs b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Proactor/When_a_message_consumer_throws_an_operation_interrupted_exception_when_connecting_async.cs
similarity index 96%
rename from tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_a_message_consumer_throws_an_operation_interrupted_exception_when_connecting_async.cs
rename to tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Proactor/When_a_message_consumer_throws_an_operation_interrupted_exception_when_connecting_async.cs
index d0587caa8e..a1821e91be 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_a_message_consumer_throws_an_operation_interrupted_exception_when_connecting_async.cs
+++ b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Proactor/When_a_message_consumer_throws_an_operation_interrupted_exception_when_connecting_async.cs
@@ -26,11 +26,11 @@ THE SOFTWARE. */
 using System.Threading.Tasks;
 using FluentAssertions;
 using Paramore.Brighter.MessagingGateway.RMQ.Async;
-using Paramore.Brighter.RMQ.Tests.TestDoubles;
+using Paramore.Brighter.RMQ.Async.Tests.TestDoubles;
 using RabbitMQ.Client.Exceptions;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Proactor;
+namespace Paramore.Brighter.RMQ.Async.Tests.MessagingGateway.Proactor;
 
 [Trait("Category", "RMQ")]
 public class AsyncRmqMessageConsumerOperationInterruptedTestsAsync : IAsyncDisposable, IDisposable
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_binding_a_channel_to_multiple_topics_async.cs b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Proactor/When_binding_a_channel_to_multiple_topics_async.cs
similarity index 97%
rename from tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_binding_a_channel_to_multiple_topics_async.cs
rename to tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Proactor/When_binding_a_channel_to_multiple_topics_async.cs
index f9f6215286..e6a0d5706a 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_binding_a_channel_to_multiple_topics_async.cs
+++ b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Proactor/When_binding_a_channel_to_multiple_topics_async.cs
@@ -5,7 +5,7 @@
 using Paramore.Brighter.MessagingGateway.RMQ.Async;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Proactor;
+namespace Paramore.Brighter.RMQ.Async.Tests.MessagingGateway.Proactor;
 
 [Trait("Category", "RMQ")]
 public class AsyncRmqMessageConsumerMultipleTopicTests : IAsyncDisposable, IDisposable
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_confirming_posting_a_message_via_the_messaging_gateway_async.cs b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Proactor/When_confirming_posting_a_message_via_the_messaging_gateway_async.cs
similarity index 97%
rename from tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_confirming_posting_a_message_via_the_messaging_gateway_async.cs
rename to tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Proactor/When_confirming_posting_a_message_via_the_messaging_gateway_async.cs
index 0cb1fd5f0e..4725b4aade 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_confirming_posting_a_message_via_the_messaging_gateway_async.cs
+++ b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Proactor/When_confirming_posting_a_message_via_the_messaging_gateway_async.cs
@@ -28,7 +28,7 @@ THE SOFTWARE. */
 using Paramore.Brighter.MessagingGateway.RMQ.Async;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Proactor;
+namespace Paramore.Brighter.RMQ.Async.Tests.MessagingGateway.Proactor;
 
 [Trait("Category", "RMQ")]
 public class RmqMessageProducerConfirmationsSendMessageAsyncTests : IDisposable
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_infrastructure_exists_can_assert_async.cs b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Proactor/When_infrastructure_exists_can_assert_async.cs
similarity index 97%
rename from tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_infrastructure_exists_can_assert_async.cs
rename to tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Proactor/When_infrastructure_exists_can_assert_async.cs
index bf31ff51f4..b645e8f971 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_infrastructure_exists_can_assert_async.cs
+++ b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Proactor/When_infrastructure_exists_can_assert_async.cs
@@ -4,7 +4,7 @@
 using Paramore.Brighter.MessagingGateway.RMQ.Async;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Proactor;
+namespace Paramore.Brighter.RMQ.Async.Tests.MessagingGateway.Proactor;
 
 public class RmqAssumeExistingInfrastructureTestsAsync : IDisposable, IAsyncDisposable
 {
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_infrastructure_exists_can_validate_async.cs b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Proactor/When_infrastructure_exists_can_validate_async.cs
similarity index 97%
rename from tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_infrastructure_exists_can_validate_async.cs
rename to tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Proactor/When_infrastructure_exists_can_validate_async.cs
index 55bea8c242..e4e8c67995 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_infrastructure_exists_can_validate_async.cs
+++ b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Proactor/When_infrastructure_exists_can_validate_async.cs
@@ -4,7 +4,7 @@
 using Paramore.Brighter.MessagingGateway.RMQ.Async;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Proactor;
+namespace Paramore.Brighter.RMQ.Async.Tests.MessagingGateway.Proactor;
 
 public class RmqValidateExistingInfrastructureTestsAsync : IDisposable, IAsyncDisposable
 {
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_multiple_threads_try_to_post_a_message_at_the_same_time_async.cs b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Proactor/When_multiple_threads_try_to_post_a_message_at_the_same_time_async.cs
similarity index 96%
rename from tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_multiple_threads_try_to_post_a_message_at_the_same_time_async.cs
rename to tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Proactor/When_multiple_threads_try_to_post_a_message_at_the_same_time_async.cs
index cd8212c1a5..59be5c7de7 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_multiple_threads_try_to_post_a_message_at_the_same_time_async.cs
+++ b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Proactor/When_multiple_threads_try_to_post_a_message_at_the_same_time_async.cs
@@ -5,7 +5,7 @@
 using Paramore.Brighter.MessagingGateway.RMQ.Async;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Proactor;
+namespace Paramore.Brighter.RMQ.Async.Tests.MessagingGateway.Proactor;
 
 [Trait("Category", "RMQ")]
 public class RmqMessageProducerSupportsMultipleThreadsTestsAsync : IDisposable, IAsyncDisposable
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_posting_a_message_but_no_broker_created_async.cs b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Proactor/When_posting_a_message_but_no_broker_created_async.cs
similarity index 95%
rename from tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_posting_a_message_but_no_broker_created_async.cs
rename to tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Proactor/When_posting_a_message_but_no_broker_created_async.cs
index ab1b9333bf..8c0a7fda91 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_posting_a_message_but_no_broker_created_async.cs
+++ b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Proactor/When_posting_a_message_but_no_broker_created_async.cs
@@ -4,7 +4,7 @@
 using Paramore.Brighter.MessagingGateway.RMQ.Async;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Proactor;
+namespace Paramore.Brighter.RMQ.Async.Tests.MessagingGateway.Proactor;
 
 public class RmqBrokerNotPreCreatedTestsAsync : IDisposable
 {
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_posting_a_message_to_persist_via_the_messaging_gateway_async.cs b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Proactor/When_posting_a_message_to_persist_via_the_messaging_gateway_async.cs
similarity index 96%
rename from tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_posting_a_message_to_persist_via_the_messaging_gateway_async.cs
rename to tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Proactor/When_posting_a_message_to_persist_via_the_messaging_gateway_async.cs
index 5d0c0e4ab2..970366b358 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_posting_a_message_to_persist_via_the_messaging_gateway_async.cs
+++ b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Proactor/When_posting_a_message_to_persist_via_the_messaging_gateway_async.cs
@@ -5,7 +5,7 @@
 using Paramore.Brighter.MessagingGateway.RMQ.Async;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Proactor;
+namespace Paramore.Brighter.RMQ.Async.Tests.MessagingGateway.Proactor;
 
 [Trait("Category", "RMQ")]
 public class RmqMessageProducerSendPersistentMessageTestsAsync : IDisposable, IAsyncDisposable
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_posting_a_message_via_the_messaging_gateway_async.cs b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Proactor/When_posting_a_message_via_the_messaging_gateway_async.cs
similarity index 97%
rename from tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_posting_a_message_via_the_messaging_gateway_async.cs
rename to tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Proactor/When_posting_a_message_via_the_messaging_gateway_async.cs
index 507f223d66..964b63b67b 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_posting_a_message_via_the_messaging_gateway_async.cs
+++ b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Proactor/When_posting_a_message_via_the_messaging_gateway_async.cs
@@ -29,7 +29,7 @@ THE SOFTWARE. */
 using Paramore.Brighter.MessagingGateway.RMQ.Async;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Proactor;
+namespace Paramore.Brighter.RMQ.Async.Tests.MessagingGateway.Proactor;
 
 [Trait("Category", "RMQ")]
 public class RmqMessageProducerSendMessageTestsAsync : IDisposable, IAsyncDisposable
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_queue_length_causes_a_message_to_be_rejected_async.cs b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Proactor/When_queue_length_causes_a_message_to_be_rejected_async.cs
similarity index 98%
rename from tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_queue_length_causes_a_message_to_be_rejected_async.cs
rename to tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Proactor/When_queue_length_causes_a_message_to_be_rejected_async.cs
index bf141ca422..2879f41956 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_queue_length_causes_a_message_to_be_rejected_async.cs
+++ b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Proactor/When_queue_length_causes_a_message_to_be_rejected_async.cs
@@ -29,7 +29,7 @@ THE SOFTWARE. */
 using Paramore.Brighter.MessagingGateway.RMQ.Async;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Proactor;
+namespace Paramore.Brighter.RMQ.Async.Tests.MessagingGateway.Proactor;
 
 [Trait("Category", "RMQ")]
 public class RmqMessageProducerQueueLengthTestsAsync : IDisposable, IAsyncDisposable
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_reading_a_delayed_message_via_the_messaging_gateway_async.cs b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Proactor/When_reading_a_delayed_message_via_the_messaging_gateway_async.cs
similarity index 98%
rename from tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_reading_a_delayed_message_via_the_messaging_gateway_async.cs
rename to tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Proactor/When_reading_a_delayed_message_via_the_messaging_gateway_async.cs
index af510115cb..b4737fcd13 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_reading_a_delayed_message_via_the_messaging_gateway_async.cs
+++ b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Proactor/When_reading_a_delayed_message_via_the_messaging_gateway_async.cs
@@ -29,7 +29,7 @@ THE SOFTWARE. */
 using Paramore.Brighter.MessagingGateway.RMQ.Async;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Proactor;
+namespace Paramore.Brighter.RMQ.Async.Tests.MessagingGateway.Proactor;
 
 [Trait("Category", "RMQ")]
 public class RmqMessageProducerDelayedMessageTestsAsync : IDisposable, IAsyncDisposable
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_rejecting_a_message_to_a_dead_letter_queue_async.cs b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Proactor/When_rejecting_a_message_to_a_dead_letter_queue_async.cs
similarity index 98%
rename from tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_rejecting_a_message_to_a_dead_letter_queue_async.cs
rename to tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Proactor/When_rejecting_a_message_to_a_dead_letter_queue_async.cs
index 0ce664a239..9221e5c4a7 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_rejecting_a_message_to_a_dead_letter_queue_async.cs
+++ b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Proactor/When_rejecting_a_message_to_a_dead_letter_queue_async.cs
@@ -29,7 +29,7 @@ THE SOFTWARE. */
 using Paramore.Brighter.MessagingGateway.RMQ.Async;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Proactor;
+namespace Paramore.Brighter.RMQ.Async.Tests.MessagingGateway.Proactor;
 
 [Trait("Category", "RMQ")]
 public class RmqMessageProducerDLQTestsAsync : IDisposable, IAsyncDisposable
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_resetting_a_connection_that_exists.cs b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Proactor/When_resetting_a_connection_that_exists.cs
similarity index 96%
rename from tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_resetting_a_connection_that_exists.cs
rename to tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Proactor/When_resetting_a_connection_that_exists.cs
index d6a0f9a1b5..f9010b5e0a 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_resetting_a_connection_that_exists.cs
+++ b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Proactor/When_resetting_a_connection_that_exists.cs
@@ -28,7 +28,7 @@ THE SOFTWARE. */
 using RabbitMQ.Client;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Proactor;
+namespace Paramore.Brighter.RMQ.Async.Tests.MessagingGateway.Proactor;
 
 [Trait("Category", "RMQ")]
 public class RMQMessageGatewayConnectionPoolResetConnectionExists
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_retry_limits_force_a_message_onto_the_DLQ_async.cs b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Proactor/When_retry_limits_force_a_message_onto_the_DLQ_async.cs
similarity index 98%
rename from tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_retry_limits_force_a_message_onto_the_DLQ_async.cs
rename to tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Proactor/When_retry_limits_force_a_message_onto_the_DLQ_async.cs
index 7f886c2f5c..e19c5cbe51 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_retry_limits_force_a_message_onto_the_DLQ_async.cs
+++ b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Proactor/When_retry_limits_force_a_message_onto_the_DLQ_async.cs
@@ -4,12 +4,12 @@
 using System.Threading.Tasks;
 using FluentAssertions;
 using Paramore.Brighter.MessagingGateway.RMQ.Async;
-using Paramore.Brighter.RMQ.Tests.TestDoubles;
+using Paramore.Brighter.RMQ.Async.Tests.TestDoubles;
 using Paramore.Brighter.ServiceActivator;
 using Polly.Registry;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Proactor;
+namespace Paramore.Brighter.RMQ.Async.Tests.MessagingGateway.Proactor;
 
 [Trait("Category", "RMQ")]
 [Trait("Fragile", "CI")]
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_ttl_causes_a_message_to_expire.cs b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Proactor/When_ttl_causes_a_message_to_expire.cs
similarity index 98%
rename from tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_ttl_causes_a_message_to_expire.cs
rename to tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Proactor/When_ttl_causes_a_message_to_expire.cs
index 0b70e16933..f26e73311d 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_ttl_causes_a_message_to_expire.cs
+++ b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Proactor/When_ttl_causes_a_message_to_expire.cs
@@ -29,7 +29,7 @@ THE SOFTWARE. */
 using Paramore.Brighter.MessagingGateway.RMQ.Async;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Proactor;
+namespace Paramore.Brighter.RMQ.Async.Tests.MessagingGateway.Proactor;
 
 [Trait("Category", "RMQ")]
 public class RmqMessageProducerTTLTests : IAsyncDisposable, IDisposable
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_a_message_consumer_reads_multiple_messages.cs b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Reactor/When_a_message_consumer_reads_multiple_messages.cs
similarity index 97%
rename from tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_a_message_consumer_reads_multiple_messages.cs
rename to tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Reactor/When_a_message_consumer_reads_multiple_messages.cs
index fda5a6a516..e919c0b773 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_a_message_consumer_reads_multiple_messages.cs
+++ b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Reactor/When_a_message_consumer_reads_multiple_messages.cs
@@ -4,7 +4,7 @@
 using Paramore.Brighter.MessagingGateway.RMQ.Async;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Reactor;
+namespace Paramore.Brighter.RMQ.Async.Tests.MessagingGateway.Reactor;
 
 [Trait("Category", "RMQ")]
 public class RMQBufferedConsumerTests : IDisposable
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_a_message_consumer_throws_an_already_closed_exception_when_connecting.cs b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Reactor/When_a_message_consumer_throws_an_already_closed_exception_when_connecting.cs
similarity index 94%
rename from tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_a_message_consumer_throws_an_already_closed_exception_when_connecting.cs
rename to tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Reactor/When_a_message_consumer_throws_an_already_closed_exception_when_connecting.cs
index 4c0a011ead..b7491970f0 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_a_message_consumer_throws_an_already_closed_exception_when_connecting.cs
+++ b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Reactor/When_a_message_consumer_throws_an_already_closed_exception_when_connecting.cs
@@ -1,11 +1,11 @@
 using System;
 using FluentAssertions;
 using Paramore.Brighter.MessagingGateway.RMQ.Async;
-using Paramore.Brighter.RMQ.Tests.TestDoubles;
+using Paramore.Brighter.RMQ.Async.Tests.TestDoubles;
 using RabbitMQ.Client.Exceptions;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Reactor;
+namespace Paramore.Brighter.RMQ.Async.Tests.MessagingGateway.Reactor;
 
 [Trait("Category", "RMQ")]
 public class RmqMessageConsumerConnectionClosedTests : IDisposable
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_a_message_consumer_throws_an_not_supported_exception_when_connecting.cs b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Reactor/When_a_message_consumer_throws_an_not_supported_exception_when_connecting.cs
similarity index 96%
rename from tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_a_message_consumer_throws_an_not_supported_exception_when_connecting.cs
rename to tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Reactor/When_a_message_consumer_throws_an_not_supported_exception_when_connecting.cs
index 58ded680c7..42acc38df8 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_a_message_consumer_throws_an_not_supported_exception_when_connecting.cs
+++ b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Reactor/When_a_message_consumer_throws_an_not_supported_exception_when_connecting.cs
@@ -25,10 +25,10 @@ THE SOFTWARE. */
 using System;
 using FluentAssertions;
 using Paramore.Brighter.MessagingGateway.RMQ.Async;
-using Paramore.Brighter.RMQ.Tests.TestDoubles;
+using Paramore.Brighter.RMQ.Async.Tests.TestDoubles;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Reactor;
+namespace Paramore.Brighter.RMQ.Async.Tests.MessagingGateway.Reactor;
 
 [Trait("Category", "RMQ")]
 public class RmqMessageConsumerChannelFailureTests : IDisposable
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_a_message_consumer_throws_an_operation_interrupted_exception_when_connecting.cs b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Reactor/When_a_message_consumer_throws_an_operation_interrupted_exception_when_connecting.cs
similarity index 96%
rename from tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_a_message_consumer_throws_an_operation_interrupted_exception_when_connecting.cs
rename to tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Reactor/When_a_message_consumer_throws_an_operation_interrupted_exception_when_connecting.cs
index 32c752ec20..a9f48ade59 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_a_message_consumer_throws_an_operation_interrupted_exception_when_connecting.cs
+++ b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Reactor/When_a_message_consumer_throws_an_operation_interrupted_exception_when_connecting.cs
@@ -25,11 +25,11 @@ THE SOFTWARE. */
 using System;
 using FluentAssertions;
 using Paramore.Brighter.MessagingGateway.RMQ.Async;
-using Paramore.Brighter.RMQ.Tests.TestDoubles;
+using Paramore.Brighter.RMQ.Async.Tests.TestDoubles;
 using RabbitMQ.Client.Exceptions;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Reactor;
+namespace Paramore.Brighter.RMQ.Async.Tests.MessagingGateway.Reactor;
 
 [Trait("Category", "RMQ")]
 public class RmqMessageConsumerOperationInterruptedTests : IDisposable
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_binding_a_channel_to_multiple_topics.cs b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Reactor/When_binding_a_channel_to_multiple_topics.cs
similarity index 97%
rename from tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_binding_a_channel_to_multiple_topics.cs
rename to tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Reactor/When_binding_a_channel_to_multiple_topics.cs
index 678cc3e558..673da3f74d 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_binding_a_channel_to_multiple_topics.cs
+++ b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Reactor/When_binding_a_channel_to_multiple_topics.cs
@@ -4,7 +4,7 @@
 using Paramore.Brighter.MessagingGateway.RMQ.Async;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Reactor;
+namespace Paramore.Brighter.RMQ.Async.Tests.MessagingGateway.Reactor;
 
 [Trait("Category", "RMQ")]
 public class RmqMessageConsumerMultipleTopicTests : IDisposable
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_confirming_posting_a_message_via_the_messaging_gateway.cs b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Reactor/When_confirming_posting_a_message_via_the_messaging_gateway.cs
similarity index 97%
rename from tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_confirming_posting_a_message_via_the_messaging_gateway.cs
rename to tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Reactor/When_confirming_posting_a_message_via_the_messaging_gateway.cs
index 84052e5e6a..f243ea6e33 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_confirming_posting_a_message_via_the_messaging_gateway.cs
+++ b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Reactor/When_confirming_posting_a_message_via_the_messaging_gateway.cs
@@ -28,7 +28,7 @@ THE SOFTWARE. */
 using Paramore.Brighter.MessagingGateway.RMQ.Async;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Reactor;
+namespace Paramore.Brighter.RMQ.Async.Tests.MessagingGateway.Reactor;
 
 [Trait("Category", "RMQ")]
 public class RmqMessageProducerConfirmationsSendMessageTests : IDisposable
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_infrastructure_exists_can_assert.cs b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Reactor/When_infrastructure_exists_can_assert.cs
similarity index 96%
rename from tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_infrastructure_exists_can_assert.cs
rename to tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Reactor/When_infrastructure_exists_can_assert.cs
index 55ccb4a124..9703d6455e 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_infrastructure_exists_can_assert.cs
+++ b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Reactor/When_infrastructure_exists_can_assert.cs
@@ -3,7 +3,7 @@
 using Paramore.Brighter.MessagingGateway.RMQ.Async;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Reactor;
+namespace Paramore.Brighter.RMQ.Async.Tests.MessagingGateway.Reactor;
 
 public class RmqAssumeExistingInfrastructureTests : IDisposable
 {
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_infrastructure_exists_can_validate.cs b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Reactor/When_infrastructure_exists_can_validate.cs
similarity index 97%
rename from tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_infrastructure_exists_can_validate.cs
rename to tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Reactor/When_infrastructure_exists_can_validate.cs
index 4a5e14e0b7..7aee8f274f 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_infrastructure_exists_can_validate.cs
+++ b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Reactor/When_infrastructure_exists_can_validate.cs
@@ -3,7 +3,7 @@
 using Paramore.Brighter.MessagingGateway.RMQ.Async;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Reactor;
+namespace Paramore.Brighter.RMQ.Async.Tests.MessagingGateway.Reactor;
 
 public class RmqValidateExistingInfrastructureTests : IDisposable
 {
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_multiple_threads_try_to_post_a_message_at_the_same_time.cs b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Reactor/When_multiple_threads_try_to_post_a_message_at_the_same_time.cs
similarity index 95%
rename from tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_multiple_threads_try_to_post_a_message_at_the_same_time.cs
rename to tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Reactor/When_multiple_threads_try_to_post_a_message_at_the_same_time.cs
index d02a2d842d..ac8ac9f683 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_multiple_threads_try_to_post_a_message_at_the_same_time.cs
+++ b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Reactor/When_multiple_threads_try_to_post_a_message_at_the_same_time.cs
@@ -5,7 +5,7 @@
 using Paramore.Brighter.MessagingGateway.RMQ.Async;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Reactor;
+namespace Paramore.Brighter.RMQ.Async.Tests.MessagingGateway.Reactor;
 
 [Trait("Category", "RMQ")]
 public class RmqMessageProducerSupportsMultipleThreadsTests : IDisposable
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_posting_a_message_but_no_broker_created.cs b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Reactor/When_posting_a_message_but_no_broker_created.cs
similarity index 94%
rename from tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_posting_a_message_but_no_broker_created.cs
rename to tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Reactor/When_posting_a_message_but_no_broker_created.cs
index 18a4ee66f4..58036c576d 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_posting_a_message_but_no_broker_created.cs
+++ b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Reactor/When_posting_a_message_but_no_broker_created.cs
@@ -2,7 +2,7 @@
 using Paramore.Brighter.MessagingGateway.RMQ.Async;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Reactor;
+namespace Paramore.Brighter.RMQ.Async.Tests.MessagingGateway.Reactor;
 
 public class RmqBrokerNotPreCreatedTests : IDisposable
 {
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_posting_a_message_to_persist_via_the_messaging_gateway.cs b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Reactor/When_posting_a_message_to_persist_via_the_messaging_gateway.cs
similarity index 96%
rename from tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_posting_a_message_to_persist_via_the_messaging_gateway.cs
rename to tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Reactor/When_posting_a_message_to_persist_via_the_messaging_gateway.cs
index 1f48350c0d..e98268edec 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_posting_a_message_to_persist_via_the_messaging_gateway.cs
+++ b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Reactor/When_posting_a_message_to_persist_via_the_messaging_gateway.cs
@@ -4,7 +4,7 @@
 using Paramore.Brighter.MessagingGateway.RMQ.Async;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Reactor;
+namespace Paramore.Brighter.RMQ.Async.Tests.MessagingGateway.Reactor;
 
 [Trait("Category", "RMQ")]
 public class RmqMessageProducerSendPersistentMessageTests : IDisposable
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_posting_a_message_via_the_messaging_gateway.cs b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Reactor/When_posting_a_message_via_the_messaging_gateway.cs
similarity index 97%
rename from tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_posting_a_message_via_the_messaging_gateway.cs
rename to tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Reactor/When_posting_a_message_via_the_messaging_gateway.cs
index 8fc78036c8..a75f64d176 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_posting_a_message_via_the_messaging_gateway.cs
+++ b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Reactor/When_posting_a_message_via_the_messaging_gateway.cs
@@ -28,7 +28,7 @@ THE SOFTWARE. */
 using Paramore.Brighter.MessagingGateway.RMQ.Async;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Reactor;
+namespace Paramore.Brighter.RMQ.Async.Tests.MessagingGateway.Reactor;
 
 [Trait("Category", "RMQ")]
 public class RmqMessageProducerSendMessageTests : IDisposable
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_queue_length_causes_a_message_to_be_rejected.cs b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Reactor/When_queue_length_causes_a_message_to_be_rejected.cs
similarity index 98%
rename from tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_queue_length_causes_a_message_to_be_rejected.cs
rename to tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Reactor/When_queue_length_causes_a_message_to_be_rejected.cs
index 5e6fd8b55b..fe4a490fa3 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_queue_length_causes_a_message_to_be_rejected.cs
+++ b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Reactor/When_queue_length_causes_a_message_to_be_rejected.cs
@@ -28,7 +28,7 @@ THE SOFTWARE. */
 using Paramore.Brighter.MessagingGateway.RMQ.Async;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Reactor;
+namespace Paramore.Brighter.RMQ.Async.Tests.MessagingGateway.Reactor;
 
 [Trait("Category", "RMQ")]
 public class RmqMessageProducerQueueLengthTests : IDisposable
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_reading_a_delayed_message_via_the_messaging_gateway.cs b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Reactor/When_reading_a_delayed_message_via_the_messaging_gateway.cs
similarity index 98%
rename from tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_reading_a_delayed_message_via_the_messaging_gateway.cs
rename to tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Reactor/When_reading_a_delayed_message_via_the_messaging_gateway.cs
index 9e0501f4c8..60616f8cee 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_reading_a_delayed_message_via_the_messaging_gateway.cs
+++ b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Reactor/When_reading_a_delayed_message_via_the_messaging_gateway.cs
@@ -28,7 +28,7 @@ THE SOFTWARE. */
 using Paramore.Brighter.MessagingGateway.RMQ.Async;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Reactor;
+namespace Paramore.Brighter.RMQ.Async.Tests.MessagingGateway.Reactor;
 
 [Trait("Category", "RMQ")]
 public class RmqMessageProducerDelayedMessageTests : IDisposable
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_rejecting_a_message_to_a_dead_letter_queue.cs b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Reactor/When_rejecting_a_message_to_a_dead_letter_queue.cs
similarity index 98%
rename from tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_rejecting_a_message_to_a_dead_letter_queue.cs
rename to tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Reactor/When_rejecting_a_message_to_a_dead_letter_queue.cs
index 312015ba92..5747a0d73a 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_rejecting_a_message_to_a_dead_letter_queue.cs
+++ b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Reactor/When_rejecting_a_message_to_a_dead_letter_queue.cs
@@ -28,7 +28,7 @@ THE SOFTWARE. */
 using Paramore.Brighter.MessagingGateway.RMQ.Async;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Reactor;
+namespace Paramore.Brighter.RMQ.Async.Tests.MessagingGateway.Reactor;
 
 [Trait("Category", "RMQ")]
 public class RmqMessageProducerDLQTests : IDisposable
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_resetting_a_connection_that_does_not_exist.cs b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Reactor/When_resetting_a_connection_that_does_not_exist.cs
similarity index 96%
rename from tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_resetting_a_connection_that_does_not_exist.cs
rename to tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Reactor/When_resetting_a_connection_that_does_not_exist.cs
index e80d69c77d..177bab812d 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_resetting_a_connection_that_does_not_exist.cs
+++ b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Reactor/When_resetting_a_connection_that_does_not_exist.cs
@@ -29,7 +29,7 @@ THE SOFTWARE. */
 using RabbitMQ.Client;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Reactor;
+namespace Paramore.Brighter.RMQ.Async.Tests.MessagingGateway.Reactor;
 
 [Trait("Category", "RMQ")]
 public class RmqMessageGatewayConnectionPoolResetConnectionDoesNotExist
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_retry_limits_force_a_message_onto_the_DLQ.cs b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Reactor/When_retry_limits_force_a_message_onto_the_DLQ.cs
similarity index 98%
rename from tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_retry_limits_force_a_message_onto_the_DLQ.cs
rename to tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Reactor/When_retry_limits_force_a_message_onto_the_DLQ.cs
index 83da201207..e0a8009a90 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_retry_limits_force_a_message_onto_the_DLQ.cs
+++ b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/Reactor/When_retry_limits_force_a_message_onto_the_DLQ.cs
@@ -5,12 +5,12 @@
 using System.Threading.Tasks;
 using FluentAssertions;
 using Paramore.Brighter.MessagingGateway.RMQ.Async;
-using Paramore.Brighter.RMQ.Tests.TestDoubles;
+using Paramore.Brighter.RMQ.Async.Tests.TestDoubles;
 using Paramore.Brighter.ServiceActivator;
 using Polly.Registry;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Reactor;
+namespace Paramore.Brighter.RMQ.Async.Tests.MessagingGateway.Reactor;
 
 [Trait("Category", "RMQ")]
 [Trait("Fragile", "CI")]
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/TestHelpers.cs b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/TestHelpers.cs
similarity index 97%
rename from tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/TestHelpers.cs
rename to tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/TestHelpers.cs
index 486963014c..565732d610 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/TestHelpers.cs
+++ b/tests/Paramore.Brighter.RMQ.Async.Tests/MessagingGateway/TestHelpers.cs
@@ -30,7 +30,7 @@ THE SOFTWARE. */
 using Xunit;
 
 [assembly: CollectionBehavior(DisableTestParallelization = true)]
-namespace Paramore.Brighter.RMQ.Tests.MessagingGateway;
+namespace Paramore.Brighter.RMQ.Async.Tests.MessagingGateway;
 
 internal class QueueFactory(RmqMessagingGatewayConnection connection, ChannelName channelName, RoutingKeys routingKeys)
 {
diff --git a/tests/Paramore.Brighter.RMQ.Tests/Paramore.Brighter.RMQ.Tests.csproj b/tests/Paramore.Brighter.RMQ.Async.Tests/Paramore.Brighter.RMQ.Async.Tests.csproj
similarity index 100%
rename from tests/Paramore.Brighter.RMQ.Tests/Paramore.Brighter.RMQ.Tests.csproj
rename to tests/Paramore.Brighter.RMQ.Async.Tests/Paramore.Brighter.RMQ.Async.Tests.csproj
diff --git a/tests/Paramore.Brighter.RMQ.Tests/TestDoubles/MyCommand.cs b/tests/Paramore.Brighter.RMQ.Async.Tests/TestDoubles/MyCommand.cs
similarity index 95%
rename from tests/Paramore.Brighter.RMQ.Tests/TestDoubles/MyCommand.cs
rename to tests/Paramore.Brighter.RMQ.Async.Tests/TestDoubles/MyCommand.cs
index d720dd8dff..fcf36f8890 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/TestDoubles/MyCommand.cs
+++ b/tests/Paramore.Brighter.RMQ.Async.Tests/TestDoubles/MyCommand.cs
@@ -24,7 +24,7 @@ THE SOFTWARE. */
 
 using System;
 
-namespace Paramore.Brighter.RMQ.Tests.TestDoubles;
+namespace Paramore.Brighter.RMQ.Async.Tests.TestDoubles;
 
 internal class MyCommand : Command
 {
diff --git a/tests/Paramore.Brighter.RMQ.Tests/TestDoubles/MyDeferredCommand.cs b/tests/Paramore.Brighter.RMQ.Async.Tests/TestDoubles/MyDeferredCommand.cs
similarity index 75%
rename from tests/Paramore.Brighter.RMQ.Tests/TestDoubles/MyDeferredCommand.cs
rename to tests/Paramore.Brighter.RMQ.Async.Tests/TestDoubles/MyDeferredCommand.cs
index c78ebe28de..f254c20e6b 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/TestDoubles/MyDeferredCommand.cs
+++ b/tests/Paramore.Brighter.RMQ.Async.Tests/TestDoubles/MyDeferredCommand.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Paramore.Brighter.RMQ.Tests.TestDoubles;
+namespace Paramore.Brighter.RMQ.Async.Tests.TestDoubles;
 
 internal class MyDeferredCommand : Command
 {
diff --git a/tests/Paramore.Brighter.RMQ.Tests/TestDoubles/MyDeferredCommandHandler.cs b/tests/Paramore.Brighter.RMQ.Async.Tests/TestDoubles/MyDeferredCommandHandler.cs
similarity index 84%
rename from tests/Paramore.Brighter.RMQ.Tests/TestDoubles/MyDeferredCommandHandler.cs
rename to tests/Paramore.Brighter.RMQ.Async.Tests/TestDoubles/MyDeferredCommandHandler.cs
index e627c371f1..9f0bf9e1f9 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/TestDoubles/MyDeferredCommandHandler.cs
+++ b/tests/Paramore.Brighter.RMQ.Async.Tests/TestDoubles/MyDeferredCommandHandler.cs
@@ -1,6 +1,6 @@
 using Paramore.Brighter.Actions;
 
-namespace Paramore.Brighter.RMQ.Tests.TestDoubles;
+namespace Paramore.Brighter.RMQ.Async.Tests.TestDoubles;
 
 internal class MyDeferredCommandHandler : RequestHandler<MyDeferredCommand>
 {
diff --git a/tests/Paramore.Brighter.RMQ.Tests/TestDoubles/MyDeferredCommandHandlerAsync.cs b/tests/Paramore.Brighter.RMQ.Async.Tests/TestDoubles/MyDeferredCommandHandlerAsync.cs
similarity index 88%
rename from tests/Paramore.Brighter.RMQ.Tests/TestDoubles/MyDeferredCommandHandlerAsync.cs
rename to tests/Paramore.Brighter.RMQ.Async.Tests/TestDoubles/MyDeferredCommandHandlerAsync.cs
index 8ca518bcfd..2123a6fcdd 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/TestDoubles/MyDeferredCommandHandlerAsync.cs
+++ b/tests/Paramore.Brighter.RMQ.Async.Tests/TestDoubles/MyDeferredCommandHandlerAsync.cs
@@ -2,7 +2,7 @@
 using System.Threading.Tasks;
 using Paramore.Brighter.Actions;
 
-namespace Paramore.Brighter.RMQ.Tests.TestDoubles;
+namespace Paramore.Brighter.RMQ.Async.Tests.TestDoubles;
 
 internal class MyDeferredCommandHandlerAsync : RequestHandlerAsync<MyDeferredCommand>
 {
diff --git a/tests/Paramore.Brighter.RMQ.Tests/TestDoubles/MyDeferredCommandMessageMapper.cs b/tests/Paramore.Brighter.RMQ.Async.Tests/TestDoubles/MyDeferredCommandMessageMapper.cs
similarity index 93%
rename from tests/Paramore.Brighter.RMQ.Tests/TestDoubles/MyDeferredCommandMessageMapper.cs
rename to tests/Paramore.Brighter.RMQ.Async.Tests/TestDoubles/MyDeferredCommandMessageMapper.cs
index 6539d290e0..a3a400497a 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/TestDoubles/MyDeferredCommandMessageMapper.cs
+++ b/tests/Paramore.Brighter.RMQ.Async.Tests/TestDoubles/MyDeferredCommandMessageMapper.cs
@@ -1,7 +1,7 @@
 using System.Text.Json;
 using Paramore.Brighter.Extensions;
 
-namespace Paramore.Brighter.RMQ.Tests.TestDoubles;
+namespace Paramore.Brighter.RMQ.Async.Tests.TestDoubles;
 
 internal class MyDeferredCommandMessageMapper : IAmAMessageMapper<MyDeferredCommand>
 {
diff --git a/tests/Paramore.Brighter.RMQ.Tests/TestDoubles/MyDeferredCommandMessageMapperAsync.cs b/tests/Paramore.Brighter.RMQ.Async.Tests/TestDoubles/MyDeferredCommandMessageMapperAsync.cs
similarity index 95%
rename from tests/Paramore.Brighter.RMQ.Tests/TestDoubles/MyDeferredCommandMessageMapperAsync.cs
rename to tests/Paramore.Brighter.RMQ.Async.Tests/TestDoubles/MyDeferredCommandMessageMapperAsync.cs
index be617f4771..3c68c33d64 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/TestDoubles/MyDeferredCommandMessageMapperAsync.cs
+++ b/tests/Paramore.Brighter.RMQ.Async.Tests/TestDoubles/MyDeferredCommandMessageMapperAsync.cs
@@ -4,7 +4,7 @@
 using System.Threading.Tasks;
 using Paramore.Brighter.Extensions;
 
-namespace Paramore.Brighter.RMQ.Tests.TestDoubles;
+namespace Paramore.Brighter.RMQ.Async.Tests.TestDoubles;
 
 internal class MyDeferredCommandMessageMapperAsync : IAmAMessageMapperAsync<MyDeferredCommand>
 {
diff --git a/tests/Paramore.Brighter.RMQ.Tests/TestDoubles/MyEvent.cs b/tests/Paramore.Brighter.RMQ.Async.Tests/TestDoubles/MyEvent.cs
similarity index 97%
rename from tests/Paramore.Brighter.RMQ.Tests/TestDoubles/MyEvent.cs
rename to tests/Paramore.Brighter.RMQ.Async.Tests/TestDoubles/MyEvent.cs
index aa2157b15a..8b57102c79 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/TestDoubles/MyEvent.cs
+++ b/tests/Paramore.Brighter.RMQ.Async.Tests/TestDoubles/MyEvent.cs
@@ -24,7 +24,7 @@ THE SOFTWARE. */
 
 using System;
 
-namespace Paramore.Brighter.RMQ.Tests.TestDoubles;
+namespace Paramore.Brighter.RMQ.Async.Tests.TestDoubles;
 
 internal class MyEvent : Event, IEquatable<MyEvent>
 {
diff --git a/tests/Paramore.Brighter.RMQ.Tests/TestDoubles/MyEventMessageMapper.cs b/tests/Paramore.Brighter.RMQ.Async.Tests/TestDoubles/MyEventMessageMapper.cs
similarity index 97%
rename from tests/Paramore.Brighter.RMQ.Tests/TestDoubles/MyEventMessageMapper.cs
rename to tests/Paramore.Brighter.RMQ.Async.Tests/TestDoubles/MyEventMessageMapper.cs
index 7f54cb5cd1..286654e3a5 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/TestDoubles/MyEventMessageMapper.cs
+++ b/tests/Paramore.Brighter.RMQ.Async.Tests/TestDoubles/MyEventMessageMapper.cs
@@ -25,7 +25,7 @@ THE SOFTWARE. */
 using System.Text.Json;
 using Paramore.Brighter.Extensions;
 
-namespace Paramore.Brighter.RMQ.Tests.TestDoubles;
+namespace Paramore.Brighter.RMQ.Async.Tests.TestDoubles;
 
 internal class MyEventMessageMapper : IAmAMessageMapper<MyEvent>
 {
diff --git a/tests/Paramore.Brighter.RMQ.Tests/TestDoubles/MyEventMessageMapperAsync.cs b/tests/Paramore.Brighter.RMQ.Async.Tests/TestDoubles/MyEventMessageMapperAsync.cs
similarity index 93%
rename from tests/Paramore.Brighter.RMQ.Tests/TestDoubles/MyEventMessageMapperAsync.cs
rename to tests/Paramore.Brighter.RMQ.Async.Tests/TestDoubles/MyEventMessageMapperAsync.cs
index cf9541dd7e..0e148ccdbc 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/TestDoubles/MyEventMessageMapperAsync.cs
+++ b/tests/Paramore.Brighter.RMQ.Async.Tests/TestDoubles/MyEventMessageMapperAsync.cs
@@ -1,7 +1,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Paramore.Brighter.RMQ.Tests.TestDoubles;
+namespace Paramore.Brighter.RMQ.Async.Tests.TestDoubles;
 
 internal class MyEventMessageMapperAsync : IAmAMessageMapperAsync<MyEvent>
 {
diff --git a/tests/Paramore.Brighter.RMQ.Tests/TestDoubles/QuickHandlerFactory.cs b/tests/Paramore.Brighter.RMQ.Async.Tests/TestDoubles/QuickHandlerFactory.cs
similarity index 84%
rename from tests/Paramore.Brighter.RMQ.Tests/TestDoubles/QuickHandlerFactory.cs
rename to tests/Paramore.Brighter.RMQ.Async.Tests/TestDoubles/QuickHandlerFactory.cs
index 57734aa997..72bdb45b2b 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/TestDoubles/QuickHandlerFactory.cs
+++ b/tests/Paramore.Brighter.RMQ.Async.Tests/TestDoubles/QuickHandlerFactory.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Paramore.Brighter.RMQ.Tests.TestDoubles;
+namespace Paramore.Brighter.RMQ.Async.Tests.TestDoubles;
 
 internal class QuickHandlerFactory(Func<IHandleRequests> handlerAction) : IAmAHandlerFactorySync
 {
diff --git a/tests/Paramore.Brighter.RMQ.Tests/TestDoubles/QuickHandlerFactoryAsync.cs b/tests/Paramore.Brighter.RMQ.Async.Tests/TestDoubles/QuickHandlerFactoryAsync.cs
similarity index 85%
rename from tests/Paramore.Brighter.RMQ.Tests/TestDoubles/QuickHandlerFactoryAsync.cs
rename to tests/Paramore.Brighter.RMQ.Async.Tests/TestDoubles/QuickHandlerFactoryAsync.cs
index 4a1495912c..ceea37e06b 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/TestDoubles/QuickHandlerFactoryAsync.cs
+++ b/tests/Paramore.Brighter.RMQ.Async.Tests/TestDoubles/QuickHandlerFactoryAsync.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Paramore.Brighter.RMQ.Tests.TestDoubles;
+namespace Paramore.Brighter.RMQ.Async.Tests.TestDoubles;
 
 internal class QuickHandlerFactoryAsync(Func<IHandleRequestsAsync> handlerAction) : IAmAHandlerFactoryAsync
 {
diff --git a/tests/Paramore.Brighter.RMQ.Tests/TestDoubles/TestDoubleRmqMessageConsumer.cs b/tests/Paramore.Brighter.RMQ.Async.Tests/TestDoubles/TestDoubleRmqMessageConsumer.cs
similarity index 98%
rename from tests/Paramore.Brighter.RMQ.Tests/TestDoubles/TestDoubleRmqMessageConsumer.cs
rename to tests/Paramore.Brighter.RMQ.Async.Tests/TestDoubles/TestDoubleRmqMessageConsumer.cs
index c33b1e6a14..bcc25dcf5c 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/TestDoubles/TestDoubleRmqMessageConsumer.cs
+++ b/tests/Paramore.Brighter.RMQ.Async.Tests/TestDoubles/TestDoubleRmqMessageConsumer.cs
@@ -30,7 +30,7 @@ THE SOFTWARE. */
 using RabbitMQ.Client.Events;
 using RabbitMQ.Client.Exceptions;
 
-namespace Paramore.Brighter.RMQ.Tests.TestDoubles;
+namespace Paramore.Brighter.RMQ.Async.Tests.TestDoubles;
 /*
  * Use to force a failure mirroring a RabbitMQ subscription failure for testing flow of failure
  */