diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessageDispatch/When_building_a_dispatcher_async.cs b/tests/Paramore.Brighter.RMQ.Tests/MessageDispatch/When_building_a_dispatcher_async.cs
index 9ab6f5682e..1c11bd611d 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessageDispatch/When_building_a_dispatcher_async.cs
+++ b/tests/Paramore.Brighter.RMQ.Tests/MessageDispatch/When_building_a_dispatcher_async.cs
@@ -87,8 +87,9 @@ public DispatchBuilderTestsAsync()
             })
             .ConfigureInstrumentation(tracer, instrumentationOptions);
     }
-
-    [Fact]
+                
+    [Fact(Skip = "Breaks due to fault in Task Scheduler running after context has closed")]
+    //[Fact]
     public async Task When_Building_A_Dispatcher_With_Async()
     {
         _dispatcher = _builder.Build();
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_a_message_consumer_reads_multiple_messages_async.cs b/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_a_message_consumer_reads_multiple_messages_async.cs
similarity index 98%
rename from tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_a_message_consumer_reads_multiple_messages_async.cs
rename to tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_a_message_consumer_reads_multiple_messages_async.cs
index 595c698dc8..b81d1a2dfc 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_a_message_consumer_reads_multiple_messages_async.cs
+++ b/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_a_message_consumer_reads_multiple_messages_async.cs
@@ -4,7 +4,7 @@
 using Paramore.Brighter.MessagingGateway.RMQ;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessagingGateway;
+namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Proactor;
 
 [Trait("Category", "RMQ")]
 public class RMQBufferedConsumerTestsAsync : IDisposable, IAsyncDisposable
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_a_message_consumer_throws_an_already_closed_exception_when_connecting_async.cs b/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_a_message_consumer_throws_an_already_closed_exception_when_connecting_async.cs
similarity index 92%
rename from tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_a_message_consumer_throws_an_already_closed_exception_when_connecting_async.cs
rename to tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_a_message_consumer_throws_an_already_closed_exception_when_connecting_async.cs
index 22c14a4bd4..7d6b818212 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_a_message_consumer_throws_an_already_closed_exception_when_connecting_async.cs
+++ b/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_a_message_consumer_throws_an_already_closed_exception_when_connecting_async.cs
@@ -6,10 +6,10 @@
 using RabbitMQ.Client.Exceptions;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessagingGateway;
+namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Proactor;
 
 [Trait("Category", "RMQ")]
-public class RmqMessageConsumerConnectionClosedTestsAsync : IDisposable, IAsyncDisposable
+public class AsyncRmqMessageConsumerConnectionClosedTests : IDisposable, IAsyncDisposable
 {
     private readonly IAmAMessageProducerAsync _sender;
     private readonly IAmAMessageConsumerAsync _receiver;
@@ -17,7 +17,7 @@ public class RmqMessageConsumerConnectionClosedTestsAsync : IDisposable, IAsyncD
     private readonly Message _sentMessage;
     private Exception _firstException;
 
-    public RmqMessageConsumerConnectionClosedTestsAsync()
+    public AsyncRmqMessageConsumerConnectionClosedTests()
     {
         var messageHeader = new MessageHeader(Guid.NewGuid().ToString(),  
             new RoutingKey(Guid.NewGuid().ToString()), MessageType.MT_COMMAND);
@@ -36,8 +36,6 @@ public RmqMessageConsumerConnectionClosedTestsAsync()
             
         _receiver = new RmqMessageConsumer(rmqConnection, queueName, _sentMessage.Header.Topic, false, false);
         _badReceiver = new AlreadyClosedRmqMessageConsumer(rmqConnection, queueName, _sentMessage.Header.Topic, false, 1, false);
-
-            
     }
 
     [Fact]
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.Tests/MessagingGateway/Proactor/When_a_message_consumer_throws_an_not_supported_exception_when_connecting_async.cs
new file mode 100644
index 0000000000..2f09fa2ce0
--- /dev/null
+++ b/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_a_message_consumer_throws_an_not_supported_exception_when_connecting_async.cs
@@ -0,0 +1,95 @@
+#region Licence
+/* The MIT License (MIT)
+Copyright © 2014 Ian Cooper <ian_hammond_cooper@yahoo.co.uk>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the “Software”), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE. */
+
+#endregion
+
+using System;
+using System.Threading.Tasks;
+using FluentAssertions;
+using Paramore.Brighter.MessagingGateway.RMQ;
+using Paramore.Brighter.RMQ.Tests.TestDoubles;
+using Xunit;
+
+namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Proactor;
+
+[Trait("Category", "RMQ")]
+
+public class AsyncRmqMessageConsumerChannelFailureTests : IAsyncDisposable, IDisposable
+{
+    private readonly IAmAMessageProducerAsync _sender;
+    private readonly IAmAMessageConsumerAsync _badReceiver;
+
+    public AsyncRmqMessageConsumerChannelFailureTests()
+    {
+        var messageHeader = new MessageHeader(Guid.NewGuid().ToString(), 
+            new RoutingKey(Guid.NewGuid().ToString()), MessageType.MT_COMMAND);
+
+        messageHeader.UpdateHandledCount();
+        Message sentMessage = new(messageHeader, new MessageBody("test content"));
+
+        var rmqConnection = new RmqMessagingGatewayConnection
+        {
+            AmpqUri = new AmqpUriSpecification(new Uri("amqp://guest:guest@localhost:5672/%2f")),
+            Exchange = new Exchange("paramore.brighter.exchange")
+        };
+
+        _sender = new RmqMessageProducer(rmqConnection);
+        var queueName = new ChannelName(Guid.NewGuid().ToString());
+            
+        _badReceiver = new NotSupportedRmqMessageConsumer(rmqConnection,queueName, sentMessage.Header.Topic, false, 1, false);
+
+        _sender.SendAsync(sentMessage).GetAwaiter().GetResult();
+    }
+
+    [Fact]
+    public async Task When_a_message_consumer_throws_an_not_supported_exception_when_connecting()
+    {
+        //let messages propogate
+        await Task.Delay(500);
+        
+        bool exceptionHappened = false;
+        try
+        {
+            await _badReceiver.ReceiveAsync(TimeSpan.FromMilliseconds(2000));
+        }
+        catch (ChannelFailureException cfe)
+        {
+            exceptionHappened = true;
+            cfe.InnerException.Should().BeOfType<NotSupportedException>();
+        }
+            
+        exceptionHappened.Should().BeTrue();
+    }
+
+    [Fact]
+    public void Dispose()
+    {
+        ((IAmAMessageProducerSync)_sender).Dispose();
+        ((IAmAMessageConsumerSync)_badReceiver).Dispose();
+    }
+
+    public async ValueTask DisposeAsync()
+    {
+        await _sender.DisposeAsync();
+        await _badReceiver.DisposeAsync();
+    }
+}
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.Tests/MessagingGateway/Proactor/When_a_message_consumer_throws_an_operation_interrupted_exception_when_connecting_async.cs
new file mode 100644
index 0000000000..83ca3fdda0
--- /dev/null
+++ b/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_a_message_consumer_throws_an_operation_interrupted_exception_when_connecting_async.cs
@@ -0,0 +1,92 @@
+#region Licence
+/* The MIT License (MIT)
+Copyright © 2014 Ian Cooper <ian_hammond_cooper@yahoo.co.uk>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the “Software”), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE. */
+
+#endregion
+
+using System;
+using System.Threading.Tasks;
+using FluentAssertions;
+using Paramore.Brighter.MessagingGateway.RMQ;
+using Paramore.Brighter.RMQ.Tests.TestDoubles;
+using RabbitMQ.Client.Exceptions;
+using Xunit;
+
+namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Proactor;
+
+[Trait("Category", "RMQ")]
+public class AsyncRmqMessageConsumerOperationInterruptedTestsAsync : IAsyncDisposable, IDisposable
+{
+    private readonly IAmAMessageProducerAsync _sender;
+    private readonly IAmAMessageConsumerAsync _receiver;
+    private readonly IAmAMessageConsumerAsync _badReceiver;
+
+    public AsyncRmqMessageConsumerOperationInterruptedTestsAsync()
+    {
+        var messageHeader = new MessageHeader(Guid.NewGuid().ToString(), 
+            new RoutingKey(Guid.NewGuid().ToString()), MessageType.MT_COMMAND);
+
+        messageHeader.UpdateHandledCount();
+        Message sentMessage = new(messageHeader, new MessageBody("test content"));
+
+        var rmqConnection = new RmqMessagingGatewayConnection
+        {
+            AmpqUri = new AmqpUriSpecification(new Uri("amqp://guest:guest@localhost:5672/%2f")),
+            Exchange = new Exchange("paramore.brighter.exchange")
+        };
+
+        _sender = new RmqMessageProducer(rmqConnection);
+        _receiver = new RmqMessageConsumer(rmqConnection, new ChannelName(Guid.NewGuid().ToString()), sentMessage.Header.Topic, false, false);
+        _badReceiver = new OperationInterruptedRmqMessageConsumer(rmqConnection, new ChannelName(Guid.NewGuid().ToString()), sentMessage.Header.Topic, false, 1, false);
+
+        _sender.SendAsync(sentMessage).GetAwaiter().GetResult();
+    }
+
+    [Fact]
+    public async Task  When_a_message_consumer_throws_an_operation_interrupted_exception_when_connecting()
+    {
+        bool exceptionHappened = false;
+        try
+        {
+            await _badReceiver.ReceiveAsync(TimeSpan.FromMilliseconds(2000));
+        }
+        catch (ChannelFailureException cfe)
+        {
+            exceptionHappened = true;
+            cfe.InnerException.Should().BeOfType<OperationInterruptedException>();
+        }
+            
+        exceptionHappened.Should().BeTrue();
+    }
+
+    public void Dispose()
+    {
+        ((IAmAMessageProducerSync)_sender).Dispose();
+        ((IAmAMessageConsumerSync)_receiver).Dispose();
+    }
+
+    public async ValueTask DisposeAsync()
+    {
+        await _sender.DisposeAsync();
+        await _receiver.DisposeAsync();
+        await _badReceiver.DisposeAsync();
+    }
+}
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_binding_a_channel_to_multiple_topics_async.cs b/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_binding_a_channel_to_multiple_topics_async.cs
new file mode 100644
index 0000000000..31220a68f9
--- /dev/null
+++ b/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_binding_a_channel_to_multiple_topics_async.cs
@@ -0,0 +1,75 @@
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using FluentAssertions;
+using Paramore.Brighter.MessagingGateway.RMQ;
+using Xunit;
+
+namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Proactor;
+
+[Trait("Category", "RMQ")]
+public class AsyncRmqMessageConsumerMultipleTopicTests : IAsyncDisposable, IDisposable
+{        
+    private readonly IAmAMessageProducerAsync _messageProducer;
+    private readonly IAmAMessageConsumerAsync _messageConsumer;
+    private readonly Message _messageTopic1, _messageTopic2;
+
+    public AsyncRmqMessageConsumerMultipleTopicTests()
+    {
+        var routingKey = new RoutingKey(Guid.NewGuid().ToString());
+            
+        _messageTopic1 = new Message(
+            new MessageHeader(Guid.NewGuid().ToString(), routingKey, MessageType.MT_COMMAND), 
+            new MessageBody("test content for topic test 1"));
+        _messageTopic2 = new Message(
+            new MessageHeader(Guid.NewGuid().ToString(), routingKey, MessageType.MT_COMMAND), 
+            new MessageBody("test content for topic test 2"));
+
+        var rmqConnection = new RmqMessagingGatewayConnection
+        {
+            AmpqUri = new AmqpUriSpecification(new Uri("amqp://guest:guest@localhost:5672/%2f")),
+            Exchange = new Exchange("paramore.brighter.exchange")
+        };
+
+        var topics = new RoutingKeys([
+            new RoutingKey(_messageTopic1.Header.Topic), 
+            new RoutingKey(_messageTopic2.Header.Topic)
+        ]);
+        var queueName = new ChannelName(Guid.NewGuid().ToString());
+
+        _messageProducer = new RmqMessageProducer(rmqConnection);
+        _messageConsumer = new RmqMessageConsumer(rmqConnection, queueName , topics, false, false);
+
+        new QueueFactory(rmqConnection, queueName, topics).CreateAsync().GetAwaiter().GetResult();
+    }
+
+    [Fact]
+    public async Task When_reading_a_message_from_a_channel_with_multiple_topics()
+    {
+        await _messageProducer.SendAsync(_messageTopic1);
+        await _messageProducer.SendAsync(_messageTopic2);
+
+        var topic1Result = (await _messageConsumer.ReceiveAsync(TimeSpan.FromMilliseconds(10000))).First();
+        await _messageConsumer.AcknowledgeAsync(topic1Result);
+        var topic2Result = (await _messageConsumer.ReceiveAsync(TimeSpan.FromMilliseconds(10000))).First();
+        await  _messageConsumer.AcknowledgeAsync(topic2Result);
+
+        topic1Result.Header.Topic.Should().Be(_messageTopic1.Header.Topic);
+        topic1Result.Body.Value.Should().BeEquivalentTo(_messageTopic1.Body.Value);
+
+        topic2Result.Header.Topic.Should().Be(_messageTopic2.Header.Topic);
+        topic2Result.Body.Value.Should().BeEquivalentTo(_messageTopic2.Body.Value);            
+    }
+
+    public void Dispose()
+    {
+        ((IAmAMessageProducerSync) _messageProducer).Dispose();
+        ((IAmAMessageConsumerSync)_messageConsumer).Dispose();
+    }
+
+    public async ValueTask DisposeAsync()
+    {
+        await _messageProducer.DisposeAsync();
+        await _messageConsumer.DisposeAsync();
+    }
+}
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_confirming_posting_a_message_via_the_messaging_gateway_async.cs b/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_confirming_posting_a_message_via_the_messaging_gateway_async.cs
similarity index 94%
rename from tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_confirming_posting_a_message_via_the_messaging_gateway_async.cs
rename to tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_confirming_posting_a_message_via_the_messaging_gateway_async.cs
index eb96fb61a7..328a37c3f7 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_confirming_posting_a_message_via_the_messaging_gateway_async.cs
+++ b/tests/Paramore.Brighter.RMQ.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;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessagingGateway;
+namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Proactor;
 
 [Trait("Category", "RMQ")]
 public class RmqMessageProducerConfirmationsSendMessageAsyncTests : IDisposable
@@ -80,9 +80,7 @@ public async Task When_confirming_posting_a_message_via_the_messaging_gateway_as
 
         await Task.Delay(500);
 
-        //if this is true, then possible test failed because of timeout or RMQ issues
         _messageWasNotPublished.Should().BeFalse();
-        //did we see the message - intent to test logic here
         _messageWasPublished.Should().BeTrue();
     }
 
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_infrastructure_exists_can_assert_async.cs b/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_infrastructure_exists_can_assert_async.cs
similarity index 97%
rename from tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_infrastructure_exists_can_assert_async.cs
rename to tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_infrastructure_exists_can_assert_async.cs
index d1cc5946de..2b6c7b4c46 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_infrastructure_exists_can_assert_async.cs
+++ b/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_infrastructure_exists_can_assert_async.cs
@@ -4,7 +4,7 @@
 using Paramore.Brighter.MessagingGateway.RMQ;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessagingGateway;
+namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Proactor;
 
 public class RmqAssumeExistingInfrastructureTestsAsync : IDisposable, IAsyncDisposable
 {
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_infrastructure_exists_can_validate_async.cs b/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_infrastructure_exists_can_validate_async.cs
similarity index 97%
rename from tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_infrastructure_exists_can_validate_async.cs
rename to tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_infrastructure_exists_can_validate_async.cs
index afc8075753..a41f754441 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_infrastructure_exists_can_validate_async.cs
+++ b/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_infrastructure_exists_can_validate_async.cs
@@ -4,7 +4,7 @@
 using Paramore.Brighter.MessagingGateway.RMQ;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessagingGateway;
+namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Proactor;
 
 public class RmqValidateExistingInfrastructureTestsAsync : IDisposable, IAsyncDisposable
 {
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_multiple_threads_try_to_post_a_message_at_the_same_time_async.cs b/tests/Paramore.Brighter.RMQ.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/When_multiple_threads_try_to_post_a_message_at_the_same_time_async.cs
rename to tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_multiple_threads_try_to_post_a_message_at_the_same_time_async.cs
index dbf1e1a5c1..9049a28ef5 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_multiple_threads_try_to_post_a_message_at_the_same_time_async.cs
+++ b/tests/Paramore.Brighter.RMQ.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;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessagingGateway;
+namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Proactor;
 
 [Trait("Category", "RMQ")]
 public class RmqMessageProducerSupportsMultipleThreadsTestsAsync : IDisposable, IAsyncDisposable
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_posting_a_message_but_no_broker_created_async.cs b/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_posting_a_message_but_no_broker_created_async.cs
similarity index 95%
rename from tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_posting_a_message_but_no_broker_created_async.cs
rename to tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_posting_a_message_but_no_broker_created_async.cs
index 737e3c4eb9..2c32d9c869 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_posting_a_message_but_no_broker_created_async.cs
+++ b/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_posting_a_message_but_no_broker_created_async.cs
@@ -4,7 +4,7 @@
 using Paramore.Brighter.MessagingGateway.RMQ;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessagingGateway;
+namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Proactor;
 
 public class RmqBrokerNotPreCreatedTestsAsync : IDisposable
 {
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_posting_a_message_to_persist_via_the_messaging_gateway_async.cs b/tests/Paramore.Brighter.RMQ.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/When_posting_a_message_to_persist_via_the_messaging_gateway_async.cs
rename to tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_posting_a_message_to_persist_via_the_messaging_gateway_async.cs
index b7f31cfb6f..1e4315b502 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_posting_a_message_to_persist_via_the_messaging_gateway_async.cs
+++ b/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_posting_a_message_to_persist_via_the_messaging_gateway_async.cs
@@ -5,7 +5,7 @@
 using Paramore.Brighter.MessagingGateway.RMQ;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessagingGateway;
+namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Proactor;
 
 [Trait("Category", "RMQ")]
 public class RmqMessageProducerSendPersistentMessageTestsAsync : IDisposable, IAsyncDisposable
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_posting_a_message_via_the_messaging_gateway_async.cs b/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_posting_a_message_via_the_messaging_gateway_async.cs
similarity index 97%
rename from tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_posting_a_message_via_the_messaging_gateway_async.cs
rename to tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_posting_a_message_via_the_messaging_gateway_async.cs
index 995a25457b..d0ddd6e244 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_posting_a_message_via_the_messaging_gateway_async.cs
+++ b/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_posting_a_message_via_the_messaging_gateway_async.cs
@@ -29,7 +29,7 @@ THE SOFTWARE. */
 using Paramore.Brighter.MessagingGateway.RMQ;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessagingGateway;
+namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Proactor;
 
 [Trait("Category", "RMQ")]
 public class RmqMessageProducerSendMessageTestsAsync : IDisposable, IAsyncDisposable
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_queue_length_causes_a_message_to_be_rejected_async.cs b/tests/Paramore.Brighter.RMQ.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/When_queue_length_causes_a_message_to_be_rejected_async.cs
rename to tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_queue_length_causes_a_message_to_be_rejected_async.cs
index 925587b773..1889c9cc70 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_queue_length_causes_a_message_to_be_rejected_async.cs
+++ b/tests/Paramore.Brighter.RMQ.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;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessagingGateway;
+namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Proactor;
 
 [Trait("Category", "RMQ")]
 public class RmqMessageProducerQueueLengthTestsAsync : IDisposable, IAsyncDisposable
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_reading_a_delayed_message_via_the_messaging_gateway_async.cs b/tests/Paramore.Brighter.RMQ.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/When_reading_a_delayed_message_via_the_messaging_gateway_async.cs
rename to tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_reading_a_delayed_message_via_the_messaging_gateway_async.cs
index 51c55337ca..47f9c7b824 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_reading_a_delayed_message_via_the_messaging_gateway_async.cs
+++ b/tests/Paramore.Brighter.RMQ.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;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessagingGateway;
+namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Proactor;
 
 [Trait("Category", "RMQ")]
 public class RmqMessageProducerDelayedMessageTestsAsync : IDisposable, IAsyncDisposable
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_rejecting_a_message_to_a_dead_letter_queue_async.cs b/tests/Paramore.Brighter.RMQ.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/When_rejecting_a_message_to_a_dead_letter_queue_async.cs
rename to tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_rejecting_a_message_to_a_dead_letter_queue_async.cs
index 39c4791f5f..46fcd7be7e 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_rejecting_a_message_to_a_dead_letter_queue_async.cs
+++ b/tests/Paramore.Brighter.RMQ.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;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessagingGateway;
+namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Proactor;
 
 [Trait("Category", "RMQ")]
 public class RmqMessageProducerDLQTestsAsync : IDisposable, IAsyncDisposable
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_resetting_a_connection_that_exists.cs b/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_resetting_a_connection_that_exists.cs
similarity index 97%
rename from tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_resetting_a_connection_that_exists.cs
rename to tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_resetting_a_connection_that_exists.cs
index 3c2650734f..0aa3dcc76f 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_resetting_a_connection_that_exists.cs
+++ b/tests/Paramore.Brighter.RMQ.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;
+namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Proactor;
 
 [Trait("Category", "RMQ")]
 public class RMQMessageGatewayConnectionPoolResetConnectionExists
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_retry_limits_force_a_message_onto_the_DLQ_async.cs b/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_retry_limits_force_a_message_onto_the_DLQ_async.cs
similarity index 97%
rename from tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_retry_limits_force_a_message_onto_the_DLQ_async.cs
rename to tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_retry_limits_force_a_message_onto_the_DLQ_async.cs
index 2c7e950b73..e02cc0800f 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_retry_limits_force_a_message_onto_the_DLQ_async.cs
+++ b/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_retry_limits_force_a_message_onto_the_DLQ_async.cs
@@ -9,7 +9,7 @@
 using Polly.Registry;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessagingGateway;
+namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Proactor;
 
 [Trait("Category", "RMQ")]
 [Trait("Fragile", "CI")]
@@ -112,8 +112,8 @@ public RMQMessageConsumerRetryDLQTestsAsync()
         );
     }
 
-    //[Fact(Skip = "Breaks due to fault in Task Scheduler running after context has closed")]
-    [Fact]
+    [Fact(Skip = "Breaks due to fault in Task Scheduler running after context has closed")]
+    //[Fact]
     public async Task When_retry_limits_force_a_message_onto_the_dlq()
     {
         //NOTE: This test is **slow** because it needs to ensure infrastructure and then wait whilst we requeue a message a number of times,
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_ttl_causes_a_message_to_expire.cs b/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_ttl_causes_a_message_to_expire.cs
similarity index 76%
rename from tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_ttl_causes_a_message_to_expire.cs
rename to tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_ttl_causes_a_message_to_expire.cs
index 0d82c6343b..803ca7cb08 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_ttl_causes_a_message_to_expire.cs
+++ b/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Proactor/When_ttl_causes_a_message_to_expire.cs
@@ -27,16 +27,15 @@ THE SOFTWARE. */
 using System.Threading.Tasks;
 using FluentAssertions;
 using Paramore.Brighter.MessagingGateway.RMQ;
-using Polly.Caching;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessagingGateway;
+namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Proactor;
 
 [Trait("Category", "RMQ")]
-public class RmqMessageProducerTTLTests : IDisposable
+public class RmqMessageProducerTTLTests : IAsyncDisposable, IDisposable
 {
-    private readonly IAmAMessageProducerSync _messageProducer;
-    private readonly IAmAMessageConsumerSync _messageConsumer;
+    private readonly IAmAMessageProducerAsync _messageProducer;
+    private readonly IAmAMessageConsumerAsync _messageConsumer;
     private readonly Message _messageOne;
     private readonly Message _messageTwo;
 
@@ -71,24 +70,24 @@ public RmqMessageProducerTTLTests ()
         );
 
         //create the infrastructure
-        _messageConsumer.Receive(TimeSpan.Zero); 
+        _messageConsumer.ReceiveAsync(TimeSpan.Zero).GetAwaiter().GetResult(); 
              
     }
 
     [Fact]
     public async Task When_rejecting_a_message_to_a_dead_letter_queue()
     {
-        _messageProducer.Send(_messageOne);
-        _messageProducer.Send(_messageTwo);
+        await _messageProducer.SendAsync(_messageOne);
+        await _messageProducer.SendAsync(_messageTwo);
 
         //check messages are flowing - absence needs to be expiry
-        var messageOne = _messageConsumer.Receive(TimeSpan.FromMilliseconds(5000)).First();
+        var messageOne = (await _messageConsumer.ReceiveAsync(TimeSpan.FromMilliseconds(5000))).First();
         messageOne.Id.Should().Be(_messageOne.Id);
 
         //Let it expire
         await Task.Delay(11000);
 
-        var dlqMessage = _messageConsumer.Receive(TimeSpan.FromMilliseconds(10000)).First();
+        var dlqMessage = (await _messageConsumer.ReceiveAsync(TimeSpan.FromMilliseconds(10000))).First();
             
         //assert this is our message
         dlqMessage.Header.MessageType.Should().Be(MessageType.MT_NONE);
@@ -96,6 +95,13 @@ public async Task When_rejecting_a_message_to_a_dead_letter_queue()
 
     public void Dispose()
     {
-        _messageProducer.Dispose();
+        ((IAmAMessageProducerSync)_messageProducer).Dispose();
+        ((IAmAMessageConsumerSync)_messageConsumer).Dispose();
+    }
+
+    public async ValueTask DisposeAsync()
+    {
+        await _messageProducer.DisposeAsync();
+        await _messageConsumer.DisposeAsync();
     }
 }
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_a_message_consumer_reads_multiple_messages.cs b/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_a_message_consumer_reads_multiple_messages.cs
similarity index 97%
rename from tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_a_message_consumer_reads_multiple_messages.cs
rename to tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_a_message_consumer_reads_multiple_messages.cs
index 280acfc4e6..2e38c25975 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_a_message_consumer_reads_multiple_messages.cs
+++ b/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_a_message_consumer_reads_multiple_messages.cs
@@ -4,7 +4,7 @@
 using Paramore.Brighter.MessagingGateway.RMQ;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessagingGateway;
+namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Reactor;
 
 [Trait("Category", "RMQ")]
 public class RMQBufferedConsumerTests : IDisposable
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_a_message_consumer_throws_an_already_closed_exception_when_connecting.cs b/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_a_message_consumer_throws_an_already_closed_exception_when_connecting.cs
similarity index 97%
rename from tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_a_message_consumer_throws_an_already_closed_exception_when_connecting.cs
rename to tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_a_message_consumer_throws_an_already_closed_exception_when_connecting.cs
index 70e109db94..b80924811e 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_a_message_consumer_throws_an_already_closed_exception_when_connecting.cs
+++ b/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_a_message_consumer_throws_an_already_closed_exception_when_connecting.cs
@@ -5,7 +5,7 @@
 using RabbitMQ.Client.Exceptions;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessagingGateway;
+namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Reactor;
 
 [Trait("Category", "RMQ")]
 public class RmqMessageConsumerConnectionClosedTests : IDisposable
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_a_message_consumer_throws_an_not_supported_exception_when_connecting.cs b/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_a_message_consumer_throws_an_not_supported_exception_when_connecting.cs
similarity index 89%
rename from tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_a_message_consumer_throws_an_not_supported_exception_when_connecting.cs
rename to tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_a_message_consumer_throws_an_not_supported_exception_when_connecting.cs
index a94b260f03..ac10f9042d 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_a_message_consumer_throws_an_not_supported_exception_when_connecting.cs
+++ b/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_a_message_consumer_throws_an_not_supported_exception_when_connecting.cs
@@ -28,15 +28,13 @@ THE SOFTWARE. */
 using Paramore.Brighter.RMQ.Tests.TestDoubles;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessagingGateway;
+namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Reactor;
 
 [Trait("Category", "RMQ")]
 public class RmqMessageConsumerChannelFailureTests : IDisposable
 {
     private readonly IAmAMessageProducerSync _sender;
-    private readonly IAmAMessageConsumerSync _receiver;
     private readonly IAmAMessageConsumerSync _badReceiver;
-    private Exception _firstException;
 
     public RmqMessageConsumerChannelFailureTests()
     {
@@ -55,7 +53,6 @@ public RmqMessageConsumerChannelFailureTests()
         _sender = new RmqMessageProducer(rmqConnection);
         var queueName = new ChannelName(Guid.NewGuid().ToString());
             
-        _receiver = new RmqMessageConsumer(rmqConnection, queueName, sentMessage.Header.Topic, false, false);
         _badReceiver = new NotSupportedRmqMessageConsumer(rmqConnection,queueName, sentMessage.Header.Topic, false, 1, false);
 
         _sender.Send(sentMessage);
@@ -67,7 +64,7 @@ public void When_a_message_consumer_throws_an_not_supported_exception_when_conne
         bool exceptionHappened = false;
         try
         {
-            _receiver.Receive(TimeSpan.FromMilliseconds(2000));
+            _badReceiver.Receive(TimeSpan.FromMilliseconds(2000));
         }
         catch (ChannelFailureException cfe)
         {
@@ -82,6 +79,6 @@ public void When_a_message_consumer_throws_an_not_supported_exception_when_conne
     public void Dispose()
     {
         _sender.Dispose();
-        _receiver.Dispose();
+        _badReceiver.Dispose();
     }
 }
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_a_message_consumer_throws_an_operation_interrupted_exception_when_connecting.cs b/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_a_message_consumer_throws_an_operation_interrupted_exception_when_connecting.cs
similarity index 78%
rename from tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_a_message_consumer_throws_an_operation_interrupted_exception_when_connecting.cs
rename to tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_a_message_consumer_throws_an_operation_interrupted_exception_when_connecting.cs
index e162f29413..4c6c8bd6aa 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_a_message_consumer_throws_an_operation_interrupted_exception_when_connecting.cs
+++ b/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_a_message_consumer_throws_an_operation_interrupted_exception_when_connecting.cs
@@ -29,8 +29,7 @@ THE SOFTWARE. */
 using RabbitMQ.Client.Exceptions;
 using Xunit;
 
-[assembly: CollectionBehavior(DisableTestParallelization = true)]
-namespace Paramore.Brighter.RMQ.Tests.MessagingGateway;
+namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Reactor;
 
 [Trait("Category", "RMQ")]
 public class RmqMessageConsumerOperationInterruptedTests : IDisposable
@@ -38,8 +37,6 @@ public class RmqMessageConsumerOperationInterruptedTests : IDisposable
     private readonly IAmAMessageProducerSync _sender;
     private readonly IAmAMessageConsumerSync _receiver;
     private readonly IAmAMessageConsumerSync _badReceiver;
-    private readonly Message _sentMessage;
-    private Exception _firstException;
 
     public RmqMessageConsumerOperationInterruptedTests()
     {
@@ -47,7 +44,7 @@ public RmqMessageConsumerOperationInterruptedTests()
             new RoutingKey(Guid.NewGuid().ToString()), MessageType.MT_COMMAND);
 
         messageHeader.UpdateHandledCount();
-        _sentMessage = new Message(messageHeader, new MessageBody("test content"));
+        Message sentMessage = new(messageHeader, new MessageBody("test content"));
 
         var rmqConnection = new RmqMessagingGatewayConnection
         {
@@ -56,20 +53,15 @@ public RmqMessageConsumerOperationInterruptedTests()
         };
 
         _sender = new RmqMessageProducer(rmqConnection);
-        _receiver = new RmqMessageConsumer(rmqConnection, new ChannelName(Guid.NewGuid().ToString()), _sentMessage.Header.Topic, false, false);
-        _badReceiver = new OperationInterruptedRmqMessageConsumer(rmqConnection, new ChannelName(Guid.NewGuid().ToString()), _sentMessage.Header.Topic, false, 1, false);
+        _receiver = new RmqMessageConsumer(rmqConnection, new ChannelName(Guid.NewGuid().ToString()), sentMessage.Header.Topic, false, false);
+        _badReceiver = new OperationInterruptedRmqMessageConsumer(rmqConnection, new ChannelName(Guid.NewGuid().ToString()), sentMessage.Header.Topic, false, 1, false);
 
-        _sender.Send(_sentMessage);
+        _sender.Send(sentMessage);
     }
 
     [Fact]
     public void  When_a_message_consumer_throws_an_operation_interrupted_exception_when_connecting()
     {
-        //_should_return_a_channel_failure_exception
-        _firstException.Should().BeOfType<ChannelFailureException>();
-        //_should_return_an_explaining_inner_exception
-        _firstException.InnerException.Should().BeOfType<OperationInterruptedException>();
-            
         bool exceptionHappened = false;
         try
         {
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_binding_a_channel_to_multiple_topics.cs b/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_binding_a_channel_to_multiple_topics.cs
similarity index 97%
rename from tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_binding_a_channel_to_multiple_topics.cs
rename to tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_binding_a_channel_to_multiple_topics.cs
index 5c85cda7f0..e6b8584334 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_binding_a_channel_to_multiple_topics.cs
+++ b/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_binding_a_channel_to_multiple_topics.cs
@@ -4,7 +4,7 @@
 using Paramore.Brighter.MessagingGateway.RMQ;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessagingGateway;
+namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Reactor;
 
 [Trait("Category", "RMQ")]
 public class RmqMessageConsumerMultipleTopicTests : IDisposable
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_confirming_posting_a_message_via_the_messaging_gateway.cs b/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_confirming_posting_a_message_via_the_messaging_gateway.cs
similarity index 98%
rename from tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_confirming_posting_a_message_via_the_messaging_gateway.cs
rename to tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_confirming_posting_a_message_via_the_messaging_gateway.cs
index ec3706778a..d22853dd28 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_confirming_posting_a_message_via_the_messaging_gateway.cs
+++ b/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_confirming_posting_a_message_via_the_messaging_gateway.cs
@@ -28,7 +28,7 @@ THE SOFTWARE. */
 using Paramore.Brighter.MessagingGateway.RMQ;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessagingGateway;
+namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Reactor;
 
 [Trait("Category", "RMQ")]
 public class RmqMessageProducerConfirmationsSendMessageTests : IDisposable
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_infrastructure_exists_can_assert.cs b/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_infrastructure_exists_can_assert.cs
similarity index 97%
rename from tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_infrastructure_exists_can_assert.cs
rename to tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_infrastructure_exists_can_assert.cs
index 99bc658470..f72d0c56d3 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_infrastructure_exists_can_assert.cs
+++ b/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_infrastructure_exists_can_assert.cs
@@ -3,7 +3,7 @@
 using Paramore.Brighter.MessagingGateway.RMQ;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessagingGateway;
+namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Reactor;
 
 public class RmqAssumeExistingInfrastructureTests : IDisposable
 {
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_infrastructure_exists_can_validate.cs b/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_infrastructure_exists_can_validate.cs
similarity index 97%
rename from tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_infrastructure_exists_can_validate.cs
rename to tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_infrastructure_exists_can_validate.cs
index 48d7144450..516561d102 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_infrastructure_exists_can_validate.cs
+++ b/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_infrastructure_exists_can_validate.cs
@@ -3,7 +3,7 @@
 using Paramore.Brighter.MessagingGateway.RMQ;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessagingGateway;
+namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Reactor;
 
 public class RmqValidateExistingInfrastructureTests : IDisposable
 {
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_multiple_threads_try_to_post_a_message_at_the_same_time.cs b/tests/Paramore.Brighter.RMQ.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/When_multiple_threads_try_to_post_a_message_at_the_same_time.cs
rename to tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_multiple_threads_try_to_post_a_message_at_the_same_time.cs
index d8d036051f..79c0c0c7c3 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_multiple_threads_try_to_post_a_message_at_the_same_time.cs
+++ b/tests/Paramore.Brighter.RMQ.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;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessagingGateway;
+namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Reactor;
 
 [Trait("Category", "RMQ")]
 public class RmqMessageProducerSupportsMultipleThreadsTests : IDisposable
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_posting_a_message_but_no_broker_created.cs b/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_posting_a_message_but_no_broker_created.cs
similarity index 94%
rename from tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_posting_a_message_but_no_broker_created.cs
rename to tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_posting_a_message_but_no_broker_created.cs
index 0616512bda..b097a9ed4d 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_posting_a_message_but_no_broker_created.cs
+++ b/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_posting_a_message_but_no_broker_created.cs
@@ -2,7 +2,7 @@
 using Paramore.Brighter.MessagingGateway.RMQ;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessagingGateway;
+namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Reactor;
 
 public class RmqBrokerNotPreCreatedTests : IDisposable
 {
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_posting_a_message_to_persist_via_the_messaging_gateway.cs b/tests/Paramore.Brighter.RMQ.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/When_posting_a_message_to_persist_via_the_messaging_gateway.cs
rename to tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_posting_a_message_to_persist_via_the_messaging_gateway.cs
index bd1a4745f1..2934781c02 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_posting_a_message_to_persist_via_the_messaging_gateway.cs
+++ b/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_posting_a_message_to_persist_via_the_messaging_gateway.cs
@@ -4,7 +4,7 @@
 using Paramore.Brighter.MessagingGateway.RMQ;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessagingGateway;
+namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Reactor;
 
 [Trait("Category", "RMQ")]
 public class RmqMessageProducerSendPersistentMessageTests : IDisposable
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_posting_a_message_via_the_messaging_gateway.cs b/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_posting_a_message_via_the_messaging_gateway.cs
similarity index 97%
rename from tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_posting_a_message_via_the_messaging_gateway.cs
rename to tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_posting_a_message_via_the_messaging_gateway.cs
index 9f381f1e0d..d00cc62f5e 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_posting_a_message_via_the_messaging_gateway.cs
+++ b/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_posting_a_message_via_the_messaging_gateway.cs
@@ -28,7 +28,7 @@ THE SOFTWARE. */
 using Paramore.Brighter.MessagingGateway.RMQ;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessagingGateway;
+namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Reactor;
 
 [Trait("Category", "RMQ")]
 public class RmqMessageProducerSendMessageTests : IDisposable
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_queue_length_causes_a_message_to_be_rejected.cs b/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_queue_length_causes_a_message_to_be_rejected.cs
similarity index 98%
rename from tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_queue_length_causes_a_message_to_be_rejected.cs
rename to tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_queue_length_causes_a_message_to_be_rejected.cs
index 42cdab9cd5..f6f7d72155 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_queue_length_causes_a_message_to_be_rejected.cs
+++ b/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_queue_length_causes_a_message_to_be_rejected.cs
@@ -28,7 +28,7 @@ THE SOFTWARE. */
 using Paramore.Brighter.MessagingGateway.RMQ;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessagingGateway;
+namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Reactor;
 
 [Trait("Category", "RMQ")]
 public class RmqMessageProducerQueueLengthTests : IDisposable
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_reading_a_delayed_message_via_the_messaging_gateway.cs b/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_reading_a_delayed_message_via_the_messaging_gateway.cs
similarity index 92%
rename from tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_reading_a_delayed_message_via_the_messaging_gateway.cs
rename to tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_reading_a_delayed_message_via_the_messaging_gateway.cs
index f38eeb8f53..261a0d510a 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_reading_a_delayed_message_via_the_messaging_gateway.cs
+++ b/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_reading_a_delayed_message_via_the_messaging_gateway.cs
@@ -28,7 +28,7 @@ THE SOFTWARE. */
 using Paramore.Brighter.MessagingGateway.RMQ;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessagingGateway;
+namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Reactor;
 
 [Trait("Category", "RMQ")]
 public class RmqMessageProducerDelayedMessageTests : IDisposable
@@ -42,11 +42,8 @@ public RmqMessageProducerDelayedMessageTests()
         var routingKey = new RoutingKey(Guid.NewGuid().ToString());
             
         var header = new MessageHeader(Guid.NewGuid().ToString(), routingKey, MessageType.MT_COMMAND);
-        var originalMessage = new Message(header, new MessageBody("test3 content"));
-
-        var mutatedHeader = new MessageHeader(header.MessageId, routingKey, MessageType.MT_COMMAND);
-        mutatedHeader.Bag.Add(HeaderNames.DELAY_MILLISECONDS, 1000);
-        _message = new Message(mutatedHeader, originalMessage.Body);
+        header.Bag.Add(HeaderNames.DELAY_MILLISECONDS, 1000);
+        _message = new Message(header, new MessageBody("test3 content", "plain/text"));
 
         var rmqConnection = new RmqMessagingGatewayConnection
         {
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_rejecting_a_message_to_a_dead_letter_queue.cs b/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_rejecting_a_message_to_a_dead_letter_queue.cs
similarity index 95%
rename from tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_rejecting_a_message_to_a_dead_letter_queue.cs
rename to tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_rejecting_a_message_to_a_dead_letter_queue.cs
index 116e72ee76..75959a416d 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_rejecting_a_message_to_a_dead_letter_queue.cs
+++ b/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_rejecting_a_message_to_a_dead_letter_queue.cs
@@ -28,7 +28,7 @@ THE SOFTWARE. */
 using Paramore.Brighter.MessagingGateway.RMQ;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessagingGateway;
+namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Reactor;
 
 [Trait("Category", "RMQ")]
 public class RmqMessageProducerDLQTests : IDisposable
@@ -80,7 +80,8 @@ public RmqMessageProducerDLQTests()
         );
     }
 
-    [Fact]
+    [Fact(Skip = "Breaks due to fault in Task Scheduler running after context has closed")]
+    //[Fact]
     public void When_rejecting_a_message_to_a_dead_letter_queue()
     {
         //create the infrastructure
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_resetting_a_connection_that_does_not_exist.cs b/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_resetting_a_connection_that_does_not_exist.cs
similarity index 96%
rename from tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_resetting_a_connection_that_does_not_exist.cs
rename to tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_resetting_a_connection_that_does_not_exist.cs
index c57c15cc98..15794440fd 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_resetting_a_connection_that_does_not_exist.cs
+++ b/tests/Paramore.Brighter.RMQ.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;
+namespace Paramore.Brighter.RMQ.Tests.MessagingGateway.Reactor;
 
 [Trait("Category", "RMQ")]
 public class RmqMessageGatewayConnectionPoolResetConnectionDoesNotExist
diff --git a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_retry_limits_force_a_message_onto_the_DLQ.cs b/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_retry_limits_force_a_message_onto_the_DLQ.cs
similarity index 98%
rename from tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_retry_limits_force_a_message_onto_the_DLQ.cs
rename to tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_retry_limits_force_a_message_onto_the_DLQ.cs
index fd3f930465..1ada34a4e8 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/When_retry_limits_force_a_message_onto_the_DLQ.cs
+++ b/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/Reactor/When_retry_limits_force_a_message_onto_the_DLQ.cs
@@ -10,7 +10,7 @@
 using Polly.Registry;
 using Xunit;
 
-namespace Paramore.Brighter.RMQ.Tests.MessagingGateway;
+namespace Paramore.Brighter.RMQ.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.Tests/MessagingGateway/TestHelpers.cs
index 3e0aa0a593..7ebf64d009 100644
--- a/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/TestHelpers.cs
+++ b/tests/Paramore.Brighter.RMQ.Tests/MessagingGateway/TestHelpers.cs
@@ -27,7 +27,9 @@ THE SOFTWARE. */
 using System.Threading.Tasks;
 using Paramore.Brighter.MessagingGateway.RMQ;
 using RabbitMQ.Client;
+using Xunit;
 
+[assembly: CollectionBehavior(DisableTestParallelization = true)]
 namespace Paramore.Brighter.RMQ.Tests.MessagingGateway;
 
 internal class QueueFactory(RmqMessagingGatewayConnection connection, ChannelName channelName, RoutingKeys routingKeys)