diff --git a/src/Tests/SlimCluster.Transport.Ip.Tests/IPMessageEndpointTests.cs b/src/Tests/SlimCluster.Transport.Ip.Tests/IPMessageEndpointTests.cs
index a940657..c2122e4 100644
--- a/src/Tests/SlimCluster.Transport.Ip.Tests/IPMessageEndpointTests.cs
+++ b/src/Tests/SlimCluster.Transport.Ip.Tests/IPMessageEndpointTests.cs
@@ -56,7 +56,7 @@ public async Task When_SendRequest_And_ResponseArrives_Then_ResponseIsReturned(b
         _socketClient.OnMessageSend(async (endPoint, payload) =>
         {
             // Send response for request            
-            if (IPEndPointAddress.From(endPoint) == remoteAddress && payload == requestPayload)
+            if (IPEndPointAddress.From(endPoint).Equals(remoteAddress) && payload == requestPayload)
             {
                 await _socketClient.OnMessageArrived(endPoint, responsePayload);
             }
@@ -75,11 +75,14 @@ public async Task When_SendRequest_And_ResponseArrives_Then_ResponseIsReturned(b
         {
             // completed
             responseTask.IsCompleted.Should().BeTrue();
+            responseTask.IsCanceled.Should().BeFalse();
+            responseTask.IsFaulted.Should().BeFalse();
             responseTask.Result.Should().Be(response);
         }
         else
         {
             // canceled
+            responseTask.IsCompleted.Should().BeTrue();
             responseTask.IsCanceled.Should().BeTrue();
         }
 
diff --git a/src/Tests/SlimCluster.Transport.Ip.Tests/TestSocketClient.cs b/src/Tests/SlimCluster.Transport.Ip.Tests/TestSocketClient.cs
index b08afea..4a2bc3d 100644
--- a/src/Tests/SlimCluster.Transport.Ip.Tests/TestSocketClient.cs
+++ b/src/Tests/SlimCluster.Transport.Ip.Tests/TestSocketClient.cs
@@ -24,7 +24,6 @@ public TestSocketClient()
 
     public void Dispose()
     {
-
         _tokenSource.Cancel();
         _tokenSource.Dispose();