diff --git a/CryptoExchange.Net/CryptoExchange.Net.csproj b/CryptoExchange.Net/CryptoExchange.Net.csproj
index 2f2474e..097ce7a 100644
--- a/CryptoExchange.Net/CryptoExchange.Net.csproj
+++ b/CryptoExchange.Net/CryptoExchange.Net.csproj
@@ -7,7 +7,7 @@
   <PropertyGroup>
     <PackageId>CryptoExchange.Net</PackageId>
 	<Authors>JKorf</Authors>
-    <PackageVersion>0.0.30</PackageVersion>
+    <PackageVersion>0.0.31</PackageVersion>
 	<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <PackageProjectUrl>https://github.com/JKorf/CryptoExchange.Net</PackageProjectUrl>
 	<PackageLicenseUrl>https://github.com/JKorf/CryptoExchange.Net/blob/master/LICENSE</PackageLicenseUrl>
diff --git a/CryptoExchange.Net/Implementation/BaseSocket.cs b/CryptoExchange.Net/Implementation/BaseSocket.cs
index ac51e21..0b0a9ee 100644
--- a/CryptoExchange.Net/Implementation/BaseSocket.cs
+++ b/CryptoExchange.Net/Implementation/BaseSocket.cs
@@ -75,7 +75,7 @@ namespace CryptoExchange.Net.Implementation
         public event Action OnOpen
         {
             add => openhandlers.Add(value);
-            remove => closehandlers.Remove(value);
+            remove => openhandlers.Remove(value);
         }
 
         protected static void Handle(List<Action> handlers)
diff --git a/CryptoExchange.Net/Implementation/TestWebsocket.cs b/CryptoExchange.Net/Implementation/TestWebsocket.cs
index 384b053..4cfe037 100644
--- a/CryptoExchange.Net/Implementation/TestWebsocket.cs
+++ b/CryptoExchange.Net/Implementation/TestWebsocket.cs
@@ -28,7 +28,7 @@ namespace CryptoExchange.Net.Implementation
         public event Action<Exception> OnError;
         public event Action OnOpen;
 
-        public bool IsClosed { get; private set; }
+        public bool IsClosed { get; private set; } = true;
         public bool IsOpen { get; private set; }
         public bool PingConnection { get; set; }
         public TimeSpan PingInterval { get; set; }
@@ -62,18 +62,18 @@ namespace CryptoExchange.Net.Implementation
             MessagesSend.Add(data);
         }
         
-        public void EnqueueMessage(string data)
+        public async Task EnqueueMessage(string data, int wait)
         {
-            Thread.Sleep(10);
+            await Task.Delay(wait);
             OnMessage?.Invoke(data);
         }
 
-        public void InvokeError(Exception ex, bool closeConnection)
+        public async Task InvokeError(Exception ex, bool closeConnection)
         {
-            Thread.Sleep(10);
+            await Task.Delay(10);
             OnError?.Invoke(ex);
             if (closeConnection)
-                Close();
+                await Close();
         }
 
         public Task Close()