diff --git a/src/NATS.Client.Core/INatsConnection.cs b/src/NATS.Client.Core/INatsConnection.cs
index 04a87b9d2..77a47cddc 100644
--- a/src/NATS.Client.Core/INatsConnection.cs
+++ b/src/NATS.Client.Core/INatsConnection.cs
@@ -1,6 +1,5 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Threading.Channels;
-using NATS.Client.Core.Internal;
 
 namespace NATS.Client.Core;
 
diff --git a/src/NATS.Client.Core/Internal/ISocketConnection.cs b/src/NATS.Client.Core/ISocketConnection.cs
similarity index 91%
rename from src/NATS.Client.Core/Internal/ISocketConnection.cs
rename to src/NATS.Client.Core/ISocketConnection.cs
index 2575899df..855b6502c 100644
--- a/src/NATS.Client.Core/Internal/ISocketConnection.cs
+++ b/src/NATS.Client.Core/ISocketConnection.cs
@@ -1,4 +1,4 @@
-namespace NATS.Client.Core.Internal;
+namespace NATS.Client.Core;
 
 public interface ISocketConnection : IAsyncDisposable
 {
diff --git a/tests/NATS.Client.JetStream.Tests/NatsJsContextFactoryTest.cs b/tests/NATS.Client.JetStream.Tests/NatsJsContextFactoryTest.cs
index 13ac111e2..f1261b586 100644
--- a/tests/NATS.Client.JetStream.Tests/NatsJsContextFactoryTest.cs
+++ b/tests/NATS.Client.JetStream.Tests/NatsJsContextFactoryTest.cs
@@ -105,6 +105,8 @@ public class MockConnection : INatsConnection
         public INatsSubscriptionManager SubscriptionManager { get; } = new TestSubscriptionManager();
 
         public NatsHeaderParser HeaderParser { get; } = new NatsHeaderParser(Encoding.UTF8);
+        public Func<(string Host, int Port), ValueTask<(string Host, int Port)>>? OnConnectingAsync { get; set; }
+        public Func<ISocketConnection, ValueTask<ISocketConnection>>? OnSocketAvailableAsync { get; set; }
 
         public ValueTask<TimeSpan> PingAsync(CancellationToken cancellationToken = default) => throw new NotImplementedException();