diff --git a/Source/MQTTnet.Benchmarks/ChannelAdapterBenchmark.cs b/Source/MQTTnet.Benchmarks/ChannelAdapterBenchmark.cs
index e51ab6a8..f73e7b36 100644
--- a/Source/MQTTnet.Benchmarks/ChannelAdapterBenchmark.cs
+++ b/Source/MQTTnet.Benchmarks/ChannelAdapterBenchmark.cs
@@ -46,7 +46,7 @@ namespace MQTTnet.Benchmarks
 
             _stream.Position = 0;
 
-            var channel = new TestMqttChannel(_stream);
+            var channel = new MemoryMqttChannel(_stream);
             
             _channelAdapter = new MqttChannelAdapter(channel, serializer, null, new MqttNetEventLogger());
         }
diff --git a/Source/MQTTnet.Tests/Formatter/MqttPacketSerialization_V3_Binary_Tests.cs b/Source/MQTTnet.Tests/Formatter/MqttPacketSerialization_V3_Binary_Tests.cs
index aa299d7e..8260b3f4 100644
--- a/Source/MQTTnet.Tests/Formatter/MqttPacketSerialization_V3_Binary_Tests.cs
+++ b/Source/MQTTnet.Tests/Formatter/MqttPacketSerialization_V3_Binary_Tests.cs
@@ -563,7 +563,7 @@ namespace MQTTnet.Tests
 
             using (var headerStream = new MemoryStream(buffer1.Join().ToArray()))
             {
-                using (var channel = new TestMqttChannel(headerStream))
+                using (var channel = new MemoryMqttChannel(headerStream))
                 {
                     using (var adapter = new MqttChannelAdapter(
                                channel,
@@ -583,7 +583,7 @@ namespace MQTTnet.Tests
 
         MqttProtocolVersion DeserializeAndDetectVersion(MqttPacketFormatterAdapter packetFormatterAdapter, byte[] buffer)
         {
-            var channel = new TestMqttChannel(buffer);
+            var channel = new MemoryMqttChannel(buffer);
             var adapter = new MqttChannelAdapter(channel, packetFormatterAdapter, null, new MqttNetEventLogger());
 
             adapter.ReceivePacketAsync(CancellationToken.None).GetAwaiter().GetResult();
@@ -603,7 +603,7 @@ namespace MQTTnet.Tests
             var serializer = MqttPacketFormatterAdapter.GetMqttPacketFormatter(protocolVersion, writer);
             var buffer = serializer.Encode(packet);
 
-            using (var channel = new TestMqttChannel(buffer.Join().ToArray()))
+            using (var channel = new MemoryMqttChannel(buffer.Join().ToArray()))
             {
                 var adapter = new MqttChannelAdapter(channel, new MqttPacketFormatterAdapter(protocolVersion, new MqttBufferWriter(4096, 65535)), null, new MqttNetEventLogger());
                 return (TPacket)adapter.ReceivePacketAsync(CancellationToken.None).GetAwaiter().GetResult();
diff --git a/Source/MQTTnet.Tests/Mockups/TestMqttChannel.cs b/Source/MQTTnet.Tests/Mockups/MemoryMqttChannel.cs
similarity index 90%
rename from Source/MQTTnet.Tests/Mockups/TestMqttChannel.cs
rename to Source/MQTTnet.Tests/Mockups/MemoryMqttChannel.cs
index d6165510..0dae51f3 100644
--- a/Source/MQTTnet.Tests/Mockups/TestMqttChannel.cs
+++ b/Source/MQTTnet.Tests/Mockups/MemoryMqttChannel.cs
@@ -10,16 +10,16 @@ using MQTTnet.Channel;
 
 namespace MQTTnet.Tests.Mockups
 {
-    public sealed class TestMqttChannel : IMqttChannel
+    public sealed class MemoryMqttChannel : IMqttChannel
     {
         readonly MemoryStream _stream;
 
-        public TestMqttChannel(MemoryStream stream)
+        public MemoryMqttChannel(MemoryStream stream)
         {
             _stream = stream;
         }
 
-        public TestMqttChannel(byte[] buffer)
+        public MemoryMqttChannel(byte[] buffer)
         {
             _stream = new MemoryStream(buffer);
         }
diff --git a/Source/MQTTnet.Tests/Mockups/MqttPacketAsserts.cs b/Source/MQTTnet.Tests/Mockups/MqttPacketAsserts.cs
deleted file mode 100644
index 5d944072..00000000
--- a/Source/MQTTnet.Tests/Mockups/MqttPacketAsserts.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using MQTTnet.Packets;
-
-namespace MQTTnet.Tests.Mockups
-{
-    public sealed class MqttPacketAsserts
-    {
-        public void AssertIsConnectPacket(MqttPacket packet)
-        {
-            Assert.AreEqual(packet.GetType(), typeof(MqttConnectPacket));
-        }
-        
-        public void AssertIsConnAckPacket(MqttPacket packet)
-        {
-            Assert.AreEqual(packet.GetType(), typeof(MqttConnAckPacket));
-        }
-    }
-}
\ No newline at end of file
diff --git a/Source/MQTTnet.Tests/MqttPacketSerializationHelper.cs b/Source/MQTTnet.Tests/MqttPacketSerializationHelper.cs
index 530b185d..5d93c72a 100644
--- a/Source/MQTTnet.Tests/MqttPacketSerializationHelper.cs
+++ b/Source/MQTTnet.Tests/MqttPacketSerializationHelper.cs
@@ -27,7 +27,7 @@ namespace MQTTnet.Tests
 
         public MqttPacket Decode(MqttPacketBuffer buffer)
         {
-            using (var channel = new TestMqttChannel(buffer.ToArray()))
+            using (var channel = new MemoryMqttChannel(buffer.ToArray()))
             {
                 var formatterAdapter = new MqttPacketFormatterAdapter(_protocolVersion, new MqttBufferWriter(4096, 65535));